银农 常用，虚拟转账：收款方类型，是否同行判断

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

@@ -163,17 +163,17 @@
 
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
       <div class="main_box" style="margin-bottom: 15px;">
-        <van-cell title="收款账户类型">
+        <van-cell title="收款账户类型" v-if="form.bankType==1">
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
+            <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange" >
               <van-radio name="1">公户</van-radio>
               <van-radio name="2">私户</van-radio>
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
+        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4" >
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.isPeers">
+            <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>
               <van-radio name="N">否</van-radio>
             </van-radio-group>
@@ -210,22 +210,20 @@
             readonly
             clickable
             label="所属银行"
-            placeholder="请选择"
+            placeholder=""
             v-model="item.bankTypeText"
-            @click="item.showbankType = true"
             input-align="right"
-            right-icon="arrow-down"
             required
             :rules="[{ required: true , message:'请选择所属银行' }]"
           />
-          <van-popup v-model="item.showbankType" position="bottom">
+          <!--<van-popup v-model="item.showbankType" position="bottom">
             <van-picker
               show-toolbar
               :columns="bankTypeDictionaries"
               @confirm="onConfirmBankType($event,index)"
               @cancel="item.showbankType = false"
             />
-          </van-popup>
+          </van-popup>-->
         </div>
       </div>
       <p class="main_title">上传附件</p>
@@ -337,7 +335,6 @@
         status: "N",
       }
       getAccount(params1).then((response) => {
-        console.log(response)
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '1'
@@ -357,8 +354,8 @@
           orderId: null,
           cashierId: null,
           transferType: '1',
-          accountType: '2',
-          isPeers:'Y',
+          accountType: null,
+          isPeers:null,
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -404,7 +401,6 @@
             this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getPayeeList();
       },
       getError(e){
         console.log(e)
@@ -434,8 +430,8 @@
             payeeAccount: "", //收款账户
             bankDeposit: "", //开户银行
             incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            bankType: null, //所属银行
+            bankTypeText:"", //所属银行
             showPayee:false,
             showbankType:false
           });
@@ -443,7 +439,6 @@
       },
       getPayeeList() {
         //普通转账
-        this.queryParams.accountType = this.form.accountType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           this.payeeList = response.rows;
@@ -510,7 +505,6 @@
         this.chargeItme[index].showbankType = false;
       },
       onConfirmPayer(data){
-        console.log(data)
         this.form.payer = data.text;
         this.form.cashierId = data.value;
         this.showpayer = false;
@@ -524,6 +518,21 @@
         this.payeeList = [];
         this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
+        this.queryParams.bankType = this.form.bankType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      accountTypeChange1(e){
+        this.payeeList = [];
+        this.chargeItme = [];
+        this.queryParams.isPeers = this.form.isPeers
+        this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           this.payeeList = response.rows;
@@ -768,6 +777,7 @@
           //model就是上面的数据源
           return account.id === select ; //筛选出匹配数据
         });
+        let _this = this
         if(this.chargeItme != [] && this.chargeItme.length>1){
           this.chargeItme.some((value, index) => {
             if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
@@ -788,6 +798,12 @@
           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.bankTypeDictionaries.map(rr => {
+            if(rr.value==obj.bankType){
+              this.$set(this.chargeItme[i], "bankTypeText", rr.text);
+            }
+          })
+
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -796,6 +812,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
+          this.$set(this.chargeItme[i], "bankTypeText", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -805,6 +822,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
+          this.$set(this.chargeItme[i], "bankTypeText", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
@@ -825,6 +843,16 @@
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
           this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
+          console.log(obj.bankType)
+          if(obj.bankType==1){
+            this.form.accountType = "1"
+            this.form.isPeers = null
+            this.accountTypeChange();
+          }else if(obj.bankType==2||obj.bankType==4){
+            this.form.accountType = null
+            this.form.isPeers = "Y"
+            this.accountTypeChange1();
+          }
         }else{
           if(obj.payerFrom==1){
             this.diglogStatus = false;

src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue

@@ -171,14 +171,6 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.isPeers">
-              <van-radio name="Y">是</van-radio>
-              <van-radio name="N">否</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
       </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
@@ -226,11 +218,11 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-<!--            @click="goUpdate"-->
+            <!--            @click="goUpdate"-->
             <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
           </van-col>
           <van-col span="12" align="center">
-<!--            @click="goAdd"-->
+            <!--            @click="goAdd"-->
             <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
           </van-col>
         </van-row>
@@ -347,7 +339,6 @@
           cashierId: null,
           transferType: '2',
           accountType: '2',
-          isPeers:'Y',
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -782,7 +773,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
-          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -790,7 +780,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -799,7 +788,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
@@ -809,8 +797,9 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != ""){
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -818,7 +807,6 @@
           this.$set(this.form, "payerAccount", obj.bankAccountNumber);
           this.$set(this.form, "operatorCode", obj.operatorCode);
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
-          this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
         }else{
           if(obj.payerFrom==1){

src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue

@@ -171,14 +171,6 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.isPeers">
-              <van-radio name="Y">是</van-radio>
-              <van-radio name="N">否</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
       </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
@@ -225,11 +217,11 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-<!--            @click="goUpdate"-->
+            <!--            @click="goUpdate"-->
             <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
           </van-col>
           <van-col span="12" align="center">
-<!--            @click="goAdd"-->
+            <!--            @click="goAdd"-->
             <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
           </van-col>
         </van-row>
@@ -353,7 +345,6 @@
           cashierId: null,
           transferType: '3',
           accountType: '2',
-          isPeers:'Y',
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -520,7 +511,6 @@
         this.form.payer = data.text;
         this.form.cashierId = data.value;
         this.form.payerAccount = data.payeeAccount;
-        this.form.bankType = data.bankType;
         this.showpayer = false;
         this.accountTypeChange();
       },
@@ -802,7 +792,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
-          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -810,7 +799,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -819,7 +807,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
@@ -829,8 +816,9 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != ""){
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -838,7 +826,6 @@
           this.$set(this.form, "payerAccount", obj.bankAccountNumber);
           this.$set(this.form, "operatorCode", obj.operatorCode);
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
-          this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
         }else{
           if(obj.payerFrom==1){

src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue

@@ -163,7 +163,7 @@
 
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
       <div class="main_box" style="margin-bottom: 15px;">
-        <van-cell title="收款账户类型">
+        <van-cell title="收款账户类型"  v-if="form.bankType==1">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
               <van-radio name="1">公户</van-radio>
@@ -173,7 +173,7 @@
         </van-cell>
         <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.isPeers">
+            <van-radio-group direction="horizontal" v-model="form.isPeers"  @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>
               <van-radio name="N">否</van-radio>
             </van-radio-group>
@@ -212,9 +212,7 @@
             label="所属银行"
             placeholder="请选择"
             v-model="item.bankTypeText"
-            @click="item.showbankType = true"
             input-align="right"
-            right-icon="arrow-down"
             required
             :rules="[{ required: true , message:'请选择所属银行' }]"
           />
@@ -353,8 +351,8 @@
           orderId: null,
           cashierId: null,
           transferType: '4',
-          accountType: '2',
-          isPeers:'Y',
+          accountType: null,
+          isPeers:null,
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -403,7 +401,7 @@
             this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getPayeeList();
+        /*this.getPayeeList();*/
       },
       getError(e){
         console.log(e)
@@ -523,6 +521,21 @@
         this.payeeList = [];
         this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
+        this.queryParams.bankType = this.form.bankType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      accountTypeChange1(e){
+        this.payeeList = [];
+        this.chargeItme = [];
+        this.queryParams.isPeers = this.form.isPeers
+        this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           this.payeeList = response.rows;
@@ -767,6 +780,7 @@
           //model就是上面的数据源
           return account.id === select ; //筛选出匹配数据
         });
+        let _this = this
         if(this.chargeItme != [] && this.chargeItme.length>1){
           this.chargeItme.some((value, index) => {
             if(value.payeeAccount != undefined &&value.payeeAccount != '' && obj.payeeAccount == value.payeeAccount&&index!=i){
@@ -787,6 +801,11 @@
           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.bankTypeDictionaries.map(rr => {
+            if(rr.value==obj.bankType){
+              this.$set(this.chargeItme[i], "bankTypeText", rr.text);
+            }
+          })
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -795,6 +814,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
+          this.$set(this.chargeItme[i], "bankTypeText", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -804,6 +824,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
+          this.$set(this.chargeItme[i], "bankTypeText", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
@@ -823,6 +844,16 @@
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
           this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
+        console.log(obj.bankType)
+        if(obj.bankType==1){
+          this.form.accountType = "1"
+          this.form.isPeers = null
+          this.accountTypeChange();
+        }else if(obj.bankType==2||obj.bankType==4){
+          this.form.accountType = null
+          this.form.isPeers = "Y"
+          this.accountTypeChange1();
+        }
       },
       beforeRead(file) {
         this.uploadFiles.push(file.file);

src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue

@@ -171,14 +171,6 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.isPeers">
-              <van-radio name="Y">是</van-radio>
-              <van-radio name="N">否</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
       </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
@@ -226,11 +218,11 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-<!--            @click="goUpdate"-->
+            <!--            @click="goUpdate"-->
             <van-button type="info" native-type="submit" @click="buttonType='update'" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
           </van-col>
           <van-col span="12" align="center">
-<!--            @click="goAdd"-->
+            <!--            @click="goAdd"-->
             <van-button type="info" native-type="submit" @click="buttonType='add'" class="submitButton">保存并提交</van-button>
           </van-col>
         </van-row>
@@ -355,7 +347,6 @@
           cashierId: null,
           transferType: '5',
           accountType: '2',
-          isPeers:'Y',
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -803,7 +794,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
-          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -811,7 +801,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -820,7 +809,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
@@ -830,8 +818,9 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != ""){
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -839,7 +828,6 @@
           this.$set(this.form, "payerAccount", obj.bankAccountNumber);
           this.$set(this.form, "operatorCode", obj.operatorCode);
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
-          this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
         }else{
           if(obj.payerFrom==1){

src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue

@@ -45,7 +45,7 @@
     <p class="main_title">收款方信息</p>
 
     <div class="main_box" style="margin-bottom: 15px;">
-      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
+      <van-field readonly label="收款账户类型" v-if="form.bankType==1" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
       <van-field readonly label="是否与付款方同行" v-if="form.bankType==2||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
 
     </div>

src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue

@@ -46,7 +46,6 @@
 
     <div class="main_box" style="margin-bottom: 15px;">
       <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
-      <van-field readonly label="是否与付款方同行" v-if="form.bankType==2||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
     </div>
 
     <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">

src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue

@@ -46,7 +46,6 @@
 
     <div class="main_box" style="margin-bottom: 15px;">
       <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
-      <van-field readonly label="是否与付款方同行" v-if="form.bankType==2||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
     </div>
 
     <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">

src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue

@@ -45,7 +45,7 @@
     <p class="main_title">列表信息</p>
 
     <div class="main_box" style="margin-bottom: 15px;">
-      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
+      <van-field readonly label="收款账户类型" v-if="form.bankType==1" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
       <van-field readonly label="是否与付款方同行" v-if="form.bankType==2||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
 
     </div>

src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue

@@ -46,7 +46,6 @@
 
     <div class="main_box" style="margin-bottom: 15px;">
       <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
-      <van-field readonly label="是否与付款方同行" v-if="form.bankType==2||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
     </div>
 
     <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">

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

@@ -212,9 +212,7 @@
             label="所属银行"
             placeholder="请选择"
             v-model="item.bankTypeText"
-            @click="item.showbankType = true"
             input-align="right"
-            right-icon="arrow-down"
             required
             :rules="[{ required: true , message:'请选择所属银行' }]"
           />
@@ -427,8 +425,8 @@
             payeeAccount: "", //收款账户
             bankDeposit: "", //开户银行
             incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            bankType: null, //所属银行
+            bankTypeText:"", //所属银行
             showPayee:false,
             showbankType:false
           });
@@ -516,6 +514,21 @@
         this.payeeList = [];
         this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
+        this.queryParams.bankType = this.form.bankType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      accountTypeChange1(e){
+        this.payeeList = [];
+        this.chargeItme = [];
+        this.queryParams.isPeers = this.form.isPeers
+        this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           this.payeeList = response.rows;
@@ -755,6 +768,7 @@
       payeeSelectChange(select, i) {
         let obj = {};
         let fuzhitype = 0;
+        let _this = this
         obj = this.payeeList.find((account) => {
           //model就是上面的数据源
           return account.id === select ; //筛选出匹配数据
@@ -779,6 +793,11 @@
           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.bankTypeDictionaries.map(rr => {
+            if(rr.value==obj.bankType){
+              this.$set(this.chargeItme[i], "bankTypeText", rr.text);
+            }
+          })
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -787,6 +806,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
+          this.$set(this.chargeItme[i], "bankTypeText", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -796,6 +816,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
+          this.$set(this.chargeItme[i], "bankTypeText", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
@@ -816,6 +837,16 @@
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
           this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
+          console.log(obj.bankType)
+          if(obj.bankType==1){
+            this.form.accountType = "1"
+            this.form.isPeers = null
+            this.accountTypeChange();
+          }else if(obj.bankType==2||obj.bankType==4){
+            this.form.accountType = null
+            this.form.isPeers = "Y"
+            this.accountTypeChange1();
+          }
         }else{
           if(obj.payerFrom==1){
             this.diglogStatus = false;

src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue

@@ -171,14 +171,6 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.isPeers">
-              <van-radio name="Y">是</van-radio>
-              <van-radio name="N">否</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
       </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
@@ -779,7 +771,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
-          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -787,7 +778,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -796,7 +786,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
@@ -806,8 +795,9 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.accountPassword != null && obj.accountPassword != "" &&
-          obj.bankType != null && obj.bankType != ""){
+        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
+          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
+          obj.accountPassword != null && obj.accountPassword != ""){
           this.$set(this.form, "bookId", obj.bookId);
           this.$set(this.form, "deptId", obj.deptId);
           this.$set(this.form, "cashierId", obj.id);
@@ -815,7 +805,6 @@
           this.$set(this.form, "payerAccount", obj.bankAccountNumber);
           this.$set(this.form, "operatorCode", obj.operatorCode);
           this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
-          this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
         }else{
           if(obj.payerFrom==1){

src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue

@@ -171,14 +171,6 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
-          <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.isPeers">
-              <van-radio name="Y">是</van-radio>
-              <van-radio name="N">否</van-radio>
-            </van-radio-group>
-          </template>
-        </van-cell>
       </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
         <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
@@ -505,7 +497,6 @@
         this.form.payer = data.text;
         this.form.cashierId = data.value;
         this.form.payerAccount = data.payeeAccount
-        this.form.bankType = data.bankType;
         this.showpayer = false;
         //this.selectChange(data.value);
         this.accountTypeChange();
@@ -787,7 +778,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount);
           this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
           this.$set(this.chargeItme[i], "accountType", obj.accountType);
-          this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -795,7 +785,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -804,7 +793,6 @@
           this.$set(this.chargeItme[i], "payeeAccount", '');
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
-          this.$set(this.chargeItme[i], "payeePaymentLines", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },

src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue

@@ -163,7 +163,7 @@
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
 
       <div class="main_box" style="margin-bottom: 15px;">
-        <van-cell title="收款账户类型">
+        <van-cell title="收款账户类型" v-if="form.bankType==1">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
               <van-radio name="1">公户</van-radio>
@@ -173,7 +173,7 @@
         </van-cell>
         <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.isPeers">
+            <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>
               <van-radio name="N">否</van-radio>
             </van-radio-group>
@@ -210,11 +210,9 @@
             readonly
             clickable
             label="所属银行"
-            placeholder="请选择"
+            placeholder=""
             v-model="item.bankTypeText"
-            @click="item.showbankType = true"
             input-align="right"
-            right-icon="arrow-down"
             required
             :rules="[{ required: true , message:'请选择所属银行' }]"
           />
@@ -428,8 +426,8 @@
             payeeAccount: "", //收款账户
             bankDeposit: "", //开户银行
             incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+            bankType:null, //所属银行
+            bankTypeText:"", //所属银行
             showPayee:false,
             showbankType:false
           });
@@ -519,6 +517,21 @@
         this.payeeList = [];
         this.chargeItme = [];
         this.queryParams.accountType = this.form.accountType
+        this.queryParams.bankType = this.form.bankType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          this.payeeList = response.rows;
+          response.rows.map((res,index) => {
+            this.payeeList[index].text = res.payee;
+            this.payeeList[index].value = res.id;
+          })
+        });
+      },
+      accountTypeChange1(e){
+        this.payeeList = [];
+        this.chargeItme = [];
+        this.queryParams.isPeers = this.form.isPeers
+        this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           this.payeeList = response.rows;
@@ -758,6 +771,7 @@
       payeeSelectChange(select, i) {
         let obj = {};
         let fuzhitype = 0;
+        let _this = this
         obj = this.payeeList.find((account) => {
           //model就是上面的数据源
           return account.id === select ; //筛选出匹配数据
@@ -782,6 +796,11 @@
           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.bankTypeDictionaries.map(rr => {
+            if(rr.value==obj.bankType){
+              this.$set(this.chargeItme[i], "bankTypeText", rr.text);
+            }
+          })
         }else if(fuzhitype == 1){
           this.$set(this.chargeItme[i], "payee",'')
           this.$set(this.chargeItme[i], "bankType",'')
@@ -790,6 +809,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
+          this.$set(this.chargeItme[i], "bankTypeText", '');
           this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方！' });
         }else if(fuzhitype == 2){
           this.$set(this.chargeItme[i], "payee",'')
@@ -799,6 +819,7 @@
           this.$set(this.chargeItme[i], "bankDeposit", '');
           this.$set(this.chargeItme[i], "accountType", '');
           this.$set(this.chargeItme[i], "payeePaymentLines", '');
+          this.$set(this.chargeItme[i], "bankTypeText", '');
           this.$notify({ type: 'danger', message: '收款方已存在！' });
         }
       },
@@ -808,7 +829,6 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        console.log(obj)
         this.$set(this.form, "bookId", obj.bookId);
         this.$set(this.form, "deptId", obj.deptId);
         this.$set(this.form, "cashierId", obj.id);
@@ -818,6 +838,15 @@
         this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
         this.$set(this.form, "bankType", obj.bankType);
         this.$set(this.form, "payerFrom", '1');
+        if(obj.bankType==1){
+          this.form.accountType = "1"
+          this.form.isPeers = null
+          this.accountTypeChange();
+        }else if(obj.bankType==2||obj.bankType==4){
+          this.form.accountType = null
+          this.form.isPeers = "Y"
+          this.accountTypeChange1();
+        }
       },
       beforeRead(file) {
         this.uploadFiles.push(file.file);

src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue

@@ -212,7 +212,6 @@
             label="所属银行"
             placeholder="请选择"
             v-model="item.bankTypeText"
-            @click="item.showbankType = true"
             input-align="right"
             required
             :rules="[{ required: true , message:'请选择所属银行' }]"