From a2fa99e638ea661fac1686cb97feac8f7b613535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 5 Apr 2023 23:35:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=B6=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E5=92=8C=E5=AF=B9=E8=B4=A6=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E9=80=80=E6=AC=BE=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/bill/modules/PurchaseBackModal.vue | 8 +------- .../src/views/bill/modules/SaleBackModal.vue | 8 +------- .../src/views/financial/dialog/DebtBillList.vue | 17 ++++------------- .../financial/mixins/FinancialModalMixin.js | 4 ++-- .../views/financial/modules/MoneyInModal.vue | 2 +- .../views/financial/modules/MoneyOutModal.vue | 2 +- .../views/report/modules/DebtAccountList.vue | 15 ++++++--------- 7 files changed, 16 insertions(+), 40 deletions(-) diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index b857d218..d39fd84a 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -139,7 +139,7 @@ - + @@ -212,7 +212,6 @@ prefixNo: 'CGTH', fileList:[], rowCanEdit: true, - backStatus: true, model: {}, labelCol: { xs: { span: 24 }, @@ -302,14 +301,10 @@ if (this.action === 'add') { this.addInit(this.prefixNo) this.fileList = [] - this.backStatus = true } else { if(this.model.linkNumber) { this.rowCanEdit = false this.materialTable.columns[1].type = FormTypes.normal - this.backStatus = false - } else { - this.backStatus = true } this.model.operTime = this.model.operTimeStr this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2) @@ -383,7 +378,6 @@ }, linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) { this.rowCanEdit = false - this.backStatus = false this.materialTable.columns[1].type = FormTypes.normal this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1) diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 2c9f088a..b8ee15da 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -139,7 +139,7 @@ - + @@ -217,7 +217,6 @@ prefixNo: 'XSTH', fileList:[], rowCanEdit: true, - backStatus: true, model: {}, labelCol: { xs: { span: 24 }, @@ -308,14 +307,10 @@ this.addInit(this.prefixNo) this.personList.value = '' this.fileList = [] - this.backStatus = true } else { if(this.model.linkNumber) { this.rowCanEdit = false this.materialTable.columns[1].type = FormTypes.normal - this.backStatus = false - } else { - this.backStatus = true } this.model.operTime = this.model.operTimeStr this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2) @@ -394,7 +389,6 @@ }, linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) { this.rowCanEdit = false - this.backStatus = false this.materialTable.columns[1].type = FormTypes.normal this.changeFormTypes(this.materialTable.columns, 'preNumber', 1) this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1) diff --git a/jshERP-web/src/views/financial/dialog/DebtBillList.vue b/jshERP-web/src/views/financial/dialog/DebtBillList.vue index 49ee8664..657be07b 100644 --- a/jshERP-web/src/views/financial/dialog/DebtBillList.vue +++ b/jshERP-web/src/views/financial/dialog/DebtBillList.vue @@ -65,12 +65,6 @@ {{record.number}} - - 实际欠款 - - - - @@ -134,9 +128,6 @@ { title: '单据日期', dataIndex: 'operTimeStr',width:130}, { title: '操作员', dataIndex: 'userName',width:70, ellipsis:true}, { title: '本单欠款', dataIndex: 'needDebt',width:70 }, - { dataIndex: 'realNeedDebt',width:80, - slots: { title: 'customTitle' } - }, { title: '已收欠款', dataIndex: 'finishDebt',width:70 }, { title: '待收欠款', dataIndex: 'debt',width:70 } ], @@ -160,11 +151,11 @@ this.queryParam.status = status this.columns[0].title = organType if(type === '入库') { - this.columns[7].title = '已付欠款' - this.columns[8].title = '待付欠款' + this.columns[6].title = '已付欠款' + this.columns[7].title = '待付欠款' } else if(type === '出库') { - this.columns[7].title = '已收欠款' - this.columns[8].title = '待收欠款' + this.columns[6].title = '已收欠款' + this.columns[7].title = '待收欠款' } this.model = Object.assign({}, {}); this.visible = true; diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index 2908c2d7..addf4383 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -250,7 +250,7 @@ export const FinancialModalMixin = { for(let i=0; i{ if(res.code === 200){ - info.needDebt = res.data.needDebt + info.needDebt = res.data.needDebt?res.data.needDebt:0 info.finishDebt = res.data.finishDebt info.eachAmount = res.data.eachAmount listEx.push(info) diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index 4e77ff2d..55a599de 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -278,7 +278,7 @@ let organId = this.form.getFieldValue('organId') if(organId){ this.$refs.debtBillList.show(organId, '出库', '销售', '客户', "") - this.$refs.debtBillList.title = "选择销售出库欠款单据" + this.$refs.debtBillList.title = "选择销售欠款单据" } else { this.$message.warning('请选择客户！'); } diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue index 34e72aee..6a1570e9 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -282,7 +282,7 @@ let organId = this.form.getFieldValue('organId') if(organId){ this.$refs.debtBillList.show(organId, '入库', '采购', '供应商', "") - this.$refs.debtBillList.title = "选择采购入库欠款单据" + this.$refs.debtBillList.title = "选择采购欠款单据" } else { this.$message.warning('请选择供应商！'); } diff --git a/jshERP-web/src/views/report/modules/DebtAccountList.vue b/jshERP-web/src/views/report/modules/DebtAccountList.vue index c3a6e4fb..d1026661 100644 --- a/jshERP-web/src/views/report/modules/DebtAccountList.vue +++ b/jshERP-web/src/views/report/modules/DebtAccountList.vue @@ -131,9 +131,6 @@ { title: '单据日期', dataIndex: 'operTimeStr',width:130}, { title: '操作员', dataIndex: 'userName',width:60, ellipsis:true}, { title: '本单欠款', dataIndex: 'needDebt',width:70}, - { dataIndex: 'realNeedDebt',width:80, - slots: { title: 'customTitle' } - }, { title: '已收欠款', dataIndex: 'finishDebt',width:70}, { title: '待收欠款', dataIndex: 'debt',width:70} ], @@ -159,11 +156,11 @@ this.queryParam.endTime = endTime this.columns[2].title = organType if(type === '入库') { - this.columns[8].title = '已付欠款' - this.columns[9].title = '待付欠款' + this.columns[7].title = '已付欠款' + this.columns[8].title = '待付欠款' } else if(type === '出库') { - this.columns[8].title = '已收欠款' - this.columns[9].title = '待收欠款' + this.columns[7].title = '已收欠款' + this.columns[8].title = '待收欠款' } this.model = Object.assign({}, {}); this.visible = true; @@ -190,10 +187,10 @@ console.log(value); }, exportExcel() { - let aoa = [['单据编号', this.columns[2].title, '商品信息', '单据日期', '操作员', '本单欠款', '实际欠款', '已收欠款', '待收欠款']] + let aoa = [['单据编号', this.columns[2].title, '商品信息', '单据日期', '操作员', '本单欠款', '已收欠款', '待收欠款']] for (let i = 0; i < this.dataSource.length; i++) { let ds = this.dataSource[i] - let item = [ds.number, ds.organName, ds.materialsList, ds.operTimeStr, ds.userName, ds.needDebt, ds.realNeedDebt, ds.finishDebt, ds.debt] + let item = [ds.number, ds.organName, ds.materialsList, ds.operTimeStr, ds.userName, ds.needDebt, ds.finishDebt, ds.debt] aoa.push(item) } openDownloadDialog(sheet2blob(aoa), '欠款详情')