Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

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

@@ -171,6 +171,14 @@
             </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)" />
@@ -333,7 +341,6 @@
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '1'
-          console.log(res)
           this.payerOptions[index].text = res.accountName;
           this.payerOptions[index].value = res.id;
         })
@@ -351,6 +358,7 @@
           cashierId: null,
           transferType: '1',
           accountType: '2',
+          isPeers:'Y',
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -502,6 +510,7 @@
         this.chargeItme[index].showbankType = false;
       },
       onConfirmPayer(data){
+        console.log(data)
         this.form.payer = data.text;
         this.form.cashierId = data.value;
         this.showpayer = false;
@@ -802,9 +811,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
-          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
-          obj.accountPassword != null && obj.accountPassword != ""){
+        if(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);
@@ -812,6 +820,7 @@
           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/approvalAdd2.vue

@@ -171,6 +171,14 @@
             </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)" />
@@ -339,6 +347,7 @@
           cashierId: null,
           transferType: '2',
           accountType: '2',
+          isPeers:'Y',
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -797,9 +806,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
-          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
-          obj.accountPassword != null && obj.accountPassword != ""){
+        if(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);
@@ -807,6 +815,7 @@
           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,6 +171,14 @@
             </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)" />
@@ -345,6 +353,7 @@
           cashierId: null,
           transferType: '3',
           accountType: '2',
+          isPeers:'Y',
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -511,6 +520,7 @@
         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();
       },
@@ -816,9 +826,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
-          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
-          obj.accountPassword != null && obj.accountPassword != ""){
+        if(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);
@@ -826,6 +835,7 @@
           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

@@ -171,6 +171,14 @@
             </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)" />
@@ -346,6 +354,7 @@
           cashierId: null,
           transferType: '4',
           accountType: '2',
+          isPeers:'Y',
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -809,6 +818,7 @@
           this.$set(this.form, "payerAccount", obj.payeeAccount);
           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');
       },
       beforeRead(file) {

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

@@ -171,6 +171,14 @@
             </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)" />
@@ -347,6 +355,7 @@
           cashierId: null,
           transferType: '5',
           accountType: '2',
+          isPeers:'Y',
           explainSituation: null,
           succeedAmount: null,
           payer: null,
@@ -818,9 +827,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
-          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
-          obj.accountPassword != null && obj.accountPassword != ""){
+        if(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);
@@ -828,6 +836,7 @@
           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/approvalApproval.vue

@@ -46,6 +46,7 @@
 
     <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/approvalDetail.vue

@@ -46,6 +46,8 @@
 
     <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/approvalDetail2.vue

@@ -46,6 +46,7 @@
 
     <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,6 +46,7 @@
 
     <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

@@ -46,6 +46,8 @@
 
     <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/approvalDetail5.vue

@@ -46,6 +46,7 @@
 
     <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

@@ -171,6 +171,14 @@
             </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)" />
@@ -794,9 +802,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
-          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
-          obj.accountPassword != null && obj.accountPassword != ""){
+        if(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);
@@ -804,6 +811,7 @@
           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/approvalModify2.vue

@@ -171,6 +171,14 @@
             </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)" />
@@ -795,9 +803,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
-          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
-          obj.accountPassword != null && obj.accountPassword != ""){
+        if(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);
@@ -805,6 +812,7 @@
           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,6 +171,14 @@
             </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)" />
@@ -497,6 +505,7 @@
         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();

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

@@ -171,6 +171,14 @@
             </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)" />
@@ -805,6 +813,7 @@
         this.$set(this.form, "payerAccount", obj.payeeAccount);
         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');
       },
       beforeRead(file) {

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

@@ -171,6 +171,14 @@
             </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)" />
@@ -797,9 +805,8 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
-        if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" &&
-          obj.enterpriseCode != null && obj.enterpriseCode != "" &&
-          obj.accountPassword != null && obj.accountPassword != ""){
+        if(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);
@@ -807,6 +814,7 @@
           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){