zc

src/views/safetyCheck/components/initiateInspect/initiateInspect.vue

@@ -365,16 +365,7 @@
       //初始化
       initialize() {
         //计划详情
-        this.securityCheckPlanCheckInfo()
-        // 上级页面检查项状态 指定时false,未指定true
-        if (this.initiateData.freeChoiceType) {
-          this.$set(this, 'freeChoiceType', true)
-          //开始检查/未指定检查项-获取未执行过的检查项列表
-          this.securityCheckSetOptionUnCheckList();
-        }else{
-          //开始检查/开始整改/开始复查-获取所有检查项列表
-          this.securityCheckOptionSelAllList();
-        }
+        this.securityCheckPlanCheckInfo('initialize');
         // 是否是详情进入
         if (this.initiateData.showType) {
           this.$set(this, 'lookInfoType', true)
@@ -383,7 +374,7 @@
         }
       },
       //开始检查计划详情
-      securityCheckPlanCheckInfo() {
+      securityCheckPlanCheckInfo(type) {
         //type 初始化时为FALSE 提交再次调用为true
         let self = this
         securityCheckPlanCheckInfo({
@@ -410,6 +401,17 @@
               //未指定检查项
               this.$set(this,'loadType',true);
             }
+            if(type == 'initialize'){
+              // 上级页面检查项状态 指定时false,未指定true
+              if (this.initiateData.freeChoiceType) {
+                this.$set(this, 'freeChoiceType', true)
+                //开始检查/未指定检查项-获取未执行过的检查项列表
+                this.securityCheckSetOptionUnCheckList();
+              }else{
+                //开始检查/开始整改/开始复查-获取所有检查项列表
+                this.securityCheckOptionSelAllList();
+              }
+            }
           })
         })
       },
@@ -470,16 +472,18 @@
       //手动选择检查项目
       hazardCheckProChange(val){
         let self = this;
-        for (let i=0;i<self.cascaderDataList.length;i++){
-          if(val == self.cascaderDataList[i].hazardCheckPro){
-            self.$set(self.projectData,'setOptionId',self.cascaderDataList[i].setOptionId);
-            self.$set(self.projectData,'hazardCheckPoint',self.cascaderDataList[i].hazardCheckPoint);
-            self.$set(self.projectData,'hazardCheckPro',self.cascaderDataList[i].hazardCheckPro);
-            self.$nextTick(()=>{
-              self.securityDraftFindBySetOptionId(self.cascaderDataList[i].setOptionId);
-              self.securityCheckPhotoGetCheckNumBySub()
-            })
-            break
+        if (val){
+          for (let i=0;i<self.cascaderDataList.length;i++){
+            if(val == self.cascaderDataList[i].hazardCheckPro){
+              self.$set(self.projectData,'setOptionId',self.cascaderDataList[i].setOptionId);
+              self.$set(self.projectData,'hazardCheckPoint',self.cascaderDataList[i].hazardCheckPoint);
+              self.$set(self.projectData,'hazardCheckPro',self.cascaderDataList[i].hazardCheckPro);
+              self.$nextTick(()=>{
+                self.securityDraftFindBySetOptionId(self.cascaderDataList[i].setOptionId);
+                self.securityCheckPhotoGetCheckNumBySub()
+              })
+              break
+            }
           }
         }
       },