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

src/router/index.js

@@ -2321,6 +2321,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalApproval12'], resolve)
   },
+  {
+    path: '/yinnong/approvalApproval13',
+    name: 'approvalApproval13',
+    meta: {
+      title: '付款审批',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalApproval13'], resolve)
+  },
 
   {
     path: '/yinnong/approvalModify',

src/views/onlineHome/done.vue

@@ -213,7 +213,9 @@
             case 'house_circulation':
               this.$router.push({name:'circulationDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
               break;
-
+            case 'yinnong_majorevent':
+            this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              break;
             case 'yinnong_transfer':
               this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
               break;

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/approvalAdd10.vue

@@ -676,7 +676,7 @@
             this.uploadFiles1.map(rr => {
               const params = new FormData();
               params.append("tableId", response.data.id);
-              params.append("tableName", "t_yinnong_cash");
+              params.append("tableName", "t_yinnong_transfer");
               params.append("bizPath", "yinnong");
               params.append("fileType", "1");
               params.append("file", rr);
@@ -686,7 +686,7 @@
             this.uploadFiles2.map(rr => {
               const params = new FormData();
               params.append("tableId", response.data.id);
-              params.append("tableName", "t_yinnong_cash");
+              params.append("tableName", "t_yinnong_transfer");
               params.append("bizPath", "yinnong");
               params.append("fileType", "2");
               params.append("file", rr);
@@ -696,7 +696,7 @@
             this.uploadFiles3.map(rr => {
               const params = new FormData();
               params.append("tableId", response.data.id);
-              params.append("tableName", "t_yinnong_cash");
+              params.append("tableName", "t_yinnong_transfer");
               params.append("bizPath", "yinnong");
               params.append("fileType", "3");
               params.append("file", rr);
@@ -776,7 +776,7 @@
             this.uploadFiles1.map(rr => {
               const params = new FormData();
               params.append("tableId", response.data.id);
-              params.append("tableName", "t_yinnong_cash");
+              params.append("tableName", "t_yinnong_transfer");
               params.append("bizPath", "yinnong");
               params.append("fileType", "1");
               params.append("file", rr);
@@ -786,7 +786,7 @@
             this.uploadFiles2.map(rr => {
               const params = new FormData();
               params.append("tableId", response.data.id);
-              params.append("tableName", "t_yinnong_cash");
+              params.append("tableName", "t_yinnong_transfer");
               params.append("bizPath", "yinnong");
               params.append("fileType", "2");
               params.append("file", rr);
@@ -796,7 +796,7 @@
             this.uploadFiles3.map(rr => {
               const params = new FormData();
               params.append("tableId", response.data.id);
-              params.append("tableName", "t_yinnong_cash");
+              params.append("tableName", "t_yinnong_transfer");
               params.append("bizPath", "yinnong");
               params.append("fileType", "3");
               params.append("file", rr);
@@ -978,7 +978,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -990,7 +990,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -1002,7 +1002,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -772,7 +772,7 @@
                   this.uploadFiles1.map((rr1,idx1) => {
                     let params1 = new FormData();
                     params1.append("tableId", response.data.id);
-                    params1.append("tableName", "t_yinnong_cash");
+                    params1.append("tableName", "t_yinnong_transfer");
                     params1.append("bizPath", "yinnong");
                     params1.append("fileType", "1");
                     params1.append("file", rr1);
@@ -782,7 +782,7 @@
                           _this.uploadFiles2.map((rr2,idx2) => {
                             let params2 = new FormData();
                             params2.append("tableId", response.data.id);
-                            params2.append("tableName", "t_yinnong_cash");
+                            params2.append("tableName", "t_yinnong_transfer");
                             params2.append("bizPath", "yinnong");
                             params2.append("fileType", "2");
                             params2.append("file", rr2);
@@ -792,7 +792,7 @@
                                   _this.uploadFiles3.map((rr3,idx3) => {
                                     let params3 = new FormData();
                                     params3.append("tableId", response.data.id);
-                                    params3.append("tableName", "t_yinnong_cash");
+                                    params3.append("tableName", "t_yinnong_transfer");
                                     params3.append("bizPath", "yinnong");
                                     params3.append("fileType", "3");
                                     params3.append("file", rr3);
@@ -1000,7 +1000,7 @@
                           _this.uploadFiles3.map((rr3,idx3) => {
                             let params3 = new FormData();
                             params3.append("tableId", response.data.id);
-                            params3.append("tableName", "t_yinnong_cash");
+                            params3.append("tableName", "t_yinnong_transfer");
                             params3.append("bizPath", "yinnong");
                             params3.append("fileType", "3");
                             params3.append("file", rr3);
@@ -1208,7 +1208,7 @@
                   this.uploadFiles2.map((rr2,idx2) => {
                     let params = new FormData();
                     params.append("tableId", response.data.id);
-                    params.append("tableName", "t_yinnong_cash");
+                    params.append("tableName", "t_yinnong_transfer");
                     params.append("bizPath", "yinnong");
                     params.append("fileType", "2");
                     params.append("file", rr2);
@@ -1218,7 +1218,7 @@
                           _this.uploadFiles3.map((rr3,idx3) => {
                             let params3 = new FormData();
                             params3.append("tableId", response.data.id);
-                            params3.append("tableName", "t_yinnong_cash");
+                            params3.append("tableName", "t_yinnong_transfer");
                             params3.append("bizPath", "yinnong");
                             params3.append("fileType", "3");
                             params3.append("file", rr3);
@@ -1426,7 +1426,7 @@
                   this.uploadFiles3.map((rr3,idx3) => {
                     let params = new FormData();
                     params.append("tableId", response.data.id);
-                    params.append("tableName", "t_yinnong_cash");
+                    params.append("tableName", "t_yinnong_transfer");
                     params.append("bizPath", "yinnong");
                     params.append("fileType", "3");
                     params.append("file", rr3);
@@ -1687,7 +1687,7 @@
                 this.uploadFiles1.map((rr1,idx1) => {
                   let params1 = new FormData();
                   params1.append("tableId", response.data.id);
-                  params1.append("tableName", "t_yinnong_cash");
+                  params1.append("tableName", "t_yinnong_transfer");
                   params1.append("bizPath", "yinnong");
                   params1.append("fileType", "1");
                   params1.append("file", rr1);
@@ -1697,7 +1697,7 @@
                         _this.uploadFiles2.map((rr2,idx2) => {
                           let params2 = new FormData();
                           params2.append("tableId", response.data.id);
-                          params2.append("tableName", "t_yinnong_cash");
+                          params2.append("tableName", "t_yinnong_transfer");
                           params2.append("bizPath", "yinnong");
                           params2.append("fileType", "2");
                           params2.append("file", rr2);
@@ -1707,7 +1707,7 @@
                                 _this.uploadFiles3.map((rr3,idx3) => {
                                   let params3 = new FormData();
                                   params3.append("tableId", response.data.id);
-                                  params3.append("tableName", "t_yinnong_cash");
+                                  params3.append("tableName", "t_yinnong_transfer");
                                   params3.append("bizPath", "yinnong");
                                   params3.append("fileType", "3");
                                   params3.append("file", rr3);
@@ -1807,7 +1807,7 @@
                         _this.uploadFiles3.map((rr3,idx3) => {
                           let params3 = new FormData();
                           params3.append("tableId", response.data.id);
-                          params3.append("tableName", "t_yinnong_cash");
+                          params3.append("tableName", "t_yinnong_transfer");
                           params3.append("bizPath", "yinnong");
                           params3.append("fileType", "3");
                           params3.append("file", rr3);
@@ -1907,7 +1907,7 @@
                 this.uploadFiles2.map((rr2,idx2) => {
                   let params = new FormData();
                   params.append("tableId", response.data.id);
-                  params.append("tableName", "t_yinnong_cash");
+                  params.append("tableName", "t_yinnong_transfer");
                   params.append("bizPath", "yinnong");
                   params.append("fileType", "2");
                   params.append("file", rr2);
@@ -1917,7 +1917,7 @@
                         _this.uploadFiles3.map((rr3,idx3) => {
                           let params3 = new FormData();
                           params3.append("tableId", response.data.id);
-                          params3.append("tableName", "t_yinnong_cash");
+                          params3.append("tableName", "t_yinnong_transfer");
                           params3.append("bizPath", "yinnong");
                           params3.append("fileType", "3");
                           params3.append("file", rr3);
@@ -2017,7 +2017,7 @@
                 this.uploadFiles3.map((rr3,idx3) => {
                   let params = new FormData();
                   params.append("tableId", response.data.id);
-                  params.append("tableName", "t_yinnong_cash");
+                  params.append("tableName", "t_yinnong_transfer");
                   params.append("bizPath", "yinnong");
                   params.append("fileType", "3");
                   params.append("file", rr3);
@@ -2264,7 +2264,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -2276,7 +2276,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -2288,7 +2288,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -247,9 +247,9 @@
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
-          bizPath: "upload",
-          fileType: "0",
+          tableName: "t_yinnong_majorevent",
+          bizPath: "yinnong",
+          fileType: "",
         }
         attachmentList(oData).then(res => {
           console.log(res)

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

@@ -286,7 +286,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -298,7 +298,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -310,7 +310,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -308,7 +308,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -320,7 +320,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -332,7 +332,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -372,7 +372,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -384,7 +384,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -396,7 +396,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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/approvalDetail10.vue

@@ -237,7 +237,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -249,7 +249,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -261,7 +261,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -256,7 +256,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -268,7 +268,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -280,7 +280,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -319,7 +319,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -331,7 +331,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -343,7 +343,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -233,9 +233,9 @@
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
-          bizPath: "upload",
-          fileType: "0",
+          tableName: "t_yinnong_majorevent",
+          bizPath: "yinnong",
+          fileType: "",
         }
         attachmentList(oData).then(res => {
           console.log(res)

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

@@ -115,8 +115,8 @@ export default {
       this.fileList = [];
       let oData1= {
         tableId: id,
-        tableName: "t_yinnong_transfer",
-        bizPath: "transfer",
+        tableName: "t_yinnong_majorevent",
+        bizPath: "yinnong",
         fileType: '',
       }
       attachmentList(oData1).then(res => {

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/sunVillage_info/bankAgriculture/paymentApproval/approvalModify10.vue

@@ -663,7 +663,7 @@
               this.uploadFiles1.map(rr => {
                 const params = new FormData();
                 params.append("tableId", this.form.id);
-                params.append("tableName", "t_yinnong_cash");
+                params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "yinnong");
                 params.append("fileType", "1");
                 params.append("file", rr);
@@ -674,7 +674,7 @@
               this.uploadFiles2.map(rr => {
                 const params = new FormData();
                 params.append("tableId", this.form.id);
-                params.append("tableName", "t_yinnong_cash");
+                params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "yinnong");
                 params.append("fileType", "2");
                 params.append("file", rr);
@@ -685,7 +685,7 @@
               this.uploadFiles3.map(rr => {
                 const params = new FormData();
                 params.append("tableId", this.form.id);
-                params.append("tableName", "t_yinnong_cash");
+                params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "yinnong");
                 params.append("fileType", "3");
                 params.append("file", rr);
@@ -768,7 +768,7 @@
               this.uploadFiles1.map(rr => {
                 const params = new FormData();
                 params.append("tableId", this.form.id);
-                params.append("tableName", "t_yinnong_cash");
+                params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "yinnong");
                 params.append("fileType", "1");
                 params.append("file", rr);
@@ -779,7 +779,7 @@
               this.uploadFiles2.map(rr => {
                 const params = new FormData();
                 params.append("tableId", this.form.id);
-                params.append("tableName", "t_yinnong_cash");
+                params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "yinnong");
                 params.append("fileType", "2");
                 params.append("file", rr);
@@ -790,7 +790,7 @@
               this.uploadFiles3.map(rr => {
                 const params = new FormData();
                 params.append("tableId", this.form.id);
-                params.append("tableName", "t_yinnong_cash");
+                params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "yinnong");
                 params.append("fileType", "3");
                 params.append("file", rr);
@@ -974,7 +974,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -986,7 +986,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -998,7 +998,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -759,7 +759,7 @@
                   this.uploadFiles1.map((rr1,idx1) => {
                     let params1 = new FormData();
                     params1.append("tableId", _this.form.id);
-                    params1.append("tableName", "t_yinnong_cash");
+                    params1.append("tableName", "t_yinnong_transfer");
                     params1.append("bizPath", "yinnong");
                     params1.append("fileType", "1");
                     params1.append("file", rr1);
@@ -769,7 +769,7 @@
                           _this.uploadFiles2.map((rr2,idx2) => {
                             let params2 = new FormData();
                             params2.append("tableId", _this.form.id);
-                            params2.append("tableName", "t_yinnong_cash");
+                            params2.append("tableName", "t_yinnong_transfer");
                             params2.append("bizPath", "yinnong");
                             params2.append("fileType", "2");
                             params2.append("file", rr2);
@@ -779,7 +779,7 @@
                                   _this.uploadFiles3.map((rr3,idx3) => {
                                     let params3 = new FormData();
                                     params3.append("tableId", _this.form.id);
-                                    params3.append("tableName", "t_yinnong_cash");
+                                    params3.append("tableName", "t_yinnong_transfer");
                                     params3.append("bizPath", "yinnong");
                                     params3.append("fileType", "3");
                                     params3.append("file", rr3);
@@ -987,7 +987,7 @@
                           _this.uploadFiles3.map((rr3,idx3) => {
                             let params3 = new FormData();
                             params3.append("tableId", _this.form.id);
-                            params3.append("tableName", "t_yinnong_cash");
+                            params3.append("tableName", "t_yinnong_transfer");
                             params3.append("bizPath", "yinnong");
                             params3.append("fileType", "3");
                             params3.append("file", rr3);
@@ -1195,7 +1195,7 @@
                   this.uploadFiles2.map((rr2,idx2) => {
                     let params = new FormData();
                     params.append("tableId", _this.form.id);
-                    params.append("tableName", "t_yinnong_cash");
+                    params.append("tableName", "t_yinnong_transfer");
                     params.append("bizPath", "yinnong");
                     params.append("fileType", "2");
                     params.append("file", rr2);
@@ -1205,7 +1205,7 @@
                           _this.uploadFiles3.map((rr3,idx3) => {
                             let params3 = new FormData();
                             params3.append("tableId", _this.form.id);
-                            params3.append("tableName", "t_yinnong_cash");
+                            params3.append("tableName", "t_yinnong_transfer");
                             params3.append("bizPath", "yinnong");
                             params3.append("fileType", "3");
                             params3.append("file", rr3);
@@ -1413,7 +1413,7 @@
                   this.uploadFiles3.map((rr3,idx3) => {
                     let params = new FormData();
                     params.append("tableId", _this.form.id);
-                    params.append("tableName", "t_yinnong_cash");
+                    params.append("tableName", "t_yinnong_transfer");
                     params.append("bizPath", "yinnong");
                     params.append("fileType", "3");
                     params.append("file", rr3);
@@ -1676,7 +1676,7 @@
                 this.uploadFiles1.map((rr1,idx1) => {
                   let params1 = new FormData();
                   params1.append("tableId", _this.form.id);
-                  params1.append("tableName", "t_yinnong_cash");
+                  params1.append("tableName", "t_yinnong_transfer");
                   params1.append("bizPath", "yinnong");
                   params1.append("fileType", "1");
                   params1.append("file", rr1);
@@ -1686,7 +1686,7 @@
                         _this.uploadFiles2.map((rr2,idx2) => {
                           let params2 = new FormData();
                           params2.append("tableId", _this.form.id);
-                          params2.append("tableName", "t_yinnong_cash");
+                          params2.append("tableName", "t_yinnong_transfer");
                           params2.append("bizPath", "yinnong");
                           params2.append("fileType", "2");
                           params2.append("file", rr2);
@@ -1696,7 +1696,7 @@
                                 _this.uploadFiles3.map((rr3,idx3) => {
                                   let params3 = new FormData();
                                   params3.append("tableId", _this.form.id);
-                                  params3.append("tableName", "t_yinnong_cash");
+                                  params3.append("tableName", "t_yinnong_transfer");
                                   params3.append("bizPath", "yinnong");
                                   params3.append("fileType", "3");
                                   params3.append("file", rr3);
@@ -1796,7 +1796,7 @@
                         _this.uploadFiles3.map((rr3,idx3) => {
                           let params3 = new FormData();
                           params3.append("tableId", _this.form.id);
-                          params3.append("tableName", "t_yinnong_cash");
+                          params3.append("tableName", "t_yinnong_transfer");
                           params3.append("bizPath", "yinnong");
                           params3.append("fileType", "3");
                           params3.append("file", rr3);
@@ -1896,7 +1896,7 @@
                 this.uploadFiles2.map((rr2,idx2) => {
                   let params = new FormData();
                   params.append("tableId", _this.form.id);
-                  params.append("tableName", "t_yinnong_cash");
+                  params.append("tableName", "t_yinnong_transfer");
                   params.append("bizPath", "yinnong");
                   params.append("fileType", "2");
                   params.append("file", rr2);
@@ -1906,7 +1906,7 @@
                         _this.uploadFiles3.map((rr3,idx3) => {
                           let params3 = new FormData();
                           params3.append("tableId", _this.form.id);
-                          params3.append("tableName", "t_yinnong_cash");
+                          params3.append("tableName", "t_yinnong_transfer");
                           params3.append("bizPath", "yinnong");
                           params3.append("fileType", "3");
                           params3.append("file", rr3);
@@ -2006,7 +2006,7 @@
                 this.uploadFiles3.map((rr3,idx3) => {
                   let params = new FormData();
                   params.append("tableId", _this.form.id);
-                  params.append("tableName", "t_yinnong_cash");
+                  params.append("tableName", "t_yinnong_transfer");
                   params.append("bizPath", "yinnong");
                   params.append("fileType", "3");
                   params.append("file", rr3);
@@ -2262,7 +2262,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -2274,7 +2274,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -2286,7 +2286,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -845,7 +845,7 @@
               this.uploadFiles1.map((rr1,idx1) => {
                 let params1 = new FormData();
                 params1.append("tableId", _this.form.id);
-                params1.append("tableName", "t_yinnong_cash");
+                params1.append("tableName", "t_yinnong_transfer");
                 params1.append("bizPath", "yinnong");
                 params1.append("fileType", "1");
                 params1.append("file", rr1);
@@ -855,7 +855,7 @@
                       _this.uploadFiles2.map((rr2,idx2) => {
                         let params2 = new FormData();
                         params2.append("tableId", _this.form.id);
-                        params2.append("tableName", "t_yinnong_cash");
+                        params2.append("tableName", "t_yinnong_transfer");
                         params2.append("bizPath", "yinnong");
                         params2.append("fileType", "2");
                         params2.append("file", rr2);
@@ -865,7 +865,7 @@
                               _this.uploadFiles3.map((rr3,idx3) => {
                                 let params3 = new FormData();
                                 params3.append("tableId", _this.form.id);
-                                params3.append("tableName", "t_yinnong_cash");
+                                params3.append("tableName", "t_yinnong_transfer");
                                 params3.append("bizPath", "yinnong");
                                 params3.append("fileType", "3");
                                 params3.append("file", rr3);
@@ -1073,7 +1073,7 @@
                       _this.uploadFiles3.map((rr3,idx3) => {
                         let params3 = new FormData();
                         params3.append("tableId", _this.form.id);
-                        params3.append("tableName", "t_yinnong_cash");
+                        params3.append("tableName", "t_yinnong_transfer");
                         params3.append("bizPath", "yinnong");
                         params3.append("fileType", "3");
                         params3.append("file", rr3);
@@ -1281,7 +1281,7 @@
               this.uploadFiles2.map((rr2,idx2) => {
                 let params = new FormData();
                 params.append("tableId", _this.form.id);
-                params.append("tableName", "t_yinnong_cash");
+                params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "yinnong");
                 params.append("fileType", "2");
                 params.append("file", rr2);
@@ -1291,7 +1291,7 @@
                       _this.uploadFiles3.map((rr3,idx3) => {
                         let params3 = new FormData();
                         params3.append("tableId", _this.form.id);
-                        params3.append("tableName", "t_yinnong_cash");
+                        params3.append("tableName", "t_yinnong_transfer");
                         params3.append("bizPath", "yinnong");
                         params3.append("fileType", "3");
                         params3.append("file", rr3);
@@ -1499,7 +1499,7 @@
               this.uploadFiles3.map((rr3,idx3) => {
                 let params = new FormData();
                 params.append("tableId", _this.form.id);
-                params.append("tableName", "t_yinnong_cash");
+                params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "yinnong");
                 params.append("fileType", "3");
                 params.append("file", rr3);
@@ -1746,7 +1746,7 @@
             this.uploadFiles1.map((rr1,idx1) => {
               let params1 = new FormData();
               params1.append("tableId", _this.form.id);
-              params1.append("tableName", "t_yinnong_cash");
+              params1.append("tableName", "t_yinnong_transfer");
               params1.append("bizPath", "yinnong");
               params1.append("fileType", "1");
               params1.append("file", rr1);
@@ -1756,7 +1756,7 @@
                     _this.uploadFiles2.map((rr2,idx2) => {
                       let params2 = new FormData();
                       params2.append("tableId", _this.form.id);
-                      params2.append("tableName", "t_yinnong_cash");
+                      params2.append("tableName", "t_yinnong_transfer");
                       params2.append("bizPath", "yinnong");
                       params2.append("fileType", "2");
                       params2.append("file", rr2);
@@ -1766,7 +1766,7 @@
                             _this.uploadFiles3.map((rr3,idx3) => {
                               let params3 = new FormData();
                               params3.append("tableId", _this.form.id);
-                              params3.append("tableName", "t_yinnong_cash");
+                              params3.append("tableName", "t_yinnong_transfer");
                               params3.append("bizPath", "yinnong");
                               params3.append("fileType", "3");
                               params3.append("file", rr3);
@@ -1866,7 +1866,7 @@
                     _this.uploadFiles3.map((rr3,idx3) => {
                       let params3 = new FormData();
                       params3.append("tableId", _this.form.id);
-                      params3.append("tableName", "t_yinnong_cash");
+                      params3.append("tableName", "t_yinnong_transfer");
                       params3.append("bizPath", "yinnong");
                       params3.append("fileType", "3");
                       params3.append("file", rr3);
@@ -1966,7 +1966,7 @@
             this.uploadFiles2.map((rr2,idx2) => {
               let params = new FormData();
               params.append("tableId", _this.form.id);
-              params.append("tableName", "t_yinnong_cash");
+              params.append("tableName", "t_yinnong_transfer");
               params.append("bizPath", "yinnong");
               params.append("fileType", "2");
               params.append("file", rr2);
@@ -1976,7 +1976,7 @@
                     _this.uploadFiles3.map((rr3,idx3) => {
                       let params3 = new FormData();
                       params3.append("tableId", _this.form.id);
-                      params3.append("tableName", "t_yinnong_cash");
+                      params3.append("tableName", "t_yinnong_transfer");
                       params3.append("bizPath", "yinnong");
                       params3.append("fileType", "3");
                       params3.append("file", rr3);
@@ -2076,7 +2076,7 @@
             this.uploadFiles3.map((rr3,idx3) => {
               let params = new FormData();
               params.append("tableId", _this.form.id);
-              params.append("tableName", "t_yinnong_cash");
+              params.append("tableName", "t_yinnong_transfer");
               params.append("bizPath", "yinnong");
               params.append("fileType", "3");
               params.append("file", rr3);
@@ -2316,7 +2316,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -2328,7 +2328,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -2340,7 +2340,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -249,9 +249,9 @@
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
-          bizPath: "upload",
-          fileType: "0",
+          tableName: "t_yinnong_majorevent",
+          bizPath: "yinnong",
+          fileType: "",
         }
         attachmentList(oData).then(res => {
           console.log(res)

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/approvalAdd10.vue

@@ -978,7 +978,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -990,7 +990,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -1002,7 +1002,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfers",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -2257,7 +2257,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -2269,7 +2269,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -2281,7 +2281,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -2305,7 +2305,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -2317,7 +2317,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -2329,7 +2329,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -247,9 +247,9 @@
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
-          bizPath: "upload",
-          fileType: "0",
+          tableName: "t_yinnong_majorevent",
+          bizPath: "yinnong",
+          fileType: "",
         }
         attachmentList(oData).then(res => {
           console.log(res)

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

@@ -373,7 +373,8 @@
           }
         });
       },
-    },watch: {
+    },
+    watch: {
       pass: function (val) {
         this.comment = val === "true" ? "同意" : "驳回";
       },

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

@@ -99,7 +99,7 @@
             <van-radio name="true">同意</van-radio>
             <van-radio name="false">驳回</van-radio>
           </van-radio-group>
-          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="同意申请宅基地"/>
+          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="请输入审批意见"/>
         </van-col>
       </van-row>
     </div>
@@ -286,7 +286,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -298,7 +298,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -310,7 +310,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -100,7 +100,7 @@
             <van-radio name="true">同意</van-radio>
             <van-radio name="false">驳回</van-radio>
           </van-radio-group>
-          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="同意申请宅基地"/>
+          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="请输入审批意见"/>
         </van-col>
       </van-row>
     </div>
@@ -308,7 +308,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -320,7 +320,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -332,7 +332,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -152,7 +152,7 @@
             <van-radio name="true">同意</van-radio>
             <van-radio name="false">驳回</van-radio>
           </van-radio-group>
-          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="同意申请宅基地"/>
+          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="请输入审批意见"/>
         </van-col>
       </van-row>
     </div>
@@ -372,7 +372,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -384,7 +384,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -396,7 +396,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -0,0 +1,376 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">重大事项</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first readonly>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          label="事项名称"
+          v-model="form.eventName"
+          placeholder="事项名称"
+          input-align="right"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'事项名称' }]"
+        />
+        <van-field
+          readonly
+          clickable
+          required
+          :rules="[{ required: true , message:'发生日期'  }]"
+          v-model="form.eventTime"
+          label="发生日期"
+          placeholder="发生日期"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showlasj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmLasj"
+            @cancel="showlasj = false"
+          />
+        </van-popup>
+      </div>
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field
+          label="事项内容"
+          input-align="right"
+          label-width="auto"
+          readonly
+        />
+        <van-field
+          v-model="form.eventContent"
+          type="textarea"
+          placeholder="事项内容"
+          rows="8"
+          required
+          :rules="[{ required: true , message:'事项内容'  }]"
+        />
+<!--        <editor v-model="form.eventContent" :min-height="192"/>-->
+<!--        <quill-editors @ChangeText="(text)=>{form.eventContent=text}" :title="title" />-->
+      </div>
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field
+          label="备注"
+          v-model="form.remark"
+          type="textarea"
+          placeholder="备注"
+          input-align="right"
+          rows="3"
+          label-width="auto"
+        />
+      </div>
+
+     <!-- <p class="main_title">上传附件</p>
+     <div class="main_box" style="padding: 5px 0 0 8px;">
+       <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader> 
+       </div> -->
+      <p style="margin-top:20px;padding: 0 10px">附件{{fileList&&fileList.length==0?':暂无可下载文件':''}}</p>
+      <van-cell v-for="(item,index) in fileList" :key="index">
+        <a :href="item.url" target="_blank">{{index+1}}.{{item.fileName}}</a>
+      </van-cell>
+    </van-form>
+    <div class="main_box examine_box" v-if="this.$route.query.type != 'done'">
+      <van-row type="flex" justify="space-between" align="center">
+        <van-col span="5">审批<br/>意见</van-col>
+        <van-col span="19">
+          <van-radio-group v-model="pass" direction="horizontal">
+            <van-radio name="true">同意</van-radio>
+            <van-radio name="false">驳回</van-radio>
+          </van-radio-group>
+          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="请输入审批意见"/>
+        </van-col>
+      </van-row>
+    </div>
+
+    <div style="margin: 16px 2%;" v-if="this.$route.query.type != 'done'">
+      <van-row>
+        <van-col span="24" align="center">
+          <van-button type="info" native-type="submit" @click="submitForm" class="submitButton">提交</van-button>
+        </van-col>
+      </van-row>
+      <div class="clear"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { addMajorevent , getMajorevent , attachmentList , updateMajorevent,approval } from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import request from '@/utils/request';
+  import Dialog from "vant/lib/dialog";
+  import Editor from '@/components/Editor';
+  export default {
+    name: "approvalApproval13",
+    components: {
+      Editor,
+    },
+    data() {
+      return {
+        title:false,
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+        showpayer:false,
+
+        buttonType:'a',
+
+        minDate: new Date(2000, 1, 1),
+        maxDate: new Date(2050, 12, 31),
+        currentDate: new Date(),
+        form:{},
+        fileList:[],
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+        payerOptions:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'2'
+        },
+        projectFundType:'',
+        uploadFiles:[],
+        // 审核意见默认值
+        pass: "true",
+        comment: "同意",
+        templateList:[],
+      };
+    },
+    created() {
+      this.reset();
+      this.getForm();
+      this.getFileList();
+    },
+    methods: {
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          upId: null,
+          downId: null,
+          orderId: null,
+          cashierId: null,
+          transferType: '3',
+          accountType: '2',
+          explainSituation: null,
+          succeedAmount: null,
+          payer: null,
+          payerAccount: null,
+          operatorCode: null,
+          enterpriseCode: null,
+          expenditureAmount: null,
+          capitalExpenditureType: '1',
+          remark: null,
+          transferStatus: "0",
+          auditStatus: "0",
+          paymentState: "1",
+          bankPriority: "0",
+          clientPriority: "0"
+        };
+        this.processList = {}
+        this.projectForm={
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        }
+      },
+      getForm(){
+        getMajorevent(this.$route.query.id).then(response => {
+          this.form = response.data;
+        });
+      },
+      goFlow(){
+        window.location='approvalProcess13?id='+this.form.instanceId;
+      },
+      getChange(){
+        updateMajorevent(this.form).then(response => {
+          this.$toast.success('修改成功');
+          setTimeout(function(){
+            history.go(-1)
+          },2000)
+        });
+      },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
+      onConfirmLasj(data){
+        this.form.eventTime = this.getNowFormatDate(data).substr(0,10);
+        this.showlasj = false;
+      },
+      beforeRead(file) {
+        this.uploadFiles.push(file.file);
+      },
+      deleteFile(file){
+        this.uploadFiles.map((response,index) => {
+          if(file.file == response){
+            this.uploadFiles.splice(index,1)
+          }
+        })
+      },
+      getFileList(){
+        let oData= {
+          tableId: this.$route.query.id,
+          tableName: "t_yinnong_majorevent",
+          bizPath: "yinnong",
+          fileType: "",
+        }
+        attachmentList(oData).then(res => {
+          console.log(res)
+          console.log(location.protocol+"//"+location.host+request.defaults.baseURL)
+          res.rows.map(r => {
+            let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL
+            // this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{})})
+            this.fileList.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName})
+            console.log(r)
+          })
+        })
+      },
+      goBack(){
+        window.history.go(-1)
+      },
+      //删除家庭成员
+      deleteChargeItme(index){
+        this.chargeItme.splice(index,1)
+      },
+      /** 提交按钮 */
+      submitForm() {
+        const data = {
+          taskId: this.$route.query.taskId,
+          instanceId: this.form.instanceId,
+          variables: JSON.stringify({
+            comment: this.comment,
+            pass: this.pass,
+          }),
+        };
+        approval(data).then((response) => {
+          if(response.code==200 && response.msg=="操作成功"){
+            this.$toast.success("操作成功");
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          } else{
+            this.$toast.success("操作失败");
+          }
+        });
+      },
+    },
+    watch: {
+      pass: function (val) {
+        this.comment = val === "true" ? "同意" : "驳回";
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 80%;
+    margin: 0 auto;
+    background-color: #1D6FE9;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+  }
+  .examine_box .van-col:first-child{
+    color: #FFF!important;
+    font-size: 0.45rem!important;
+    text-align: center!important;
+  }
+  .examine_box .van-col:last-child{
+    background-color: #FFF!important;
+    border-radius: 0.15rem!important;
+    overflow: hidden!important;
+    .van-radio-group--horizontal{
+      padding: 0.2rem 0;
+      border-bottom: 1px solid #eee;
+    }
+  }
+</style>

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/approvalDetail10.vue

@@ -237,7 +237,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -249,7 +249,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -261,7 +261,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -256,7 +256,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -268,7 +268,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -280,7 +280,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -319,7 +319,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -331,7 +331,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -343,7 +343,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -233,9 +233,9 @@
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
-          bizPath: "upload",
-          fileType: "0",
+          tableName: "t_yinnong_majorevent",
+          bizPath: "yinnong",
+          fileType: "",
         }
         attachmentList(oData).then(res => {
           console.log(res)

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

@@ -115,8 +115,8 @@ export default {
       this.fileList = [];
       let oData1= {
         tableId: id,
-        tableName: "t_yinnong_transfer",
-        bizPath: "transfer",
+        tableName: "t_yinnong_majorevent",
+        bizPath: "yinnong",
         fileType: '',
       }
       attachmentList(oData1).then(res => {

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() {
         //普通转账

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

@@ -974,7 +974,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -986,7 +986,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -998,7 +998,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -2262,7 +2262,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -2274,7 +2274,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -2286,7 +2286,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -2316,7 +2316,7 @@
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "1",
         }
@@ -2328,7 +2328,7 @@
         })
         let oData2= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "2",
         }
@@ -2340,7 +2340,7 @@
         })
         let oData3= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_cash",
+          tableName: "t_yinnong_transfer",
           bizPath: "yinnong",
           fileType: "3",
         }

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

@@ -249,9 +249,9 @@
       getFileList(){
         let oData= {
           tableId: this.$route.query.id,
-          tableName: "t_yinnong_transfer",
-          bizPath: "upload",
-          fileType: "0",
+          tableName: "t_yinnong_majorevent",
+          bizPath: "yinnong",
+          fileType: "",
         }
         attachmentList(oData).then(res => {
           console.log(res)

src/views/yinnong/done.vue

@@ -161,6 +161,9 @@
                 this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
                 break;
               }
+            case 'yinnong_majorevent':
+              this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              break;
           }
         }
       },

src/views/yinnong/doneCompleted/completed.vue

@@ -157,6 +157,9 @@
                 this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
                 break;
               }
+            case 'yinnong_majorevent':
+              this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+                break;
           }
         }
       },

src/views/yinnong/doneCompleted/done.vue

@@ -59,7 +59,7 @@
       data(){
         return{
           taskList:[],
-          activeName:this.$route.query.activeName?this.$route.query.activeName:'1',
+          activeName:this.$route.query.activeName?this.$route.query.activeName:'2',
           total:0,
           queryParams: {
             pageNum: 1,
@@ -151,6 +151,9 @@
                 this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
                 break;
               }
+            case 'yinnong_majorevent':
+              this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              break;
           }
         }
       },