heyang

src/views/safetyCheck/equipmentConfig/index.vue

@@ -36,6 +36,7 @@
         <el-table-column label="名称" align="left" prop="anotherName"></el-table-column>
         <el-table-column label="型号" align="left" prop="anotherCode"></el-table-column>
         <el-table-column label="检查项目数" align="left" prop="checkNum"></el-table-column>
+        <el-table-column label="编辑人" align="left" prop="createName"></el-table-column>
         <el-table-column label="编辑时间" align="left" prop="createTimeStr"></el-table-column>
         <el-table-column label="操作" width="180">
           <template slot-scope="scope">

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -798,10 +798,6 @@
                   return
                 }
               }
-              if(this.dialogForm.checkCategory == 2 && !this.deviceIsEmpty){
-                this.msgError('请选择检查内容')
-                return
-              }
               let obj = {
                 title:this.dialogForm.title,
                 checkType:this.dialogForm.checkType,
@@ -871,7 +867,7 @@
           }
           this.$set(this.dialogForm,'hazardIds',list.join(','));
           this.$set(this.dialogForm,'hazardNum',list.length);
-          this.dialogClickType(1);
+
           //实验室是否有当前设备
           let obj={
             "checkRange":this.dialogForm.checkRange,
@@ -881,9 +877,10 @@
           }
           haveHazardInSub(obj).then(response => {
             if(response.code==200){
-              this.deviceIsEmpty=true;
+               this.dialogClickType(1);
             }else{
-              this.deviceIsEmpty=false;
+              this.$set(this.dialogForm,'hazardIds','');
+              this.$set(this.dialogForm,'hazardNum',0);
             }
           });
         }

src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -996,10 +996,6 @@ export default {
               this.msgError('请添加至少一名巡查成员')
               return
             }
-            if(this.dialogForm.checkCategory == 2 && !this.deviceIsEmpty){
-              this.msgError('请选择检查内容')
-              return
-            }
             let obj = {
               title:this.dialogForm.title,
               checkType:this.dialogForm.checkType,
@@ -1106,7 +1102,7 @@ export default {
         }
         this.$set(this.dialogForm,'hazardIds',list.join(','));
         this.$set(this.dialogForm,'hazardNum',list.length);
-        this.dialogClickType(1);
+
         //实验室是否有当前设备
         let obj={
           "checkRange":this.dialogForm.checkRange,
@@ -1116,9 +1112,10 @@ export default {
         }
         haveHazardInSub(obj).then(response => {
           if(response.code==200){
-            this.deviceIsEmpty=true;
+            this.dialogClickType(1);
           }else{
-            this.deviceIsEmpty=false;
+            this.$set(this.dialogForm,'hazardIds','');
+            this.$set(this.dialogForm,'hazardNum',0);
           }
         });
       }