diff --git a/src/views/mes/dvrepair/DvRepairForm.vue b/src/views/mes/dvrepair/DvRepairForm.vue
index 45b214d0..863e83d0 100644
--- a/src/views/mes/dvrepair/DvRepairForm.vue
+++ b/src/views/mes/dvrepair/DvRepairForm.vue
@@ -340,7 +340,43 @@ watch(
   }
 )
 const formRules = reactive({
-  repairCode: [{ required: true, message: t('EquipmentManagement.DvRepair.validatorRepairCodeRequired'), trigger: 'blur' }],
+  repairCode: [
+    {
+      validator: (_: any, value: any, callback: any) => {
+        if (formType.value === 'update') {
+          callback()
+          return
+        }
+        if (formData.value.isCode === true) {
+          callback()
+          return
+        }
+        if (value === undefined || value === null || String(value).trim() === '') {
+          callback(new Error(t('EquipmentManagement.DvRepair.validatorRepairCodeRequired')))
+          return
+        }
+        callback()
+      },
+      trigger: 'blur',
+    },
+  ],
+  deviceId: [{ required: true, message: t('EquipmentManagement.DvRepair.validatorMachineryIdRequired'), trigger: 'change' }],
+  componentId: [
+    {
+      validator: (_: any, value: any, callback: any) => {
+        if (formData.value.machineryTypeId !== 2) {
+          callback()
+          return
+        }
+        if (value === undefined || value === null || value === '') {
+          callback(new Error(t('EquipmentManagement.DvRepair.validatorComponentRequired')))
+          return
+        }
+        callback()
+      },
+      trigger: 'change',
+    },
+  ],
   machineryId: [{ required: true, message: t('EquipmentManagement.DvRepair.validatorMachineryIdRequired'), trigger: 'blur' }],
   machineryCode: [{ required: true, message: t('EquipmentManagement.DvRepair.validatorMachineryCodeRequired'), trigger: 'blur' }],
   machineryName: [{ required: true, message: t('EquipmentManagement.DvRepair.validatorMachineryNameRequired'), trigger: 'blur' }],
@@ -396,6 +432,16 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 
+watch(
+  () => formData.value.isCode,
+  (val) => {
+    if (val === true) {
+      formData.value.repairCode = undefined
+    }
+    formRef.value?.clearValidate?.(['repairCode'])
+  }
+)
+
 /** 子表的表单 */
 const subTabsName = ref('dvRepairLine')
 const dvRepairLineFormRef = ref()
diff --git a/src/views/mes/dvrepair/components/DvRepairLineForm.vue b/src/views/mes/dvrepair/components/DvRepairLineForm.vue
index a5f7accf..17bd2762 100644
--- a/src/views/mes/dvrepair/components/DvRepairLineForm.vue
+++ b/src/views/mes/dvrepair/components/DvRepairLineForm.vue
@@ -146,7 +146,7 @@ const formRules = reactive({
   repairId: [{ required: true, message: t('EquipmentManagement.DvRepair.validatorLineRepairIdRequired'), trigger: 'blur' }],
   subjectId: [{ required: true, message: t('EquipmentManagement.DvRepair.validatorLineSubjectIdRequired'), trigger: 'blur' }],
   subjectCode: [{ required: true, message: t('EquipmentManagement.DvRepair.validatorLineSubjectCodeRequired'), trigger: 'blur' }],
-  subjectContent: [{ required: true, message: t('EquipmentManagement.DvRepair.validatorLineSubjectContentRequired'), trigger: 'blur' }],
+  subjectContent: [],
   remark: [
     {
       validator: (_: any, value: any, callback: any) => {
diff --git a/src/views/mold/moldrepair/MoldRepairForm.vue b/src/views/mold/moldrepair/MoldRepairForm.vue
index 8699306a..13264125 100644
--- a/src/views/mold/moldrepair/MoldRepairForm.vue
+++ b/src/views/mold/moldrepair/MoldRepairForm.vue
@@ -273,8 +273,27 @@ watch(
   }
 )
 const formRules = reactive({
-  repairCode: [{ required: true, message: t('MoldManagement.MoldRepair.validatorRepairCodeRequired'), trigger: 'blur' }],
-  repairName: [{ required: true, message: t('MoldManagement.MoldRepair.validatorRepairNameRequired'), trigger: 'blur' }],
+  repairCode: [
+    {
+      validator: (_: any, value: any, callback: any) => {
+        if (formType.value === 'update') {
+          callback()
+          return
+        }
+        if (formData.value.isCode === true) {
+          callback()
+          return
+        }
+        if (value === undefined || value === null || String(value).trim() === '') {
+          callback(new Error(t('MoldManagement.MoldRepair.validatorRepairCodeRequired')))
+          return
+        }
+        callback()
+      },
+      trigger: 'blur',
+    },
+  ],
+  repairName: [],
   moldId: [{ required: true, message: t('MoldManagement.MoldRepair.validatorMoldRequired'), trigger: 'change' }],
   requireDate: [
     {
@@ -330,6 +349,16 @@ const formRef = ref()
 const subTabsName = ref('moldRepairLine')
 const moldRepairLineFormRef = ref()
 
+watch(
+  () => formData.value.isCode,
+  (val) => {
+    if (val === true) {
+      formData.value.repairCode = undefined
+    }
+    formRef.value?.clearValidate?.(['repairCode'])
+  }
+)
+
 const setLineRows = (rows: any[]) => {
   moldRepairLineFormRef.value?.setData(rows)
 }
diff --git a/src/views/mold/moldrepair/components/MoldRepairLineForm.vue b/src/views/mold/moldrepair/components/MoldRepairLineForm.vue
index fc1fb1ba..4af33d11 100644
--- a/src/views/mold/moldrepair/components/MoldRepairLineForm.vue
+++ b/src/views/mold/moldrepair/components/MoldRepairLineForm.vue
@@ -88,9 +88,9 @@ const formLoading = ref(false)
 const formData = ref([])
 const formRules = reactive({
   repairId: [{ required: true, message: t('MoldManagement.MoldRepairLine.validatorRepairIdRequired'), trigger: 'blur' }],
-  subjectId: [{ required: true, message: t('MoldManagement.MoldRepairLine.validatorSubjectIdRequired'), trigger: 'blur' }],
-  subjectCode: [{ required: true, message: t('MoldManagement.MoldRepairLine.validatorSubjectCodeRequired'), trigger: 'blur' }],
-  subjectContent: [{ required: true, message: t('MoldManagement.MoldRepairLine.validatorSubjectContentRequired'), trigger: 'blur' }],
+  subjectId: [],
+  subjectCode: [],
+  subjectContent: [],
   remark: [
     {
       validator: (_: any, value: any, callback: any) => {