中央刀库

imcs-ui/src/api/lineSideLibrary/toolStorge.js

@@ -60,7 +60,11 @@ const apiList = {
   import: {
     method: 'POST',
     url: `/authority/toolStorge/import`
-  }
+  },
+  toolPageList: {
+    method: 'POST',
+    url: `/authority/customizeCuttingTool/pageList`
+  },
 }
 
 export default {
@@ -165,5 +169,11 @@ export default {
       ...apiList.import,
       data
     })
+  },
+  toolPageList (data) {
+    return axiosApi({
+      ...apiList.toolPageList,
+      data
+    })
   }
 }

imcs-ui/src/views/zuihou/centralToolMagazine/goodsShelvesMgr/Index.vue

@@ -64,8 +64,8 @@
       <el-table-column prop="deviceName" :label='$t("lineSide.table.toolManagement.deviceName")' :show-overflow-tooltip="true" ></el-table-column>
       <el-table-column prop="toolType" :label='$t("lineSide.table.toolManagement.type")' align="center" >
       	<template slot-scope="{ row }">
-          <el-tag :type="row.toolType=='1' ? 'success' : 'danger'">
-          	{{ row.toolType=='1' ? $t("lineSide.common.lathe") : $t("lineSide.common.central") }}
+          <el-tag :type="getTagType(row.toolType)">
+            {{ getToolTypeText(row.toolType) }}
           </el-tag>
         </template>
       </el-table-column>
@@ -446,7 +446,35 @@
 	      if (!flag) {
 	        this.$refs.table.toggleRowSelection(row, true)
 	      }
-	    }
+	    },
+      getTagType(toolType) {
+        switch (toolType) {
+          case '1':
+            return 'success'; // 第一种类型的标签颜色
+          case '2':
+            return 'warning'; // 第二种类型的标签颜色
+          case '3':
+            return 'info'; // 第三种类型的标签颜色
+          case '4':
+            return 'danger'; // 第四种类型的标签颜色
+          default:
+            return 'default'; // 默认标签颜色，你可以根据需要修改
+        }
+      },
+      getToolTypeText(toolType) {
+        switch (toolType) {
+          case '0':
+            return this.$t('lineSide.common.central'); // 第一种类型的文本
+          case '1':
+            return this.$t('lineSide.common.lathe'); // 第二种类型的文本
+          case '2':
+            return '机器人随行货架'; // 第三种类型的文本
+          case '3':
+            return '机床刀具缓存库'; // 第四种类型的文本
+          default:
+            return ''; // 默认文本，你可以根据需要修改
+        }
+      }
 	  }
 	}
 </script>

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

@@ -23,8 +23,10 @@
       </el-form-item>-->
       <el-form-item :label='$t("lineSide.form.toolType")+"："' prop="toolType">
         <template>
-          <el-radio v-model="tenant.toolType"  label="1">{{$t("lineSide.common.lathe")}}</el-radio>
           <el-radio v-model="tenant.toolType"  label="0">{{$t("lineSide.common.central")}}</el-radio>
+          <el-radio v-model="tenant.toolType"  label="1">{{$t("lineSide.common.lathe")}}</el-radio>
+          <el-radio v-model="tenant.toolType"  label="2">机器人随行货架</el-radio>
+          <el-radio v-model="tenant.toolType"  label="3">机床刀具缓存库</el-radio>
         </template>
       </el-form-item>
       <el-form-item :label='$t("lineSide.form.pic")+"："' prop="pic">

imcs-ui/src/views/zuihou/centralToolMagazine/lineSideEmulate/Index.vue

@@ -62,7 +62,7 @@
 	  			<!-- 中部-货架小格子 -->
 	  			<table class="contentDiv" border="0" cellspacing="0" cellpadding="6">
             <tr v-for="(objTr, objIndex) in item.children" :key="objIndex">
-              <td v-for="objTd in objTr.children" :key="objTd.toolNo" :class="objTd.toolNo ? 'blueBg' : ''" @click="editOne(objTd)">
+              <td v-for="objTd in objTr.children" :key="objTd.toolId" :class="objTd.toolId ? 'blueBg' : ''" @click="editOne(objTd)">
                 {{objTd.no}}
                 <el-image v-if="objTd.lockStatus == '0'" class="locked" :src="resolveLogo(lockImg)" fit="contain"></el-image>
               </td>

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

@@ -235,7 +235,7 @@ export default {
     getList (row) {
 
 	      this.loading = true
-      lineSideMgrApi.getCuttingToolByCutterCode({ "cutterCode": row.toolNo }).then(response => {
+      lineSideMgrApi.getCuttingToolByCutterCode({ "id": row.toolId }).then(response => {
 	        const res = response.data;
 	        console.log("res123123214==== ", res);
 	        if (res.isSuccess) {

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

@@ -12,8 +12,10 @@
       <el-form-item :label='$t("lineSide.form.storgeNo")+ "："' prop="no">
           <el-input v-model="tenant.no" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
-      <el-form-item :label='$t("lineSide.form.toolNo")+ "："' prop="toolNo">
-        <el-input v-model="tenant.toolNo" :placeholder='$t("common.pleaseEnter")'/>
+      <el-form-item :label='$t("lineSide.form.toolNo")' prop="toolId"  >
+        <el-select v-model="tenant.toolId"   style="width: 50%">
+          <el-option v-for="(item, index) in toolList" :key="index" :label="item.cuttingToolName" :value="item.id" />
+        </el-select>
       </el-form-item>
       <el-form-item :label='$t("lineSide.form.storgeName")+ "："' prop="name">
           <el-input v-model="tenant.name" :placeholder='$t("common.pleaseEnter")'/>
@@ -111,6 +113,7 @@ export default {
       oldName: '',
       oldNo: '',
       oldToolNo: '',
+      toolId: '',
       tenant: this.initTenant(),
       screenWidth: 0,
       width: this.initWidth(),
@@ -120,6 +123,7 @@ export default {
         NATION: {}
       },
       roles: [],
+      toolList: [],
       rules: {
       	no: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
@@ -138,8 +142,9 @@ export default {
         status: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'change' }
         ],
-        toolNo: [
-          { validator: validateToolNoExsit, trigger: 'blur'}
+        toolId: [
+          /*{ validator: validateToolNoExsit, trigger: 'blur',required: true}*/
+          { required: true, message: this.$t("rules.require"), trigger: 'change' }
         ],
         toolManagementId: [
           { required: true, message: this.$t("rules.require"), trigger: 'change' }
@@ -150,7 +155,8 @@ export default {
   // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
   created() {
   	// 获取【库位类型】数据
-  	this.getWareTypeList()
+  	this.getWareTypeList(),
+  	this.getToolList()
 	},
   computed: {
     isVisible: {
@@ -287,7 +293,15 @@ export default {
 					this.wareTypeList = res.data
 				}
 			})
-		}
+		},
+    getToolList(){
+      locationMgrApi.toolPageList({}).then(res => {
+        res = res.data
+        if(res.isSuccess){
+          this.toolList = res.data
+        }
+      })
+    }
   }
 }
 </script>