dedsudiyu 11 달 전
부모
커밋
423b087cd6

+ 6 - 2
src/views/integratedManagement/laboratoryManagement/hazard/addLaboratory.vue

@@ -180,8 +180,12 @@ export default {
   methods: {
     //大分类字典
     getBigDicts(){
-      getDicts('classification_items').then(response => {
-        this.$set(this,'bigClassifyOptions',response.data);
+      getDicts('classify_dictionaries_all').then(response => {
+        let list = response.data;
+        getDicts('level_dictionaries_all').then(response => {
+          list = list.concat(response.data)
+          this.$set(this,'bigClassifyOptions',list);
+        });
       });
     },
     //小分类字典

+ 4 - 2
src/views/integratedManagement/laboratoryManagement/subject/addSubject.vue

@@ -41,7 +41,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="安全分类"  prop="typeId" class="form-item">
-          <el-select v-model="form.typeId" multiple collapse-tags placeholder="请选择安全分类"  style="width: 320px">
+          <el-select v-model="form.typeId" multiple collapse-tags placeholder="请选择安全分类"
+                     :disabled="form.dynamicLeveling"  style="width: 320px">
             <el-option
               v-for="dict in typeList"
               :key="dict.typeId"
@@ -51,7 +52,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="安全分级"  prop="levelId" class="form-item">
-          <el-select v-model="form.levelId" placeholder="请选择安全分级" clearable style="width:320px;">
+          <el-select v-model="form.levelId" placeholder="请选择安全分级"
+                     :disabled="form.dynamicLeveling" clearable style="width:320px;">
             <el-option
               v-for="dict in levelList"
               :key="dict.levelId"