heyang

src/views/safetyCheck/equipmentConfig/index.vue

@@ -27,7 +27,7 @@
           <p class="reset-button-one" @click="resetQuery">重置</p>
         </el-form-item>
         <el-form-item style="float: right;">
-          <p class="inquire-button-one" style="width:120px;" @click="handleClick('','','add')">+ 新增检查内容</p>
+          <p class="inquire-button-one" v-hasPermi="['check:device:add']" style="width:120px;" @click="handleClick('','','add')">+ 新增检查内容</p>
         </el-form-item>
       </el-form>
       <el-table border v-loading="loading" :data="tableData">
@@ -42,9 +42,9 @@
           <template slot-scope="scope">
             <div class="table-button-box">
               <p class="table-button-null"></p>
-              <p class="table-button-p" @click="handleClick('',scope.row,'detail')">详情</p>
-              <p class="table-button-p" @click="handleClick('',scope.row,'edit')">编辑</p>
-              <p class="table-button-p" @click="handleClick('',scope.row,'delete')">删除</p>
+              <p class="table-button-p" v-hasPermi="['check:device:query']" @click="handleClick('',scope.row,'detail')">详情</p>
+              <p class="table-button-p" v-hasPermi="['check:device:edit']" @click="handleClick('',scope.row,'edit')">编辑</p>
+              <p class="table-button-p" v-hasPermi="['check:device:remove']" @click="handleClick('',scope.row,'delete')">删除</p>
               <p class="table-button-null"></p>
             </div>
           </template>

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

@@ -798,6 +798,13 @@
                   return
                 }
               }
+              if(this.dialogForm.checkCategory==2){
+                if(this.dialogForm.hazardNum==0){
+                  this.msgError('请选择检查内容')
+                  return
+                }
+              }
+
               let obj = {
                 title:this.dialogForm.title,
                 checkType:this.dialogForm.checkType,

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

@@ -992,6 +992,12 @@ export default {
                 return
               }
             }
+            if(this.dialogForm.checkCategory==2){
+              if(this.dialogForm.hazardNum==0){
+                this.msgError('请选择检查内容')
+                return
+              }
+            }
             if(!this.dialogTableList[0]){
               this.msgError('请添加至少一名巡查成员')
               return