diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index 51528646..36d43cb6 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -232,6 +232,7 @@ } }, { title: '退款', dataIndex: 'changeAmount',width:50}, + { title: '欠款', dataIndex: 'debt',width:60}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } } diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index e0e98b2a..f4fe08f1 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -232,6 +232,7 @@ } }, { title: '退款', dataIndex: 'changeAmount',width:50}, + { title: '欠款', dataIndex: 'debt',width:60}, { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } } diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 57b3a603..48e7ba9b 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -141,7 +141,7 @@ - + @@ -214,6 +214,7 @@ prefixNo: 'CGTH', fileList:[], rowCanEdit: true, + backStatus: true, model: {}, labelCol: { xs: { span: 24 }, @@ -302,10 +303,14 @@ 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) @@ -378,6 +383,7 @@ }, linkBillListOk(selectBillDetailRows, linkNumber, organId, discount, 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 54724878..96cd7baa 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -141,7 +141,7 @@ - + @@ -219,6 +219,7 @@ prefixNo: 'XSTH', fileList:[], rowCanEdit: true, + backStatus: true, model: {}, labelCol: { xs: { span: 24 }, @@ -308,10 +309,14 @@ 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) @@ -389,6 +394,7 @@ }, linkBillListOk(selectBillDetailRows, linkNumber, organId, discount, 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 635de3fe..bc7f48a9 100644 --- a/jshERP-web/src/views/financial/dialog/DebtBillList.vue +++ b/jshERP-web/src/views/financial/dialog/DebtBillList.vue @@ -1,7 +1,7 @@