Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/enum/dict.js

@@ -47,6 +47,7 @@ export default {
   区域类型: 'main_area_type',
   工种类型: 'work_type',
   '客户/供应商资质类型': 'contact_qc_type',
+  版本规则分类: 'version_rule_type',
   生产类型: 'productionType',
   质检标准类型: 'quality_testing_code',
   质检方式: 'quality_method_code'

src/views/versionManage/components/addOrEditDialog.vue

@@ -18,15 +18,17 @@
       <el-row :gutter="12">
         <el-col :span="24">
           <el-form-item label="分类" prop="type">
-            <ele-tree-select
-              clearable
-              :data="typeList"
-              v-model="form.type"
-              placeholder="请选择"
-              valueKey="id"
-              labelKey="name"
-              childrenKey="subList"
-            />
+<!--            <ele-tree-select-->
+<!--              clearable-->
+<!--              :data="typeList"-->
+<!--              v-model="form.type"-->
+<!--              placeholder="请选择"-->
+<!--              valueKey="id"-->
+<!--              labelKey="name"-->
+<!--              childrenKey="subList"-->
+<!--            />-->
+            <DictSelection dictName="版本规则分类" clearable filterable v-model="form.type" :isProhibit="type=='view'">
+            </DictSelection>
 <!--            <el-select v-model="form.type" filterable style="width: 100%;" :disabled="type=='view'">-->
 <!--              <el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name"></el-option>-->
 <!--            </el-select>-->

src/views/versionManage/components/index-search.vue

@@ -15,18 +15,20 @@
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="分类" prop="type">
           <!-- 单选 -->
-          <ele-tree-select
-            clearable
-            :data="typeList"
-            v-model.trim="where.type"
-            placeholder="请选择"
-            valueKey="id"
-            labelKey="name"
-            childrenKey="subList"
-          />
+<!--          <ele-tree-select-->
+<!--            clearable-->
+<!--            :data="typeList"-->
+<!--            v-model.trim="where.type"-->
+<!--            placeholder="请选择"-->
+<!--            valueKey="id"-->
+<!--            labelKey="name"-->
+<!--            childrenKey="subList"-->
+<!--          />-->
 <!--          <el-select v-model.trim="where.type" filterable style="width: 100%;" :disabled="type=='view'">-->
 <!--            <el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name"></el-option>-->
 <!--          </el-select>-->
+          <DictSelection dictName="版本规则分类" clearable filterable v-model="where.type">
+          </DictSelection>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">

src/views/versionManage/index.vue

@@ -118,6 +118,7 @@ import {reviewStatus} from "@/enum/dict";
 import {getSubTwoLevelAPI, getVersionManagePageAPI, updateStatus, versionManageDeleteAPI} from "@/api/versionManage";
 import indexSearch from "@/views/versionManage/components/index-search.vue";
 import {getSubPage} from "@/api/classifyManage";
+import {getByCode} from "@/api/system/dictionary-data";
 
 export default {
   name: 'technologyProduction',
@@ -173,10 +174,8 @@ export default {
           label: '分类',
           showOverflowTooltip: true,
           align: 'center',
-          formatter: (_row, _column, cellValue) => {
-            /* && this.typeList.find(item => item.id == cellValue)?.name*/
-
-            return this.getTypeName(this.typeList, cellValue, (item) => item.id == cellValue)
+          formatter: (row, column) => {
+            return this.getDictV('version_rule_type',row.type) ;
           },
           minWidth: 110
         },
@@ -211,6 +210,7 @@ export default {
       ],
       // 表格选中数据
       selection: [],
+      dictList: {},
       // 当前编辑数据
       current: null,
       typeList: [],
@@ -223,21 +223,36 @@ export default {
   },
   computed: {},
   methods: {
-    getTypeName(list, val, callBack) {
-      let find = list.find(item => callBack(item, val)) || {}
-      if (find.name) {
-        return find.name
-      } else {
-        for (let i = 0; i < list.length; i++) {
-          let find = list[i].subList.find(item => callBack(item, val)) || {}
-          if (find.name) {
-            return find.name
-          }
+    // getTypeName(list, val, callBack) {
+    //   let find = list.find(item => callBack(item, val)) || {}
+    //   if (find.name) {
+    //     return find.name
+    //   } else {
+    //     for (let i = 0; i < list.length; i++) {
+    //       let find = list[i].subList.find(item => callBack(item, val)) || {}
+    //       if (find.name) {
+    //         return find.name
+    //       }
+    //     }
+    //   }
+    // },
+    getDictV(code, val) {
+      if (!this.dictList[code]) return '';
+      return this.dictList[code].find(item => item.value == val)?.label
+    },
+    async getDictList(code) {
+      let {data: res} = await getByCode(code)
+      this.dictList[code] = res.map(item => {
+        let values = Object.keys(item)
+        return {
+          value: values[0],
+          label: item[values[0]]
         }
-      }
+      })
     },
     /* 表格数据源 */
     async datasource({page, limit, where, order}) {
+      await this.getDictList('version_rule_type')
       return await getVersionManagePageAPI({
         ...where,
         ...order,