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

src/permission.js

@@ -227,11 +227,9 @@ router.beforeEach((to, from, next) => {
             } else if (to.path.indexOf('/homesteadSurvey') !== -1) {
               next(`/homesteadLogin`)
             } else if (to.path.indexOf('/lawEnforcement') !== -1) {
-              next(`//lawEnforcement/login`)
+              next(`/lawEnforcement/login`)
             } else if (to.path.indexOf('/sunVillage') !== -1) {
               next(`/sunVillage/login`)
-            } else if (to.path.indexOf('/homestead/') !== -1) {
-              next(`/homestead/login`)
             } else {
               next(`/yinnongLogin`)
               //next({ path: '/' })

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

@@ -204,7 +204,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -203,7 +203,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -204,7 +204,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="this.form.bankType == 2 || this.form.bankType == 3 || this.form.bankType == 4">
+        <van-cell title="行内转账" v-if="this.form.bankType == 2 || this.form.bankType == 3 || this.form.bankType == 4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers"  @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -54,7 +54,7 @@
 
     <div class="main_box" style="margin-bottom: 15px;">
       <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
-      <van-field readonly label="是否与付款方同行" v-if="form.bankType==2||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
+      <van-field readonly label="行内转账" v-if="form.bankType==2||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
     </div>
 
     <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">

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

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

src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue

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

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

@@ -204,7 +204,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange">
               <van-radio name="Y">是</van-radio>

src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue

@@ -204,7 +204,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue

@@ -171,7 +171,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers">
               <van-radio name="Y">是</van-radio>

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

@@ -239,7 +239,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -239,7 +239,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -207,7 +207,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="this.form.bankType == 2 || this.form.bankType == 3 || this.form.bankType == 4">
+        <van-cell title="行内转账" v-if="this.form.bankType == 2 || this.form.bankType == 3 || this.form.bankType == 4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers"  @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

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

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

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

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

@@ -233,7 +233,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -229,7 +229,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -207,7 +207,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -174,7 +174,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers">
               <van-radio name="Y">是</van-radio>

src/views/sunVillage_info/index.vue

@@ -110,7 +110,8 @@
         actions: [
           { text: '个人信息', icon: 'manager-o' , index: 0 },
           { text: '修改密码', icon: 'edit' , index: 1 },
-          { text: '退出登录', icon: 'revoke' , index: 2 },
+          { text: '事项审批', icon: 'manager-o' , index: 2 },
+          { text: '退出登录', icon: 'revoke' , index: 3 },
         ],
         deptIdOptions:[],
         villageVisbile:false,
@@ -244,7 +245,11 @@
         })
       },
       selectChange(val){
-        val.index == 0 ? this.$router.push({path:"/sunVillage_info/user"}) : val.index == 1 ? this.$router.push({path:"/sunVillage_info/passWord"}) : val.index == 2 ? this.logout() : '';
+        val.index == 0 ? this.$router.push({path:"/sunVillage_info/user"}) :
+          val.index == 1 ? this.$router.push({path:"/sunVillage_info/passWord"}) :
+            val.index == 2 ? this.logout() :
+              val.index == 3 ? this.$router.push({path:"../yinnong/my"}) :
+                '';
       }
     },
   }

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

@@ -234,7 +234,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -232,7 +232,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -207,7 +207,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="this.form.bankType == 2 || this.form.bankType == 3 || this.form.bankType == 4">
+        <van-cell title="行内转账" v-if="this.form.bankType == 2 || this.form.bankType == 3 || this.form.bankType == 4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers"  @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

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

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

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

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

@@ -233,7 +233,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>
@@ -1043,7 +1043,7 @@
       deleteFile(file){
         systemAttachment(file.id).then((res) => {});
       },
-    
+
       getFileList(){
         let oData1= {
           tableId: this.$route.query.id,

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

@@ -229,7 +229,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==3||form.bankType==4" >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -207,7 +207,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers" @change="accountTypeChange1">
               <van-radio name="Y">是</van-radio>

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

@@ -174,7 +174,7 @@
             </van-radio-group>
           </template>
         </van-cell>
-        <van-cell title="是否与付款方同行" v-if="form.bankType==2||form.bankType==4">
+        <van-cell title="行内转账" v-if="form.bankType==2||form.bankType==4">
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.isPeers">
               <van-radio name="Y">是</van-radio>