刀具管理页面处理

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

@@ -8,11 +8,11 @@
   	width="750px"
   	top="50px"
   >
-    <el-form ref="form" :disabled="formDisabled" :model="customizeCuttingTool" :rules="rules" label-position="right" label-width="130px">
-      <!-- 刀具号 -->
+    <el-form ref="form" :disabled="formDisabled" :model="customizeCuttingTool" :rules="rules" label-position="right" label-width="100px">
+      <!-- 刀具编号 -->
       <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-input-number v-model="customizeCuttingTool.cuttingToolNo" :min="1" :max="1200"></el-input-number>
+      </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" style="width: 93%;"></el-input>
@@ -26,10 +26,15 @@
       	<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 v-if="customizeCuttingTool.cutterNo > 0"  :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.cutterNo")+"："' prop="cutterNo">
-      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="0" :max="1000"></el-input-number>
+      <el-form-item v-if="customizeCuttingTool.cutterNo > 0 " :label='$t("cuttingTool.form.customizeCuttingtool.cutterNo")+"："' prop="cutterNo">
+      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="1"></el-input-number>
       </el-form-item>
 
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolPicture")+"："' prop="cuttingToolPicture">
@@ -170,8 +175,8 @@ export default {
       },
       roles: [],
       rules: {
-        cuttingToolNo: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+        cuttingToolNo:[
+          { required: true, message: this.$t("rules.require"), trigger: 'blur' },
         ],
         specifications: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
@@ -254,7 +259,7 @@ export default {
       return {
         id: '',
         specifications: '',
-
+        cuttingToolNo: 1,  
         cuttingToolName: '',
         cuttingToolType: {
             key: ""
@@ -264,7 +269,7 @@ export default {
         },
         deviceId: '',
         resourceIdList: [],
-        cutterNo: 0,
+        cutterNo: 1,
         cuttingToolPicture: '',
         cuttingToolInstallPicture: '',
         remark: '',

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

@@ -66,7 +66,11 @@
 		<!-- 刀具规格 -->
 		<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="deviceName" :label='$t("cuttingTool.table.customizeCuttingtool.deviceName")' :show-overflow-tooltip="true"></el-table-column>-->
+		<el-table-column align="center" prop="deviceName" :label='$t("cuttingTool.table.customizeCuttingtool.storgeName")' :show-overflow-tooltip="true">
+	    	<template slot-scope="{ row }">
+				{{row['deviceName']? row['deviceName']+"_"+row['cutterNo']+"号刀位" : row['storgeName']}}
+	    	</template>		
+	 	</el-table-column>
 		<!-- 刀具类型 -->
 	   <el-table-column align="center"
 		  :filter-multiple="false"
@@ -128,6 +132,7 @@
 		  <template slot-scope="{ row }">
 			<el-tooltip class="item" :content='$t("common.edit")' effect="dark" placement="top-start">
 				<i
+				  v-if="row.cutterNo==0"
 				  class="el-icon-edit table-operation"
 				  style="color: #2db7f5;"
 				  @click="edit(row)"
@@ -135,6 +140,7 @@
 			</el-tooltip>
 			<el-tooltip class="item" :content='$t("common.delete")' effect="dark" placement="top-start">
 				<i
+				  v-if="row.cutterNo==0"
 				  class="el-icon-delete table-operation"
 				  style="color: #f50;"
 				  @click="singleDelete(row)"