From f668a63a51811ea7d97b109c787fd7ff6e81ab09 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Fri, 30 Sep 2022 08:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=85=E5=9F=BA=E5=9C=B0?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E4=B8=AD=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=B7=B2=E5=8A=9E=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homestead/homeApplication/proposerLite.vue    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 79332ea2..feca7c34 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -1988,11 +1988,15 @@ export default {
         case PROPOSER_VIEW:
           this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(houseApplyStatus, ["1", '32']);
           this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31"]);
-          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8']);
-          this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
-          this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
-          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '7', this.isInRoles(role, 'town_leader') ? -99 : '8']);
+          this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
 
+          // this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", "7", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8','7']);
+          // this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8','7']);
+          // this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8','7']);
+          // this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "7", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8','7']);
           this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);
           this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);
 
@@ -2565,7 +2569,8 @@ export default {
       }
 
       // 通用设置
-      if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){
+      // if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){
+      if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null){
         if (this.isAccepting()) {
           this.active = PROPOSER_STAGE_START;
           this.selectedTabName = PROPOSER_STAGE_START;