fix:优化刀具基础数据

imcs-ui/src/lang/zh/cuttingTool.js

@@ -59,12 +59,18 @@ export default {
       },
       // 刀具基础数据
       customizeCuttingtool: {
+        cuttingToolNo:'刀具号',
         cuttingToolName: '刀具名称',
         specifications: '刀具规格',
         cuttingToolType: '刀具类型',
+        cuttingSetToolPicture: '刀具组刀图片',
+        deviceId: '安装设备',
+        resourceId: '执行设备',
         cuttingToolPicture: '刀具图片',
         cuttingToolInstallPicture: '装夹方式',
-        deviceName: '设备名称',
+        cutterNo: '刀位号',
+        toolSetToCheckParameter: '刀具组刀参数',
+        remark: '备注',
         status: '启用状态',
         cutterCode: '刀具编码',
       }
@@ -73,14 +79,17 @@ export default {
     form: {
       // 刀具基础数据
       customizeCuttingtool: {
+        cuttingToolNo:'刀具号',
         cuttingToolName: '刀具名称',
         specifications: '刀具规格',
         cuttingToolType: '刀具类型',
+        cuttingSetToolPicture: '刀具组刀图片',
         deviceId: '安装设备',
         resourceId: '执行设备',
         cuttingToolPicture: '刀具图片',
         cuttingToolInstallPicture: '装夹方式',
         cutterNo: '刀位号',
+        toolSetToCheckParameter: '刀具组刀参数',
         remark: '备注',
         status: '启用状态',
         cutterCode: '刀具编码',

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

@@ -8,51 +8,28 @@
   	width="750px"
   	top="50px"
   >
-    <el-form ref="form" :disabled="formDisabled" :model="customizeCuttingTool" :rules="rules" label-position="right" label-width="100px">
-      <!-- 刀具规格 -->
-      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.specifications")+"："' prop="specifications">
-        <el-input v-model.trim="customizeCuttingTool.specifications"  :label='$t("common.pleaseEnter")' maxlength="255"></el-input>
+    <el-form ref="form" :disabled="formDisabled" :model="customizeCuttingTool" :rules="rules" label-position="right" label-width="130px">
+      <!-- 刀具号 -->
+      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolNo")+"："' prop="cuttingToolNo">
+        <el-input v-model.trim="customizeCuttingTool.cuttingToolNo"  :label='$t("common.pleaseEnter")' maxlength="128" style="width: 93%;"></el-input>
       </el-form-item>
-
       <!-- 刀具名称-->
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolName")+"："' prop="cuttingToolName">
-        <el-input v-model.trim="customizeCuttingTool.cuttingToolName"  :label='$t("common.pleaseEnter")' maxlength="128"></el-input>
+        <el-input v-model.trim="customizeCuttingTool.cuttingToolName"  :label='$t("common.pleaseEnter")' maxlength="128" style="width: 93%;"></el-input>
       </el-form-item>
-      <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='"刀具类别："' 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 :label='$t("cuttingTool.form.customizeCuttingtool.specifications")+"："' prop="specifications">
+        <el-input v-model.trim="customizeCuttingTool.specifications"  :label='$t("common.pleaseEnter")' maxlength="255" style="width: 93%;"></el-input>
       </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-select v-model="customizeCuttingTool.cuttingToolType.key" :placeholder='$t("common.pleaseSelect")' style="width: 93%;">
           <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.CUTTING_TOOL_TYPE" />
       	</el-select>
       </el-form-item>
-
-      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.deviceId")+"："' prop="deviceId">
-      	<el-select v-model="customizeCuttingTool.deviceId" :placeholder='$t("common.pleaseSelect")' style="width: 50%;">
-          <el-option :key="item.name" :label="item.name" :value="item.id" v-for="(item, index) in deviceData.records" />
-      	</el-select>
-      </el-form-item>
-
-      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.resourceId")+"："'  label-width="100px">
-        <el-select v-model="customizeCuttingTool.resourceIdList" multiple placeholder="请选择"  style="width: 70%;">
-          <el-option
-            v-for="(item, index)  in deviceData.records"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
+      <!-- 刀位号 -->
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cutterNo")+"："' prop="cutterNo">
-      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="1"></el-input-number>
+      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="0" :max="1000"></el-input-number>
       </el-form-item>
 
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolPicture")+"："' prop="cuttingToolPicture">
@@ -101,7 +78,18 @@
           <el-image :src="customizeCuttingTool.cuttingToolInstallPicture" fit="cover" />
         </div>
       </el-form-item>
-
+      <!-- 刀具组刀参数-->
+      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.toolSetToCheckParameter")+"："' prop="toolSetToCheckParameter">
+        <el-input v-model.trim="customizeCuttingTool.toolSetToCheckParameter" type="textarea" :rows="3"  style="width: 93%;" :label='$t("common.pleaseEnter")' maxlength="255"></el-input>
+        <el-tooltip
+          class="item"
+          :content="'长度不能超过3000位'"
+          effect="dark"
+          placement="top-end"
+        >
+          <i class="el-icon-question" />
+        </el-tooltip>
+      </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>
@@ -182,6 +170,9 @@ export default {
       },
       roles: [],
       rules: {
+        cuttingToolNo: [
+        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+        ],
         specifications: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
         ],
@@ -273,7 +264,7 @@ export default {
         },
         deviceId: '',
         resourceIdList: [],
-        cutterNo: 1,
+        cutterNo: 0,
         cuttingToolPicture: '',
         cuttingToolInstallPicture: '',
         remark: '',

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

@@ -59,15 +59,16 @@
 	      </template>
       </el-table-column>
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
+	  <!-- 刀具号 -->
+	  <el-table-column align="center" prop="cuttingToolNo" :label='$t("cuttingTool.table.customizeCuttingtool.cuttingToolNo")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 刀具名称 -->
       <el-table-column align="center" prop="cuttingToolName" :label='$t("cuttingTool.table.customizeCuttingtool.cuttingToolName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 刀具规格 -->
       <el-table-column align="center" prop="specifications" :label='$t("cuttingTool.table.customizeCuttingtool.specifications")' :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column align="center" prop="cutterCode" :label='$t("cuttingTool.table.customizeCuttingtool.cutterCode")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 设备名称 -->
 <!--	  <el-table-column align="center" prop="deviceName" :label='$t("cuttingTool.table.customizeCuttingtool.deviceName")' :show-overflow-tooltip="true"></el-table-column>-->
 	  <!-- 刀具类型 -->
-<!--      <el-table-column align="center"
+     <el-table-column align="center"
         :filter-multiple="false"
         :filters="cuttingToolTypeList"
         column-key="cuttingToolType.key"
@@ -77,10 +78,10 @@
         <template slot-scope="scope">
           <span>{{ scope.row.cuttingToolType['data'] ? scope.row.cuttingToolType['data'] : scope.row.cuttingToolType['key'] }}</span>
         </template>
-      </el-table-column>-->
-      <!-- 刀具图片 -->
-<!--      <el-table-column prop="cuttingToolPicture" :label='$t("cuttingTool.table.customizeCuttingtool.cuttingToolPicture")' :show-overflow-tooltip="true"></el-table-column>-->
-<!--      <el-table-column align="center" :label='$t("cuttingTool.table.customizeCuttingtool.cuttingToolPicture")' :show-overflow-tooltip="true">
+      </el-table-column>
+ 
+	  <!-- 刀具图片 -->
+     <el-table-column align="center" :label='$t("cuttingTool.table.customizeCuttingtool.cuttingToolPicture")' :show-overflow-tooltip="true">
         <template slot-scope="{ row }">
           <el-image
             style="width: 100px; height: 100px"
@@ -98,7 +99,8 @@
             :preview-src-list="[row.cuttingToolInstallPicture]">
           </el-image>
         </template>
-      </el-table-column>-->
+      </el-table-column>
+	  <el-table-column prop="toolSetToCheckParameter" :label='$t("cuttingTool.table.customizeCuttingtool.toolSetToCheckParameter")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 启用状态 -->
       <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' align="center">
       	<template slot-scope="{ row }">
@@ -108,13 +110,13 @@
         </template>
       </el-table-column>
 	  <!-- 启用状态 -->
-      <el-table-column prop="programId" :label='$t("runCenter.table.oder.state")' align="center">
+      <!-- <el-table-column prop="programId" :label='$t("runCenter.table.oder.state")' align="center">
       	<template slot-scope="{ row }">
           <el-tag :type="row.programId==null ? 'success' : 'danger'">
           	{{ row.programId==null ? '可用' : '占用' }}
           </el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"
@@ -310,21 +312,8 @@
 	    },
 	    edit (row) {
         //查询刀具可执行设备
-        const param = {
-          toolId: row.id
-        }
-        machineCustomizeCuttingToolMgrApi.getResource(param).then(response => {
-          const res = response.data
-          if (res.isSuccess) {
-            row.resourceIdList = []
-            if(res.data){
-              row.resourceIdList = res.data
-              console.log("可执行设备：",row.resourceIdList)
-              this.$refs.edit.setCustomizeCuttingTool(row, this.dicts)
-            }
-          }
-        }).finally(() => this.loading = false)
 
+		  this.$refs.edit.setCustomizeCuttingTool(row, this.dicts)
 	      this.$refs.edit.type = "edit"
 	      this.dialog.title = this.$t("common.edit")
 	      this.dialog.isVisible = true