From 48a65ee397908fd2aead3120a85a5a269b01593a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 3 Jan 2023 16:50:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=BE=E9=A1=B9?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4--=E6=94=B6=E6=AC=BE=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acknowledgementReceiptAdd.vue | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue index 6b35a289fd..fbb03d96d3 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue @@ -107,7 +107,7 @@ - + @@ -152,18 +152,18 @@ - +
- + - + - +
@@ -216,7 +216,7 @@
- +
@@ -264,12 +264,12 @@ {{ scope.row.currentReceivableMoney }} - + - + @@ -296,6 +296,7 @@ export default { data() { return { viewTitle: '', + dialogStatus: '', overduereceivableKey: 0, selectedreceivableKey: 1, receiptBank_list: [], @@ -350,7 +351,8 @@ export default { payAccount: [{ required: true, message: '付款账号不能为空', trigger: 'blur' }] }, submitdisabled: false, - balance: '' // 余额 + balance: '', // 余额 + balanceCopy: '' // 计算余额时使用(针对已选应收款项明细表中认款金额多次输入导致余额计算错误) } }, methods: { @@ -426,7 +428,10 @@ export default { this.formobj.collectionTypeKey = aa.value }, changeCollectionMoney() { - this.balance = this.formobj.collectionMoney + if (this.dialogStatus === '') { + this.balance = this.formobj.collectionMoney + this.balanceCopy = this.formobj.collectionMoney + } }, changeSubscriptionMoney() { let subscriptionMoney = '0' @@ -469,7 +474,7 @@ export default { return u }) }) - this.balance = parseInt(this.balance) - parseInt(resNum) + this.balance = parseInt(this.balanceCopy) - parseInt(resNum) }, getlist() { this.listQuery.createBySid = window.sessionStorage.getItem('userSid') @@ -508,10 +513,12 @@ export default { showEdit(row) { this.DataDictionary() this.viewTitle = '【编辑】收款确认申请' + this.dialogStatus = 'edit' fetchDetailBySid(row.sid).then(resp => { - if (resp.code === '200') { + if (resp.success) { this.formobj = resp.data this.balance = this.formobj.balance + this.balanceCopy = this.formobj.balance this.getlist() this.forbidden = true if (this.formobj.paymentVoucherAppendixs.length > 0) { @@ -622,6 +629,9 @@ export default { paymentVoucherUrl_list.push(this.formobj.paymentVoucherAppendixs[i].filePath) } this.formobj.paymentVoucherUrl = paymentVoucherUrl_list.join(',') + } else { + this.$message({ showClose: true, type: 'error', message: '请上传打款凭证' }) + return } if (this.formobj.remittanceConfirmationAppendixs.length > 0) { var remittanceConfirmationUrl_list = [] @@ -629,6 +639,13 @@ export default { remittanceConfirmationUrl_list.push(this.formobj.remittanceConfirmationAppendixs[b].filePath) } this.formobj.remittanceConfirmationUrl = remittanceConfirmationUrl_list.join(',') + } else { + for (var k = 0; k < this.formobj.finSelectedReceivablesDetaileds.length; k++) { + if (this.formobj.finSelectedReceivablesDetaileds[k].customerName !== this.formobj.payerName) { + this.$message({ showClose: true, type: 'error', message: '请上传汇款确认书' }) + return + } + } } this.formobj.userSid = window.sessionStorage.getItem('userSid') this.$refs['form_obj'].validate((valid) => { @@ -638,6 +655,8 @@ export default { if (resp.success) { this.$message({ showClose: true, type: 'success', message: resp.msg }) this.handleReturn('true') + } else { + this.submitdisabled = false } }).catch(() => { this.submitdisabled = false @@ -691,6 +710,8 @@ export default { this.$refs['remittance'].show(this.list2) }) this.balance = '' + this.balanceCopy = '' + this.dialogStatus = '' this.$refs['form_obj'].resetFields() this.$emit('doback') } From f5721f72b398a3501ea7615b7b471ee4fac2196b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 3 Jan 2023 17:57:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8C=82=E8=BD=A6?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E7=AE=A1=E7=90=86=E3=80=81=E6=8C=82=E8=BD=A6?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guache/guachechexing/guachechexingAdd.vue | 24 ++++--------------- .../guachechexing/guachechexingguanli.vue | 17 ++++--------- .../guachetaizhang/guachetaizhangAdd.vue | 20 +++++++++------- .../guachetaizhang/guachetaizhangInfo.vue | 2 +- .../guachetaizhang/guachetaizhangguanli.vue | 17 ++++--------- .../relation/guachechexingselect.vue | 17 ++++--------- 6 files changed, 30 insertions(+), 67 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue index 98b25e07f1..3479b5cb53 100644 --- a/anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue @@ -16,10 +16,7 @@ - - - - + @@ -190,10 +187,10 @@ - 销售指导价(元) + *销售指导价(元) - + @@ -206,14 +203,13 @@