银农独立app

src/permission.js

@@ -79,7 +79,6 @@ router.beforeEach((to, from, next) => {
         next()
         // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(res => {
-          console.log(to.path)
           // 拉取user_info
           const roles = res.roles
           // store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
@@ -90,7 +89,6 @@ router.beforeEach((to, from, next) => {
           next()
         }).catch(err => {
           store.dispatch('LogOut').then(() => {
-            console.log(to.path)
             // Message.error(err)
             if ('/authenticRight/index'.indexOf(to.path) !== -1) {
               next({ path: '/authenticRight/login' })

src/router/index.js

@@ -1081,7 +1081,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList',
   //   name: 'approvalList',
   //   meta: {
-  //     title: '村户转账列表',
+  //     title: '银行卡转账列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList'], resolve)
@@ -1090,7 +1090,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList2',
   //   name: 'approvalList2',
   //   meta: {
-  //     title: '公务卡转账列表',
+  //     title: '信用卡还款列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList2'], resolve)
@@ -1135,7 +1135,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList11',
   //   name: 'approvalList11',
   //   meta: {
-  //     title: '现金使用列表',
+  //     title: '备服金支出列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList11'], resolve)
@@ -1153,7 +1153,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail',
   //   name: 'approvalDetail',
   //   meta: {
-  //     title: '银农村户转账申请',
+  //     title: '银农银行卡转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail'], resolve)
@@ -1162,7 +1162,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail2',
   //   name: 'approvalDetail2',
   //   meta: {
-  //     title: '银农公务卡转账申请',
+  //     title: '银农信用卡还款申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2'], resolve)
@@ -1207,7 +1207,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail11',
   //   name: 'approvalDetail11',
   //   meta: {
-  //     title: '银农现金使用申请',
+  //     title: '银农备服金支出申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail11'], resolve)
@@ -1225,7 +1225,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd',
   //   name: 'approvalAdd',
   //   meta: {
-  //     title: '添加村户转账申请',
+  //     title: '添加银行卡转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve)
@@ -1234,7 +1234,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd2',
   //   name: 'approvalAdd2',
   //   meta: {
-  //     title: '添加公务卡转账申请',
+  //     title: '添加信用卡还款申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2'], resolve)
@@ -1279,7 +1279,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd11',
   //   name: 'approvalAdd11',
   //   meta: {
-  //     title: '添加现金使用申请',
+  //     title: '添加备服金支出申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd11'], resolve)
@@ -1333,7 +1333,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify',
   //   name: 'approvalModify',
   //   meta: {
-  //     title: '修改村户转账申请',
+  //     title: '修改银行卡转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify'], resolve)
@@ -1342,7 +1342,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify2',
   //   name: 'approvalModify2',
   //   meta: {
-  //     title: '修改公务卡转账申请',
+  //     title: '修改信用卡还款申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2'], resolve)
@@ -1387,7 +1387,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify11',
   //   name: 'approvalModify11',
   //   meta: {
-  //     title: '修改现金使用申请',
+  //     title: '修改备服金支出申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify11'], resolve)
@@ -1649,7 +1649,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList',
     name: 'approvalList',
     meta: {
-      title: '村户转账列表',
+      title: '银行卡转账列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList'], resolve)
@@ -1658,7 +1658,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList2',
     name: 'approvalList2',
     meta: {
-      title: '公务卡转账列表',
+      title: '信用卡还款列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList2'], resolve)
@@ -1703,7 +1703,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalList11',
     name: 'approvalList11',
     meta: {
-      title: '现金使用列表',
+      title: '备服金支出列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalList11'], resolve)
@@ -1721,7 +1721,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail',
     name: 'approvalDetail',
     meta: {
-      title: '银农村户转账申请',
+      title: '银农银行卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail'], resolve)
@@ -1730,7 +1730,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail2',
     name: 'approvalDetail2',
     meta: {
-      title: '银农公务卡转账申请',
+      title: '银农信用卡还款申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2'], resolve)
@@ -1775,7 +1775,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail11',
     name: 'approvalDetail11',
     meta: {
-      title: '银农现金使用申请',
+      title: '银农备服金支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11'], resolve)
@@ -1793,7 +1793,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd',
     name: 'approvalAdd',
     meta: {
-      title: '添加村户转账申请',
+      title: '添加银行卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd'], resolve)
@@ -1802,7 +1802,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd2',
     name: 'approvalAdd2',
     meta: {
-      title: '添加公务卡转账申请',
+      title: '添加信用卡还款申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2'], resolve)
@@ -1847,7 +1847,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd11',
     name: 'approvalAdd11',
     meta: {
-      title: '添加现金使用申请',
+      title: '添加备服金支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11'], resolve)
@@ -1901,7 +1901,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify',
     name: 'approvalModify',
     meta: {
-      title: '修改村户转账申请',
+      title: '修改银行卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify'], resolve)
@@ -1910,7 +1910,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify2',
     name: 'approvalModify2',
     meta: {
-      title: '修改公务卡转账申请',
+      title: '修改信用卡还款申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify2'], resolve)
@@ -1955,7 +1955,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify11',
     name: 'approvalModify11',
     meta: {
-      title: '修改现金使用申请',
+      title: '修改备服金支出申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify11'], resolve)

src/utils/request.js

@@ -69,7 +69,6 @@ service.interceptors.response.use(res => {
     })
       .then(() => {
         store.dispatch('LogOut').then(() => {
-          console.log(window.location.href);
           if(window.location.href.indexOf('lawEnforcement') != -1){
             window.location.href = '/lawEnforcement/login';
           } else if (window.location.href.indexOf('authenticRight') != -1) {

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加村户转账申请</p>
+        <p style="font-weight: bold;">添加银行卡转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -388,7 +388,7 @@
       });
       let params1={
         accountType: "102",
-        "params":{townAccountType:'0'},
+       // "params":{townAccountType:'0'},
         status: "N",
       }
       getAccount(params1).then((response) => {
@@ -487,7 +487,7 @@
             this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getDicts("bank_type").then(res => {
+        this.getDicts("bank_type_all").then(res => {
           for (var i = 0; i < res.data.length; i++) {
             this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }

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

@@ -454,17 +454,15 @@
           this.$notify({ type: 'danger', message: '请输入资金用途！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方全称
-            payeeAccount: "", //收款账户
-            drawer: "", //提款人
-            incomeAmount: "", //提款金额
-            bankType: "", //资金用途
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方全称
+          payeeAccount: "", //收款账户
+          drawer: "", //提款人
+          incomeAmount: "", //提款金额
+          bankType: "", //资金用途
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加现金使用申请</p>
+        <p style="font-weight: bold;">添加备服金支出申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -457,17 +457,15 @@
           this.$notify({ type: 'danger', message: '请输入资金用途！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方全称
-            payeeAccount: "", //收款账户
-            drawer: "", //提款人
-            incomeAmount: "", //提款金额
-            bankType: "", //资金用途
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方全称
+          payeeAccount: "", //收款账户
+          drawer: "", //提款人
+          incomeAmount: "", //提款金额
+          bankType: "", //资金用途
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {
@@ -629,7 +627,6 @@
                 message: '此申请单中未上传任何附件，是否确认提交？',
               })
                 .then(() => {
-                  console.log(this.form)
                   addCash(this.form).then((response) => {
                     this.chargeItme.map(res => {
                       res.cashId = response.data.id

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加公务卡转账申请</p>
+        <p style="font-weight: bold;">添加信用卡还款申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -525,7 +525,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)
@@ -627,7 +627,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)
@@ -643,7 +643,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)

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

@@ -485,7 +485,7 @@
             this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }
         });
-        this.getDicts("bank_type").then(res => {
+        this.getDicts("bank_type_all").then(res => {
           for (var i = 0; i < res.data.length; i++) {
             this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
           }

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

@@ -7,7 +7,7 @@
       @click-left="backDone"
     >
       <template #title>
-        <p style="font-weight: bold;">付款审批</p>
+        <p style="font-weight: bold;">转账/还款审批</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -209,7 +209,7 @@
           this.form = response.data;
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">现金使用申请审批</p>
+        <p style="font-weight: bold;">备服金支出审批</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">汇票支出申请审批</p>
+        <p style="font-weight: bold;">汇票支出审批</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看村户转账申请</p>
+        <p style="font-weight: bold;">查看银行卡转账申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -209,7 +209,7 @@
           this.form = response.data;
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看现金使用申请</p>
+        <p style="font-weight: bold;">查看备服金支出申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">查看公务卡转账申请</p>
+        <p style="font-weight: bold;">查看信用卡还款申请</p>
       </template>
       <template #right>
         <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
@@ -206,7 +206,7 @@
           this.form = response.data;
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }

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

@@ -8,7 +8,7 @@
         @click-right="goAdd()"
       >
         <template #title>
-          <p style="font-weight: bold;">村户转账申请列表</p>
+          <p style="font-weight: bold;">银行卡转账申请列表</p>
         </template>
         <template #right>
           <van-icon name="add" size="18"/>

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

@@ -8,7 +8,7 @@
         @click-right="goAdd()"
       >
         <template #title>
-          <p style="font-weight: bold;">现金使用申请列表</p>
+          <p style="font-weight: bold;">备服金支出申请列表</p>
         </template>
         <template #right>
           <van-icon name="add" size="18"/>

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

@@ -8,7 +8,7 @@
         @click-right="goAdd()"
       >
         <template #title>
-          <p style="font-weight: bold;">公务卡转账申请列表</p>
+          <p style="font-weight: bold;">信用卡还款申请列表</p>
         </template>
         <template #right>
           <van-icon name="add" size="18"/>

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改村户转账申请</p>
+        <p style="font-weight: bold;">修改银行卡转账申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -404,7 +404,7 @@
       });
       let params1={
         accountType: "102",
-        "params":{townAccountType:'0'},
+       // "params":{townAccountType:'0'},
         status: "N",
       }
       getAccount(params1).then((response) => {
@@ -454,7 +454,7 @@
           this.getPayeeList();
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
@@ -498,7 +498,7 @@
         if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>1){
           this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
         }else{
-        this.getDicts("bank_type").then(res => {
+        this.getDicts("bank_type_all").then(res => {
           this.chargeItme.splice(index + 1, 0, {
             payeeId: "", //收款方ID
             payee: "", //收款方

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

@@ -437,17 +437,15 @@
           this.$notify({ type: 'danger', message: '请输入资金用途！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方全称
-            payeeAccount: "", //收款账户
-            drawer: "", //提款人
-            incomeAmount: "", //提款金额
-            bankType: "", //资金用途
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方全称
+          payeeAccount: "", //收款账户
+          drawer: "", //提款人
+          incomeAmount: "", //提款金额
+          bankType: "", //资金用途
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改现金使用申请</p>
+        <p style="font-weight: bold;">修改备服金支出申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -449,18 +449,15 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
-          this.chargeItme.splice(index + 1, 0, {
-            payeeId: "", //收款方ID
-            payee: "", //收款方
-            payeeAccount: "", //收款账户
-            bankDeposit: "", //开户银行
-            incomeAmount: "", //收入金额
-            bankType: "1", //所属银行
-            bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
-            showPayee:false,
-            showbankType:false
-          });
+        this.chargeItme.splice(index + 1, 0, {
+          payeeId: "", //收款方ID
+          payee: "", //收款方全称
+          payeeAccount: "", //收款账户
+          drawer: "", //提款人
+          incomeAmount: "", //提款金额
+          bankType: "", //资金用途
+          showPayee:false,
+          showbankType:false
         });
       },
       getPayeeList() {

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

@@ -488,7 +488,6 @@
         }
       },
       getError(e){
-        console.log(e)
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       addChargeItme(index){

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

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">修改公务卡转账申请</p>
+        <p style="font-weight: bold;">修改信用卡还款申请</p>
       </template>
     </van-nav-bar>
     <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
@@ -457,7 +457,7 @@
           this.getPayeeList();
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
-          this.getDicts("bank_type").then(res => {
+          this.getDicts("bank_type_all").then(res => {
             for (var i = 0; i < res.data.length; i++) {
               this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
             }
@@ -501,7 +501,7 @@
           this.$notify({ type: 'danger', message: '请选择所属银行！' });
           return;
         }
-        this.getDicts("bank_type").then(res => {
+        this.getDicts("bank_type_all").then(res => {
           this.chargeItme.splice(index + 1, 0, {
             payeeId: "", //收款方ID
             payee: "", //收款方
@@ -524,7 +524,7 @@
         console.log(this.queryParams)
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee;
               res.value = res.id;
               this.payeeList.push(res)
@@ -623,7 +623,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)
@@ -902,7 +902,7 @@
         this.queryParams.status = "0"
         listPayee(this.queryParams).then((response) => {
           response.rows.map((res,index) => {
-            if(res.payeeType==4){
+            if(res.payeeType==4||res.payeeType==3){
               res.text = res.payee
               res.value = res.id
               this.payeeList.push(res)

src/views/yinnong/workbench.vue

@@ -60,35 +60,35 @@
           </template>
         </van-cell>
         <van-grid :border="false">
-          <van-grid-item text="村户转账" :to="{name:'approvalList'}" >
+          <van-grid-item text="银行卡转账" :to="{name:'approvalList'}" >
             <div class="icon" slot="default" style="background:#FF4646;" >
               <img src="../../../static/images/onlineHome/icon_Y1.png" alt />
             </div>
-            <p style="margin-top: 5px;color: #666666;">村户转账</p>
+            <p style="margin-top: 5px;color: #666666;">银行卡转账</p>
           </van-grid-item>
-          <van-grid-item text="代管转账" :to="{name:'approvalList4'}" >
-            <div class="icon" slot="default" style="background:#c568f5;" >
-              <img src="../../../static/images/onlineHome/icon_Y4.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">代管转账</p>
-          </van-grid-item>
-          <van-grid-item text="公务卡转账" :to="{name:'approvalList2'}" >
+<!--          <van-grid-item text="代管转账" :to="{name:'approvalList4'}" >-->
+<!--            <div class="icon" slot="default" style="background:#c568f5;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y4.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">代管转账</p>-->
+<!--          </van-grid-item>-->
+          <van-grid-item text="信用卡还款" :to="{name:'approvalList2'}" >
             <div class="icon" slot="default" style="background:#3ac2db;" >
               <img src="../../../static/images/onlineHome/icon_Y2.png" alt />
             </div>
-            <p style="margin-top: 5px;color: #666666;">公务卡转账</p>
-          </van-grid-item>
-          <van-grid-item text="现金提现" :to="{name:'approvalList10'}" >
-            <div class="icon" slot="default" style="background:#FF6464;" >
-              <img src="../../../static/images/onlineHome/icon_Y6.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">现金提现</p>
+            <p style="margin-top: 5px;color: #666666;">信用卡还款</p>
           </van-grid-item>
-          <van-grid-item text="现金使用" :to="{name:'approvalList11'}" >
+<!--          <van-grid-item text="现金提现" :to="{name:'approvalList10'}" >-->
+<!--            <div class="icon" slot="default" style="background:#FF6464;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y6.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">现金提现</p>-->
+<!--          </van-grid-item>-->
+          <van-grid-item text="备服金支出" :to="{name:'approvalList11'}" >
             <div class="icon" slot="default" style="background:#7790FE;" >
               <img src="../../../static/images/onlineHome/icon_Y7.png" alt />
             </div>
-            <p style="margin-top: 5px;color: #666666;">现金使用</p>
+            <p style="margin-top: 5px;color: #666666;">备服金支出</p>
           </van-grid-item>
           <van-grid-item text="汇票支出" :to="{name:'approvalList12'}" >
             <div class="icon" slot="default" style="background:#539ffd;" >
@@ -155,7 +155,6 @@
       },
       created() {
         getInfo().then(response => {
-          console.log(response.user);
           this.bookName = response.user.bookName
           this.deptName = response.user.deptName
           this.getBookList(response.user.loginDeptId);