银农：黑龙江农商行相关

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

@@ -104,7 +104,8 @@
             @cancel="showTaccountId = false"
           />
         </van-popup>
-        <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
+        <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2'||form.bankType=='7')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
+        <van-field label="DN" v-if="accountType=='银行存款'&&form.bankType=='7'" required :rules="[{ required: true , message:'DN' }]" v-model="form.alternateField1" placeholder="请输入DN" input-align="right" label-width="auto"/>
         <van-field label="账簿号" v-if="accountType=='银行存款'&&villageAccountType=='多级账簿'" required :rules="[{ required: true , message:'请输入账簿号' }]" v-model="form.accountNo" placeholder="请输入账簿号" input-align="right" label-width="auto"/>
         <van-field label="管控类型" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
           <template #right-icon>

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

@@ -98,7 +98,8 @@
             @cancel="showTaccountId = false"
           />
         </van-popup>
-        <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
+        <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2'||form.bankType=='7')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
+        <van-field label="DN" v-if="accountType=='银行存款'&&form.bankType=='7'" required :rules="[{ required: true , message:'DN' }]" v-model="form.alternateField1" placeholder="请输入DN" input-align="right" label-width="auto"/>
         <van-field label="账簿号" v-if="accountType=='银行存款'&&villageAccountType=='多级账簿'" required :rules="[{ required: true , message:'请输入账簿号' }]" v-model="form.accountNo" placeholder="请输入账簿号" input-align="right" label-width="auto"/>
         <van-field label="管控类型" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
           <template #right-icon>

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

@@ -257,7 +257,7 @@
 
       <div class="main_title main_title_box">
         <p>收款方信息</p>
-        <router-link  v-if="!isModifyOrder"  :to="{name:'sunVillageApprovalCollectionAdd', params: {accountType:form.accountType,isPeers:form.isPeers,bankType:form.bankType,option:form}}">添加收款方</router-link>
+        <router-link  v-if="!isModifyOrder && isCanBatch"  :to="{name:'sunVillageApprovalCollectionAdd', params: {accountType:form.accountType,isPeers:form.isPeers,bankType:form.bankType,option:form}}">添加收款方</router-link>
         <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/>
       </div>
 
@@ -465,6 +465,7 @@
         projectFundType:'',
         nowDate:"",
         isModifyOrder:false,  //是已创建订单 false新建订单  true已创建订单
+        isCanBatch:true,  //能否批量
       };
     },
     created() {
@@ -643,22 +644,28 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
-        if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
-          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
+        //   this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        // }else 
+        if(this.form.bankType == '7' && this.chargeItme.length>0 && this.chargeItme != []){
+          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
         }else{
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方
-            payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: null, //所属银行
-            bankTypeText:"", //所属银行
-            showPayee:false,
-            showbankType:false
-          });
-        });}
+          this.getDicts("bank_type").then(res => {
+            this.chargeItme.splice(index + 1, 0, {
+              payeeId: "", //收款方ID
+              payee: "", //收款方
+              payeeAccount: "", //收款账户
+              bankDeposit: "", //开户银行
+              incomeAmount: "", //收入金额
+              bankType: null, //所属银行
+              bankTypeText:"", //所属银行
+              showPayee:false,
+              showbankType:false
+            });
+          });}
+          if(this.form.bankType == '7'){
+            this.isCanBatch = false;
+          }
       },
       getPayeeList() {
         //普通转账

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

@@ -71,6 +71,8 @@
         <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+        <van-field v-if="item.transferStatus=='成功'||item.transferStatus=='失败'" readonly label="转账状态" v-model="item.transferStatus" input-align="right" />
+        <van-field v-if="item.transferStatus=='成功'||item.transferStatus=='失败'" readonly label="交易结果描述" v-model="item.causeFailure"  type="textarea" input-align="right" rows="3" label-width="auto" />
       </div>
       <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
       <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>
@@ -131,6 +133,7 @@
         bankTypeDictionaries:[],
         projectList:[],
         projectFundTypeOptions:[],
+        transferStatusOptions:[],
         projectFundTypeDictionaries:[],
         projectList:[],
 
@@ -175,6 +178,9 @@
         }
         this.projectFundTypeDictionaries = response.data;
       });
+      this.getDicts("transfer_status").then((response) => {
+        this.transferStatusOptions = response.data;
+      });
       this.getDictionaries();
       this.getFileList();
       this.getTemplateList();
@@ -241,6 +247,7 @@
             }
             for (var j = 0 ; j < response.rows.length ; j++){
               response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+              response.rows[j].transferStatus = this.selectDictLabel(this.transferStatusOptions, response.rows[j].transferStatus);
             }
             this.chargeItme = response.rows;
           });

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

@@ -590,22 +590,25 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
-        if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>1){
-          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length==1){
+        //   this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        // }else 
+        if(this.form.bankType == '7' && this.chargeItme.length==1){
+          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
         }else{
-        this.getDicts("bank_type_all").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方
-            payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: null, //所属银行
-            bankTypeText:"", //所属银行
-            showPayee:false,
-            showbankType:false
-          });
-        });}
+          this.getDicts("bank_type_all").then(res => {
+            this.chargeItme.splice(index + 1, 0, {
+              payeeId: "", //收款方ID
+              payee: "", //收款方
+              payeeAccount: "", //收款账户
+              bankDeposit: "", //开户银行
+              incomeAmount: "", //收入金额
+              bankType: null, //所属银行
+              bankTypeText:"", //所属银行
+              showPayee:false,
+              showbankType:false
+            });
+          });}
       },
       getPayeeList() {
         //普通转账

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

@@ -98,7 +98,8 @@
             @cancel="showTaccountId = false"
           />
         </van-popup>
-        <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
+        <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2'||form.bankType=='7')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
+        <van-field label="DN" v-if="accountType=='银行存款'&&form.bankType=='7'" required :rules="[{ required: true , message:'DN' }]" v-model="form.alternateField1" placeholder="请输入DN" input-align="right" label-width="auto"/>
         <van-field label="账簿号" v-if="accountType=='银行存款'&&villageAccountType=='多级账簿'" required :rules="[{ required: true , message:'请输入账簿号' }]" v-model="form.accountNo" placeholder="请输入账簿号" input-align="right" label-width="auto"/>
         <van-field label="管控类型" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
           <template #right-icon>

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

@@ -98,7 +98,8 @@
             @cancel="showTaccountId = false"
           />
         </van-popup>
-        <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
+        <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2'||form.bankType=='7')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
+        <van-field label="DN" v-if="accountType=='银行存款'&&form.bankType=='7'" required :rules="[{ required: true , message:'DN' }]" v-model="form.alternateField1" placeholder="请输入DN" input-align="right" label-width="auto"/>
         <van-field label="账簿号" v-if="accountType=='银行存款'&&villageAccountType=='多级账簿'" required :rules="[{ required: true , message:'请输入账簿号' }]" v-model="form.accountNo" placeholder="请输入账簿号" input-align="right" label-width="auto"/>
         <van-field label="管控类型" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
           <template #right-icon>

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

@@ -252,7 +252,7 @@
 
       <div class="main_title main_title_box">
         <p>收款方信息</p>
-        <router-link v-if="!isModifyOrder" :to="{name:'approvalCollectionAdd', params: {accountType:form.accountType,isPeers:form.isPeers,bankType:form.bankType,option:form}}">添加收款方</router-link>
+        <router-link v-if="!isModifyOrder && isCanBatch" :to="{name:'approvalCollectionAdd', params: {accountType:form.accountType,isPeers:form.isPeers,bankType:form.bankType,option:form}}">添加收款方</router-link>
         <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/>
       </div>
 
@@ -461,6 +461,7 @@
         projectFundType:'',
         nowDate:"",
         isModifyOrder:false,  //是已创建订单 false新建订单  true已创建订单
+        isCanBatch:true,  //能否批量
       };
     },
     created() {
@@ -638,22 +639,28 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
-        if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
-          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
+        //   this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        // }else 
+        if(this.form.bankType == '7' && this.chargeItme.length>0 && this.chargeItme != []){
+          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
         }else{
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方
-            payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: null, //所属银行
-            bankTypeText:"", //所属银行
-            showPayee:false,
-            showbankType:false
-          });
-        });}
+          this.getDicts("bank_type").then(res => {
+            this.chargeItme.splice(index + 1, 0, {
+              payeeId: "", //收款方ID
+              payee: "", //收款方
+              payeeAccount: "", //收款账户
+              bankDeposit: "", //开户银行
+              incomeAmount: "", //收入金额
+              bankType: null, //所属银行
+              bankTypeText:"", //所属银行
+              showPayee:false,
+              showbankType:false
+            });
+          });}
+          if(this.form.bankType == '7'){
+            this.isCanBatch = false;
+          }
       },
       getPayeeList() {
         //普通转账

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

@@ -72,7 +72,7 @@
         <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
         <van-field v-if="item.transferStatus=='成功'||item.transferStatus=='失败'" readonly label="转账状态" v-model="item.transferStatus" input-align="right" />
-        <van-field v-if="item.transferStatus=='成功'||item.transferStatus=='失败'" readonly label="交易结果描述" v-model="item.causeFailure" input-align="right" />
+        <van-field v-if="item.transferStatus=='成功'||item.transferStatus=='失败'" readonly label="交易结果描述" v-model="item.causeFailure"  type="textarea" input-align="right" rows="3" label-width="auto" />
       </div>
       <p class="main_more" v-if="chargeItme.length>1 && showbtn" @click="listLength = chargeItme.length,showbtn=false">查看更多</p>
       <p class="main_more" v-if="chargeItme.length>1 && !showbtn" @click="listLength = 1,showbtn=true">收起列表</p>

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

@@ -589,22 +589,25 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
-        if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>1){
-          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length==1){
+        //   this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+        // }else 
+        if(this.form.bankType == '7' && this.chargeItme.length==1){
+          this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
         }else{
-        this.getDicts("bank_type_all").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方
-            payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: null, //所属银行
-            bankTypeText:"", //所属银行
-            showPayee:false,
-            showbankType:false
-          });
-        });}
+          this.getDicts("bank_type_all").then(res => {
+            this.chargeItme.splice(index + 1, 0, {
+              payeeId: "", //收款方ID
+              payee: "", //收款方
+              payeeAccount: "", //收款账户
+              bankDeposit: "", //开户银行
+              incomeAmount: "", //收入金额
+              bankType: null, //所属银行
+              bankTypeText:"", //所属银行
+              showPayee:false,
+              showbankType:false
+            });
+          });}
       },
       getPayeeList() {
         //普通转账