diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index f264b33..ef64c03 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -631,7 +631,7 @@ export default { if (this.accountsReceivableNum !== null && this.amountReceivedNum !== null) { this.model.outstandingAmount = Number(this.accountsReceivableNum) - Number(this.amountReceivedNum) this.model.outstandingAmount = this.model.outstandingAmount.toFixed(2) - if (Number(this.model.outstandingAmount) === 0) { + if (Number(this.model.outstandingAmount) <= 0) { this.model.accountStatus = '3' } else if (Number(this.model.outstandingAmount) > 0 && Number(this.model.outstandingAmount) < Number(this.accountsReceivableNum)) { this.model.accountStatus = '2' diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index d2ddc59..74b0338 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -502,8 +502,11 @@ export default { this.accountsReceivableNum = record.accountsReceivableAmount this.amountReceivedNum = record.amountReceived this.model = Object.assign({}, record) + // 计算未收金额和赊账状态 + this.calculateOutstandingAmount() this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear')) + // 此处回显缺少未收金额和赊账状态,因为需要进行计算,选择了在this.calculateOutstandingAmount()方法中计算后回显 + this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'contractPaymentTimes', 'pack', 'packYear')) this.confirmLoading = false }) }) @@ -694,7 +697,7 @@ export default { this.model.outstandingAmount = Number(this.accountsReceivableNum) - Number(this.amountReceivedNum) this.model.outstandingAmount = this.model.outstandingAmount.toFixed(2) // 未收金额 === 0,已付全款状态 - if (Number(this.model.outstandingAmount) === 0) { + if (Number(this.model.outstandingAmount) <= 0) { this.model.accountStatus = '3' // 未收金额 > 0 且 未收金额 < 应收金额,部分付款状态 } else if (Number(this.model.outstandingAmount) > 0 && Number(this.model.outstandingAmount) < Number(this.accountsReceivableNum)) {