TASK 43633 完善app端内蒙农商行相关功能、解决一些发现的问题

src/views/sunVillage_info/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue

@@ -47,6 +47,7 @@
           />
         </van-popup>
         <van-field label="联行号" required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines" placeholder="请输入联行号" input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
         <van-field label="机构号" v-model="form.institutionNumber" placeholder="请输入机构号" input-align="right" label-width="auto"/>
 
       </div>
@@ -85,6 +86,7 @@
           bankType: "", //所属银行 必填
           bankDeposit: "", //开户行 必填
           payeePaymentLines: "", //联行号 //必填
+          clearingBank: "", //上级清算行
           region: [],
         },
       };
@@ -131,6 +133,7 @@
       onConfirmBankAddress(value){
         this.form.bankAddress = value.bankDeposit;
         this.form.payeePaymentLines = value.payeePaymentLines;
+        this.form.clearingBank = data.clearingBank
         this.form.bankDeposit = value.bankDeposit;
         this.showBankAddress = false;
       },

src/views/sunVillage_info/bankAgriculture/bankOfDeposit/bankOfDepositModify.vue

@@ -39,6 +39,8 @@
 
         <van-field label="开户行" required :rules="[{ required: true , message:'请输入开户行' }]" v-model="form.bankDeposit" placeholder="请输入开户行" input-align="right" label-width="auto"/>
         <van-field label="联行号" required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines" placeholder="请输入联行号" input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
+        <van-field label="机构号" v-model="form.institutionNumber" placeholder="请输入机构号" input-align="right" label-width="auto"/>
 
       </div>
       <div style="padding: 16px 0;">
@@ -69,6 +71,8 @@
           bankType: "", //所属银行 必填
           bankDeposit: "", //开户行 必填
           payeePaymentLines: "", //联行号 //必填
+          clearingBank: "", //上级清算行
+          institutionNumber: "",//上级清算行机构号
         }
       };
     },

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

@@ -73,6 +73,7 @@
           />
         </van-popup>
        <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -224,7 +225,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -239,7 +240,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -247,6 +248,7 @@
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
       },

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

@@ -17,6 +17,7 @@
       <van-field readonly label="所属银行" v-model="bankType" input-align="right" label-width="auto" />
       <van-field readonly label="开户银行" v-model="form.bankDeposit" input-align="right" label-width="auto"/>
       <van-field readonly label="联行号" v-model="form.payeePaymentLines" input-align="right" label-width="auto"/>
+      <van-field readonly label="上级清算行" v-model="form.clearingBank" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">

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

@@ -63,6 +63,7 @@
           />
         </van-popup>
         <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -189,7 +190,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -204,7 +205,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -212,6 +213,7 @@
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
       },

src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountAdd.vue

@@ -1,21 +1,15 @@
 <template>
   <div class="app-container">
-<!--    <van-nav-bar-->
-<!--      left-arrow-->
-<!--      fixed-->
-<!--      placeholder-->
-<!--      @click-left="$router.back(-1)"-->
-<!--    >-->
-<!--      <template #title>-->
-<!--        <p style="font-weight: bold;">添加付款账户信息</p>-->
-<!--      </template>-->
-<!--    </van-nav-bar>-->
-
-    <div class="header_main">
-      添加付款账户信息
-      <div class="return_btn" @click="onClickLeft"></div>
-    </div>
-
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">添加付款账户信息</p>
+      </template>
+    </van-nav-bar>
     <van-form @submit="goModify" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
       <p class="main_title">基础信息</p>
       <div class="main_box">
@@ -161,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
@@ -184,6 +181,7 @@
           />
         </van-popup>
         <van-field label="联行号" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.paymentLines" placeholder="请输入联行号" input-align="right" label-width="auto" required/>
+        <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
         <van-field
           readonly
           clickable
@@ -206,7 +204,7 @@
           />
         </van-popup>
         <van-field label="开户银行地址" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入开户银行地址' }]" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto" required/>
-        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令：请输入六位以上数字' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
+        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令至少6个字符，必须包括字母、数字和符号' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
         <van-field label="账户类型" v-if="accountType=='银行存款'" required>
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.bankAccountType" required :rules="[{ required: true , message:'请选择账户类型' }]">
@@ -279,6 +277,7 @@
         showAccountType:false,
         showSubjectId:false,
         showBankType:false,
+        depositListShow:false,
         minDate: new Date(),
         showBankDeposit:false,
         maxDate: new Date(2025, 10, 1),
@@ -324,6 +323,7 @@
           bankAccountType: "1",
           villageAccountType: "2",
           status: "N",
+          bankName: "",
         }
       };
     },
@@ -333,7 +333,7 @@
     },
     methods: {
       validator(val){
-        return /^\d{6,}$/.test(val);
+        return /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{6,}$/.test(val);
       },
       getDetail(){
         // 账户类型
@@ -412,9 +412,12 @@
         }
       },
       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, "clearingBank", val.clearingBank);
         this.$set(this.form, "alternateField10", val.institutionNumber);
       },
       onConfirmTaccountId(val){
@@ -445,6 +448,7 @@
         this.getTaList();
         this.$set(this.form, "bankName", '');
         this.$set(this.form, "paymentLines", '');
+        this.$set(this.form, "clearingBank", '');
         this.bankDepositQueryParams.bankType = val.value;
         listDeposit(this.bankDepositQueryParams).then(response => {
           this.bankDepositList = response.rows;
@@ -482,47 +486,56 @@
       },
       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,
+                "clearingBank":response.rows[i].clearingBank,
+                "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-bottom: 2%;
-    .header_main{
-      height: 116px;
-      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
-      background-size: 100% 100%;
-      position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
-      font-size: 36px;
-      line-height: 116px;
-      text-align: center;
-      color: #fff;
-      position: relative;
-      margin-bottom: 2%;
-      .return_btn{
-        width: 24px;
-        height: 43.2px;
-        background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
-        background-size: 20px 36px;
-        position: absolute;
-        left: 38px;
-        top: 36px;
-      }
-      .add_btn{
-        width: 20PX;
-        height: 20PX;
-        background: url('../../../../../static/images/icon/icon_flow.png') center center no-repeat;
-        background-size: 20PX 20PX;
-        position: absolute;
-        right: 38px;
-        top: 36px;
-      }
-    }
+    padding: 2% 0;
   }
   .main_title{
     font-size: 0.4rem;

src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountList.vue

@@ -47,7 +47,10 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button square text="修改" type="info" :to="{name:'sunVillagePaymentAccountModify', query: {id:item.id}}" class="delete-button" />
+                <van-button v-if="item.accountType=='银行存款' && item.status != '是'" square text="余额查询"  color="#FFA63E" type="info" @click="balanceEnquiry(item.id)" class="delete-button" />
+              </van-col>
+              <van-col>
+                <van-button square text="修改" type="info" :to="{name:'paymentAccountModify', query: {id:item.id}}" class="delete-button" />
               </van-col>
               <van-col>
                 <van-button square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
@@ -60,7 +63,7 @@
 </template>
 
 <script>
-import { getList , delAccount } from "@/api/onlineHome/bankAgriculture/paymentAccount";
+import { getList , delAccount , balanceEnquiry} from "@/api/onlineHome/bankAgriculture/paymentAccount";
 export default {
   name: "paymentAccountList",
   data() {
@@ -137,6 +140,21 @@ export default {
       .catch(() => {
         // on cancel
       });
+    },
+    balanceEnquiry(id){
+      this.$dialog.confirm({
+        message: '您确认查询账户余额？',
+      })
+      .then(() => {
+        balanceEnquiry(id).then(res => {
+          if(res.code = 200){
+            this.$toast.success('余额查询成功');
+          }
+        });
+      })
+      .catch(() => {
+        // on cancel
+      });
     }
   },
 }

src/views/sunVillage_info/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
@@ -178,6 +181,7 @@
           />
         </van-popup>
         <van-field label="联行号" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.paymentLines" placeholder="请输入联行号" input-align="right" label-width="auto" required/>
+        <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
         <van-field
           readonly
           clickable
@@ -200,7 +204,7 @@
           />
         </van-popup>
         <van-field label="开户银行地址" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入开户银行地址' }]" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto" required/>
-        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令：请输入六位以上数字' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
+        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令至少6个字符，必须包括字母、数字和符号' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
         <van-field label="账户类型" v-if="accountType=='银行存款'" required >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.bankAccountType" required :rules="[{ required: true , message:'请选择账户类型' }]">
@@ -273,6 +277,7 @@
         showAccountType:false,
         showSubjectId:false,
         showBankType:false,
+        depositListShow:false,
         minDate: new Date(),
         showBankDeposit:false,
         maxDate: new Date(2025, 10, 1),
@@ -327,7 +332,7 @@
     },
     methods: {
       validator(val){
-        return /^\d{6,}$/.test(val);
+        return /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{6,}$/.test(val);
       },
       getDetail(){
         getAccount(this.$route.query.id).then((response) => {
@@ -463,8 +468,10 @@
       },
       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, "clearingBank", val.clearingBank);
         this.$set(this.form, "alternateField10", val.institutionNumber);
       },
       onConfirmTaccountId(val){
@@ -495,6 +502,7 @@
         this.getTaList();
         this.$set(this.form, "bankName", '');
         this.$set(this.form, "paymentLines", '');
+        this.$set(this.form, "clearingBank", '');
         this.bankDepositQueryParams.bankType = val.value;
         listDeposit(this.bankDepositQueryParams).then(response => {
           this.bankDepositList = response.rows;
@@ -532,12 +540,54 @@
       },
       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,
+                "clearingBank":response.rows[i].clearingBank,
+                "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;
   }

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

@@ -1235,6 +1235,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
           this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
+          this.$set(this.chargeItme[i], "clearingBank", obj.clearingBank);
           _this.bankTypeDictionaries.map(rr => {
             if(rr.value==obj.bankType){
               this.$set(this.chargeItme[i], "bankTypeText", rr.text);
@@ -1269,8 +1270,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != ""){
+        if(obj.bankType === "8" || (obj.accountPassword != null && obj.accountPassword != "" &&
+          obj.bankType != null && obj.bankType != "")){
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -1286,6 +1287,7 @@
           this.$set(this.form, "accountNo", obj.accountNo);
           this.$set(this.form, "cifNo", obj.cifNo);
           this.$set(this.form, "payerFrom", '1');
+          this.$set(this.form, "clearingBank", obj.clearingBank);
           if(obj.bankType==1){
             this.form.accountType = "1"
             this.form.isPeers = null
@@ -1448,7 +1450,7 @@
     watch: {
       $route (to, from ) {
         // 监听路由变化, 实现类似 小程序的 onShow 事件
-        if (to.path === '/yinnong/approvalAdd') {
+        if (to.path === '/sunVillage_info/approvalAdd') {
           // do anything you want
           console.log("aaa")
           if (this.$route.params.payeeForm){

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

@@ -1131,6 +1131,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
           this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
+          this.$set(this.chargeItme[i], "clearingBank", obj.clearingBank);
           _this.bankTypeDictionaries.map(rr => {
             if(rr.value==obj.bankType){
               this.$set(this.chargeItme[i], "bankTypeText", rr.text);
@@ -1164,8 +1165,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != ""){
+        if(obj.bankType === "8" || (obj.accountPassword != null && obj.accountPassword != "" &&
+          obj.bankType != null && obj.bankType != "")){
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -1176,6 +1177,7 @@
           this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "balance", obj.balance);
           this.$set(this.form, "payerFrom", '1');
+          this.$set(this.form, "clearingBank", obj.clearingBank);
           console.log(obj.bankType)
           if(obj.bankType==1){
             this.form.accountType = "1"
@@ -1310,7 +1312,7 @@
     watch: {
       $route (to, from ) {
         // 监听路由变化, 实现类似 小程序的 onShow 事件
-        if (to.path === '/yinnong/approvalModify') {
+        if (to.path === '/sunVillage_info/approvalModify') {
           // do anything you want
           console.log("aaa")
           if (this.$route.params.payeeForm){

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

@@ -1,21 +1,15 @@
 <template>
   <div class="app-container">
-<!--    <van-nav-bar-->
-<!--      left-arrow-->
-<!--      fixed-->
-<!--      placeholder-->
-<!--      @click-left="goBack"-->
-<!--    >-->
-<!--      <template #title>-->
-<!--        <p style="font-weight: bold;">添加收款账户信息</p>-->
-<!--      </template>-->
-<!--    </van-nav-bar>-->
-
-    <div class="header_main">
-      添加收款账户信息
-      <div class="return_btn" @click="onClickLeft"></div>
-<!--      <div class="add_btn" @click="goAdd"></div>-->
-    </div>
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="goBack"
+    >
+      <template #title>
+        <p style="font-weight: bold;">添加收款账户信息</p>
+      </template>
+    </van-nav-bar>
 
     <van-form @submit="goAdd" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
       <p class="main_title">基础信息</p>
@@ -70,6 +64,7 @@
           />
         </van-popup>
        <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -137,6 +132,7 @@
         showBankType:false,
         showBankDeposit:false,
         showPayeeType:false,
+        depositListShow:false,
         bankDepositValue:'',
         form:{
           accountType:'1',
@@ -160,7 +156,7 @@
       const bankType = this.$route.params.bankType;
       console.log(this.$route.params.option)
       if (accountType){this.form.accountType = accountType;}
-      if (isPeers){
+      if (isPeers && (bankType == 2 || bankType == 3)){
         this.form.isPeers = isPeers;
         if (isPeers == 'Y'){
           this.isPeersRead = false;
@@ -218,7 +214,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -233,16 +229,19 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
       onConfirmBankDeposit(data){
+        console.log(data)
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
+        this.depositListShow = false;
       },
       onConfirmPayeeType(data){
         this.payeeType = data.text;
@@ -255,54 +254,60 @@
           this.$toast.success('新增成功');
           setTimeout(function(){
             that.form.bankTypeText = that.bankType;
-            that.$router.push({name: 'approvalAdd', params: { payeeForm: that.form }});
+            that.$router.push({name: 'sunVillageApprovalAdd', params: { payeeForm: that.form }});
             // history.go(-1)
           },2000)
         });
       },
       goBack(){
         window.history.go(-1)
+      },
+      selectDeposit(val){
+        //depositListShow
+        if (val == '' || this.bankDeposit == ''){return;}
+        this.depositListShow = true;
+
+        let queryParams={
+          "bankType":this.form.bankType,
+          "status": "0",
+          "bankDeposit":this.bankDeposit,
+          "pageNum":1,
+          "pageSize":10
+        }
+
+        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,"clearingBank":response.rows[i].clearingBank
+              }
+            );
+          }
+        });
+
       }
     },
   }
 </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-bottom: 2%;
-    .header_main{
-      height: 116px;
-      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
-      background-size: 100% 100%;
-      position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
-      font-size: 36px;
-      line-height: 116px;
-      text-align: center;
-      color: #fff;
-      position: relative;
-      margin-bottom: 2%;
-      .return_btn{
-        width: 24px;
-        height: 43.2px;
-        background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
-        background-size: 20px 36px;
-        position: absolute;
-        left: 38px;
-        top: 36px;
-      }
-      .add_btn{
-        width: 56.4px;
-        height: 40.8px;
-        background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
-        background-size: 47px 34px;
-        position: absolute;
-        right: 38px;
-        top: 36px;
-      }
-    }
+    padding: 2% 0;
   }
   .main_title{
     font-size: 0.4rem;

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

@@ -1,21 +1,15 @@
 <template>
   <div class="app-container">
-<!--    <van-nav-bar-->
-<!--      left-arrow-->
-<!--      fixed-->
-<!--      placeholder-->
-<!--      @click-left="goBack"-->
-<!--    >-->
-<!--      <template #title>-->
-<!--        <p style="font-weight: bold;">添加收款账户信息</p>-->
-<!--      </template>-->
-<!--    </van-nav-bar>-->
-
-    <div class="header_main">
-      添加收款账户信息
-      <div class="return_btn" @click="onClickLeft"></div>
-      <!--      <div class="add_btn" @click="goAdd"></div>-->
-    </div>
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="goBack"
+    >
+      <template #title>
+        <p style="font-weight: bold;">添加收款账户信息</p>
+      </template>
+    </van-nav-bar>
 
     <van-form @submit="goAdd" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
       <p class="main_title">基础信息</p>
@@ -70,6 +64,7 @@
           />
         </van-popup>
        <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -137,6 +132,7 @@
         showBankType:false,
         showBankDeposit:false,
         showPayeeType:false,
+        depositListShow:false,
         bankDepositValue:'',
         form:{
           accountType:'1',
@@ -218,7 +214,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -233,7 +229,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -241,8 +237,10 @@
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
+        this.depositListShow = false;
       },
       onConfirmPayeeType(data){
         this.payeeType = data.text;
@@ -255,54 +253,60 @@
           this.$toast.success('新增成功');
           setTimeout(function(){
             that.form.bankTypeText = that.bankType;
-            that.$router.push({name: 'approvalAdd2', params: { payeeForm: that.form }});
+            that.$router.push({name: 'sunVillageApprovalAdd2', params: { payeeForm: that.form }});
             // history.go(-1)
           },2000)
         });
       },
       goBack(){
         window.history.go(-1)
+      },
+      selectDeposit(val){
+        //depositListShow
+        if (val == '' || this.bankDeposit == ''){return;}
+        this.depositListShow = true;
+
+        let queryParams={
+          "bankType":this.form.bankType,
+          "status": "0",
+          "bankDeposit":this.bankDeposit,
+          "pageNum":1,
+          "pageSize":10
+        }
+
+        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,"clearingBank":response.rows[i].clearingBank
+              }
+            );
+          }
+        });
+
       }
     },
   }
 </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-bottom: 2%;
-    .header_main{
-      height: 116px;
-      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
-      background-size: 100% 100%;
-      position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
-      font-size: 36px;
-      line-height: 116px;
-      text-align: center;
-      color: #fff;
-      position: relative;
-      margin-bottom: 2%;
-      .return_btn{
-        width: 24px;
-        height: 43.2px;
-        background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
-        background-size: 20px 36px;
-        position: absolute;
-        left: 38px;
-        top: 36px;
-      }
-      .add_btn{
-        width: 56.4px;
-        height: 40.8px;
-        background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
-        background-size: 47px 34px;
-        position: absolute;
-        right: 38px;
-        top: 36px;
-      }
-    }
+    padding: 2% 0;
   }
   .main_title{
     font-size: 0.4rem;

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

@@ -64,6 +64,7 @@
           />
         </van-popup>
        <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -214,7 +215,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -229,7 +230,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -237,6 +238,7 @@
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
       },
@@ -251,7 +253,7 @@
           this.$toast.success('新增成功');
           setTimeout(function(){
             that.form.bankTypeText = that.bankType;
-            that.$router.push({name: 'approvalModify', params: { payeeForm: that.form , id : that.id}});
+            that.$router.push({name: 'sunVillageApprovalModify', params: { payeeForm: that.form , id : that.id}});
             // history.go(-1)
           },2000)
         });

src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositAdd.vue

@@ -1,44 +1,53 @@
 <template>
   <div class="app-container">
-    <van-nav-bar
-      left-arrow
-      fixed
-      placeholder
-      @click-left="$router.back(-1)"
-    >
-      <template #title>
-        <p style="font-weight: bold;">添加开户行</p>
-      </template>
-    </van-nav-bar>
+<!--    <van-nav-bar-->
+<!--      left-arrow-->
+<!--      fixed-->
+<!--      placeholder-->
+<!--      @click-left="$router.back(-1)"-->
+<!--    >-->
+<!--      <template #title>-->
+<!--        <p style="font-weight: bold;">添加开户行</p>-->
+<!--      </template>-->
+<!--    </van-nav-bar>-->
+
+    <div class="header_main">
+      添加开户行
+      <div class="return_btn" @click="onClickLeft"></div>
+    </div>
+
     <van-form @submit="goModify" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
       <div class="main_box">
-        <van-field label="省" required :rules="[{ required: true , message:'请输入省' }]" v-model="form.sheng" placeholder="请输入省" input-align="right" label-width="auto"/>
-        <van-field label="市" required :rules="[{ required: true , message:'请输入市' }]" v-model="form.shi" placeholder="请输入市" input-align="right" label-width="auto"/>
 
-        <van-field
-          readonly
-          clickable
+        <FieldCascadeSelect :required="true" :rules="[{ required: true , message:'请选择省市' }]" data-key="value" value-key="label" :columns="regionOptions" v-model="form.region" placeholder="请选择开户省市" label="开户省市" label-width="auto" @input="onRegionChanged"/>
+
+        <FieldSelect
           label="所属银行"
           placeholder="请选择"
-          v-model="bankType"
-          @click="showBankType = true"
-          input-align="right"
-          right-icon="arrow-down"
+          v-model="form.bankType"
           label-width="auto"
-          required
+          :required="true"
           :rules="[{ required: true , message:'请选择所属银行' }]"
+          :columns="bankTypeOptions"
+          data-key="dictValue"
+          value-key="dictLabel"
         />
-        <van-popup v-model="showBankType" position="bottom">
+        <van-field label="开户行" required :rules="[{ required: true , message:'请输入开户行' }]" v-model="form.bankDeposit" placeholder="请输入开户行" input-align="right" label-width="auto">
+          <template #button>
+            <van-button :disabled="!canFetch" size="small" type="primary" native-type="button" @click="searchBankAddress">手动检索</van-button>
+          </template>
+        </van-field>
+        <van-popup v-model:show="showBankAddress" position="bottom">
           <van-picker
             show-toolbar
-            :columns="bankTypeOptions"
-            @confirm="onConfirmBankType"
-            @cancel="showBankType = false"
+            value-key="bankDeposit"
+            :columns="bankAddressOption"
+            @confirm="onConfirmBankAddress"
+            @cancel="showBankAddress = false"
           />
         </van-popup>
-
-        <van-field label="开户行" required :rules="[{ required: true , message:'请输入开户行' }]" v-model="form.bankDeposit" placeholder="请输入开户行" input-align="right" label-width="auto"/>
         <van-field label="联行号" required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines" placeholder="请输入联行号" input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
         <van-field label="机构号" v-model="form.institutionNumber" placeholder="请输入机构号" input-align="right" label-width="auto"/>
 
       </div>
@@ -56,21 +65,30 @@
 
 <script>
   import { addDeposit } from "@/api/onlineHome/bankAgriculture/bankOfDeposit";
+  import {options} from "@/api/user";
+  import FieldCascadeSelect from "@/components/form/FieldCascadeSelect";
+  import {listDeposit, realtimeBankList} from "@/api/onlineHome/bankAgriculture/paymentAccount";
+  import FieldSelect from "@/components/form/FieldSelect";
   export default {
     name: "paymentAccountAdd",
+    components: {FieldSelect, FieldCascadeSelect},
     data() {
       return {
         showBankType:false,
         bankType:'',
         // 所属银行字典
         bankTypeOptions: [],
+        showBankAddress: false,
+        bankAddressOption: [],
         form:{
           sheng: "", //省 必填
           shi: "",  //市  必填
           bankType: "", //所属银行 必填
           bankDeposit: "", //开户行 必填
           payeePaymentLines: "", //联行号 //必填
-        }
+          clearingBank: "", //上级清算行
+          region: [],
+        },
       };
     },
     created() {
@@ -83,9 +101,7 @@
       getDetail(){
         // 所属银行
         this.getDicts("bank_type_all").then(res => {
-          for (var i = 0; i < res.data.length; i++) {
-            this.bankTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-          }
+          this.bankTypeOptions = res.data;
         });
       },
       getError(e){
@@ -108,14 +124,102 @@
       },
       goBack(){
         window.history.go(-1)
-      }
+      },
+      onRegionChanged(val) {
+        val = val || [];
+        this.form.sheng = val.length > 0 ? val[0] : null;
+        this.form.shi = val.length > 1 ? val[1] : null;
+      },
+      onConfirmBankAddress(value){
+        this.form.bankAddress = value.bankDeposit;
+        this.form.payeePaymentLines = value.payeePaymentLines;
+        this.form.clearingBank = data.clearingBank
+        this.form.bankDeposit = value.bankDeposit;
+        this.showBankAddress = false;
+      },
+      checkFormField(what, desc) {
+        if(!this.form[what])
+        {
+          this.$toast({
+            icon: 'fail',
+            message: '请选择' + desc,
+            duration:"1000",
+          });
+          return false;
+        }
+        return true;
+      },
+      searchBankAddress(){
+        if(!this.checkFormField('sheng', '省')) return;
+        if(!this.checkFormField('shi', '市')) return;
+        if(!this.checkFormField('bankType', '所属银行')) return;
+        if(!this.checkFormField('bankDeposit', '关键词')) return;
+        let data = {
+          sheng: this.form.sheng,
+          shi: this.form.shi,
+          bankType: this.form.bankType,
+          bankDeposit: this.form.bankDeposit,
+        }
+        listDeposit(data).then(response => {
+          if (response.rows.length<1){
+            realtimeBankList(data, false).then(response2 => {
+              this.bankAddressOption = response2.data;
+              this.showBankAddress = true;
+            });
+          }else{
+            this.bankAddressOption = response.rows;
+            this.showBankAddress = true;
+          }
+        });
+      },
+    },
+    computed: {
+      regionOptions() {
+        return options;
+      },
+      canFetch() {
+        return this.form.sheng && this.form.shi && this.form.bankType && this.form.bankDeposit;
+      },
     },
   }
 </script>
 
 <style scoped lang="scss">
   .app-container {
-    padding: 2% 0;
+    padding-bottom: 2%;
+    .header_main{
+      height: 116px;
+      background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
+      background-size: 100% 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      font-size: 36px;
+      line-height: 116px;
+      text-align: center;
+      color: #fff;
+      position: relative;
+      margin-bottom: 2%;
+      .return_btn{
+        width: 24px;
+        height: 43.2px;
+        background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
+        background-size: 20px 36px;
+        position: absolute;
+        left: 38px;
+        top: 36px;
+      }
+      .add_btn{
+        width: 20PX;
+        height: 20PX;
+        background: url('../../../../../static/images/icon/icon_flow.png') center center no-repeat;
+        background-size: 20PX 20PX;
+        position: absolute;
+        right: 38px;
+        top: 36px;
+      }
+    }
   }
   .main_title{
     font-size: 0.4rem;

src/views/yinnong/bankAgriculture/bankOfDeposit/bankOfDepositModify.vue

@@ -39,6 +39,8 @@
 
         <van-field label="开户行" required :rules="[{ required: true , message:'请输入开户行' }]" v-model="form.bankDeposit" placeholder="请输入开户行" input-align="right" label-width="auto"/>
         <van-field label="联行号" required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines" placeholder="请输入联行号" input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
+        <van-field label="机构号" v-model="form.institutionNumber" placeholder="请输入机构号" input-align="right" label-width="auto"/>
 
       </div>
       <div style="padding: 16px 0;">
@@ -69,6 +71,8 @@
           bankType: "", //所属银行 必填
           bankDeposit: "", //开户行 必填
           payeePaymentLines: "", //联行号 //必填
+          clearingBank: "", //上级清算行
+          institutionNumber: "",//上级清算行机构号
         }
       };
     },

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

@@ -68,6 +68,7 @@
           />
         </van-popup>
        <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -221,7 +222,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -236,7 +237,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -244,6 +245,7 @@
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
         this.depositListShow = false;
@@ -285,7 +287,7 @@
                 "text":response.rows[i].bankDeposit,
                 "value":response.rows[i].id,
                 "payeePaymentLines":response.rows[i].payeePaymentLines,
-                "institutionNumber":response.rows[i].institutionNumber
+                "institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank
               }
             );
           }

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

@@ -17,6 +17,7 @@
       <van-field readonly label="所属银行" v-model="bankType" input-align="right" label-width="auto" />
       <van-field readonly label="开户银行" v-model="form.bankDeposit" input-align="right" label-width="auto"/>
       <van-field readonly label="联行号" v-model="form.payeePaymentLines" input-align="right" label-width="auto"/>
+      <van-field readonly label="上级清算行" v-model="form.clearingBank" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">

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

@@ -63,6 +63,7 @@
           />
         </van-popup>
         <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -190,7 +191,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -205,7 +206,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -213,6 +214,7 @@
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
         this.depositListShow = false;
@@ -255,7 +257,7 @@
                 "text":response.rows[i].bankDeposit,
                 "value":response.rows[i].id,
                 "payeePaymentLines":response.rows[i].payeePaymentLines,
-                "institutionNumber":response.rows[i].institutionNumber
+                "institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank
               }
             );
           }

src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue

@@ -181,6 +181,7 @@
           />
         </van-popup>
         <van-field label="联行号" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.paymentLines" placeholder="请输入联行号" input-align="right" label-width="auto" required/>
+        <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
         <van-field
           readonly
           clickable
@@ -203,7 +204,7 @@
           />
         </van-popup>
         <van-field label="开户银行地址" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入开户银行地址' }]" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto" required/>
-        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令：请输入六位以上数字' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
+        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令至少6个字符，必须包括字母、数字和符号' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
         <van-field label="账户类型" v-if="accountType=='银行存款'" required>
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.bankAccountType" required :rules="[{ required: true , message:'请选择账户类型' }]">
@@ -332,7 +333,7 @@
     },
     methods: {
       validator(val){
-        return /^\d{6,}$/.test(val);
+        return /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{6,}$/.test(val);
       },
       getDetail(){
         // 账户类型
@@ -416,6 +417,7 @@
         console.log(val)
         this.$set(this.form, "bankName", val.text);
         this.$set(this.form, "paymentLines", val.payeePaymentLines);
+        this.$set(this.form, "clearingBank", val.clearingBank);
         this.$set(this.form, "alternateField10", val.institutionNumber);
       },
       onConfirmTaccountId(val){
@@ -446,6 +448,7 @@
         this.getTaList();
         this.$set(this.form, "bankName", '');
         this.$set(this.form, "paymentLines", '');
+        this.$set(this.form, "clearingBank", '');
         this.bankDepositQueryParams.bankType = val.value;
         listDeposit(this.bankDepositQueryParams).then(response => {
           this.bankDepositList = response.rows;
@@ -507,6 +510,7 @@
                 "text":response.rows[i].bankDeposit,
                 "value":response.rows[i].id,
                 "payeePaymentLines":response.rows[i].payeePaymentLines,
+                "clearingBank":response.rows[i].clearingBank,
                 "institutionNumber":response.rows[i].institutionNumber
               }
             );

src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue

@@ -181,6 +181,7 @@
           />
         </van-popup>
         <van-field label="联行号" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.paymentLines" placeholder="请输入联行号" input-align="right" label-width="auto" required/>
+        <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
         <van-field
           readonly
           clickable
@@ -203,7 +204,7 @@
           />
         </van-popup>
         <van-field label="开户银行地址" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入开户银行地址' }]" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto" required/>
-        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令：请输入六位以上数字' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
+        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令至少6个字符，必须包括字母、数字和符号' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
         <van-field label="账户类型" v-if="accountType=='银行存款'" required >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.bankAccountType" required :rules="[{ required: true , message:'请选择账户类型' }]">
@@ -331,7 +332,7 @@
     },
     methods: {
       validator(val){
-        return /^\d{6,}$/.test(val);
+        return /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{6,}$/.test(val);
       },
       getDetail(){
         getAccount(this.$route.query.id).then((response) => {
@@ -470,6 +471,7 @@
         this.depositListShow = false;
         this.$set(this.form, "bankName", val.text);
         this.$set(this.form, "paymentLines", val.payeePaymentLines);
+        this.$set(this.form, "clearingBank", val.clearingBank);
         this.$set(this.form, "alternateField10", val.institutionNumber);
       },
       onConfirmTaccountId(val){
@@ -500,6 +502,7 @@
         this.getTaList();
         this.$set(this.form, "bankName", '');
         this.$set(this.form, "paymentLines", '');
+        this.$set(this.form, "clearingBank", '');
         this.bankDepositQueryParams.bankType = val.value;
         listDeposit(this.bankDepositQueryParams).then(response => {
           this.bankDepositList = response.rows;
@@ -561,6 +564,7 @@
                 "text":response.rows[i].bankDeposit,
                 "value":response.rows[i].id,
                 "payeePaymentLines":response.rows[i].payeePaymentLines,
+                "clearingBank":response.rows[i].clearingBank,
                 "institutionNumber":response.rows[i].institutionNumber
               }
             );

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

@@ -1227,6 +1227,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
           this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
+          this.$set(this.chargeItme[i], "clearingBank", obj.clearingBank);
           _this.bankTypeDictionaries.map(rr => {
             if(rr.value==obj.bankType){
               this.$set(this.chargeItme[i], "bankTypeText", rr.text);
@@ -1261,8 +1262,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != ""){
+        if(obj.bankType === "8" || (obj.accountPassword != null && obj.accountPassword != "" &&
+          obj.bankType != null && obj.bankType != "")){
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -1278,6 +1279,7 @@
           this.$set(this.form, "accountNo", obj.accountNo);
           this.$set(this.form, "cifNo", obj.cifNo);
           this.$set(this.form, "payerFrom", '1');
+          this.$set(this.form, "clearingBank", obj.clearingBank);
           if(obj.bankType==1){
             this.form.accountType = "1"
             this.form.isPeers = null

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

@@ -1172,6 +1172,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
           this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
+          this.$set(this.chargeItme[i], "clearingBank", obj.clearingBank);
           _this.bankTypeDictionaries.map(rr => {
             if (rr.value == obj.bankType) {
               this.$set(this.chargeItme[i], "bankTypeText", rr.text);
@@ -1205,8 +1206,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if (obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != "") {
+        if(obj.bankType === "8" || (obj.accountPassword != null && obj.accountPassword != "" &&
+          obj.bankType != null && obj.bankType != "")){
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -1216,6 +1217,7 @@
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
           this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
+          this.$set(this.form, "clearingBank", obj.clearingBank);
           if (obj.bankType == 1) {
             this.form.accountType = "1"
             this.form.isPeers = null

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

@@ -64,6 +64,7 @@
           />
         </van-popup>
        <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -155,7 +156,7 @@
       const bankType = this.$route.params.bankType;
       console.log(this.$route.params.option)
       if (accountType){this.form.accountType = accountType;}
-      if (isPeers){
+      if (isPeers && (bankType == 2 || bankType == 3)){
         this.form.isPeers = isPeers;
         if (isPeers == 'Y'){
           this.isPeersRead = false;
@@ -213,7 +214,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -228,7 +229,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -237,6 +238,7 @@
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
         this.depositListShow = false;
@@ -281,7 +283,7 @@
                 "text":response.rows[i].bankDeposit,
                 "value":response.rows[i].id,
                 "payeePaymentLines":response.rows[i].payeePaymentLines,
-                "institutionNumber":response.rows[i].institutionNumber
+                "institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank
               }
             );
           }

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

@@ -64,6 +64,7 @@
           />
         </van-popup>
        <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -213,7 +214,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -228,7 +229,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -236,6 +237,7 @@
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
         this.depositListShow = false;
@@ -280,7 +282,7 @@
                 "text":response.rows[i].bankDeposit,
                 "value":response.rows[i].id,
                 "payeePaymentLines":response.rows[i].payeePaymentLines,
-                "institutionNumber":response.rows[i].institutionNumber
+                "institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank
               }
             );
           }

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

@@ -64,6 +64,7 @@
           />
         </van-popup>
        <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
+       <van-field label="上级清算行" v-model="form.clearingBank"  input-align="right" label-width="auto" disabled/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -214,7 +215,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -229,7 +230,7 @@
           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});
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber,"clearingBank":response.rows[i].clearingBank});
           }
         });
       },
@@ -237,6 +238,7 @@
         this.bankDeposit = data.text
         this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.clearingBank = data.clearingBank
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
       },