From 00be2d25423924e7e607fac46416afe42e9e468c Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 28 Sep 2022 16:43:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homeApplication/proposerLite.vue          | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index d2ae429d..79332ea2 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -391,7 +391,7 @@
               <template v-if="formVisible.baseApplyForm.buildingFormVisible">
                 <div class="main_box examine_box">
                   <van-row type="flex" justify="space-between" align="center">
-                    <van-col span="5">乡镇<br/>其他<br/>部门<br/>意见<br/></van-col>
+                    <van-col span="5">乡镇<br/>住建<br/>部门<br/>意见<br/></van-col>
                     <van-col span="19">
                       <!--                      <field-select-->
                       <!--                        v-model="applicationDetail.tHouseApproveOtherOptions.buildingType"-->
@@ -906,7 +906,7 @@
               <template v-if="formVisible.baseApplyForm.buildingFormVisible">
                 <div class="main_box examine_box">
                   <van-row type="flex" justify="space-between" align="center">
-                    <van-col span="5">乡镇<br/>其他<br/>部门<br/>意见<br/></van-col>
+                    <van-col span="5">乡镇<br/>住建<br/>部门<br/>意见<br/></van-col>
                     <van-col span="19">
                       <van-field required :readonly="!formEnabled.baseApplyForm.buildingFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveOption" rows="2" autosize  type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
                       <van-field :rules="[{ required: true }]" v-if="applicationDetail.tHouseApproveOtherOptions.approveLeader !='' && applicationDetail.tHouseApproveOtherOptions.approveLeader !=null && !applicationDetail.tHouseApproveOtherOptions.approveLeader.endsWith('jpeg')"
@@ -1983,7 +1983,6 @@ export default {
       this.formEnabled.acceptingForm.townFormEnabled = false;
       this.formEnabled.acceptingForm.agricultureFormEnabled = false;
       this.formEnabled.acceptingForm.nature_resourceFormEnabled = false;
-
       switch (this.proposerStatus) {
         // 查看
         case PROPOSER_VIEW:
@@ -2102,7 +2101,6 @@ export default {
           let handlerTime = this.getDate();
           this.applicationDetail = value;
           this.formVisible.auditVisible = this.type === 'done' || this.type === 'todo';
-
           // 申请-组级审批 初始化表单
           if(hasGroupLevel)
           {
@@ -2129,8 +2127,6 @@ export default {
               }
             }
           }
-
-          console.log(value.tHouseApproveVillageOptions);
           // 申请-草稿
           if(this.isProposeStatus(houseApplyStatus, ["1"]))
           {
@@ -2173,7 +2169,7 @@ export default {
             }
           }
           // 申请-镇级审批
-          else if(this.isProposeStatus(houseApplyStatus, ["8"]))
+          else if(this.isProposeStatus(houseApplyStatus, ["8","7"]))
           {
             // 自然资源部门
             if(!value.tHouseApproveNatureOptions)
@@ -2288,6 +2284,7 @@ export default {
               if(!this.applicationDetail.tHouseApproveLocationplanOptions.cartographicTime)
                 this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'cartographicTime', handlerTime);
             }
+            console.info(this.formVisible.auditVisible);
           }
 
           // 开工申请
@@ -2315,7 +2312,7 @@ export default {
               this.applicationDetail.tHouseApplyEnd.oldHouseStatus = null;
           }
           // 验收镇级审批
-          else if(this.isProposeStatus(houseApplyStatus, ["29"]))
+          else if(this.isProposeStatus(houseApplyStatus, ["29","25"]))
           {
             if(this.isInRoles(role, ['town_leader']))
             {
@@ -2354,25 +2351,26 @@ export default {
           }
 
           // 可见/隐藏
-          this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(houseApplyStatus, ["1"]);
-          this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3"]);
-          if(this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5']))
+          this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(houseApplyStatus, ["1","25"]);
+          this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3","25"]);
+
+          if(this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5',25]))
           {
-            if(this.isInRoles(role, ['town_leader', 'agriculture']) || houseApplyStatus != '8')
+            if(this.isInRoles(role, ['town_leader', 'agriculture']) || houseApplyStatus != '7')
             {
               this.formVisible.baseApplyForm.agricultureFormVisible = true;
               // this.applicationDetail.tHouseApproveAgricultureOptions.approveOption = null;
               // this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader = null;
               // this.applicationDetail.tHouseApproveAgricultureOptions.approveTime = handlerTime;
             }
-            if(this.isInRoles(role, ['town_leader', 'building']) || houseApplyStatus != '8')
+            if(this.isInRoles(role, ['town_leader', 'building']) || houseApplyStatus != '7')
             {
               this.formVisible.baseApplyForm.buildingFormVisible = true;
               // this.applicationDetail.tHouseApproveOtherOptions.approveOption = null;
               // this.applicationDetail.tHouseApproveOtherOptions.approveLeader = null;
               // this.applicationDetail.tHouseApproveOtherOptions.approveTime = handlerTime;
             }
-            if(this.isInRoles(role, ['town_leader', 'nature_resource']) || houseApplyStatus != '8')
+            if(this.isInRoles(role, ['town_leader', 'nature_resource']) || houseApplyStatus != '7')
             {
               this.formVisible.baseApplyForm.nature_resourceFormVisible = true;
               // this.applicationDetail.tHouseApproveNatureOptions.approveOption = null;
@@ -2387,20 +2385,19 @@ export default {
               // this.applicationDetail.tHouseApproveTownOptions.approveTime = handlerTime;
             }
           }
-
-          this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9']);
-          this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9']);
+          this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9',"25"]);
+          this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9',"25"]);
 
           //this.formVisible.baseApplyForm.townFormVisible = this.landscopeVisible
-          this.formVisible.acceptingVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
-          this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26"]);
-          if(this.isProposeStatus(houseApplyStatus, ["29", "26"]))
+          this.formVisible.acceptingVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26","25"]);
+          this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(houseApplyStatus, ["18", "20", "21", "22", "23", "24", "25", "30", "29", "26","25"]);
+          if(this.isProposeStatus(houseApplyStatus, ["29", "26","25"]))
           {
-            if(this.isInRoles(role, ['town_leader', 'agriculture']) || houseApplyStatus != '29')
+            if(this.isInRoles(role, ['town_leader', 'agriculture']) || houseApplyStatus != '25')
             {
               this.formVisible.acceptingForm.agricultureFormVisible = true;
             }
-            if(this.isInRoles(role, ['town_leader', 'nature_resource']) || houseApplyStatus != '29')
+            if(this.isInRoles(role, ['town_leader', 'nature_resource']) || houseApplyStatus != '25')
             {
               this.formVisible.acceptingForm.nature_resourceFormVisible = true;
             }
@@ -2418,7 +2415,7 @@ export default {
           //   this.applicationDetail.tHouseApproveVillageOptions.villageLeader = null;
           //   //this.applicationDetail.tHouseApproveVillageOptions.
           // }
-          if(this.isProposeStatus(houseApplyStatus, ['8']))
+          if(this.isProposeStatus(houseApplyStatus, ['8',"7"]))
           {
             if(this.isInRoles(role, ['agriculture']))
             {
@@ -2442,7 +2439,7 @@ export default {
 
           this.formEnabled.acceptingEnabled = this.isProposeStatus(houseApplyStatus, ['20']);
           this.formEnabled.acceptingForm.baseFormEnabled = this.isProposeStatus(houseApplyStatus, ['20']);
-          if(this.isProposeStatus(houseApplyStatus, ['29']))
+          if(this.isProposeStatus(houseApplyStatus, ['29',"25"]))
           {
             if(this.isInRoles(role, ['agriculture']))
             {
@@ -4225,6 +4222,7 @@ export default {
     searchCommit(data){
       this.showesign = true;
       this.onCliceQz = data;
+      console.info(this.$store.getters.baseRoutingUrl);
       console.log(this.currentUserRole);
       console.log(this.$store.getters.baseRoutingUrl);
       if(this.selectedTabName ==0){