| @@ -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; | |||