From b1660650a4e9b5bb5e884aedaeba032ffcfc4714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 9 Aug 2022 18:08:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           | 10 +++++
 .../collectionAccount/collectionAdd.vue       |  2 +-
 .../paymentApproval/approvalAdd2.vue          | 40 ++++++++++++++++---
 .../paymentApproval/approvalList.vue          |  7 +++-
 .../paymentApproval/approvalList2.vue         |  7 +++-
 .../paymentApproval/approvalModify.vue        | 34 ++++++++++++++--
 6 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index c8b3bfac..ceed518d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1881,6 +1881,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2'], resolve)
   },
+  {
+    path: '/yinnong/approval/collectionApprovalAdd',
+    name: 'collectionApprovalAdd',
+    meta: {
+      title: '添加收款账户信息',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd'], resolve)
+  },
   {
     path: '/yinnong/approvalApproval',
     name: 'approvalApproval',
@@ -1923,6 +1932,7 @@ export const constantRoutes = [
     meta: {
       title: '修改银行卡转账申请',
       hidden: true,
+      keepAlive: true
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify'], resolve)
   },
diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
index 7511ecb7..0796a9f4 100644
--- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
+++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
@@ -192,7 +192,7 @@
       },
       onConfirmBankDeposit(data){
         this.bankDeposit = data.text
-        this.form.bankDeposit = data.value
+        this.form.bankDeposit = data.text
         this.form.payeePaymentLines = data.payeePaymentLines
         this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
index 424dc259..c8e112c7 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
@@ -4,7 +4,7 @@
       left-arrow
       fixed
       placeholder
-      @click-left="$router.back(-1)"
+      @click-left="goBack"
     >
       <template #title>
         <p style="font-weight: bold;">添加信用卡还款申请</p>
@@ -215,7 +215,11 @@
         <van-field :rules="[{ required: true , message:'请输入付款方账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
       </div>
 
-      <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
+      <div class="main_title main_title_box">
+        <p>收款方信息</p>
+        <router-link :to="{name:'approvalCollectionAdd2', 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>
       <div class="main_box" style="margin-bottom: 15px;">
         <van-cell title="收款账户类型" v-if="form.bankType==1">
           <template #right-icon>
@@ -1843,13 +1847,26 @@
         })
       },
       goBack(){
-        window.history.go(-1)
+        this.$router.push({path:'/yinnong/approvalList2'})
       },
       //删除家庭成员
       deleteChargeItme(index){
         this.chargeItme.splice(index,1)
       },
     },
+    watch: {
+      $route (to, from ) {
+        // 监听路由变化, 实现类似 小程序的 onShow 事件
+        if (to.path === '/yinnong/approvalAdd2') {
+          // do anything you want
+          console.log("aaa")
+          if (this.$route.params.payeeForm){
+            this.chargeItme.push(this.$route.params.payeeForm)
+            console.log(this.$route.params.payeeForm)
+          }
+        }
+      }
+    },
   }
 </script>
 
@@ -1857,11 +1874,22 @@
   .app-container {
     padding: 2% 0;
   }
+  .main_title_box{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
   .main_title{
     font-size: 0.4rem;
     color: #1D6FE9;
     margin: 0.2rem 6%;
     position: relative;
+    a{
+      background: #1989fa;
+      color: #ffffff;
+      padding: 0.05rem 0.3rem;
+      border-radius: 5PX;
+    }
   }
   .main_box{
     width: 96%;
@@ -1878,9 +1906,9 @@
   }
 
   .addFamily{
-    position: absolute;
-    top: -2px;
-    right: 0;
+    //position: absolute;
+    //top: -2px;
+    //right: 0;
     border-radius: 50%;
   }
   .deleteFamily{
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
index 82b31483..d77b5ef0 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
@@ -4,7 +4,7 @@
         left-arrow
         fixed
         placeholder
-        @click-left="$router.back(-1)"
+        @click-left="goBack()"
         @click-right="goAdd()"
       >
         <template #title>
@@ -138,7 +138,10 @@ export default {
       .catch(() => {
         // on cancel
       });
-    }
+    },
+    goBack(){
+      this.$router.push({path:'/yinnong/workbench'})
+    },
   },
 }
 </script>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue
index 40bab025..357ff9a1 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue
@@ -4,7 +4,7 @@
         left-arrow
         fixed
         placeholder
-        @click-left="$router.back(-1)"
+        @click-left="goBack"
         @click-right="goAdd()"
       >
         <template #title>
@@ -136,7 +136,10 @@ export default {
       .catch(() => {
         // on cancel
       });
-    }
+    },
+    goBack(){
+      this.$router.push({path:'/yinnong/workbench'})
+    },
   },
 }
 </script>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index 9ffcdd55..76956a0e 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -4,7 +4,7 @@
       left-arrow
       fixed
       placeholder
-      @click-left="$router.back(-1)"
+      @click-left="goBack"
     >
       <template #title>
         <p style="font-weight: bold;">修改银行卡转账申请</p>
@@ -216,7 +216,11 @@
       </div>
 
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
-
+<!--      <div class="main_title main_title_box">-->
+<!--        <p>收款方信息</p>-->
+<!--        <router-link :to="{name:'collectionApprovalAdd', 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>-->
       <div class="main_box" style="margin-bottom: 15px;">
         <van-cell title="收款账户类型" v-if="form.bankType==1">
           <template #right-icon>
@@ -1854,13 +1858,26 @@
         })
       },
       goBack(){
-        window.history.go(-1)
+        this.$router.push({path:'/yinnong/approvalList'})
       },
       //删除家庭成员
       deleteChargeItme(index){
         this.chargeItme.splice(index,1)
       },
     },
+    watch: {
+      $route (to, from ) {
+        // 监听路由变化, 实现类似 小程序的 onShow 事件
+        if (to.path === '/yinnong/approvalModify') {
+          // do anything you want
+          console.log("aaa")
+          if (this.$route.params.payeeForm){
+            this.chargeItme.push(this.$route.params.payeeForm)
+            console.log(this.$route.params.payeeForm)
+          }
+        }
+      }
+    },
   }
 </script>
 
@@ -1868,11 +1885,22 @@
   .app-container {
     padding: 2% 0;
   }
+  .main_title_box{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
   .main_title{
     font-size: 0.4rem;
     color: #1D6FE9;
     margin: 0.2rem 6%;
     position: relative;
+    /*a{*/
+    /*  background: #1989fa;*/
+    /*  color: #ffffff;*/
+    /*  padding: 0.05rem 0.3rem;*/
+    /*  border-radius: 5PX;*/
+    /*}*/
   }
   .main_box{
     width: 96%;