From ab5144080c00e1144ad71797783fb2766b46f2f9 Mon Sep 17 00:00:00 2001 From: hbao Date: Tue, 5 Jul 2022 13:16:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homestead/homeApplication/proposerLite.vue | 18 ++++++++++++++++-- src/views/onlineHome/workbench.vue | 3 ++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue index b5a31431..61576a69 100644 --- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue +++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue @@ -1737,8 +1737,10 @@ export default { this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'agriculture']) ? '29' : -99, "26"]); this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'nature_resource']) ? '29' : -99, "26"]); - this.formEnabled.submitEnabled = this.isProposeStatus(houseApplyStatus, ["1"]); - this.formVisible.editVisible = this.formEnabled.submitEnabled; + if(this.type !='done') { + this.formEnabled.submitEnabled = this.isProposeStatus(houseApplyStatus, ["1"]); + this.formVisible.editVisible = this.formEnabled.submitEnabled; + } this.houseApplyUploadComp.full = true; this.houseApplyUploadComp.readonly = true; @@ -3177,6 +3179,9 @@ export default { if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.approveOption)) { return "说明不能为空"; } + if (this.checkString(this.applicationDetail.tHouseApproveNatureOptions.approveLeader)) { + return "自然资源签名不能为空"; + } return false; }, validateAgricultureForm(pass) { @@ -3194,6 +3199,9 @@ export default { if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.approveOption)) { return "说明不能为空"; } + if (this.checkString(this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader)) { + return "农村农业部门签名不能为空"; + } // 通过时检查打勾, 农业部门 if(pass) { @@ -3246,12 +3254,18 @@ export default { if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.approveOption)) { return "说明不能为空"; } + if (this.checkString(this.applicationDetail.tHouseApproveOtherOptions.approveLeader)) { + return "其他部门签名不能为空"; + } return false; }, validateTownForm() { if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.approveOption)) { return "镇政府审批意见不能为空"; } + if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.approveLeader)) { + return "镇政府审批签字不能为空"; + } return false; }, validateAcceptingFormBase() { diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue index 9f1ed028..275c988f 100644 --- a/src/views/onlineHome/workbench.vue +++ b/src/views/onlineHome/workbench.vue @@ -637,7 +637,8 @@ } else if (data == 'paidExit') { this.$router.push({ path: "/paidExit" }); } else if (data == 'arbitrationList') { - this.$router.push({ path: "/arbitrationList" }); + console.log("arbitrationList"); + this.$router.push({ path: "/onlineHome/arbitrationList" }); } else if (data == 'utilization') { this.$router.push({ path: "/utilization" }); } else if (data == 'homesteadUtilize') {