TASK 45195 卧龙区银农系统：对接民生银行

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

@@ -137,6 +137,20 @@
           v-if="form.bankType == '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，对私转账时不要出现工资、奖金和劳务费，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="4"
+          label-width="auto"
+          maxlength="30"
+          required
+          show-word-limit
+          v-if="form.bankType == '10'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
         <van-field
           label="转账附言"
           v-model="form.remark"
@@ -148,7 +162,7 @@
           maxlength="30"
           required
           show-word-limit
-          v-if="form.bankType != '5' && form.bankType != '6' && form.bankType != '8'"
+          v-if="form.bankType != '5' && form.bankType != '6' && form.bankType != '8' && form.bankType != '10'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
       </div>
@@ -265,8 +279,8 @@
         <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/>
       </div>
 
-      <div class="main_box" style="margin-top: 10px;" v-if="form.bankType==1||form.bankType==2||form.bankType==3">
-        <van-cell title="收款账户类型" v-if="form.bankType==1">
+      <div class="main_box" style="margin-top: 10px;" v-if="form.bankType==1||form.bankType==2||form.bankType==3||form.bankType==10">
+        <van-cell title="收款账户类型" v-if="form.bankType==1 || form.bankType==10">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange" >
               <van-radio name="1">公户</van-radio>
@@ -728,6 +742,9 @@
       getPayeeList() {
         //普通转账
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -944,6 +961,9 @@
         this.queryParams.isPeers = this.form.isPeers
         this.queryParams.accountType = this.form.accountType
         this.queryParams.bankType = this.form.bankType
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
@@ -961,6 +981,9 @@
         this.queryParams.isPeers = this.form.isPeers
         this.queryParams.accountType = this.form.accountType
         this.queryParams.bankType = this.form.bankType
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
@@ -1288,7 +1311,7 @@
           this.$set(this.form, "cifNo", obj.cifNo);
           this.$set(this.form, "payerFrom", '1');
           this.$set(this.form, "clearingBank", obj.clearingBank);
-          if(obj.bankType==1){
+          if(obj.bankType==1 || obj.bankType==10){
             this.form.accountType = "1"
             this.form.isPeers = null
             this.accountTypeChange();
@@ -1355,6 +1378,9 @@
         console.log(val);
         this.payeeList = [];
         this.queryParams.payee = this.payeeSearchValue;
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){

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

@@ -59,7 +59,7 @@
     <p class="main_title">收款方信息</p>
 
     <div class="main_box" style="margin-bottom: 15px;">
-      <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==1 || form.bankType==10" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
       <van-field readonly label="行内转账" v-if="form.bankType==2||form.bankType==3" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
 
     </div>

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

@@ -59,7 +59,7 @@
 
     <div class="main_box" style="position:relative;margin-top: 10px;">
       <p class="main_title"><i></i>收款方信息</p>
-      <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==1 || form.bankType==10" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
       <van-field readonly label="行内转账" v-if="form.bankType==2||form.bankType==3" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
       <div style="margin-bottom: 10px;position:relative;" v-for="(item, index) in chargeItme" :key="index" v-if="index<listLength">
         <van-field readonly label="收款方" v-model="item.payee" input-align="right" />

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

@@ -4,7 +4,7 @@
         left-arrow
         fixed
         placeholder
-        @click-left="onClickLeft"
+        @click-left="goBack()"
         @click-right="goAdd()"
       >
         <template #title>

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

@@ -131,6 +131,20 @@
           v-if="form.bankType == '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，对私转账时不要出现工资、奖金和劳务费，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="4"
+          label-width="auto"
+          maxlength="30"
+          required
+          show-word-limit
+          v-if="form.bankType == '10'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
         <van-field
           label="转账附言"
           v-model="form.remark"
@@ -142,7 +156,7 @@
           maxlength="30"
           required
           show-word-limit
-          v-if="form.bankType != '5' && form.bankType != '6' && form.bankType != '8'"
+          v-if="form.bankType != '5' && form.bankType != '6' && form.bankType != '8' && form.bankType != '10'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
       </div>
@@ -263,7 +277,7 @@
           <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/>
         </div>
 
-        <van-cell title="收款账户类型" v-if="form.bankType==1">
+        <van-cell title="收款账户类型" v-if="form.bankType==1 || form.bankType==10">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange" >
               <van-radio name="1">公户</van-radio>
@@ -533,6 +547,9 @@
         console.log(val);
         this.payeeList = [];
         this.queryParams.payee = this.payeeSearchValue;
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -688,6 +705,9 @@
         this.queryParams.accountType = this.form.accountType?this.form.accountType:null
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -789,6 +809,9 @@
         this.queryParams.isPeers = this.form.isPeers
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -806,6 +829,9 @@
         this.queryParams.isPeers = this.form.isPeers
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -1179,7 +1205,7 @@
           this.$set(this.form, "payerFrom", '1');
           this.$set(this.form, "clearingBank", obj.clearingBank);
           console.log(obj.bankType)
-          if(obj.bankType==1){
+          if(obj.bankType==1 || obj.bankType==10){
             this.form.accountType = "1"
             this.form.isPeers = null
             this.accountTypeChange();

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

@@ -59,7 +59,7 @@
 
     <div class="main_box" style="position:relative;margin-top: 10px;">
       <p class="main_title"><i></i>收款方信息</p>
-      <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==1 || form.bankType==10" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
       <van-field readonly label="行内转账" v-if="form.bankType==2||form.bankType==3" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
       <div style="margin-bottom: 10px;position:relative;" v-for="(item, index) in chargeItme" :key="index" v-if="index<listLength">
         <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
@@ -277,6 +277,7 @@
         this.queryParams.id = id;
         this.queryParams.uuid = this.form.uuid;
         this.queryParams.alternateField1 = this.form.alternateField1;
+        this.queryParams.accountPassword = this.form.accountPassword;
         let queryParams = this.queryParams;
         const bankType = this.form.bankType;
         var that = this;
@@ -301,7 +302,7 @@
             if(err.toString().indexOf('验证码错误') !== -1){
               this.paySubmitDisabled = false;
               return
-            }else if(err.toString().indexOf('错误代码：-1') == -1 && err.toString().indexOf('错误代码：-2') == -1){
+            }else if(err.toString().indexOf('错误代码：-1') !== -1 && err.toString().indexOf('错误代码：-2') !== -1){
               this.getList();
               clearTimeout(this.sms_timer);
               this.smsStatus = false;
@@ -329,12 +330,15 @@
             if(err.toString().indexOf('验证码错误') !== -1){
               this.paySubmitDisabled = false;
               return
-            }else if(err.toString().indexOf('错误代码：-1') == -1 && err.toString().indexOf('错误代码：-2') == -1){
+            }else if(err.toString().indexOf('错误代码：-1') !== -1 && err.toString().indexOf('错误代码：-2') !== -1){
               this.getList();
               clearTimeout(this.sms_timer);
               this.smsStatus = false;
               this.sms_disabled = false;
               this.smsText = "发送验证码";
+            }else if(err.toString().indexOf('支付口令不正确') !== -1){
+              this.paySubmitDisabled1 = false;
+              return
             }
             setTimeout(function(){
               history.go(-1)

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

@@ -131,6 +131,20 @@
           v-if="form.bankType == '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，对私转账时不要出现工资、奖金和劳务费，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="4"
+          label-width="auto"
+          maxlength="30"
+          required
+          show-word-limit
+          v-if="form.bankType == '10'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
         <van-field
           label="转账附言"
           v-model="form.remark"
@@ -142,7 +156,7 @@
           maxlength="30"
           required
           show-word-limit
-          v-if="form.bankType != '5' && form.bankType != '6' && form.bankType != '8'"
+          v-if="form.bankType != '5' && form.bankType != '6' && form.bankType != '8' && form.bankType != '10'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
       </div>
@@ -257,8 +271,8 @@
         <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/>
       </div>
 
-      <div class="main_box" style="margin-bottom: 15px;" v-if="form.bankType==1||form.bankType==2||form.bankType==3">
-        <van-cell title="收款账户类型" v-if="form.bankType==1">
+      <div class="main_box" style="margin-bottom: 15px;" v-if="form.bankType==1||form.bankType==2||form.bankType==3||form.bankType==10">
+        <van-cell title="收款账户类型" v-if="form.bankType==1 || form.bankType==10">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange" >
               <van-radio name="1">公户</van-radio>
@@ -551,6 +565,9 @@
         console.log(val);
         this.payeeList = [];
         this.queryParams.payee = this.payeeSearchValue;
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -854,6 +871,9 @@
       getPayeeList() {
         //普通转账
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -955,6 +975,9 @@
         this.queryParams.accountType = this.form.accountType
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -972,6 +995,9 @@
         this.queryParams.accountType = this.form.accountType
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -1280,7 +1306,7 @@
           this.$set(this.form, "cifNo", obj.cifNo);
           this.$set(this.form, "payerFrom", '1');
           this.$set(this.form, "clearingBank", obj.clearingBank);
-          if(obj.bankType==1){
+          if(obj.bankType==1 || obj.bankType==10){
             this.form.accountType = "1"
             this.form.isPeers = null
             this.accountTypeChange();

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

@@ -59,7 +59,7 @@
     <p class="main_title">收款方信息</p>
 
     <div class="main_box" style="margin-bottom: 15px;">
-      <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==1 || form.bankType==10" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
       <van-field readonly label="行内转账" v-if="form.bankType==2||form.bankType==3" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
 
     </div>

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

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

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

@@ -131,6 +131,20 @@
           v-if="form.bankType == '6'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
+        <van-field
+          label="转账附言"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="附言请尽量简洁并减少标点符号的使用，对私转账时不要出现工资、奖金和劳务费，详情可在‘说明情况’中描述。"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+          maxlength="30"
+          required
+          show-word-limit
+          v-if="form.bankType != '5' && form.bankType == '10'"
+          :rules="[{ required: true , message:'请输入转账附言' }]"
+        />
         <van-field
           label="转账附言"
           v-model="form.remark"
@@ -142,7 +156,7 @@
           maxlength="30"
           required
           show-word-limit
-          v-if="form.bankType != '5' && form.bankType != '6' && form.bankType != '8'"
+          v-if="form.bankType != '5' && form.bankType != '6' && form.bankType != '8' && form.bankType != '10'"
           :rules="[{ required: true , message:'请输入转账附言' }]"
         />
       </div>
@@ -267,7 +281,7 @@
       <!--        <van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/>-->
       <!--      </div>-->
       <div class="main_box" style="margin-bottom: 15px;">
-        <van-cell title="收款账户类型" v-if="form.bankType==1">
+        <van-cell title="收款账户类型" v-if="form.bankType==1 || form.bankType==10">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.accountType" @change="accountTypeChange">
               <van-radio name="1">公户</van-radio>
@@ -570,6 +584,9 @@
         console.log(val);
         this.payeeList = [];
         this.queryParams.payee = this.payeeSearchValue;
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
             if(res.payeeType==1||res.payeeType==2){
@@ -722,6 +739,9 @@
         this.queryParams.accountType = this.form.accountType ? this.form.accountType : null
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res, index) => {
             if (res.payeeType == 1 || res.payeeType == 2) {
@@ -943,6 +963,9 @@
         this.queryParams.isPeers = this.form.isPeers
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res, index) => {
             if (res.payeeType == 1 || res.payeeType == 2) {
@@ -960,6 +983,9 @@
         this.queryParams.isPeers = this.form.isPeers
         this.queryParams.bankType = this.form.bankType
         this.queryParams.status = "0"
+        if(this.form.bankType == 1 || this.form.bankType == 10){
+          this.queryParams.bankType = "";
+        }
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res, index) => {
             if (res.payeeType == 1 || res.payeeType == 2) {
@@ -1218,7 +1244,7 @@
           this.$set(this.form, "bankType", obj.bankType);
           this.$set(this.form, "payerFrom", '1');
           this.$set(this.form, "clearingBank", obj.clearingBank);
-          if (obj.bankType == 1) {
+          if (obj.bankType == 1 || obj.bankType == 10) {
             this.form.accountType = "1"
             this.form.isPeers = null
             this.accountTypeChange();