Merge branch 'lisu_V4' into dev

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 == '0'){
+				}else if(this.patrolForm.checkResultFlag == '0'&& this.inputList[0].hazardDesc === '' && this.checkResultFlag == '1'){
 						this.inputMessageFlag = true;
 				}else{
 						this.checkboxMessageFlag = false;