银农：app中收款方选择时显示卡号、开户行选择时可搜索、新增申请单时付款账户默认第一个

src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue

@@ -59,7 +59,12 @@
           required
           :rules="[{ required: true , message:'请选择开户银行' }]"
         />
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <van-popup v-model="showBankDeposit" position="bottom" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -135,6 +140,7 @@
         showBankType:false,
         showBankDeposit:false,
         showPayeeType:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0'
@@ -211,6 +217,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {

src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue

@@ -49,7 +49,12 @@
           required
           :rules="[{ required: true , message:'请选择开户银行' }]"
         />
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <van-popup v-model="showBankDeposit" position="bottom" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -124,6 +129,7 @@
         showBankType:false,
         showBankDeposit:false,
         showPayeeType:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0'
@@ -158,21 +164,9 @@
             }
             this.payeeType = this.selectDictLabel(res.data, response.data.payeeType);
           });
-          let queryParams={
-            "bankType":response.data.bankType,
-            "status": "0",
-          }
-          listDeposit(queryParams).then(rr => {
-            this.bankDepositOptions = []
-            for(var i = 0 ; i < rr.rows.length ; i++){
-              if(_this.form.payeePaymentLines==rr.rows[i].payeePaymentLines){
-                _this.bankDeposit = rr.rows[i].bankDeposit
-              }
-                _this.bankDepositOptions.push({"text":rr.rows[i].bankDeposit,"value":rr.rows[i].id,
-                "payeePaymentLines":rr.rows[i].payeePaymentLines,"institutionNumber":rr.rows[i].institutionNumber});
-            }
-          });
           _this.form = response.data;
+          _this.bankDeposit = response.data.bankDeposit;
+          _this.bankDepositSearch();
         });
 
       },
@@ -188,6 +182,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue

@@ -538,6 +538,9 @@
           this.payerOptions[index].text = res.accountName;
           this.payerOptions[index].value = res.id;
         })
+        if(this.payerOptions != null && this.payerOptions.length>0){
+          this.onConfirmPayer(this.payerOptions[0]);
+        }
       });
       this.getDictionaries();
       this.getTemplateList();
@@ -728,7 +731,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              res.text = res.payee;
+              res.text = (res.payee +":"+ res.payeeAccount);
               res.value = res.id;
               this.payeeList.push(res)
             }
@@ -945,7 +948,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }
@@ -962,7 +965,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }
@@ -1301,7 +1304,7 @@
             listPayee(this.queryParams).then((response) => {
               response.rows.map((res,index) => {
                 if(res.payeeType==1||res.payeeType==2){
-                  response.rows[index].text = res.payee;
+                  response.rows[index].text = (res.payee +":"+ res.payeeAccount);
                   response.rows[index].value = res.id;
                   this.payeeList.push(res)
                 }
@@ -1353,7 +1356,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }

src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue

@@ -536,7 +536,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }
@@ -691,7 +691,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              res.text = res.payee;
+              res.text = (res.payee +":"+ res.payeeAccount);
               res.value = res.id;
               this.payeeList.push(res)
             }
@@ -792,7 +792,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }
@@ -809,7 +809,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }

src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue

@@ -56,7 +56,12 @@
           required
           :rules="[{ required: true , message:'请选择开户银行' }]"
         />
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <van-popup v-model="showBankDeposit" position="bottom" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -132,6 +137,7 @@
         showBankType:false,
         showBankDeposit:false,
         showPayeeType:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0',
@@ -198,7 +204,6 @@
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       onConfirmBankType(data){
-        console.log(data)
         this.bankType = data.text;
         this.form.bankType = data.value;
         this.bankDeposit = ""
@@ -206,6 +211,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {

src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue

@@ -56,7 +56,12 @@
           required
           :rules="[{ required: true , message:'请选择开户银行' }]"
         />
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <van-popup v-model="showBankDeposit" position="bottom" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -132,6 +137,7 @@
         showBankType:false,
         showBankDeposit:false,
         showPayeeType:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0',
@@ -198,7 +204,6 @@
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       onConfirmBankType(data){
-        console.log(data)
         this.bankType = data.text;
         this.form.bankType = data.value;
         this.bankDeposit = ""
@@ -206,6 +211,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {

src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue

@@ -50,7 +50,12 @@
           required
           :rules="[{ required: true , message:'请选择开户银行' }]"
         />
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <van-popup v-model="showBankDeposit" position="bottom" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -127,6 +132,7 @@
         showBankType:false,
         showBankDeposit:false,
         showPayeeType:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0',
@@ -194,7 +200,6 @@
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       onConfirmBankType(data){
-        console.log(data)
         this.bankType = data.text;
         this.form.bankType = data.value;
         this.bankDeposit = ""
@@ -202,6 +207,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {

src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue

@@ -41,27 +41,25 @@
             @cancel="showBankType = false"
           />
         </van-popup>
-        <div>
-          <van-field
-            label="开户银行"
-            placeholder="请输入开户银行"
-            v-model="bankDeposit"
-            input-align="right"
-            label-width="auto"
-            required
-            :rules="[{ required: true , message:'请输入开户银行' }]"
-            @input="selectDeposit"
-            @focus="selectDeposit"
-          />
-          <!--readonly-->
-          <!--clickable-->
-          <!--@click="showBankDeposit = true"-->
-          <!--right-icon="arrow-down"payeePaymentLines-->
-          <div class="deposit_list" v-show="depositListShow">
-            <van-cell style="cursor: pointer;" :title="item.text" @click="onConfirmBankDeposit(item)" v-for="(item,index) in bankDepositOptions" />
-          </div>
-        </div>
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <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" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -138,6 +136,7 @@
         showBankDeposit:false,
         showPayeeType:false,
         depositListShow:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0'
@@ -215,6 +214,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {

src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue

@@ -36,27 +36,25 @@
             @cancel="showBankType = false"
           />
         </van-popup>
-        <div>
-          <van-field
-            label="开户银行"
-            placeholder="请输入开户银行"
-            v-model="bankDeposit"
-            input-align="right"
-            label-width="auto"
-            required
-            :rules="[{ required: true , message:'请输入开户银行' }]"
-            @input="selectDeposit"
-            @focus="selectDeposit"
-          />
-          <!--readonly-->
-          <!--clickable-->
-          <!--@click="showBankDeposit = true"-->
-          <!--right-icon="arrow-down"payeePaymentLines-->
-          <div class="deposit_list" v-show="depositListShow">
-            <van-cell style="cursor: pointer;" :title="item.text" @click="onConfirmBankDeposit(item)" v-for="(item,index) in bankDepositOptions" />
-          </div>
-        </div>
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <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" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -132,6 +130,7 @@
         showBankDeposit:false,
         showPayeeType:false,
         depositListShow:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0'
@@ -166,22 +165,9 @@
             }
             this.payeeType = this.selectDictLabel(res.data, response.data.payeeType);
           });
-          // let queryParams={
-          //   "bankType":response.data.bankType,
-          //   "status": "0",
-          // }
-          // listDeposit(queryParams).then(rr => {
-          //   this.bankDepositOptions = []
-          //   for(var i = 0 ; i < rr.rows.length ; i++){
-          //     if(_this.form.payeePaymentLines==rr.rows[i].payeePaymentLines){
-          //       _this.bankDeposit = rr.rows[i].bankDeposit
-          //     }
-          //       _this.bankDepositOptions.push({"text":rr.rows[i].bankDeposit,"value":rr.rows[i].id,
-          //       "payeePaymentLines":rr.rows[i].payeePaymentLines,"institutionNumber":rr.rows[i].institutionNumber});
-          //   }
-          // });
           _this.form = response.data;
           _this.bankDeposit = response.data.bankDeposit;
+          _this.bankDepositSearch();
         });
 
       },
@@ -197,6 +183,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {

src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue

@@ -248,6 +248,7 @@
           />
         </van-popup>
         <van-field :rules="[{ required: true , message:'请输入付款方账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+        <van-field required label="余额" readonly v-model="form.balance" placeholder="请输入余额" input-align="right" label-width="auto"/>
       </div>
 
       <div class="main_title main_title_box">
@@ -536,6 +537,9 @@
           this.payerOptions[index].text = res.accountName;
           this.payerOptions[index].value = res.id;
         })
+        if(this.payerOptions != null && this.payerOptions.length>0){
+          this.onConfirmPayer(this.payerOptions[0]);
+        }
       });
       this.getDictionaries();
       this.getTemplateList();
@@ -550,7 +554,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }
@@ -853,7 +857,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              res.text = res.payee;
+              res.text = (res.payee +":"+ res.payeeAccount);
               res.value = res.id;
               this.payeeList.push(res)
             }
@@ -954,7 +958,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }
@@ -971,7 +975,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }
@@ -1264,6 +1268,7 @@
           this.$set(this.form, "cashierId", obj.id);
           this.$set(this.form, "payer", obj.accountName);
           this.$set(this.form, "payerAccount", obj.bankAccountNumber);
+          this.$set(this.form, "balance", obj.balance);
           this.$set(this.form, "operatorCode", obj.operatorCode);
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
           this.$set(this.form, "bankType", obj.bankType);
@@ -1291,7 +1296,7 @@
             listPayee(this.queryParams).then((response) => {
               response.rows.map((res,index) => {
                 if(res.payeeType==1||res.payeeType==2){
-                  response.rows[index].text = res.payee;
+                  response.rows[index].text = (res.payee +":"+ res.payeeAccount);
                   response.rows[index].value = res.id;
                   this.payeeList.push(res)
                 }

src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue

@@ -573,7 +573,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }
@@ -725,7 +725,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res, index) => {
             if (res.payeeType == 1 || res.payeeType == 2) {
-              res.text = res.payee;
+              res.text = (res.payee +":"+ res.payeeAccount);
               res.value = res.id;
               this.payeeList.push(res)
             }
@@ -946,7 +946,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res, index) => {
             if (res.payeeType == 1 || res.payeeType == 2) {
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }
@@ -963,7 +963,7 @@
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res, index) => {
             if (res.payeeType == 1 || res.payeeType == 2) {
-              response.rows[index].text = res.payee;
+              response.rows[index].text = (res.payee +":"+ res.payeeAccount);
               response.rows[index].value = res.id;
               this.payeeList.push(res)
             }

src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue

@@ -37,27 +37,25 @@
             @cancel="showBankType = false"
           />
         </van-popup>
-        <div>
-          <van-field
-            label="开户银行"
-            placeholder="请输入开户银行"
-            v-model="bankDeposit"
-            input-align="right"
-            label-width="auto"
-            required
-            :rules="[{ required: true , message:'请输入开户银行' }]"
-            @input="selectDeposit"
-            @focus="selectDeposit"
-          />
-          <!--readonly-->
-          <!--clickable-->
-          <!--@click="showBankDeposit = true"-->
-          <!--right-icon="arrow-down"payeePaymentLines-->
-          <div class="deposit_list" v-show="depositListShow">
-            <van-cell style="cursor: pointer;" :title="item.text" @click="onConfirmBankDeposit(item)" v-for="(item,index) in bankDepositOptions" />
-          </div>
-        </div>
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <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" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -134,6 +132,7 @@
         showBankDeposit:false,
         showPayeeType:false,
         depositListShow:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0',
@@ -200,7 +199,6 @@
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       onConfirmBankType(data){
-        console.log(data)
         this.bankType = data.text;
         this.form.bankType = data.value;
         this.bankDeposit = ""
@@ -208,6 +206,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {

src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue

@@ -37,27 +37,25 @@
             @cancel="showBankType = false"
           />
         </van-popup>
-        <div>
-          <van-field
-            label="开户银行"
-            placeholder="请输入开户银行"
-            v-model="bankDeposit"
-            input-align="right"
-            label-width="auto"
-            required
-            :rules="[{ required: true , message:'请输入开户银行' }]"
-            @input="selectDeposit"
-            @focus="selectDeposit"
-          />
-          <!--readonly-->
-          <!--clickable-->
-          <!--@click="showBankDeposit = true"-->
-          <!--right-icon="arrow-down"payeePaymentLines-->
-          <div class="deposit_list" v-show="depositListShow">
-            <van-cell style="cursor: pointer;" :title="item.text" @click="onConfirmBankDeposit(item)" v-for="(item,index) in bankDepositOptions" />
-          </div>
-        </div>
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <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" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -134,6 +132,7 @@
         showBankDeposit:false,
         showPayeeType:false,
         depositListShow:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0',
@@ -200,7 +199,6 @@
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       onConfirmBankType(data){
-        console.log(data)
         this.bankType = data.text;
         this.form.bankType = data.value;
         this.bankDeposit = ""
@@ -208,6 +206,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {

src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue

@@ -50,7 +50,12 @@
           required
           :rules="[{ required: true , message:'请选择开户银行' }]"
         />
-        <van-popup v-model="showBankDeposit" position="bottom">
+        <van-popup v-model="showBankDeposit" position="bottom" @close="bankDepositValue = ''" @closed="bankDepositSearch">
+          <van-search v-model="bankDepositValue" show-action placeholder="请输入开户银行名称搜索" >
+            <template #action>
+              <div @click="bankDepositSearch">搜索</div>
+            </template>
+          </van-search>
           <van-picker
             show-toolbar
             :columns="bankDepositOptions"
@@ -127,6 +132,7 @@
         showBankType:false,
         showBankDeposit:false,
         showPayeeType:false,
+        bankDepositValue:'',
         form:{
           accountType:'1',
           status:'0',
@@ -194,7 +200,6 @@
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       onConfirmBankType(data){
-        console.log(data)
         this.bankType = data.text;
         this.form.bankType = data.value;
         this.bankDeposit = ""
@@ -202,6 +207,22 @@
         this.showBankType = false;
         let queryParams={
           "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
+          "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,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      bankDepositSearch(data){
+        this.bankDepositOptions = [];
+        let queryParams={
+          "bankType":this.form.bankType,
+          "bankDeposit":this.bankDepositValue,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {