From 52e9f0ef9e54c4e60e7f7f293bd6bb1e839b2313 Mon Sep 17 00:00:00 2001
From: zhongwenkai <3478244299@qq.com>
Date: Thu, 9 Jul 2026 14:22:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A8=A1=E5=85=B7=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E6=A8=A1=E6=96=B0=E5=A2=9E=E5=BC=B9=E6=A1=86=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=8E=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/moldoperate/MoldOperateForm.vue | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/views/mes/moldoperate/MoldOperateForm.vue b/src/views/mes/moldoperate/MoldOperateForm.vue
index 125e1ad9..4d0734b6 100644
--- a/src/views/mes/moldoperate/MoldOperateForm.vue
+++ b/src/views/mes/moldoperate/MoldOperateForm.vue
@@ -19,13 +19,12 @@
                   @click="openCriticalComponentDialog"   />
       </el-form-item>
       <el-form-item :label="t('MoldManagement.MoldOperate.productionLine')" prop="lineId" v-if="formData.operateType != null">
-        <el-input :model-value="displayLineName" readonly />
+        <el-input :model-value="displayLineName" disabled />
       </el-form-item>
       <!-- 上模：手动选择模具 -->
       <el-form-item
         :label="t('MoldManagement.MoldOperate.mold')"
         prop="moldId"
-        :required="String(formData.operateType) === '1'"
         v-if="formData.operateType == 1"
       >
         <el-input
@@ -37,7 +36,7 @@
       </el-form-item>
       <!-- 下模：自动带出该设备的在机模具 -->
       <el-form-item label="在机模具" v-if="formData.operateType == 2">
-        <el-input :model-value="currentDeviceMoldText" readonly />
+        <el-input :model-value="currentDeviceMoldText" disabled />
       </el-form-item>
       <el-form-item :label="t('MoldManagement.MoldOperate.operateTime')" prop="operateTime">
         <el-date-picker
@@ -215,26 +214,13 @@ const formData = ref<MoldOperateFormData>({
   remark: undefined,
 })
 
-const validateMoldId = (_rule: any, value: any, callback: (error?: Error) => void) => {
-  if (String(formData.value.operateType) !== '1') {
-    callback()
-    return
-  }
-  const hasValue = value !== undefined && value !== null && value !== ''
-  if (!hasValue) {
-    callback(new Error(t('MoldManagement.MoldOperate.validatorMoldRequired')))
-  } else {
-    callback()
-  }
-}
-
-const formRules = reactive({
+const formRules = computed(() => ({
   operateType: [{ required: true, message: t('MoldManagement.MoldOperate.validatorOperateTypeRequired'), trigger: 'blur' }],
   deviceId: [{ required: true, message: t('MoldManagement.MoldOperate.validatorDeviceRequired'), trigger: 'change' }],
-  moldId: [{ validator: validateMoldId, trigger: 'change' }],
+  moldId: [{ required: true, message: formType.value === 'create' ? '关联模具不能为空' : t('MoldManagement.MoldOperate.validatorMoldRequired'), trigger: 'change' }],
   operateTime: [{ required: true, message: t('MoldManagement.MoldOperate.validatorOperateTimeRequired'), trigger: 'blur' }],
   operatorId: [{ required: true, message: t('MoldManagement.MoldOperate.validatorOperatorRequired'), trigger: 'change' }],
-})
+}))
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
@@ -409,11 +395,13 @@ watch(
       return
     }
     formData.value.deviceId = undefined as any
+    formData.value.lineId = undefined as any
     formData.value.moldId = undefined as any
     ids.value = []
     moldIds.value = []
     selectedDeviceRows.value = []
     selectedMoldRows.value = []
+    displayTopCategory.value = ''
     if (!val) {
       return
     }
@@ -599,7 +587,9 @@ const handleDeviceSelectConfirm = async (payload: { ids: (number | string)[]; ro
   } else {
     selectedDeviceRows.value = []
     formData.value.deviceId = undefined
+    formData.value.lineId = undefined
     ids.value = []
+    displayTopCategory.value = ''
   }
   nextTick(() => {
     formRef.value?.clearValidate?.('deviceId')
@@ -792,8 +782,12 @@ const openCriticalComponentDialog = async () => {
 }
 
 const openMoldSelectDialog = () => {
-  searchMoldParams.code=''
-  searchMoldParams.name=''
+  if (!formData.value.deviceId) {
+    message.warning('请先选择设备')
+    return
+  }
+  searchMoldParams.code = ''
+  searchMoldParams.name = ''
   const rows = selectedMoldRows.value.map((item) => ({ ...item, id: Number(item.id) }))
   moldSelectDialogRef.value?.open(rows)
 }