From 8e2e381bdea539a80898610059e78f43ca97d619 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 16 Dec 2021 16:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=81=94=E8=A1=8C=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bankAgriculture/collectionAccount.js      |  9 ++++
 .../collectionAccount/collectionAdd.vue       | 51 ++++++++++++++++---
 .../paymentApproval/approvalAdd.vue           |  5 +-
 .../paymentApproval/approvalAdd2.vue          |  3 ++
 .../paymentApproval/approvalAdd3.vue          |  3 ++
 .../paymentApproval/approvalAdd4.vue          |  3 ++
 .../paymentApproval/approvalAdd5.vue          |  3 ++
 .../paymentApproval/approvalModify.vue        |  3 ++
 .../paymentApproval/approvalModify2.vue       |  3 ++
 .../paymentApproval/approvalModify3.vue       |  3 ++
 .../paymentApproval/approvalModify4.vue       |  3 ++
 .../paymentApproval/approvalModify5.vue       |  3 ++
 12 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/src/api/onlineHome/bankAgriculture/collectionAccount.js b/src/api/onlineHome/bankAgriculture/collectionAccount.js
index 4570cbcc..57ab7a01 100644
--- a/src/api/onlineHome/bankAgriculture/collectionAccount.js
+++ b/src/api/onlineHome/bankAgriculture/collectionAccount.js
@@ -42,3 +42,12 @@ export function delPayee(id) {
     method: 'get'
   })
 }
+
+// 查询开户行信息列表
+export function listDeposit(query) {
+  return request({
+    url: '/yinnong/deposit/list',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd.vue
index 73645f2e..8a77a4e0 100644
--- a/src/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd.vue
+++ b/src/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd.vue
@@ -37,7 +37,28 @@
             @cancel="showBankType = false"
           />
         </van-popup>
-        <van-field label="开户银行" required :rules="[{ required: true , message:'请输入开户银行' }]" v-model="form.bankDeposit" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="开户银行"
+          placeholder="请选择"
+          @click="showBankDeposit = true"
+          v-model="bankDeposit"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择开户银行' }]"
+        />
+        <van-popup v-model="showBankDeposit" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="bankDepositOptions"
+            @confirm="onConfirmBankDeposit"
+            @cancel="showBankDeposit = false"
+          />
+        </van-popup>
+       <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -96,12 +117,13 @@
 </template>
 
 <script>
-  import { addPayee } from "@/api/onlineHome/bankAgriculture/collectionAccount";
+  import { addPayee,listDeposit } from "@/api/onlineHome/bankAgriculture/collectionAccount";
   export default {
     name: "collectionAdd",
     data() {
       return {
         showBankType:false,
+        showBankDeposit:false,
         showPayeeType:false,
         form:{
           accountType:'1',
@@ -110,12 +132,12 @@
 
         bankType:'',
         payeeType:'',
-
+        bankDeposit:'',
         bankTypeOptions:[],
         statusOptions:[],
         accountTypeOptions:[],
         payeeTypeOptions:[],
-
+        bankDepositOptions:[],
       };
     },
     created() {
@@ -154,7 +176,26 @@
       onConfirmBankType(data){
         this.bankType = data.text;
         this.form.bankType = data.value;
+        this.bankDeposit = ""
+        this.form.payeePaymentLines = ""
         this.showBankType = false;
+        let queryParams={
+          "pageNum": 1,
+          "pageSize": 20,
+          "bankType":this.form.bankType,
+          "status": "0",
+        }
+        listDeposit(queryParams).then(response => {
+          this.bankDepositOptions = []
+          for(var i = 0 ; i < response.rows.length ; i++){
+            this.bankDepositOptions.push({"text":response.rows[i].bankDeposit,"value":response.rows[i].id});
+          }
+        });
+      },
+      onConfirmBankDeposit(data){
+        this.bankDeposit = data.text
+        this.form.payeePaymentLines = data.value;
+        this.showBankDeposit = false;
       },
       onConfirmPayeeType(data){
         this.payeeType = data.text;
@@ -162,9 +203,7 @@
         this.showPayeeType = false;
       },
       goAdd(){
-        console.log(this.form)
         addPayee(this.form).then(response => {
-          console.log(response);
           this.$toast.success('新增成功');
           setTimeout(function(){
             history.go(-1)
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
index 1cf08657..a0ae3bc1 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -446,7 +446,6 @@
         this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
-          console.log(response)
           this.payeeList = response.rows;
           response.rows.map((res,index) => {
               this.payeeList[index].text = res.payee;
@@ -500,6 +499,7 @@
         this.chargeItme[index].payeeId = data.value;
         this.chargeItme[index].showpayee = false;
         this.payeeSelectChange(data.value , index)
+        console.log(data)
       },
       onConfirmBankType(data,index){
         for (var i = 0 ; i < this.chargeItme.length ; i++){
@@ -787,6 +787,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -794,6 +795,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -802,6 +804,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
index d0f957ea..c1a3fcd5 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue
@@ -782,6 +782,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -789,6 +790,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -797,6 +799,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue
index a63cf2e9..e235bd47 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue
@@ -802,6 +802,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -809,6 +810,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -817,6 +819,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
index 100493d6..d1483dd7 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue
@@ -786,6 +786,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -793,6 +794,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -801,6 +803,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
index 6cbe5a83..edb0f583 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue
@@ -803,6 +803,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -810,6 +811,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -818,6 +820,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
index baa679d7..e673c406 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
@@ -778,6 +778,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -785,6 +786,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -793,6 +795,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
index 70ac62bf..0ababe1d 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
@@ -779,6 +779,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -786,6 +787,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -794,6 +796,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue
index fc1495c6..86fb7d00 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue
@@ -787,6 +787,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -794,6 +795,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -802,6 +804,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
index 4b66b560..36a84700 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue
@@ -781,6 +781,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -788,6 +789,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -796,6 +798,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
index 1b8d938f..abdcd087 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
@@ -781,6 +781,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
+          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -788,6 +789,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -796,6 +798,7 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
+          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },