From dff2d1bb2d5390a072f62bc40ed4e6c558b90826 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 19 Mar 2025 14:09:50 +0800
Subject: [PATCH] =?UTF-8?q?change(mes):=20(MeterSphere100027)=E3=80=90?=
 =?UTF-8?q?=E6=A8=A1=E5=85=B7=E4=BF=A1=E6=81=AF=E3=80=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 取消机台必填项
- 注释掉设备类型中的父级标识选择功能
- 更新材料类型组件中的字典引用
- 移除模具信息组件中的机台名称必填验证
---
 src/views/mes/baseDeviceType/index.vue   | 5 ++---
 src/views/mes/baseMaterialType/index.vue | 2 +-
 src/views/mes/baseMouldInfo/index.vue    | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/mes/baseDeviceType/index.vue b/src/views/mes/baseDeviceType/index.vue
index d297e3c..ecf618f 100644
--- a/src/views/mes/baseDeviceType/index.vue
+++ b/src/views/mes/baseDeviceType/index.vue
@@ -88,8 +88,7 @@
 <!--        <el-form-item label="设备类型" prop="deviceTypeId">
           <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID" />
         </el-form-item>-->
-        <el-form-item label="父级标识" prop="parentId">
-<!--          <el-input v-model="form.parentId" placeholder="请输入父级标识" />-->
+<!--        <el-form-item label="父级标识" prop="parentId">
           <el-tree-select
             v-model="form.parentId"
             :data="baseOptions"
@@ -98,7 +97,7 @@
             placeholder="请选择父级标识"
             check-strictly
           />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="设备类型编号" prop="deviceTypeCode">
           <el-input v-model="form.deviceTypeCode" placeholder="请输入设备类型编号" />
         </el-form-item>
diff --git a/src/views/mes/baseMaterialType/index.vue b/src/views/mes/baseMaterialType/index.vue
index 1e15198..e49a6ef 100644
--- a/src/views/mes/baseMaterialType/index.vue
+++ b/src/views/mes/baseMaterialType/index.vue
@@ -206,7 +206,7 @@ type BaseMaterialTypeOption = {
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
 
-const { active_flag, mes_material_categories } = toRefs<any>(proxy?.useDict('active_flag', 'mes_material_categories'));
+const { active_flag   } = toRefs<any>(proxy?.useDict('active_flag'  ));
 
 const baseMaterialTypeList = ref<BaseMaterialTypeVO[]>([]);
 const baseMaterialTypeOptions = ref<BaseMaterialTypeOption[]>([]);
diff --git a/src/views/mes/baseMouldInfo/index.vue b/src/views/mes/baseMouldInfo/index.vue
index d171947..aae6e87 100644
--- a/src/views/mes/baseMouldInfo/index.vue
+++ b/src/views/mes/baseMouldInfo/index.vue
@@ -236,9 +236,9 @@ const data = reactive<PageData<BaseMouldInfoForm, BaseMouldInfoQuery>>({
     mouldName: [
       { required: true, message: '模具名称不能为空', trigger: 'blur' }
     ],
-    machineId: [
+/*    machineId: [
       { required: true, message: '机台名称不能为空', trigger: 'blur' }
-    ]
+    ]*/
   }
 });