diff --git a/packages/order-system/src/api/system/borrowedMoney.js b/packages/order-system/src/api/system/borrowedMoney.js index f6118399a..da82df841 100644 --- a/packages/order-system/src/api/system/borrowedMoney.js +++ b/packages/order-system/src/api/system/borrowedMoney.js @@ -50,3 +50,15 @@ export function getBorrowedMoneyByUuid(uuid) { method: 'GET' }); } + +// 复核从外部借款信息 +export function borrowedMoneyAudit(params) { + return request({ + url: '/system/borrowedmoney/audit', + method: 'put', + params: { + id: params.id, + auditStatus: params.auditStatus + } + }); +} diff --git a/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue b/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue index 47dd656fb..51996dd7b 100644 --- a/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue +++ b/packages/order-system/src/views/dashboard/components/goodsOrder/ElTableOrder.vue @@ -36,6 +36,46 @@ export default { computed: { PUBLIC_DICT_TYPE() { return PUBLIC_DICT_TYPE; + }, + // 调整单:使用 el-table + el-table-column(订单模式不变) + adjustTableColumns() { + const dataCols = [ + { idx: 0, label: 'ID', prop: 'id', fixed: 'left' }, + { idx: 1, label: '日期', prop: 'orderDate', fixed: 'left', width: 200 }, + { idx: 2, label: '客户', prop: 'customer', fixed: 'left', width: 196 }, + { idx: 3, label: '供应商/仓库', prop: 'supplierNames', fixed: 'left', width: 280 }, + { idx: 4, label: '陆运车牌', prop: 'landCarNo', fixed: 'left', width: 112 }, + { idx: 5, label: '审核', prop: 'checkState', width: 112 }, + { idx: 6, label: '车队', prop: 'fleet', width: 112 }, + { idx: 7, label: '陆运电话', prop: 'landDriverTel', width: 176 }, + { idx: 8, label: '司机', prop: 'landDriverName', width: 84 }, + { idx: 9, label: '海运柜号', prop: 'seaCarNo', width: 176 }, + { idx: 10, label: '海运电话', prop: 'seaDriverTel', width: 176 }, + { idx: 11, label: '海运公司', prop: 'seaDriverName', width: 168 }, + { idx: 12, label: '总货款', prop: 'allPayments', width: 144 }, + { idx: 13, label: '总吨位', prop: 'allTonnage', width: 80 }, + { idx: 14, label: '出厂货款', prop: 'allPaymentFactory', width: 144 }, + { idx: 15, label: '陆运费', prop: 'landFreight', width: 112 }, + { idx: 16, label: '海运费', prop: 'seaFreight', width: 112 }, + { idx: 17, label: '含税利润', prop: 'allProfit', width: 112 }, + { idx: 18, label: '不含税利润', prop: 'allProfitNoTax', width: 112 }, + { idx: 19, label: '销售经理', prop: 'saleManager', width: 112 }, + { idx: 20, label: '录入员', prop: 'userName', width: 84 }, + { idx: 21, label: '备注', prop: 'comments', width: 140 }, + { idx: 22, label: '出库单', prop: 'path', width: 84 }, + { idx: 23, label: '收到条附件', prop: 'receiveProof' }, + { idx: 24, label: '可否编辑', prop: 'isedit', width: 112 }, + { idx: 25, label: '客户含税', prop: 'customerTaxIncluded', width: 112 }, + { idx: 26, label: '出厂含税', prop: 'supplierTaxIncluded', width: 112 }, + { idx: 27, label: '审核人', prop: 'checkUserName', width: 112 } + ]; + + return [ + { idx: 'index', label: '序号', fixed: 'left', width: 50, align: 'center' }, + { idx: 'rowActions', label: '行操作', fixed: 'left', width: 100, align: 'center' }, + ...dataCols.filter(col => this.columns[col.idx] && this.columns[col.idx].visible), + { idx: 'orderActions', label: '订单操作', fixed: 'right', width: 250, align: 'center' } + ]; } }, components: { @@ -338,6 +378,17 @@ export default { } return {}; }, + // 调整单行高亮:ElementUI 的背景通常绘制在 td 上,使用 row-class-name + CSS 更稳定 + getAdjustRowClassName({ row }) { + if (!this.isAdjustOrder) return ''; + const adjust = Number(row && row.isAdjust); + if (!adjust) return ''; + if (adjust < 0) return 'adjust-row-negative'; + if (adjust === 1) return 'adjust-row-1'; + if (adjust === 2) return 'adjust-row-2'; + if (adjust === 3) return 'adjust-row-3'; + return 'adjust-row-gt3'; + }, // 获取客户开票列表 async getCustomerInvoiceList(orderId) { this.customerInvoiceListLoading = true; @@ -1082,7 +1133,7 @@ export default { - + + + + + + @@ -2227,6 +2417,29 @@ export default { opacity: 0; } +// 调整单行高亮:需要作用到 td(ElementUI 背景绘制在单元格上) +// 同时覆盖:主表体 / 左固定列 / 右固定列(它们是不同的 wrapper) +::v-deep .el-table__body-wrapper tr.adjust-row-1 > td, +::v-deep .el-table__fixed-body-wrapper tr.adjust-row-1 > td, +::v-deep .el-table__fixed-right .el-table__fixed-body-wrapper tr.adjust-row-1 > td { + background-color: #e9e9e9 !important; +} +::v-deep .el-table__body-wrapper tr.adjust-row-2 > td, +::v-deep .el-table__fixed-body-wrapper tr.adjust-row-2 > td, +::v-deep .el-table__fixed-right .el-table__fixed-body-wrapper tr.adjust-row-2 > td { + background-color: #e1f3d8 !important; +} +::v-deep .el-table__body-wrapper tr.adjust-row-3 > td, +::v-deep .el-table__fixed-body-wrapper tr.adjust-row-3 > td, +::v-deep .el-table__fixed-right .el-table__fixed-body-wrapper tr.adjust-row-3 > td { + background-color: #faecd8 !important; +} +::v-deep .el-table__body-wrapper tr.adjust-row-gt3 > td, +::v-deep .el-table__fixed-body-wrapper tr.adjust-row-gt3 > td, +::v-deep .el-table__fixed-right .el-table__fixed-body-wrapper tr.adjust-row-gt3 > td { + background-color: #fbc4c4 !important; +} + @keyframes fadeInRow { from { opacity: 0; diff --git a/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue b/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue index 9174041a3..e2edc962c 100644 --- a/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue +++ b/packages/order-system/src/views/system/Statement/MoneyChangeTotalAmount.vue @@ -286,9 +286,9 @@ export default { createRow('资金总额=①+②-③-④+⑤+⑥+⑦-⑧-⑨+⓪', this.calculateTotalBalance(startTimeMoney), this.calculateTotalBalance(endTimeMoney), this.calculateTotalBalance(data), null), createRow('①客户欠款合计数', startTimeMoney.companyTotalBalance, endTimeMoney.companyTotalBalance, data.companyTotalBalance, `companyTotalBalance`), createRow('②所有银行卡资金合计', startTimeMoney.selfCompanyTotalFunds, endTimeMoney.selfCompanyTotalFunds, data.selfCompanyTotalFunds, `selfCompanyTotalFunds`), - createRow('⑤其他应收-个人从公司借款', startTimeMoney.loanFromCompany, endTimeMoney.loanFromCompany, data.loanFromCompany, `loanFromCompany`), + createRow('⑤其他应收-个人/公司从公司借款', startTimeMoney.loanFromCompany, endTimeMoney.loanFromCompany, data.loanFromCompany, `loanFromCompany`), createRow('⑥期货保证金', startTimeMoney.futuresMarginBalance, endTimeMoney.futuresMarginBalance, data.futuresMarginBalance, `futuresMarginBalance`), - createRow('⑦支付保证金', startTimeMoney.paymentMarginBalance, endTimeMoney.paymentMarginBalance, data.paymentMarginBalance, `paymentMarginBalance`), + createRow('⑦厂家保证金', startTimeMoney.paymentMarginBalance, endTimeMoney.paymentMarginBalance, data.paymentMarginBalance, `paymentMarginBalance`), createRow('⓪库存金额', startTimeMoney.remainingInventoryAmount, endTimeMoney.remainingInventoryAmount, data.remainingInventoryAmount, `remainingInventoryAmount`), createRow('③欠厂家货款', startTimeMoney.supplierTotalBalance, endTimeMoney.supplierTotalBalance, data.supplierTotalBalance, `supplierTotalBalance`), createRow('④未支付运费合计', startTimeMoney.driverUnpaidAmount, endTimeMoney.driverUnpaidAmount, data.driverUnpaidAmount, `driverUnpaidAmount`), diff --git a/packages/order-system/src/views/system/Statement/totalMoneyChange.vue b/packages/order-system/src/views/system/Statement/totalMoneyChange.vue index 9eb32f840..dea032ff0 100644 --- a/packages/order-system/src/views/system/Statement/totalMoneyChange.vue +++ b/packages/order-system/src/views/system/Statement/totalMoneyChange.vue @@ -58,9 +58,9 @@ export default { createRow('②所有银行卡资金合计', data.selfCompanyTotalFunds), createRow('③欠厂家货款', data.supplierTotalBalance), createRow('④未支付运费合计', data.driverUnpaidAmount), - createRow('⑤其他应收-个人从公司借款', data.loanFromCompany), + createRow('⑤其他应收-个人/公司从公司借款', data.loanFromCompany), createRow('⑥期货保证金', data.futuresMarginBalance), - createRow('⑦支付保证金', data.paymentMarginBalance), + createRow('⑦厂家保证金', data.paymentMarginBalance), createRow('⑧收取保证金', data.receiveMarginBalance), createRow('⑨公司从外面借款合计', data.loanBalance), createRow('客户票点合计', data.companyTotalInvoiceAmount), diff --git a/packages/order-system/src/views/system/borrowedmoney/index.vue b/packages/order-system/src/views/system/borrowedmoney/index.vue index d935d0bfd..9ef656c29 100644 --- a/packages/order-system/src/views/system/borrowedmoney/index.vue +++ b/packages/order-system/src/views/system/borrowedmoney/index.vue @@ -53,7 +53,17 @@ + + + + + +