From 02ee0269ba90b930e37c2f9134ead006ffae498e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Thu, 26 Dec 2024 17:07:19 +0800
Subject: [PATCH] =?UTF-8?q?task=20=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionAccount/collectionAdd.vue       |  4 +-
 .../collectionAccount/collectionModify.vue    |  4 +-
 .../paymentAccount/paymentAccountAdd.vue      | 80 +++++++++++++++----
 .../paymentAccount/paymentAccountModify.vue   | 78 ++++++++++++++----
 .../paymentApproval/collectionAdd.vue         |  4 +-
 .../paymentApproval/collectionAdd2.vue        |  4 +-
 6 files changed, 138 insertions(+), 36 deletions(-)

diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
index b9342336..21dcdf7d 100644
--- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
+++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
@@ -257,7 +257,9 @@
         let queryParams={
           "bankType":this.form.bankType,
           "status": "0",
-          "bankDeposit":this.bankDeposit
+          "bankDeposit":this.bankDeposit,
+          "pageNum":1,
+          "pageSize":10
         }
 
         listDeposit(queryParams).then(response => {
diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue
index ad30c265..34c0a14f 100644
--- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue
+++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue
@@ -240,7 +240,9 @@
         let queryParams={
           "bankType":this.form.bankType,
           "status": "0",
-          "bankDeposit":this.bankDeposit
+          "bankDeposit":this.bankDeposit,
+          "pageNum":1,
+          "pageSize":10
         }
 
         listDeposit(queryParams).then(response => {
diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
index 17715e45..9fe5621e 100644
--- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
@@ -155,20 +155,23 @@
         </van-popup>
         <van-field label="账户名称" required :rules="[{ required: true , message:'请输入账户名称' }]" v-model="form.accountName" placeholder="请输入账户名称" input-align="right" label-width="auto"/>
         <van-field label="银行账户" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入银行账户' }]"  v-model="form.bankAccountNumber" placeholder="请输入银行账户" input-align="right" label-width="auto" required/>
-        <van-field
-          readonly
-          clickable
-          label="开户银行"
-          placeholder="请选择"
-          v-model="form.bankName"
-          @click="showBankDeposit = true"
-          input-align="right"
-          right-icon="arrow-down"
-          label-width="auto"
-          required
-          :rules="[{ required: true , message:'请选择开户银行' }]"
-          v-if="accountType=='银行存款'"
-        />
+        <div>
+          <van-field
+            label="开户银行"
+            placeholder="请选择"
+            v-model="form.bankName"
+            input-align="right"
+            label-width="auto"
+            required
+            :rules="[{ required: true , message:'请选择开户银行' }]"
+            v-if="accountType=='银行存款'"
+            @input="selectDeposit"
+            @focus="selectDeposit"
+          />
+          <div class="deposit_list" v-show="depositListShow">
+            <van-cell style="cursor: pointer;" :title="item.text" @click="onConfirmBankDeposit(item)" v-for="(item,index) in bankDepositList" />
+          </div>
+        </div>
         <van-popup v-model="showBankDeposit" position="bottom">
           <van-picker
             show-toolbar
@@ -273,6 +276,7 @@
         showAccountType:false,
         showSubjectId:false,
         showBankType:false,
+        depositListShow:false,
         minDate: new Date(),
         showBankDeposit:false,
         maxDate: new Date(2025, 10, 1),
@@ -318,6 +322,7 @@
           bankAccountType: "1",
           villageAccountType: "2",
           status: "N",
+          bankName: "",
         }
       };
     },
@@ -406,8 +411,10 @@
         }
       },
       onConfirmBankDeposit(val){
-        this.showBankDeposit = false
-        this.$set(this.form, "bankName", val.bankDeposit);
+        this.showBankDeposit = false;
+        this.depositListShow = false;
+        console.log(val)
+        this.$set(this.form, "bankName", val.text);
         this.$set(this.form, "paymentLines", val.payeePaymentLines);
         this.$set(this.form, "alternateField10", val.institutionNumber);
       },
@@ -476,12 +483,53 @@
       },
       goBack(){
         window.history.go(-1)
+      },
+      selectDeposit(val){
+        //depositListShow
+        console.log(val)
+        console.log(this.form.bankName)
+        if (val == '' || this.form.bankName == ''){return;}
+        this.depositListShow = true;
+
+        let queryParams={
+          "bankType":this.form.bankType,
+          "status": "0",
+          "bankDeposit":this.form.bankName,
+          "pageNum":1,
+          "pageSize":10
+        }
+
+        listDeposit(queryParams).then(response => {
+          this.bankDepositList = []
+          for(var i = 0 ; i < response.rows.length ; i++){
+            this.bankDepositList.push(
+              {
+                "text":response.rows[i].bankDeposit,
+                "value":response.rows[i].id,
+                "payeePaymentLines":response.rows[i].payeePaymentLines,
+                "institutionNumber":response.rows[i].institutionNumber
+              }
+            );
+          }
+        });
+
       }
     },
   }
 </script>
 
 <style scoped lang="scss">
+  .deposit_list{
+    height: 18vh;
+    width: 96%;
+    position: absolute;
+    background: #fff;
+    box-shadow: 0 10PX 10PX rgba(0, 0, 0, .5);
+    left: 2%;
+    z-index: 9;
+    border-radius: 0 0 5PX 5PX;
+    overflow-y: scroll;
+  }
   .app-container {
     padding: 2% 0;
   }
diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
index 297ad992..4b4b5650 100644
--- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
@@ -120,7 +120,7 @@
           right-icon="arrow-down"
           label-width="auto"
           required
-          :rules="[{ required: true , message:'请选择开户银行' }]"
+          :rules="[{ required: true , message:'请选择中心账套' }]"
           v-if="accountType=='银行存款'&&form.managementControlType=='2'"
         />
         <van-popup v-model="showCentralBookId" position="bottom">
@@ -155,20 +155,23 @@
         </van-popup>
         <van-field label="账户名称" required :rules="[{ required: true , message:'请输入账户名称' }]" v-model="form.accountName" placeholder="请输入账户名称" input-align="right" label-width="auto"/>
         <van-field label="银行账户" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入银行账户' }]"  v-model="form.bankAccountNumber" placeholder="请输入银行账户" input-align="right" label-width="auto" required/>
-        <van-field
-          readonly
-          clickable
-          label="开户银行"
-          placeholder="请选择"
-          v-model="form.bankName"
-          @click="showBankDeposit = true"
-          input-align="right"
-          right-icon="arrow-down"
-          label-width="auto"
-          required
-          :rules="[{ required: true , message:'请选择开户银行' }]"
-          v-if="accountType=='银行存款'"
-        />
+        <div>
+          <van-field
+            label="开户银行"
+            placeholder="请选择"
+            v-model="form.bankName"
+            input-align="right"
+            label-width="auto"
+            required
+            :rules="[{ required: true , message:'请选择开户银行' }]"
+            v-if="accountType=='银行存款'"
+            @input="selectDeposit"
+            @focus="selectDeposit"
+          />
+          <div class="deposit_list" v-show="depositListShow">
+            <van-cell style="cursor: pointer;" :title="item.text" @click="onConfirmBankDeposit(item)" v-for="(item,index) in bankDepositList" />
+          </div>
+        </div>
         <van-popup v-model="showBankDeposit" position="bottom">
           <van-picker
             show-toolbar
@@ -273,6 +276,7 @@
         showAccountType:false,
         showSubjectId:false,
         showBankType:false,
+        depositListShow:false,
         minDate: new Date(),
         showBankDeposit:false,
         maxDate: new Date(2025, 10, 1),
@@ -463,7 +467,8 @@
       },
       onConfirmBankDeposit(val){
         this.showBankDeposit = false
-        this.$set(this.form, "bankName", val.bankDeposit);
+        this.depositListShow = false;
+        this.$set(this.form, "bankName", val.text);
         this.$set(this.form, "paymentLines", val.payeePaymentLines);
         this.$set(this.form, "alternateField10", val.institutionNumber);
       },
@@ -532,12 +537,53 @@
       },
       goBack(){
         window.history.go(-1)
+      },
+      selectDeposit(val){
+        //depositListShow
+        console.log(val)
+        console.log(this.form.bankName)
+        if (val == '' || this.form.bankName == ''){return;}
+        this.depositListShow = true;
+
+        let queryParams={
+          "bankType":this.form.bankType,
+          "status": "0",
+          "bankDeposit":this.form.bankName,
+          "pageNum":1,
+          "pageSize":10
+        }
+
+        listDeposit(queryParams).then(response => {
+          this.bankDepositList = []
+          for(var i = 0 ; i < response.rows.length ; i++){
+            this.bankDepositList.push(
+              {
+                "text":response.rows[i].bankDeposit,
+                "value":response.rows[i].id,
+                "payeePaymentLines":response.rows[i].payeePaymentLines,
+                "institutionNumber":response.rows[i].institutionNumber
+              }
+            );
+          }
+        });
+
       }
     },
   }
 </script>
 
 <style scoped lang="scss">
+  .deposit_list{
+    height: 18vh;
+    width: 96%;
+    position: absolute;
+    background: #fff;
+    box-shadow: 0 10PX 10PX rgba(0, 0, 0, .5);
+    left: 2%;
+    z-index: 9;
+    border-radius: 0 0 5PX 5PX;
+    overflow-y: scroll;
+  }
   .app-container {
     padding: 2% 0;
   }
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue
index b542985f..a3a7115c 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue
@@ -254,7 +254,9 @@
         let queryParams={
           "bankType":this.form.bankType,
           "status": "0",
-          "bankDeposit":this.bankDeposit
+          "bankDeposit":this.bankDeposit,
+          "pageNum":1,
+          "pageSize":10
         }
 
         listDeposit(queryParams).then(response => {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue
index 930204b3..2b431ca4 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue
@@ -253,7 +253,9 @@
         let queryParams={
           "bankType":this.form.bankType,
           "status": "0",
-          "bankDeposit":this.bankDeposit
+          "bankDeposit":this.bankDeposit,
+          "pageNum":1,
+          "pageSize":10
         }
 
         listDeposit(queryParams).then(response => {