Merge branch 'VERSIONS-FenJiFenLei' into SCHOOL-ShanXiNongDa

src/api/integratedManagement/index.js

@@ -407,6 +407,14 @@ export function laboratoryUserAuthAuthTypeList(query) {
     params: query
   })
 }
+//分级配置-列表查询时接口
+export function laboratoryLevelConfigGetLevelTitleList(data) {
+  return request({
+    url: '/laboratory/levelConfig/getLevelTitleList',
+    method: 'post',
+    data: data
+  })
+}
 //分级配置-列表
 export function laboratoryLevelConfigGetList(data) {
   return request({

src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/safetyInfoConfig.vue

@@ -161,6 +161,7 @@ export default {
       },
       handleTabClick(item,index){
         this.currentIndex = index
+        this.queryParams.page=1;
         this.queryParams.brandId=item.brandId;
         this.infoType=item.brandType;
         this.getList()

src/views/integratedManagement/laboratoryManagement/subject/index.vue

@@ -38,7 +38,7 @@
                 <el-option
                   v-for="dict in typeList"
                   :key="dict.typeId"
-                  :label="dict.typeName"
+                  :label="dict.subType"
                   :value="dict.typeId"
                 ></el-option>
               </el-select>
@@ -48,7 +48,7 @@
                 <el-option
                   v-for="dict in levelList"
                   :key="dict.levelId"
-                  :label="dict.levelName"
+                  :label="dict.titleName"
                   :value="dict.levelId"
                 ></el-option>
               </el-select>
@@ -255,7 +255,7 @@
     laboratorySubRelInfoGetHazardSubRelInfo,
     laboratorySubRelInfoUpdateBySort,
     laboratorySubRelInfoUpdateByControl,
-    laboratoryBoardExportBoardInfo,
+    laboratoryBoardExportBoardInfo, laboratoryLevelConfigGetLevelTitleList, laboratoryTypeConfigGetList
   } from '@/api/integratedManagement/index'
   import indexRightPage from './indexRightPage/indexRightPage.vue'
   import addSubject from './addSubject.vue'
@@ -689,13 +689,13 @@
       },
       //查询安全分级
       laboratoryClassLevelGetList() {
-        laboratoryClassLevelGetList({}).then(response => {
+        laboratoryLevelConfigGetLevelTitleList({}).then(response => {
           this.$set(this, 'levelList', response.data)
         })
       },
       //查询安全分类
       laboratoryClassTypeGetList() {
-        laboratoryClassTypeGetList({}).then(response => {
+        laboratoryTypeConfigGetList({}).then(response => {
           this.$set(this, 'typeList', response.data)
         })
       },