Browse Source

中央刀库

oyq28 1 year ago
parent
commit
507bc0779b

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

@@ -471,6 +471,8 @@
             return '机器人随行货架'; // 第三种类型的文本
           case '3':
             return '机床刀具缓存库'; // 第四种类型的文本
+          case '4':
+            return '接驳位'; // 第四种类型的文本
           default:
             return ''; // 默认文本,你可以根据需要修改
         }

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

@@ -27,6 +27,7 @@
           <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>
+          <el-radio v-model="tenant.toolType"  label="4">接驳位</el-radio>
         </template>
       </el-form-item>
       <el-form-item :label='$t("lineSide.form.pic")+":"' prop="pic">

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

@@ -142,10 +142,10 @@ export default {
         status: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'change' }
         ],
-        toolId: [
-          /*{ validator: validateToolNoExsit, trigger: 'blur',required: true}*/
+       /* 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' }
         ]
@@ -217,10 +217,10 @@ export default {
       this.$emit('close')
     },
     checkExist(name){
-      return locationMgrApi.checkField({"name":name})
+      return locationMgrApi.checkField({"name":name,"toolManagementId":this.tenant.toolManagementId})
     },
     checkNoExist(no){
-      return locationMgrApi.checkField({"no":no})
+      return locationMgrApi.checkField({"no":no,"toolManagementId":this.tenant.toolManagementId})
     },
     checkToolNoExist(toolNo){
       return locationMgrApi.checkField({"toolNo":toolNo})