增加刀具类别

imcs-ui/src/views/zuihou/centralToolMagazine/cuttingToolMgr/components/customizeCuttingTool/components/Edit.vue

@@ -21,8 +21,14 @@
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cutterCode")+"："' prop="cutterCode">
         <el-input v-model.trim="customizeCuttingTool.cutterCode"  :label='$t("common.pleaseEnter")' maxlength="128"></el-input>
       </el-form-item>
-
-<!--      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolType")+"："' prop="cuttingToolType">
+      <!-- 刀具类别-->
+      <el-form-item :label='"刀具类别："' prop="cuttingToolCategory">
+        <el-select v-model="customizeCuttingTool.cuttingToolCategory.key" :placeholder='$t("common.pleaseSelect")' style="width: 50%;">
+          <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.CUTTING_TOOL_CATEGORY" />
+        </el-select>
+      </el-form-item>
+      <!-- 刀具类型-->
+      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolType")+"："' prop="cuttingToolType">
       	<el-select v-model="customizeCuttingTool.cuttingToolType.key" :placeholder='$t("common.pleaseSelect")' style="width: 50%;">
           <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.CUTTING_TOOL_TYPE" />
       	</el-select>
@@ -84,7 +90,7 @@
           <el-image :src="customizeCuttingTool.cuttingToolInstallPicture" fit="cover" />
         </div>
       </el-form-item>
-      -->
+
       <!-- 备注-->
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.remark")+"："' prop="remark">
         <el-input v-model.trim="customizeCuttingTool.remark" type="textarea" :rows="3"  style="width: 93%;" :label='$t("common.pleaseEnter")' maxlength="255"></el-input>
@@ -160,7 +166,8 @@ export default {
         title: ""
       },
       dicts:{
-        CUTTING_TOOL_TYPE: {}
+        CUTTING_TOOL_TYPE: {},
+        CUTTING_TOOL_CATEGORY: {},
       },
       roles: [],
       rules: {
@@ -186,6 +193,16 @@ export default {
             }
           }, trigger: ['blur','change'] }
         ],
+        cuttingToolCategory: [
+          { required: true, validator: (rule, value, callback) => {
+              console.log("this.customizeCuttingTool.cuttingToolCategory.key="+this.customizeCuttingTool.cuttingToolCategory.key)
+              if (this.customizeCuttingTool.cuttingToolCategory.key === null || this.customizeCuttingTool.cuttingToolCategory.key === "") {
+                callback(new Error("请选择刀具类别"))
+              } else {
+                callback()
+              }
+            }, trigger: ['blur','change'] }
+        ],
       }
     }
   },
@@ -237,7 +254,10 @@ export default {
         specifications: '',
         cuttingToolName: '',
         cuttingToolType: {
-            key: ''
+            key: ""
+        },
+        cuttingToolCategory: {
+            key: ""
         },
         deviceId: '',
         cutterNo: 1,
@@ -259,6 +279,7 @@ export default {
       }
     },
     setCustomizeCuttingTool (val, dicts) {
+      console.log("dicts:",dicts);
     	if(val){
     		this.customizeCuttingTool = { ...val }
     	}

imcs-ui/src/views/zuihou/centralToolMagazine/cuttingToolMgr/components/customizeCuttingTool/index.vue

@@ -181,15 +181,15 @@
 	        title: ""
 	      },
         dicts: {
-          CUTTING_TOOL_TYPE: {}
+          CUTTING_TOOL_TYPE: {},
+          CUTTING_TOOL_CATEGORY: {}
         },
 	      tableKey: 0,
 	      queryParams: initQueryParams({
             model: {
               cuttingToolType: {
                   key: ''
-              },
-
+              }
             }
         }),
 		queryMachineParams: initQueryParams({}),
@@ -204,7 +204,7 @@
 	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
 	  created() {
       // 加载【字典】
-      initDicts(['CUTTING_TOOL_TYPE'], this.dicts);
+      initDicts(['CUTTING_TOOL_TYPE','CUTTING_TOOL_CATEGORY'], this.dicts);
 	  	// 加载列表数据
 	  	this.fetch()
 		this.device()
@@ -212,6 +212,9 @@
 	  computed: {
       cuttingToolTypeList() {
           return convertEnum(this.dicts.CUTTING_TOOL_TYPE)
+      },
+      cuttingToolCategoryList() {
+        return convertEnum(this.dicts.CUTTING_TOOL_CATEGORY)
       }
 	  },
 	  mounted () {