diff --git a/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue b/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue
index f126f5db3..166514c50 100644
--- a/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue
+++ b/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue
@@ -38,6 +38,7 @@ const [Modal, modalApi] = useVbenModal({
     const data = (await formApi.getValues()) as MesCalHolidayApi.Holiday & { dayDisplay?: string };
     try {
       await saveHoliday({ day: data.day, type: data.type, remark: data.remark });
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       message.success('设置成功');
diff --git a/apps/web-antd/src/views/mes/cal/plan/modules/form.vue b/apps/web-antd/src/views/mes/cal/plan/modules/form.vue
index 7ddb19a7d..fb2202b4f 100644
--- a/apps/web-antd/src/views/mes/cal/plan/modules/form.vue
+++ b/apps/web-antd/src/views/mes/cal/plan/modules/form.vue
@@ -108,6 +108,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTabsName.value = 'shift';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -118,6 +119,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getPlan(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mes/cal/team/modules/form.vue b/apps/web-antd/src/views/mes/cal/team/modules/form.vue
index 7c1acd479..91860306b 100644
--- a/apps/web-antd/src/views/mes/cal/team/modules/form.vue
+++ b/apps/web-antd/src/views/mes/cal/team/modules/form.vue
@@ -84,6 +84,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTabsName.value = 'member';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -94,6 +95,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getTeam(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue b/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue
index 0daf5ff89..2c0e4eff6 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue
@@ -56,6 +56,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesDvCheckPlanApi.CheckPlan;
     try {
       if (formMode.value === 'create') {
@@ -80,6 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTabsName.value = 'machinery';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -90,6 +92,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getCheckPlan(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue b/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue
index 21bd5a9b2..0b63b10fb 100644
--- a/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue
@@ -78,6 +78,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesDvCheckRecordApi.CheckRecord;
     try {
       if (formMode.value === 'create') {
@@ -101,6 +102,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -111,6 +113,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getCheckRecord(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue b/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue
index 579b4cf0d..5860a6744 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue
@@ -73,6 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     const data = (await formApi.getValues()) as MesDvMachineryApi.Machinery;
     try {
       await (data.id ? updateMachinery(data) : createMachinery(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -87,6 +88,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTabsName.value = 'check';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -97,6 +99,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getMachinery(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mes/dv/machinery/modules/import-form.vue b/apps/web-antd/src/views/mes/dv/machinery/modules/import-form.vue
index ac76752e7..3e9b01e42 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/modules/import-form.vue
+++ b/apps/web-antd/src/views/mes/dv/machinery/modules/import-form.vue
@@ -45,6 +45,7 @@ const [Modal, modalApi] = useVbenModal({
       text += `更新成功数量：${importData.updateCodes?.length || 0}；`;
       text += `更新失败数量：${Object.keys(importData.failureCodes || {}).length}；`;
       message.info(text);
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
diff --git a/apps/web-antd/src/views/mes/dv/machinery/type/modules/form.vue b/apps/web-antd/src/views/mes/dv/machinery/type/modules/form.vue
index f03b58d80..ce3b2bc1b 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/type/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/machinery/type/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { MesDvMachineryTypeApi } from '#/api/mes/dv/machinery/type';
 
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -19,8 +19,8 @@ import { useFormSchema } from '../data';
 
 
 const emit = defineEmits(['success']);
-let formMode: 'create' | 'update' = 'create';
-const getTitle = computed(() => (formMode === 'create' ? '新增设备类型' : '修改设备类型'));
+const formMode = ref<'create' | 'update'>('create'); // 表单模式
+const getTitle = computed(() => (formMode.value === 'create' ? '新增设备类型' : '修改设备类型'));
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -62,7 +62,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     const data = modalApi.getData<{ id?: number; parentId?: number; type?: 'create' | 'update' }>();
-    formMode = data?.type || 'create';
+    formMode.value = data?.type || 'create';
     if (!data?.id) {
       await formApi.setValues({ parentId: data?.parentId ?? 0 });
       return;
diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue
index 86642de73..8fbfdd8e1 100644
--- a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue
@@ -81,6 +81,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesDvMaintenRecordApi.MaintenRecord;
     try {
       if (formMode.value === 'create') {
@@ -108,6 +109,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -119,6 +121,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getMaintenRecord(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mes/dv/repair/modules/form.vue b/apps/web-antd/src/views/mes/dv/repair/modules/form.vue
index 618cabdc4..2cb844f5f 100644
--- a/apps/web-antd/src/views/mes/dv/repair/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/repair/modules/form.vue
@@ -22,8 +22,10 @@ import { MesDvRepairResultEnum, MesDvRepairStatusEnum } from '#/views/mes/utils/
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
 
+type FormMode = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
+
 const emit = defineEmits(['success']);
-const formMode = ref<'confirm' | 'create' | 'detail' | 'finish' | 'update'>('create');
+const formMode = ref<FormMode>('create');
 const formData = ref<MesDvRepairApi.Repair>();
 const isDetail = computed(() => formMode.value === 'detail');
 const isReadonly = computed(() => ['confirm', 'detail', 'finish'].includes(formMode.value));
@@ -137,6 +139,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesDvRepairApi.Repair;
     try {
       if (formMode.value === 'create') {
@@ -160,7 +163,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
-    const data = modalApi.getData<{ id?: number; type?: 'confirm' | 'create' | 'detail' | 'finish' | 'update' }>();
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(isReadonly.value);
     modalApi.setState({ showConfirmButton: ['create', 'update'].includes(formMode.value) });
@@ -170,6 +174,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getRepair(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mes/dv/subject/modules/form.vue b/apps/web-antd/src/views/mes/dv/subject/modules/form.vue
index 6e2c5efd4..d69d77707 100644
--- a/apps/web-antd/src/views/mes/dv/subject/modules/form.vue
+++ b/apps/web-antd/src/views/mes/dv/subject/modules/form.vue
@@ -55,6 +55,7 @@ const [Modal, modalApi] = useVbenModal({
     const data = (await formApi.getValues()) as MesDvSubjectApi.Subject;
     try {
       await (data.id ? updateSubject(data) : createSubject(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -67,6 +68,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
diff --git a/apps/web-antd/src/views/mes/md/autocode/modules/form.vue b/apps/web-antd/src/views/mes/md/autocode/modules/form.vue
index b1ba5fdf2..04290bf51 100644
--- a/apps/web-antd/src/views/mes/md/autocode/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/autocode/modules/form.vue
@@ -55,6 +55,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = normalizeRuleData(
       (await formApi.getValues()) as MesMdAutoCodeRuleApi.AutoCodeRule,
     );
@@ -62,6 +63,7 @@ const [Modal, modalApi] = useVbenModal({
       await (formData.value?.id
         ? updateAutoCodeRule(data)
         : createAutoCodeRule(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -75,6 +77,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<MesMdAutoCodeRuleApi.AutoCodeRule>();
     if (!data?.id) {
       return;
@@ -82,6 +85,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getAutoCodeRule(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue b/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue
index 538f594cc..205a2125b 100644
--- a/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue
+++ b/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue
@@ -65,6 +65,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = normalizePartData(
       (await formApi.getValues()) as MesMdAutoCodePartApi.AutoCodePart,
     );
@@ -72,6 +73,7 @@ const [Modal, modalApi] = useVbenModal({
       await (formData.value?.id
         ? updateAutoCodePart(data)
         : createAutoCodePart(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -85,6 +87,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{
       id?: number;
       maxSort?: number;
@@ -100,6 +103,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getAutoCodePart(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue b/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue
index 345c02862..b7d155991 100644
--- a/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue
+++ b/apps/web-ele/src/views/mes/cal/holiday/modules/form.vue
@@ -38,6 +38,7 @@ const [Modal, modalApi] = useVbenModal({
     const data = (await formApi.getValues()) as MesCalHolidayApi.Holiday & { dayDisplay?: string };
     try {
       await saveHoliday({ day: data.day, type: data.type, remark: data.remark });
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       ElMessage.success('设置成功');
diff --git a/apps/web-ele/src/views/mes/cal/plan/modules/form.vue b/apps/web-ele/src/views/mes/cal/plan/modules/form.vue
index 2490cb04b..bc88a84a8 100644
--- a/apps/web-ele/src/views/mes/cal/plan/modules/form.vue
+++ b/apps/web-ele/src/views/mes/cal/plan/modules/form.vue
@@ -109,6 +109,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTabsName.value = 'shift';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -119,6 +120,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getPlan(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/cal/team/modules/form.vue b/apps/web-ele/src/views/mes/cal/team/modules/form.vue
index 3c6564055..8217bbae1 100644
--- a/apps/web-ele/src/views/mes/cal/team/modules/form.vue
+++ b/apps/web-ele/src/views/mes/cal/team/modules/form.vue
@@ -84,6 +84,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTabsName.value = 'member';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -94,6 +95,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getTeam(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue b/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue
index a265962f2..bd9d76e80 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/checkplan/modules/form.vue
@@ -56,6 +56,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesDvCheckPlanApi.CheckPlan;
     try {
       if (formMode.value === 'create') {
@@ -80,6 +81,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTabsName.value = 'machinery';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -90,6 +92,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getCheckPlan(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue b/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue
index 111ee858d..ec4f86bdc 100644
--- a/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/checkrecord/modules/form.vue
@@ -78,6 +78,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesDvCheckRecordApi.CheckRecord;
     try {
       if (formMode.value === 'create') {
@@ -101,6 +102,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -111,6 +113,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getCheckRecord(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue b/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue
index d86ffebc2..67cf156da 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/machinery/modules/form.vue
@@ -73,6 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     const data = (await formApi.getValues()) as MesDvMachineryApi.Machinery;
     try {
       await (data.id ? updateMachinery(data) : createMachinery(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
@@ -87,6 +88,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTabsName.value = 'check';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -97,6 +99,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getMachinery(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/dv/machinery/modules/import-form.vue b/apps/web-ele/src/views/mes/dv/machinery/modules/import-form.vue
index 110c9e582..52343051a 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/modules/import-form.vue
+++ b/apps/web-ele/src/views/mes/dv/machinery/modules/import-form.vue
@@ -45,6 +45,7 @@ const [Modal, modalApi] = useVbenModal({
       text += `更新成功数量：${importData.updateCodes?.length || 0}；`;
       text += `更新失败数量：${Object.keys(importData.failureCodes || {}).length}；`;
       ElMessage.info(text);
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
diff --git a/apps/web-ele/src/views/mes/dv/machinery/type/modules/form.vue b/apps/web-ele/src/views/mes/dv/machinery/type/modules/form.vue
index 59c466cb3..4426721c9 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/type/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/machinery/type/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { MesDvMachineryTypeApi } from '#/api/mes/dv/machinery/type';
 
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -19,8 +19,8 @@ import { useFormSchema } from '../data';
 
 
 const emit = defineEmits(['success']);
-let formMode: 'create' | 'update' = 'create';
-const getTitle = computed(() => (formMode === 'create' ? '新增设备类型' : '修改设备类型'));
+const formMode = ref<'create' | 'update'>('create'); // 表单模式
+const getTitle = computed(() => (formMode.value === 'create' ? '新增设备类型' : '修改设备类型'));
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -62,7 +62,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     const data = modalApi.getData<{ id?: number; parentId?: number; type?: 'create' | 'update' }>();
-    formMode = data?.type || 'create';
+    formMode.value = data?.type || 'create';
     if (!data?.id) {
       await formApi.setValues({ parentId: data?.parentId ?? 0 });
       return;
diff --git a/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue b/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue
index 60c96da23..596530b8b 100644
--- a/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/maintenrecord/modules/form.vue
@@ -81,6 +81,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesDvMaintenRecordApi.MaintenRecord;
     try {
       if (formMode.value === 'create') {
@@ -108,6 +109,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -119,6 +121,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getMaintenRecord(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/dv/repair/modules/form.vue b/apps/web-ele/src/views/mes/dv/repair/modules/form.vue
index c8f523eb1..81f5699aa 100644
--- a/apps/web-ele/src/views/mes/dv/repair/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/repair/modules/form.vue
@@ -22,8 +22,10 @@ import { MesDvRepairResultEnum, MesDvRepairStatusEnum } from '#/views/mes/utils/
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
 
+type FormMode = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
+
 const emit = defineEmits(['success']);
-const formMode = ref<'confirm' | 'create' | 'detail' | 'finish' | 'update'>('create');
+const formMode = ref<FormMode>('create');
 const formData = ref<MesDvRepairApi.Repair>();
 const isDetail = computed(() => formMode.value === 'detail');
 const isReadonly = computed(() => ['confirm', 'detail', 'finish'].includes(formMode.value));
@@ -137,6 +139,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesDvRepairApi.Repair;
     try {
       if (formMode.value === 'create') {
@@ -160,7 +163,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
-    const data = modalApi.getData<{ id?: number; type?: 'confirm' | 'create' | 'detail' | 'finish' | 'update' }>();
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(isReadonly.value);
     modalApi.setState({ showConfirmButton: ['create', 'update'].includes(formMode.value) });
@@ -170,6 +174,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getRepair(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/dv/subject/modules/form.vue b/apps/web-ele/src/views/mes/dv/subject/modules/form.vue
index 84c00ebff..5987d5cfd 100644
--- a/apps/web-ele/src/views/mes/dv/subject/modules/form.vue
+++ b/apps/web-ele/src/views/mes/dv/subject/modules/form.vue
@@ -55,6 +55,7 @@ const [Modal, modalApi] = useVbenModal({
     const data = (await formApi.getValues()) as MesDvSubjectApi.Subject;
     try {
       await (data.id ? updateSubject(data) : createSubject(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
@@ -67,6 +68,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type || 'create';
     formApi.setDisabled(formMode.value === 'detail');
diff --git a/apps/web-ele/src/views/mes/md/autocode/modules/form.vue b/apps/web-ele/src/views/mes/md/autocode/modules/form.vue
index e99f2b3ee..a87d7b7ec 100644
--- a/apps/web-ele/src/views/mes/md/autocode/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/autocode/modules/form.vue
@@ -55,6 +55,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = normalizeRuleData(
       (await formApi.getValues()) as MesMdAutoCodeRuleApi.AutoCodeRule,
     );
@@ -62,6 +63,7 @@ const [Modal, modalApi] = useVbenModal({
       await (formData.value?.id
         ? updateAutoCodeRule(data)
         : createAutoCodeRule(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
@@ -75,6 +77,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<MesMdAutoCodeRuleApi.AutoCodeRule>();
     if (!data?.id) {
       return;
@@ -82,6 +85,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getAutoCodeRule(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue b/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue
index 87da800ba..ee839560a 100644
--- a/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue
+++ b/apps/web-ele/src/views/mes/md/autocode/modules/part-form.vue
@@ -65,6 +65,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = normalizePartData(
       (await formApi.getValues()) as MesMdAutoCodePartApi.AutoCodePart,
     );
@@ -72,6 +73,7 @@ const [Modal, modalApi] = useVbenModal({
       await (formData.value?.id
         ? updateAutoCodePart(data)
         : createAutoCodePart(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
@@ -85,6 +87,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{
       id?: number;
       maxSort?: number;
@@ -100,6 +103,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getAutoCodePart(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();