From b84478672fbdc98b7cdee968ebc780f3c76908bf Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 15 May 2024 10:23:40 +0800 Subject: [PATCH 1/2] 1 --- src/views/modules/resourceManagement/enterprise/addForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue index 0121cae94..8d3aec302 100644 --- a/src/views/modules/resourceManagement/enterprise/addForm.vue +++ b/src/views/modules/resourceManagement/enterprise/addForm.vue @@ -557,7 +557,7 @@ export default { }else if(this.pageType === 'patrol'){ if(this.checkboxOptions.length > 0 && this.hiddenDangeArr.length === 0){ this.checkboxMessageFlag = true; - }else if(this.patrolForm.checkResultFlag == '0'&& this.inputList[0].hazardDesc === '' && checkResultFlag == '0'){ + }else if(this.patrolForm.checkResultFlag == '0'&& this.inputList[0].hazardDesc === '' && checkResultFlag == '1'){ this.inputMessageFlag = true; }else{ this.checkboxMessageFlag = false; From ef42035b4ad9eafe99afbde39ea3c7f23aae7d77 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 15 May 2024 10:29:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/resourceManagement/enterprise/addForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue index 8d3aec302..000a15721 100644 --- a/src/views/modules/resourceManagement/enterprise/addForm.vue +++ b/src/views/modules/resourceManagement/enterprise/addForm.vue @@ -555,9 +555,9 @@ export default { } }); }else if(this.pageType === 'patrol'){ - if(this.checkboxOptions.length > 0 && this.hiddenDangeArr.length === 0){ + if(this.checkboxOptions.length > 0 && this.hiddenDangeArr.length === 0 && this.checkResultFlag != '1'){ this.checkboxMessageFlag = true; - }else if(this.patrolForm.checkResultFlag == '0'&& this.inputList[0].hazardDesc === '' && checkResultFlag == '1'){ + }else if(this.patrolForm.checkResultFlag == '0'&& this.inputList[0].hazardDesc === '' && this.checkResultFlag == '1'){ this.inputMessageFlag = true; }else{ this.checkboxMessageFlag = false;