页面改进

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

@@ -40,7 +40,7 @@ export default {
         resourceStatus: '设备连接状态',
         sysTime: '同步时间',
         cuttingToolNum: '刀库刀具数量',
-        cuttingToolName: '刀具名称',
+        cuttingToolName: '刀具名称',        
         specifications: '刀具规格',
         cuttingToolType: '刀具类型',
         cuttingToolPicture: '刀具图片',
@@ -60,7 +60,8 @@ export default {
       // 刀具基础数据
       customizeCuttingtool: {
         cuttingToolNo:'刀具号',
-        cuttingToolName: '刀具名称',
+        cuttingToolName: '刀具名称',        
+        storgeName: '位置名称',
         specifications: '刀具规格',
         cuttingToolType: '刀具类型',
         cuttingSetToolPicture: '刀具组刀图片',

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

@@ -23,15 +23,14 @@
       	<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>
-      </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-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-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>
 
@@ -253,12 +252,13 @@ export default {
     },
     setCustomizeCuttingTool (val, dicts) {
     	if(val){
-    		this.customizeCuttingTool = { ...val }       
+    		this.customizeCuttingTool = { ...val }      
+        
     	}
       // 字典表
       this.dicts = dicts
       this.fetch({}) 
-      console.log(this.dicts)
+      console.log(this.customizeCuttingTool)
     },
     close () {
       this.$emit('close')

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

@@ -64,7 +64,12 @@
       <!-- 刀具规格 -->
       <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['storgeName']}}
+	    </template>		
+	 </el-table-column>
+	  
 	  <!-- 刀具类型 -->
       <el-table-column align="center"
         :filter-multiple="false"
@@ -124,7 +129,9 @@
       >
         <template slot-scope="{ row }">
           <el-tooltip class="item" :content='$t("common.edit")' effect="dark" placement="top-start">
+			  {{row.cutterNo}}			  
 	          <i
+			    v-if="row.cutterNo==0"
 	            class="el-icon-edit table-operation"
 	            style="color: #2db7f5;"
 	            @click="edit(row)"
@@ -132,6 +139,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)"