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] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=BE=E9=A1=B9=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4--=E6=94=B6=E6=AC=BE=E7=A1=AE=E8=AE=A4=E7=AE=A1?=
 =?UTF-8?q?=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 @@
           </el-col>
           <el-col :span="4" class="trightb">
             <el-form-item prop="payAccount">
-              <el-input v-model="formobj.payAccount" :disabled="forbidden" placeholder="" clearable/>
+              <el-input v-model="formobj.payAccount" :disabled="forbidden" maxlength="4" placeholder="" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="4" class="tleftb">
@@ -152,18 +152,18 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="10">
             <div>
               <div>
                 <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
                   <el-form-item label="合同编号:">
-                    <el-input v-model="listQuery.contractNo" placeholder="" style="width: 110px" clearable/>
+                    <el-input v-model="listQuery.contractNo" size="mini" placeholder="" style="width: 110px" clearable/>
                   </el-form-item>
                   <el-form-item label="客户名称:">
-                    <el-input v-model="listQuery.customerName" placeholder="" style="width: 100px" clearable/>
+                    <el-input v-model="listQuery.customerName" size="mini" placeholder="" style="width: 100px" clearable/>
                   </el-form-item>
                   <el-form-item label="联系电话:">
-                    <el-input v-model="listQuery.customerPhone" placeholder="" style="width: 140px" clearable/>
+                    <el-input v-model="listQuery.customerPhone" size="mini" placeholder="" style="width: 140px" clearable/>
                   </el-form-item>
                 </el-form>
                 <div style="text-align: center;padding: 5px 0;border: 1px solid #e0e3eb">
@@ -216,7 +216,7 @@
               </el-table>
             </div>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="14">
             <div>
               <div>
                 <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
@@ -264,12 +264,12 @@
                     {{ scope.row.currentReceivableMoney }}
                   </template>
                 </el-table-column>
-                <el-table-column label="认款金额" align="center" width="95">
+                <el-table-column label="认款金额" align="center" width="150">
                   <template slot-scope="scope">
                     <el-input v-model="scope.row.subscriptionMoney" @change="changeSubscriptionMoney" placeholder="" clearable/>
                   </template>
                 </el-table-column>
-                <el-table-column label="认款申请日期" align="center" width="120">
+                <el-table-column label="认款申请日期" align="center" width="200">
                   <template slot-scope="scope">
                     <el-date-picker value-format="yyyy-MM-dd" v-model="scope.row.subscriptionDate" clearable style="width: 140px" type="date" placeholder="请选择"/>
                   </template>
@@ -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')
     }