From 01a1d3e0014764ad1395825506f2e3d112d0b5f5 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 25 May 2026 09:09:14 +0800
Subject: [PATCH 01/17] =?UTF-8?q?feat(mes)=EF=BC=9A=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=AE=9A=E4=B9=89=EF=BC=88pro=5Fprocess?=
 =?UTF-8?q?=EF=BC=89=E3=80=81=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF=EF=BC=88?=
 =?UTF-8?q?pro=5Froute=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/pro/process/content/index.ts  |  49 +++
 apps/web-antd/src/api/mes/pro/route/index.ts  |  65 ++++
 .../src/api/mes/pro/route/process/index.ts    |  70 ++++
 .../src/api/mes/pro/route/product/index.ts    |  48 +++
 .../src/api/mes/pro/route/productbom/index.ts |  57 +++
 .../src/views/mes/pro/process/data.ts         | 272 ++++++++++++++
 .../src/views/mes/pro/process/index.vue       | 158 ++++++++
 .../mes/pro/process/modules/content-form.vue  |  99 +++++
 .../mes/pro/process/modules/content-list.vue  | 132 +++++++
 .../views/mes/pro/process/modules/form.vue    | 117 ++++++
 apps/web-antd/src/views/mes/pro/route/data.ts | 335 +++++++++++++++++
 .../src/views/mes/pro/route/index.vue         | 198 ++++++++++
 .../src/views/mes/pro/route/modules/form.vue  | 122 ++++++
 .../mes/pro/route/modules/process-form.vue    | 113 ++++++
 .../mes/pro/route/modules/process-list.vue    | 133 +++++++
 .../pro/route/modules/product-bom-list.vue    | 265 +++++++++++++
 .../mes/pro/route/modules/product-form.vue    | 193 ++++++++++
 .../mes/pro/route/modules/product-list.vue    | 128 +++++++
 .../src/api/mes/pro/process/content/index.ts  |  49 +++
 apps/web-ele/src/api/mes/pro/route/index.ts   |  65 ++++
 .../src/api/mes/pro/route/process/index.ts    |  70 ++++
 .../src/api/mes/pro/route/product/index.ts    |  48 +++
 .../src/api/mes/pro/route/productbom/index.ts |  57 +++
 .../web-ele/src/views/mes/pro/process/data.ts | 271 ++++++++++++++
 .../src/views/mes/pro/process/index.vue       | 160 ++++++++
 .../mes/pro/process/modules/content-form.vue  |  99 +++++
 .../mes/pro/process/modules/content-list.vue  | 133 +++++++
 .../views/mes/pro/process/modules/form.vue    | 117 ++++++
 apps/web-ele/src/views/mes/pro/route/data.ts  | 350 ++++++++++++++++++
 .../web-ele/src/views/mes/pro/route/index.vue | 195 ++++++++++
 .../src/views/mes/pro/route/modules/form.vue  | 118 ++++++
 .../mes/pro/route/modules/process-form.vue    | 112 ++++++
 .../mes/pro/route/modules/process-list.vue    | 136 +++++++
 .../pro/route/modules/product-bom-list.vue    | 278 ++++++++++++++
 .../mes/pro/route/modules/product-form.vue    | 198 ++++++++++
 .../mes/pro/route/modules/product-list.vue    | 131 +++++++
 36 files changed, 5141 insertions(+)
 create mode 100644 apps/web-antd/src/api/mes/pro/process/content/index.ts
 create mode 100644 apps/web-antd/src/api/mes/pro/route/index.ts
 create mode 100644 apps/web-antd/src/api/mes/pro/route/process/index.ts
 create mode 100644 apps/web-antd/src/api/mes/pro/route/product/index.ts
 create mode 100644 apps/web-antd/src/api/mes/pro/route/productbom/index.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/process/data.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/process/index.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/process/modules/content-form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/process/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/route/data.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/route/index.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/route/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
 create mode 100644 apps/web-ele/src/api/mes/pro/process/content/index.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/route/index.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/route/process/index.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/route/product/index.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/route/productbom/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/process/data.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/process/index.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/process/modules/content-form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/process/modules/content-list.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/process/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/route/data.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/route/index.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/route/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/route/modules/process-form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/route/modules/process-list.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/route/modules/product-bom-list.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/route/modules/product-form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/route/modules/product-list.vue

diff --git a/apps/web-antd/src/api/mes/pro/process/content/index.ts b/apps/web-antd/src/api/mes/pro/process/content/index.ts
new file mode 100644
index 000000000..8a4c15e59
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/process/content/index.ts
@@ -0,0 +1,49 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProProcessContentApi {
+  /** MES 生产工序内容（操作步骤） */
+  export interface ProcessContent {
+    id?: number;
+    processId?: number;
+    sort?: number;
+    content?: string;
+    device?: string;
+    material?: string;
+    docUrl?: string;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 按工序编号查询工序内容列表 */
+export function getProcessContentListByProcessId(processId: number) {
+  return requestClient.get<MesProProcessContentApi.ProcessContent[]>(
+    `/mes/pro/process-content/list-by-process?processId=${processId}`,
+  );
+}
+
+/** 查询工序内容详情 */
+export function getProcessContent(id: number) {
+  return requestClient.get<MesProProcessContentApi.ProcessContent>(
+    `/mes/pro/process-content/get?id=${id}`,
+  );
+}
+
+/** 新增工序内容 */
+export function createProcessContent(
+  data: MesProProcessContentApi.ProcessContent,
+) {
+  return requestClient.post('/mes/pro/process-content/create', data);
+}
+
+/** 修改工序内容 */
+export function updateProcessContent(
+  data: MesProProcessContentApi.ProcessContent,
+) {
+  return requestClient.put('/mes/pro/process-content/update', data);
+}
+
+/** 删除工序内容 */
+export function deleteProcessContent(id: number) {
+  return requestClient.delete(`/mes/pro/process-content/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/pro/route/index.ts b/apps/web-antd/src/api/mes/pro/route/index.ts
new file mode 100644
index 000000000..56baff6b5
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/route/index.ts
@@ -0,0 +1,65 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProRouteApi {
+  /** MES 工艺路线 */
+  export interface Route {
+    id?: number;
+    code?: string;
+    name?: string;
+    description?: string;
+    status?: number;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 查询工艺路线分页 */
+export function getRoutePage(params: PageParam) {
+  return requestClient.get<PageResult<MesProRouteApi.Route>>(
+    '/mes/pro/route/page',
+    { params },
+  );
+}
+
+/** 查询工艺路线精简列表 */
+export function getRouteSimpleList() {
+  return requestClient.get<MesProRouteApi.Route[]>(
+    '/mes/pro/route/simple-list',
+  );
+}
+
+/** 查询工艺路线详情 */
+export function getRoute(id: number) {
+  return requestClient.get<MesProRouteApi.Route>(
+    `/mes/pro/route/get?id=${id}`,
+  );
+}
+
+/** 新增工艺路线 */
+export function createRoute(data: MesProRouteApi.Route) {
+  return requestClient.post<number>('/mes/pro/route/create', data);
+}
+
+/** 修改工艺路线 */
+export function updateRoute(data: MesProRouteApi.Route) {
+  return requestClient.put('/mes/pro/route/update', data);
+}
+
+/** 修改工艺路线状态 */
+export function updateRouteStatus(id: number, status: number) {
+  return requestClient.put(
+    `/mes/pro/route/update-status?id=${id}&status=${status}`,
+  );
+}
+
+/** 删除工艺路线 */
+export function deleteRoute(id: number) {
+  return requestClient.delete(`/mes/pro/route/delete?id=${id}`);
+}
+
+/** 导出工艺路线 Excel */
+export function exportRoute(params: any) {
+  return requestClient.download('/mes/pro/route/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/pro/route/process/index.ts b/apps/web-antd/src/api/mes/pro/route/process/index.ts
new file mode 100644
index 000000000..fee0ce9c4
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/route/process/index.ts
@@ -0,0 +1,70 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProRouteProcessApi {
+  /** MES 工艺路线工序 */
+  export interface RouteProcess {
+    id?: number;
+    routeId?: number;
+    processId?: number;
+    processCode?: string;
+    processName?: string;
+    sort?: number;
+    nextProcessId?: number;
+    nextProcessName?: string;
+    linkType?: number;
+    prepareTime?: number;
+    waitTime?: number;
+    colorCode?: string;
+    keyFlag?: boolean;
+    checkFlag?: boolean;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 按工艺路线查询工序列表 */
+export function getRouteProcessListByRoute(routeId: number) {
+  return requestClient.get<MesProRouteProcessApi.RouteProcess[]>(
+    `/mes/pro/route-process/list-by-route?routeId=${routeId}`,
+  );
+}
+
+/** 按产品查询工序列表（自动查找关联的工艺路线） */
+export function getRouteProcessListByProduct(productId: number) {
+  return requestClient.get<MesProRouteProcessApi.RouteProcess[]>(
+    `/mes/pro/route-process/list-by-product?productId=${productId}`,
+  );
+}
+
+/** 查询工艺路线工序详情 */
+export function getRouteProcess(id: number) {
+  return requestClient.get<MesProRouteProcessApi.RouteProcess>(
+    `/mes/pro/route-process/get?id=${id}`,
+  );
+}
+
+/** 按工艺路线 + 工序精确查询工序配置 */
+export function getRouteProcessByRouteAndProcess(
+  routeId: number,
+  processId: number,
+) {
+  return requestClient.get<MesProRouteProcessApi.RouteProcess>(
+    '/mes/pro/route-process/get-by-route-and-process',
+    { params: { processId, routeId } },
+  );
+}
+
+/** 新增工艺路线工序 */
+export function createRouteProcess(data: MesProRouteProcessApi.RouteProcess) {
+  return requestClient.post('/mes/pro/route-process/create', data);
+}
+
+/** 修改工艺路线工序 */
+export function updateRouteProcess(data: MesProRouteProcessApi.RouteProcess) {
+  return requestClient.put('/mes/pro/route-process/update', data);
+}
+
+/** 删除工艺路线工序 */
+export function deleteRouteProcess(id: number) {
+  return requestClient.delete(`/mes/pro/route-process/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/pro/route/product/index.ts b/apps/web-antd/src/api/mes/pro/route/product/index.ts
new file mode 100644
index 000000000..2312f688c
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/route/product/index.ts
@@ -0,0 +1,48 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProRouteProductApi {
+  /** MES 工艺路线产品 */
+  export interface RouteProduct {
+    id?: number;
+    routeId?: number;
+    itemId?: number;
+    itemCode?: string;
+    itemName?: string;
+    specification?: string;
+    unitName?: string;
+    quantity?: number;
+    productionTime?: number;
+    timeUnitType?: string;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 按工艺路线查询产品列表 */
+export function getRouteProductListByRoute(routeId: number) {
+  return requestClient.get<MesProRouteProductApi.RouteProduct[]>(
+    `/mes/pro/route-product/list-by-route?routeId=${routeId}`,
+  );
+}
+
+/** 查询工艺路线产品详情 */
+export function getRouteProduct(id: number) {
+  return requestClient.get<MesProRouteProductApi.RouteProduct>(
+    `/mes/pro/route-product/get?id=${id}`,
+  );
+}
+
+/** 新增工艺路线产品 */
+export function createRouteProduct(data: MesProRouteProductApi.RouteProduct) {
+  return requestClient.post<number>('/mes/pro/route-product/create', data);
+}
+
+/** 修改工艺路线产品 */
+export function updateRouteProduct(data: MesProRouteProductApi.RouteProduct) {
+  return requestClient.put('/mes/pro/route-product/update', data);
+}
+
+/** 删除工艺路线产品 */
+export function deleteRouteProduct(id: number) {
+  return requestClient.delete(`/mes/pro/route-product/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/pro/route/productbom/index.ts b/apps/web-antd/src/api/mes/pro/route/productbom/index.ts
new file mode 100644
index 000000000..7cfcbcc85
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/route/productbom/index.ts
@@ -0,0 +1,57 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProRouteProductBomApi {
+  /** MES 工艺路线产品 BOM */
+  export interface RouteProductBom {
+    id?: number;
+    routeId?: number;
+    processId?: number;
+    productId?: number;
+    itemId?: number;
+    itemCode?: string;
+    itemName?: string;
+    specification?: string;
+    unitName?: string;
+    quantity?: number;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 查询工艺路线产品 BOM 列表 */
+export function getRouteProductBomList(params: {
+  processId?: number;
+  productId?: number;
+  routeId: number;
+}) {
+  return requestClient.get<MesProRouteProductBomApi.RouteProductBom[]>(
+    '/mes/pro/route-product-bom/list',
+    { params },
+  );
+}
+
+/** 查询工艺路线产品 BOM 详情 */
+export function getRouteProductBom(id: number) {
+  return requestClient.get<MesProRouteProductBomApi.RouteProductBom>(
+    `/mes/pro/route-product-bom/get?id=${id}`,
+  );
+}
+
+/** 新增工艺路线产品 BOM */
+export function createRouteProductBom(
+  data: MesProRouteProductBomApi.RouteProductBom,
+) {
+  return requestClient.post('/mes/pro/route-product-bom/create', data);
+}
+
+/** 修改工艺路线产品 BOM */
+export function updateRouteProductBom(
+  data: MesProRouteProductBomApi.RouteProductBom,
+) {
+  return requestClient.put('/mes/pro/route-product-bom/update', data);
+}
+
+/** 删除工艺路线产品 BOM */
+export function deleteRouteProductBom(id: number) {
+  return requestClient.delete(`/mes/pro/route-product-bom/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/views/mes/pro/process/data.ts b/apps/web-antd/src/views/mes/pro/process/data.ts
new file mode 100644
index 000000000..ff8089acd
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/process/data.ts
@@ -0,0 +1,272 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProProcessApi } from '#/api/mes/pro/process';
+import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
+
+import { h } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 新增/修改生产工序的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '工序编码',
+      component: 'Input',
+      componentProps: {
+        maxLength: 64,
+        placeholder: '请输入工序编码',
+      },
+      rules: z.string().min(1, '工序编码不能为空').max(64),
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.PRO_PROCESS_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '工序名称',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入工序名称',
+      },
+      rules: z.string().min(1, '工序名称不能为空').max(100),
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'RadioGroup',
+      componentProps: {
+        buttonStyle: 'solid',
+        optionType: 'button',
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'attention',
+      label: '工序说明',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        maxLength: 500,
+        placeholder: '请输入工序说明',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        maxLength: 250,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工序编码',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入工序编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工序名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入工序名称',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProProcessApi.Process>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '工序编码',
+      minWidth: 150,
+      slots: {
+        default: 'code',
+      },
+    },
+    { field: 'name', title: '工序名称', minWidth: 180 },
+    {
+      field: 'status',
+      title: '状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    { field: 'remark', title: '备注', minWidth: 180 },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 150,
+      fixed: 'right',
+      slots: {
+        default: 'actions',
+      },
+    },
+  ];
+}
+
+/** 工序内容（操作步骤）表单 */
+export function useContentFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'processId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sort',
+      label: '序号',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        max: 999,
+        min: 1,
+        precision: 0,
+      },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'content',
+      label: '步骤说明',
+      component: 'Textarea',
+      componentProps: {
+        maxLength: 500,
+        placeholder: '请输入步骤说明',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'device',
+      label: '辅助设备',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入辅助设备',
+      },
+    },
+    {
+      fieldName: 'material',
+      label: '辅助材料',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入辅助材料',
+      },
+    },
+    {
+      fieldName: 'docUrl',
+      label: '材料文档 URL',
+      component: 'Input',
+      componentProps: {
+        maxLength: 250,
+        placeholder: '请输入材料文档 URL',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        maxLength: 250,
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 工序内容列表的字段 */
+export function useContentGridColumns(): VxeTableGridOptions<MesProProcessContentApi.ProcessContent>['columns'] {
+  return [
+    { field: 'sort', title: '序号', width: 80, align: 'center' },
+    { field: 'content', title: '步骤说明', minWidth: 220 },
+    { field: 'device', title: '辅助设备', width: 150 },
+    { field: 'material', title: '辅助材料', width: 150 },
+    { field: 'docUrl', title: '材料文档', minWidth: 180 },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/pro/process/index.vue b/apps/web-antd/src/views/mes/pro/process/index.vue
new file mode 100644
index 000000000..dcd291410
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/process/index.vue
@@ -0,0 +1,158 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProProcessApi } from '#/api/mes/pro/process';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteProcess,
+  exportProcess,
+  getProcessPage,
+} from '#/api/mes/pro/process';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建生产工序 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑生产工序 */
+function handleEdit(row: MesProProcessApi.Process) {
+  formModalApi.setData({ id: row.id, type: 'update' }).open();
+}
+
+/** 查看生产工序详情 */
+function handleDetail(row: MesProProcessApi.Process) {
+  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+}
+
+/** 删除生产工序 */
+async function handleDelete(row: MesProProcessApi.Process) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteProcess(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出生产工序 */
+async function handleExport() {
+  const data = await exportProcess(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产工序.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getProcessPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProProcessApi.Process>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】工序设置、工艺流程"
+        url="https://doc.iocoder.cn/mes/pro/process-route/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="生产工序列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['工序']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-process:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-process:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">{{ row.code }}</Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:pro-process:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:pro-process:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/content-form.vue b/apps/web-antd/src/views/mes/pro/process/modules/content-form.vue
new file mode 100644
index 000000000..eb4270b25
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/process/modules/content-form.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup>
+import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProcessContent,
+  getProcessContent,
+  updateProcessContent,
+} from '#/api/mes/pro/process/content';
+import { $t } from '#/locales';
+
+import { useContentFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProProcessContentApi.ProcessContent>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['工序步骤'])
+    : $t('ui.actionTitle.create', ['工序步骤']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useContentFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProProcessContentApi.ProcessContent;
+    try {
+      await (formData.value?.id
+        ? updateProcessContent(data)
+        : createProcessContent(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      maxSort?: number;
+      processId: number;
+    }>();
+    if (!data?.id) {
+      // 新增时，默认序号 = maxSort + 1
+      await formApi.setValues({
+        processId: data?.processId,
+        sort: (data?.maxSort || 0) + 1,
+      });
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProcessContent(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue b/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
new file mode 100644
index 000000000..b54968069
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
@@ -0,0 +1,132 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
+
+import { ref, watch } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteProcessContent,
+  getProcessContentListByProcessId,
+} from '#/api/mes/pro/process/content';
+import { $t } from '#/locales';
+
+import { useContentGridColumns } from '../data';
+import ContentForm from './content-form.vue';
+
+const props = defineProps<{
+  processId: number;
+  readonly?: boolean;
+}>();
+
+const list = ref<MesProProcessContentApi.ProcessContent[]>([]);
+
+const [ContentFormModal, contentFormModalApi] = useVbenModal({
+  connectedComponent: ContentForm,
+  destroyOnClose: true,
+});
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useContentGridColumns(),
+    data: list.value,
+    minHeight: 240,
+    pagerConfig: { enabled: false },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProProcessContentApi.ProcessContent>,
+});
+
+/** 加载工序内容列表 */
+async function getList() {
+  gridApi.setLoading(true);
+  try {
+    list.value = await getProcessContentListByProcessId(props.processId);
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+/** 新增工序步骤 */
+function handleCreate() {
+  const maxSort =
+    list.value.length > 0
+      ? Math.max(...list.value.map((item) => item.sort || 0))
+      : 0;
+  contentFormModalApi
+    .setData({ maxSort, processId: props.processId })
+    .open();
+}
+
+/** 编辑工序步骤 */
+function handleEdit(row: MesProProcessContentApi.ProcessContent) {
+  contentFormModalApi.setData({ id: row.id, processId: props.processId }).open();
+}
+
+/** 删除工序步骤 */
+async function handleDelete(row: MesProProcessContentApi.ProcessContent) {
+  await deleteProcessContent(row.id!);
+  message.success($t('ui.actionMessage.deleteSuccess', ['工序步骤']));
+  await getList();
+}
+
+watch(
+  () => props.processId,
+  (value) => {
+    if (value) {
+      getList();
+    }
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <ContentFormModal @success="getList" />
+  <div v-if="!readonly" class="mb-3 flex items-center justify-start">
+    <TableAction
+      :actions="[
+        {
+          label: $t('ui.actionTitle.create', ['步骤']),
+          type: 'primary',
+          onClick: handleCreate,
+        },
+      ]"
+    />
+  </div>
+  <Grid class="w-full" table-title="工序操作步骤">
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: $t('common.edit'),
+            type: 'link',
+            ifShow: () => !readonly,
+            onClick: handleEdit.bind(null, row),
+          },
+          {
+            label: $t('common.delete'),
+            type: 'link',
+            danger: true,
+            ifShow: () => !readonly,
+            popConfirm: {
+              title: $t('ui.actionMessage.deleteConfirm', ['工序步骤']),
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/form.vue b/apps/web-antd/src/views/mes/pro/process/modules/form.vue
new file mode 100644
index 000000000..247ec05a7
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/process/modules/form.vue
@@ -0,0 +1,117 @@
+<script lang="ts" setup>
+import type { MesProProcessApi } from '#/api/mes/pro/process';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Divider, message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProcess,
+  getProcess,
+  updateProcess,
+} from '#/api/mes/pro/process';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+import ContentList from './content-list.vue';
+
+type FormMode = 'create' | 'detail' | 'update';
+
+const emit = defineEmits(['success']);
+const formMode = ref<FormMode>('create'); // 表单模式
+const formData = ref<MesProProcessApi.Process>(); // 当前编辑/查看的工序数据
+
+const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const getTitle = computed(() => {
+  if (formMode.value === 'detail') {
+    return $t('ui.actionTitle.detail', ['生产工序']);
+  }
+  return formMode.value === 'update'
+    ? $t('ui.actionTitle.edit', ['生产工序'])
+    : $t('ui.actionTitle.create', ['生产工序']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-3',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesProProcessApi.Process;
+    try {
+      await (formData.value?.id ? updateProcess(data) : createProcess(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
+    formMode.value = data?.type ?? 'create';
+    formApi.setDisabled(formMode.value === 'detail');
+    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProcess(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+/** 用于工序内容子表的工序编号 */
+const processId = computed(() => formData.value?.id);
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 编辑/详情模式下展示工序操作步骤子表，新增模式下隐藏 -->
+    <template v-if="processId">
+      <Divider class="!my-3" orientation="left">操作步骤</Divider>
+      <div class="mx-4">
+        <ContentList :process-id="processId" :readonly="isDetail" />
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/route/data.ts b/apps/web-antd/src/views/mes/pro/route/data.ts
new file mode 100644
index 000000000..f7565ce9f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/data.ts
@@ -0,0 +1,335 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteApi } from '#/api/mes/pro/route';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 工艺路线表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'code',
+      label: '路线编码',
+      component: 'Input',
+      componentProps: {
+        maxLength: 64,
+        placeholder: '请输入工艺路线编码',
+      },
+      rules: z.string().min(1, '路线编码不能为空').max(64),
+      suffix: () =>
+        h(
+          Button,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.PRO_ROUTE_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '路线名称',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入工艺路线名称',
+      },
+      rules: z.string().min(1, '路线名称不能为空').max(100),
+    },
+    {
+      fieldName: 'description',
+      label: '路线说明',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        maxLength: 500,
+        placeholder: '请输入工艺路线说明',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        maxLength: 250,
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 列表搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '路线编码',
+      component: 'Input',
+      componentProps: { allowClear: true, placeholder: '请输入路线编码' },
+    },
+    {
+      fieldName: 'name',
+      label: '路线名称',
+      component: 'Input',
+      componentProps: { allowClear: true, placeholder: '请输入路线名称' },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+  ];
+}
+
+/** 列表字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProRouteApi.Route>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '路线编码',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    { field: 'name', title: '路线名称', minWidth: 180 },
+    { field: 'description', title: '路线说明', minWidth: 200 },
+    {
+      field: 'status',
+      title: '状态',
+      width: 110,
+      slots: { default: 'status' },
+    },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工艺路线工序明细表单 */
+export function useRouteProcessFormSchema(
+  processOptions: Array<{ label: string; value: number }>,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'routeId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'sort',
+      label: '序号',
+      component: 'InputNumber',
+      componentProps: { class: '!w-full', min: 1, precision: 0 },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'processId',
+      label: '工序',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: processOptions,
+        placeholder: '请选择工序',
+        showSearch: true,
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'linkType',
+      label: '与下道工序关系',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_LINK_TYPE, 'number'),
+        placeholder: '请选择',
+      },
+      rules: z.number().default(3),
+    },
+    {
+      fieldName: 'colorCode',
+      label: '甘特图颜色',
+      component: 'Input',
+      componentProps: {
+        maxLength: 16,
+        placeholder: '请输入颜色 hex，例如 #00AEF3',
+      },
+    },
+    {
+      fieldName: 'keyFlag',
+      label: '是否关键工序',
+      component: 'Switch',
+      componentProps: { checkedChildren: '是', unCheckedChildren: '否' },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'checkFlag',
+      label: '是否质检确认',
+      component: 'Switch',
+      componentProps: { checkedChildren: '是', unCheckedChildren: '否' },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'prepareTime',
+      label: '准备时间(分)',
+      component: 'InputNumber',
+      componentProps: { class: '!w-full', min: 0, precision: 0 },
+      rules: z.number().default(0),
+    },
+    {
+      fieldName: 'waitTime',
+      label: '等待时间(分)',
+      component: 'InputNumber',
+      componentProps: { class: '!w-full', min: 0, precision: 0 },
+      rules: z.number().default(0),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: { maxLength: 250, placeholder: '请输入备注', rows: 2 },
+    },
+  ];
+}
+
+/** 工艺路线工序列表字段 */
+export function useRouteProcessGridColumns(): VxeTableGridOptions<MesProRouteProcessApi.RouteProcess>['columns'] {
+  return [
+    { field: 'sort', title: '序号', width: 70, align: 'center', fixed: 'left' },
+    { field: 'processCode', title: '工序编码', width: 140, fixed: 'left' },
+    { field: 'processName', title: '工序名称', width: 140, fixed: 'left' },
+    { field: 'nextProcessName', title: '下一道工序', width: 140 },
+    {
+      field: 'linkType',
+      title: '与下一道工序关系',
+      width: 160,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_LINK_TYPE },
+      },
+    },
+    {
+      field: 'keyFlag',
+      title: '关键工序',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'checkFlag',
+      title: '质检确认',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    { field: 'prepareTime', title: '准备时间(分)', width: 110 },
+    { field: 'waitTime', title: '等待时间(分)', width: 110 },
+    {
+      field: 'colorCode',
+      title: '甘特图颜色',
+      width: 130,
+      slots: { default: 'colorCode' },
+    },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工艺路线产品列表字段 */
+export function useRouteProductGridColumns(): VxeTableGridOptions<MesProRouteProductApi.RouteProduct>['columns'] {
+  return [
+    { field: 'itemCode', title: '产品物料编码', width: 150 },
+    { field: 'itemName', title: '产品物料名称', width: 150 },
+    { field: 'specification', title: '规格型号', width: 150 },
+    { field: 'unitName', title: '单位', width: 80 },
+    { field: 'quantity', title: '生产数量', width: 100 },
+    {
+      field: 'productionTime',
+      title: '生产用时',
+      width: 130,
+      slots: { default: 'productionTime' },
+    },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工艺路线产品 BOM 列表字段 */
+export function useRouteProductBomGridColumns(): VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>['columns'] {
+  return [
+    { field: 'itemCode', title: 'BOM 物料编码', width: 150 },
+    { field: 'itemName', title: 'BOM 物料名称', width: 150 },
+    { field: 'specification', title: '规格型号', width: 150 },
+    { field: 'unitName', title: '单位', width: 80 },
+    { field: 'quantity', title: '用料比例', width: 100 },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/pro/route/index.vue b/apps/web-antd/src/views/mes/pro/route/index.vue
new file mode 100644
index 000000000..cdfc72f71
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/index.vue
@@ -0,0 +1,198 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteApi } from '#/api/mes/pro/route';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { CommonStatusEnum } from '@vben/constants';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message, Modal, Switch, Tooltip } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteRoute,
+  exportRoute,
+  getRoutePage,
+  updateRouteStatus,
+} from '#/api/mes/pro/route';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建工艺路线 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑工艺路线（仅停用状态可编辑） */
+function handleEdit(row: MesProRouteApi.Route) {
+  formModalApi.setData({ id: row.id, type: 'update' }).open();
+}
+
+/** 详情查看 */
+function handleDetail(row: MesProRouteApi.Route) {
+  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+}
+
+/** 切换状态 */
+async function handleStatusChange(row: MesProRouteApi.Route, value: number) {
+  const text = value === CommonStatusEnum.ENABLE ? '启用' : '停用';
+  const previousStatus = row.status;
+  Modal.confirm({
+    title: `确认要"${text}""${row.name}"工艺路线吗？`,
+    onOk: async () => {
+      await updateRouteStatus(row.id!, value);
+      message.success($t('ui.actionMessage.operationSuccess'));
+      handleRefresh();
+    },
+    onCancel: () => {
+      // 用户取消时回滚开关状态
+      row.status = previousStatus;
+    },
+  });
+}
+
+/** 删除（仅停用状态可删除） */
+async function handleDelete(row: MesProRouteApi.Route) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteRoute(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出 */
+async function handleExport() {
+  const data = await exportRoute(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '工艺路线.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getRoutePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
+    toolbarConfig: { refresh: true, search: true },
+  } as VxeTableGridOptions<MesProRouteApi.Route>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】工序设置、工艺流程"
+        url="https://doc.iocoder.cn/mes/pro/process-route/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="工艺路线列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['工艺路线']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-route:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-route:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">{{ row.code }}</Button>
+      </template>
+      <template #status="{ row }">
+        <Switch
+          :checked="row.status === CommonStatusEnum.ENABLE"
+          checked-children="启用"
+          un-checked-children="停用"
+          @change="
+            (checked: boolean | number | string) =>
+              handleStatusChange(
+                row,
+                checked ? CommonStatusEnum.ENABLE : CommonStatusEnum.DISABLE,
+              )
+          "
+        />
+      </template>
+      <template #actions="{ row }">
+        <Tooltip
+          :open="row.status === CommonStatusEnum.DISABLE ? false : undefined"
+          title="仅停用状态，才可以操作"
+        >
+          <span class="inline-block">
+            <TableAction
+              :actions="[
+                {
+                  label: $t('common.edit'),
+                  type: 'link',
+                  icon: ACTION_ICON.EDIT,
+                  auth: ['mes:pro-route:update'],
+                  disabled: row.status !== CommonStatusEnum.DISABLE,
+                  onClick: handleEdit.bind(null, row),
+                },
+                {
+                  label: $t('common.delete'),
+                  type: 'link',
+                  danger: true,
+                  icon: ACTION_ICON.DELETE,
+                  auth: ['mes:pro-route:delete'],
+                  disabled: row.status !== CommonStatusEnum.DISABLE,
+                  popConfirm: {
+                    title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                    confirm: handleDelete.bind(null, row),
+                  },
+                },
+              ]"
+            />
+          </span>
+        </Tooltip>
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/form.vue b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
new file mode 100644
index 000000000..baf0d7921
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
@@ -0,0 +1,122 @@
+<script lang="ts" setup>
+import type { MesProRouteApi } from '#/api/mes/pro/route';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message, TabPane, Tabs } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createRoute,
+  getRoute,
+  updateRoute,
+} from '#/api/mes/pro/route';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+import ProcessList from './process-list.vue';
+import ProductList from './product-list.vue';
+
+type FormMode = 'create' | 'detail' | 'update';
+
+const emit = defineEmits(['success']);
+const formMode = ref<FormMode>('create');
+const subTab = ref('process');
+const formData = ref<MesProRouteApi.Route>();
+
+const isDetail = computed(() => formMode.value === 'detail');
+const getTitle = computed(() => {
+  if (formMode.value === 'detail') {
+    return $t('ui.actionTitle.detail', ['工艺路线']);
+  }
+  return formMode.value === 'update'
+    ? $t('ui.actionTitle.edit', ['工艺路线'])
+    : $t('ui.actionTitle.create', ['工艺路线']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    const data = (await formApi.getValues()) as MesProRouteApi.Route;
+    try {
+      if (formMode.value === 'create') {
+        const id = await createRoute(data);
+        formData.value = { ...data, id };
+        await formApi.setFieldValue('id', id);
+        formMode.value = 'update';
+      } else {
+        await updateRoute(data);
+        formData.value = { ...formData.value, ...data };
+      }
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    subTab.value = 'process';
+    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
+    formMode.value = data?.type ?? 'create';
+    formApi.setDisabled(formMode.value === 'detail');
+    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getRoute(data.id);
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <Tabs
+      v-if="formMode !== 'create' && formData?.id"
+      v-model:active-key="subTab"
+      class="mx-4 mt-4"
+    >
+      <TabPane key="process" tab="组成工序">
+        <ProcessList :form-mode="formMode" :route-id="formData.id" />
+      </TabPane>
+      <TabPane key="product" tab="关联产品">
+        <ProductList :form-mode="formMode" :route-id="formData.id" />
+      </TabPane>
+    </Tabs>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
new file mode 100644
index 000000000..5b1411c9b
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
@@ -0,0 +1,113 @@
+<script lang="ts" setup>
+import type { VbenFormSchema } from '#/adapter/form';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { getProcessSimpleList } from '#/api/mes/pro/process';
+import {
+  createRouteProcess,
+  updateRouteProcess,
+} from '#/api/mes/pro/route/process';
+import { $t } from '#/locales';
+
+import { useRouteProcessFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProRouteProcessApi.RouteProcess>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['工艺路线工序'])
+    : $t('ui.actionTitle.create', ['工艺路线工序']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-1',
+    labelWidth: 130,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+/** 加载工序选项后再生成 schema（避免下拉空选项） */
+async function loadSchema(): Promise<VbenFormSchema[]> {
+  const list = await getProcessSimpleList();
+  const options = (list || []).map((item) => ({
+    label: item.name ?? '',
+    value: item.id!,
+  }));
+  return useRouteProcessFormSchema(options);
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    const data =
+      (await formApi.getValues()) as MesProRouteProcessApi.RouteProcess;
+    try {
+      await (formData.value?.id
+        ? updateRouteProcess(data)
+        : createRouteProcess(data));
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    modalApi.lock();
+    try {
+      const schema = await loadSchema();
+      formApi.setState({ schema });
+      await formApi.resetForm();
+    } finally {
+      modalApi.unlock();
+    }
+    const data = modalApi.getData<{
+      id?: number;
+      maxSort?: number;
+      routeId: number;
+      row?: MesProRouteProcessApi.RouteProcess;
+    }>();
+    if (!data) {
+      return;
+    }
+    if (!data.id) {
+      await formApi.setValues({
+        colorCode: '#00AEF3',
+        routeId: data.routeId,
+        sort: (data.maxSort || 0) + 1,
+      });
+      return;
+    }
+    if (data.row) {
+      formData.value = data.row;
+      await formApi.setValues(data.row);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
new file mode 100644
index 000000000..31b2dad8c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
@@ -0,0 +1,133 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+
+import { ref, watch } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteRouteProcess,
+  getRouteProcessListByRoute,
+} from '#/api/mes/pro/route/process';
+import { $t } from '#/locales';
+
+import { useRouteProcessGridColumns } from '../data';
+import ProcessForm from './process-form.vue';
+
+const props = defineProps<{
+  formMode: 'create' | 'detail' | 'update';
+  routeId: number;
+}>();
+
+const isEditable = ref(props.formMode !== 'detail');
+const list = ref<MesProRouteProcessApi.RouteProcess[]>([]);
+
+const [ProcessFormModal, processFormModalApi] = useVbenModal({
+  connectedComponent: ProcessForm,
+  destroyOnClose: true,
+});
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useRouteProcessGridColumns(),
+    data: list.value,
+    minHeight: 240,
+    pagerConfig: { enabled: false },
+    rowConfig: { isHover: true, keyField: 'id' },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProRouteProcessApi.RouteProcess>,
+});
+
+async function getList() {
+  gridApi.setLoading(true);
+  try {
+    list.value = await getRouteProcessListByRoute(props.routeId);
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+function handleCreate() {
+  const maxSort =
+    list.value.length > 0
+      ? Math.max(...list.value.map((item) => item.sort || 0))
+      : 0;
+  processFormModalApi.setData({ maxSort, routeId: props.routeId }).open();
+}
+
+function handleEdit(row: MesProRouteProcessApi.RouteProcess) {
+  processFormModalApi.setData({ id: row.id, routeId: props.routeId, row }).open();
+}
+
+async function handleDelete(row: MesProRouteProcessApi.RouteProcess) {
+  await deleteRouteProcess(row.id!);
+  message.success($t('ui.actionMessage.deleteSuccess', ['工艺路线工序']));
+  await getList();
+}
+
+watch(
+  () => props.routeId,
+  (value) => {
+    if (value) {
+      getList();
+    }
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <ProcessFormModal @success="getList" />
+  <div v-if="isEditable" class="mb-3 flex items-center justify-start">
+    <TableAction
+      :actions="[
+        {
+          label: $t('ui.actionTitle.create', ['工序']),
+          type: 'primary',
+          onClick: handleCreate,
+        },
+      ]"
+    />
+  </div>
+  <Grid class="w-full" table-title="组成工序">
+    <template #colorCode="{ row }">
+      <div v-if="row.colorCode" class="flex items-center justify-center gap-1">
+        <div
+          class="h-4 w-4 rounded"
+          :style="{ backgroundColor: row.colorCode }"
+        ></div>
+        <span>{{ row.colorCode }}</span>
+      </div>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: $t('common.edit'),
+            type: 'link',
+            ifShow: () => isEditable,
+            onClick: handleEdit.bind(null, row),
+          },
+          {
+            label: $t('common.delete'),
+            type: 'link',
+            danger: true,
+            ifShow: () => isEditable,
+            popConfirm: {
+              title: $t('ui.actionMessage.deleteConfirm', ['工艺路线工序']),
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue
new file mode 100644
index 000000000..e9f66f9b5
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue
@@ -0,0 +1,265 @@
+<script lang="ts" setup>
+import type { FormInstance } from 'ant-design-vue';
+
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { computed, reactive, ref, watch } from 'vue';
+
+import {
+  Form as AForm,
+  FormItem,
+  InputNumber,
+  message,
+  Modal,
+  TabPane,
+  Tabs,
+  Textarea,
+} from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getRouteProcessListByRoute } from '#/api/mes/pro/route/process';
+import {
+  createRouteProductBom,
+  deleteRouteProductBom,
+  getRouteProductBomList,
+  updateRouteProductBom,
+} from '#/api/mes/pro/route/productbom';
+import { $t } from '#/locales';
+import { MdProductBomSelect } from '#/views/mes/md/item/components';
+
+import { useRouteProductBomGridColumns } from '../data';
+
+const props = defineProps<{
+  productId: number;
+  productName?: string;
+  routeId: number;
+}>();
+
+const processOptions = ref<
+  Array<{ processId: number; processName?: string }>
+>([]);
+const activeProcessId = ref<string>('');
+const list = ref<MesProRouteProductBomApi.RouteProductBom[]>([]);
+
+const formVisible = ref(false);
+const formRef = ref<FormInstance>();
+const isUpdate = ref(false);
+const formData = reactive<MesProRouteProductBomApi.RouteProductBom>({
+  quantity: 1,
+});
+const formRules = {
+  itemId: [{ message: 'BOM 物料不能为空', required: true }],
+  quantity: [{ message: '用料比例不能为空', required: true }],
+};
+const formTitle = computed(() =>
+  isUpdate.value
+    ? $t('ui.actionTitle.edit', ['BOM 物料'])
+    : $t('ui.actionTitle.create', ['BOM 物料']),
+);
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useRouteProductBomGridColumns(),
+    data: list.value,
+    minHeight: 200,
+    pagerConfig: { enabled: false },
+    rowConfig: { isHover: true, keyField: 'id' },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>,
+});
+
+async function loadProcessList() {
+  const data = await getRouteProcessListByRoute(props.routeId);
+  processOptions.value = (data || []).map((item) => ({
+    processId: item.processId!,
+    processName: item.processName,
+  }));
+  if (processOptions.value.length > 0) {
+    activeProcessId.value = String(processOptions.value[0]!.processId);
+    await getList();
+  } else {
+    activeProcessId.value = '';
+    list.value = [];
+    gridApi.setGridOptions({ data: list.value });
+  }
+}
+
+async function getList() {
+  if (!activeProcessId.value) {
+    return;
+  }
+  gridApi.setLoading(true);
+  try {
+    list.value = await getRouteProductBomList({
+      processId: Number(activeProcessId.value),
+      productId: props.productId,
+      routeId: props.routeId,
+    });
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+function resetForm() {
+  Object.assign(formData, {
+    id: undefined,
+    itemCode: undefined,
+    itemId: undefined,
+    itemName: undefined,
+    processId: Number(activeProcessId.value),
+    productId: props.productId,
+    quantity: 1,
+    remark: undefined,
+    routeId: props.routeId,
+    specification: undefined,
+    unitName: undefined,
+  });
+  formRef.value?.clearValidate();
+}
+
+function handleCreate() {
+  if (!activeProcessId.value) {
+    message.warning('请先选择工序');
+    return;
+  }
+  resetForm();
+  isUpdate.value = false;
+  formVisible.value = true;
+}
+
+function handleEdit(row: MesProRouteProductBomApi.RouteProductBom) {
+  Object.assign(formData, row);
+  isUpdate.value = true;
+  formVisible.value = true;
+}
+
+async function handleDelete(row: MesProRouteProductBomApi.RouteProductBom) {
+  await deleteRouteProductBom(row.id!);
+  message.success($t('ui.actionMessage.deleteSuccess', ['BOM 物料']));
+  await getList();
+}
+
+async function submitForm() {
+  try {
+    await formRef.value?.validate();
+  } catch {
+    return;
+  }
+  await (isUpdate.value
+    ? updateRouteProductBom(formData)
+    : createRouteProductBom(formData));
+  message.success($t('ui.actionMessage.operationSuccess'));
+  formVisible.value = false;
+  await getList();
+}
+
+/** BOM 选中后回填用量比例 */
+function handleBomChange(bom?: any) {
+  if (bom) {
+    formData.quantity = bom.quantity ?? 1;
+    formData.itemCode = bom.bomItemCode;
+    formData.itemName = bom.bomItemName;
+    formData.specification = bom.specification;
+    formData.unitName = bom.unitName;
+  }
+}
+
+watch(
+  () => [props.routeId, props.productId],
+  () => {
+    if (props.routeId && props.productId) {
+      loadProcessList();
+    }
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <Tabs v-model:active-key="activeProcessId" @change="getList">
+    <TabPane
+      v-for="item in processOptions"
+      :key="String(item.processId)"
+      :tab="item.processName"
+    />
+  </Tabs>
+  <div class="mb-3 flex items-center justify-start">
+    <TableAction
+      :actions="[
+        {
+          label: $t('ui.actionTitle.create', ['BOM 物料']),
+          type: 'primary',
+          disabled: !activeProcessId,
+          onClick: handleCreate,
+        },
+      ]"
+    />
+  </div>
+  <Grid class="w-full" table-title="产品 BOM">
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: $t('common.edit'),
+            type: 'link',
+            onClick: handleEdit.bind(null, row),
+          },
+          {
+            label: $t('common.delete'),
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: $t('ui.actionMessage.deleteConfirm', ['BOM 物料']),
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+
+  <Modal
+    v-model:open="formVisible"
+    :title="formTitle"
+    width="500px"
+    @ok="submitForm"
+  >
+    <AForm
+      ref="formRef"
+      :label-col="{ span: 6 }"
+      :wrapper-col="{ span: 16 }"
+      :model="formData"
+      :rules="formRules"
+    >
+      <FormItem label="BOM 物料" name="itemId">
+        <MdProductBomSelect
+          v-model="formData.itemId"
+          :item-id="productId"
+          placeholder="请选择 BOM 物料"
+          @change="handleBomChange"
+        />
+      </FormItem>
+      <FormItem label="用料比例" name="quantity">
+        <InputNumber
+          v-model:value="formData.quantity"
+          class="!w-full"
+          :min="0"
+          :precision="2"
+        />
+      </FormItem>
+      <FormItem label="备注" name="remark">
+        <Textarea
+          v-model:value="formData.remark"
+          :max-length="250"
+          placeholder="请输入备注"
+          :rows="2"
+        />
+      </FormItem>
+    </AForm>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
new file mode 100644
index 000000000..a9a2fbe4d
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
@@ -0,0 +1,193 @@
+<script lang="ts" setup>
+import type { FormInstance } from 'ant-design-vue';
+
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+
+import { computed, reactive, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import {
+  Form as AForm,
+  Divider,
+  FormItem,
+  InputNumber,
+  message,
+  Select,
+  Textarea,
+} from 'ant-design-vue';
+
+import {
+  createRouteProduct,
+  updateRouteProduct,
+} from '#/api/mes/pro/route/product';
+import { $t } from '#/locales';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+
+import ProductBomList from './product-bom-list.vue';
+
+const emit = defineEmits(['success']);
+const isUpdate = ref(false);
+const formRef = ref<FormInstance>();
+const formData = reactive<MesProRouteProductApi.RouteProduct>({
+  productionTime: 1,
+  quantity: 1,
+  timeUnitType: 'MINUTE',
+});
+const formRules = {
+  itemId: [{ message: '产品不能为空', required: true }],
+  quantity: [{ message: '生产数量不能为空', required: true }],
+};
+const timeUnitOptions = computed(() =>
+  getDictOptions(DICT_TYPE.MES_TIME_UNIT_TYPE).map((item) => ({
+    label: item.label,
+    value: item.value as string,
+  })),
+);
+const getTitle = computed(() =>
+  isUpdate.value
+    ? $t('ui.actionTitle.edit', ['工艺路线产品'])
+    : $t('ui.actionTitle.create', ['工艺路线产品']),
+);
+
+/** 重置表单数据 */
+function resetForm(routeId?: number) {
+  Object.assign(formData, {
+    id: undefined,
+    itemCode: undefined,
+    itemId: undefined,
+    itemName: undefined,
+    productionTime: 1,
+    quantity: 1,
+    remark: undefined,
+    routeId: routeId ?? formData.routeId,
+    specification: undefined,
+    timeUnitType: 'MINUTE',
+    unitName: undefined,
+  });
+  formRef.value?.clearValidate();
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    try {
+      await formRef.value?.validate();
+    } catch {
+      return;
+    }
+    modalApi.lock();
+    try {
+      if (isUpdate.value) {
+        await updateRouteProduct(formData);
+      } else {
+        const id = await createRouteProduct(formData);
+        formData.id = id;
+        isUpdate.value = true;
+      }
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      resetForm();
+      isUpdate.value = false;
+      return;
+    }
+    const data = modalApi.getData<{
+      id?: number;
+      routeId: number;
+      row?: MesProRouteProductApi.RouteProduct;
+    }>();
+    if (!data) {
+      return;
+    }
+    if (data.row) {
+      Object.assign(formData, data.row);
+      isUpdate.value = true;
+    } else {
+      resetForm(data.routeId);
+      isUpdate.value = false;
+    }
+  },
+});
+
+/** 物料编号变化时回填名称等 */
+function handleItemChange(item?: any) {
+  if (!item) {
+    return;
+  }
+  formData.itemCode = item.code;
+  formData.itemName = item.name;
+  formData.specification = item.specification;
+  formData.unitName = item.unitName;
+}
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <AForm
+      ref="formRef"
+      class="mx-4"
+      :label-col="{ flex: '0 0 110px' }"
+      :wrapper-col="{ flex: 'auto' }"
+      :model="formData"
+      :rules="formRules"
+    >
+      <div class="grid grid-cols-2 gap-x-4">
+        <FormItem class="col-span-2" label="产品" name="itemId">
+          <MdItemSelect
+            v-model="formData.itemId"
+            @change="handleItemChange"
+          />
+        </FormItem>
+        <FormItem label="生产数量" name="quantity">
+          <InputNumber
+            v-model:value="formData.quantity"
+            class="!w-full"
+            :min="1"
+            :precision="0"
+          />
+        </FormItem>
+        <FormItem label="生产用时" name="productionTime">
+          <InputNumber
+            v-model:value="formData.productionTime"
+            class="!w-full"
+            :min="0"
+            :precision="2"
+          />
+        </FormItem>
+        <FormItem label="时间单位" name="timeUnitType">
+          <Select
+            v-model:value="formData.timeUnitType"
+            allow-clear
+            :options="timeUnitOptions"
+            placeholder="请选择"
+          />
+        </FormItem>
+        <FormItem class="col-span-2" label="备注" name="remark">
+          <Textarea
+            v-model:value="formData.remark"
+            :max-length="250"
+            placeholder="请输入备注"
+            :rows="2"
+          />
+        </FormItem>
+      </div>
+    </AForm>
+    <template v-if="isUpdate && formData.id && formData.itemId">
+      <Divider class="!my-3" orientation="left">产品 BOM 配置</Divider>
+      <div class="mx-4">
+        <ProductBomList
+          :route-id="formData.routeId!"
+          :product-id="formData.itemId"
+          :product-name="formData.itemName"
+        />
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
new file mode 100644
index 000000000..e88f5f15c
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
@@ -0,0 +1,128 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+
+import { ref, watch } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
+
+import { message } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteRouteProduct,
+  getRouteProductListByRoute,
+} from '#/api/mes/pro/route/product';
+import { $t } from '#/locales';
+
+import { useRouteProductGridColumns } from '../data';
+import ProductForm from './product-form.vue';
+
+const props = defineProps<{
+  formMode: 'create' | 'detail' | 'update';
+  routeId: number;
+}>();
+
+const isEditable = ref(props.formMode !== 'detail');
+const list = ref<MesProRouteProductApi.RouteProduct[]>([]);
+
+const [ProductFormModal, productFormModalApi] = useVbenModal({
+  connectedComponent: ProductForm,
+  destroyOnClose: true,
+});
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useRouteProductGridColumns(),
+    data: list.value,
+    minHeight: 240,
+    pagerConfig: { enabled: false },
+    rowConfig: { isHover: true, keyField: 'id' },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProRouteProductApi.RouteProduct>,
+});
+
+async function getList() {
+  gridApi.setLoading(true);
+  try {
+    list.value = await getRouteProductListByRoute(props.routeId);
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+function handleCreate() {
+  productFormModalApi.setData({ routeId: props.routeId }).open();
+}
+
+function handleEdit(row: MesProRouteProductApi.RouteProduct) {
+  productFormModalApi.setData({ id: row.id, routeId: props.routeId, row }).open();
+}
+
+async function handleDelete(row: MesProRouteProductApi.RouteProduct) {
+  await deleteRouteProduct(row.id!);
+  message.success($t('ui.actionMessage.deleteSuccess', ['工艺路线产品']));
+  await getList();
+}
+
+watch(
+  () => props.routeId,
+  (value) => {
+    if (value) {
+      getList();
+    }
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <ProductFormModal @success="getList" />
+  <div v-if="isEditable" class="mb-3 flex items-center justify-start">
+    <TableAction
+      :actions="[
+        {
+          label: $t('ui.actionTitle.create', ['关联产品']),
+          type: 'primary',
+          onClick: handleCreate,
+        },
+      ]"
+    />
+  </div>
+  <Grid class="w-full" table-title="关联产品">
+    <template #productionTime="{ row }">
+      <span v-if="row.productionTime">
+        {{ row.productionTime }}
+        {{ getDictLabel(DICT_TYPE.MES_TIME_UNIT_TYPE, row.timeUnitType) }}
+      </span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: $t('common.edit'),
+            type: 'link',
+            ifShow: () => isEditable,
+            onClick: handleEdit.bind(null, row),
+          },
+          {
+            label: $t('common.delete'),
+            type: 'link',
+            danger: true,
+            ifShow: () => isEditable,
+            popConfirm: {
+              title: $t('ui.actionMessage.deleteConfirm', ['工艺路线产品']),
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
diff --git a/apps/web-ele/src/api/mes/pro/process/content/index.ts b/apps/web-ele/src/api/mes/pro/process/content/index.ts
new file mode 100644
index 000000000..8a4c15e59
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/process/content/index.ts
@@ -0,0 +1,49 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProProcessContentApi {
+  /** MES 生产工序内容（操作步骤） */
+  export interface ProcessContent {
+    id?: number;
+    processId?: number;
+    sort?: number;
+    content?: string;
+    device?: string;
+    material?: string;
+    docUrl?: string;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 按工序编号查询工序内容列表 */
+export function getProcessContentListByProcessId(processId: number) {
+  return requestClient.get<MesProProcessContentApi.ProcessContent[]>(
+    `/mes/pro/process-content/list-by-process?processId=${processId}`,
+  );
+}
+
+/** 查询工序内容详情 */
+export function getProcessContent(id: number) {
+  return requestClient.get<MesProProcessContentApi.ProcessContent>(
+    `/mes/pro/process-content/get?id=${id}`,
+  );
+}
+
+/** 新增工序内容 */
+export function createProcessContent(
+  data: MesProProcessContentApi.ProcessContent,
+) {
+  return requestClient.post('/mes/pro/process-content/create', data);
+}
+
+/** 修改工序内容 */
+export function updateProcessContent(
+  data: MesProProcessContentApi.ProcessContent,
+) {
+  return requestClient.put('/mes/pro/process-content/update', data);
+}
+
+/** 删除工序内容 */
+export function deleteProcessContent(id: number) {
+  return requestClient.delete(`/mes/pro/process-content/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/pro/route/index.ts b/apps/web-ele/src/api/mes/pro/route/index.ts
new file mode 100644
index 000000000..56baff6b5
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/route/index.ts
@@ -0,0 +1,65 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProRouteApi {
+  /** MES 工艺路线 */
+  export interface Route {
+    id?: number;
+    code?: string;
+    name?: string;
+    description?: string;
+    status?: number;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 查询工艺路线分页 */
+export function getRoutePage(params: PageParam) {
+  return requestClient.get<PageResult<MesProRouteApi.Route>>(
+    '/mes/pro/route/page',
+    { params },
+  );
+}
+
+/** 查询工艺路线精简列表 */
+export function getRouteSimpleList() {
+  return requestClient.get<MesProRouteApi.Route[]>(
+    '/mes/pro/route/simple-list',
+  );
+}
+
+/** 查询工艺路线详情 */
+export function getRoute(id: number) {
+  return requestClient.get<MesProRouteApi.Route>(
+    `/mes/pro/route/get?id=${id}`,
+  );
+}
+
+/** 新增工艺路线 */
+export function createRoute(data: MesProRouteApi.Route) {
+  return requestClient.post<number>('/mes/pro/route/create', data);
+}
+
+/** 修改工艺路线 */
+export function updateRoute(data: MesProRouteApi.Route) {
+  return requestClient.put('/mes/pro/route/update', data);
+}
+
+/** 修改工艺路线状态 */
+export function updateRouteStatus(id: number, status: number) {
+  return requestClient.put(
+    `/mes/pro/route/update-status?id=${id}&status=${status}`,
+  );
+}
+
+/** 删除工艺路线 */
+export function deleteRoute(id: number) {
+  return requestClient.delete(`/mes/pro/route/delete?id=${id}`);
+}
+
+/** 导出工艺路线 Excel */
+export function exportRoute(params: any) {
+  return requestClient.download('/mes/pro/route/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/pro/route/process/index.ts b/apps/web-ele/src/api/mes/pro/route/process/index.ts
new file mode 100644
index 000000000..fee0ce9c4
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/route/process/index.ts
@@ -0,0 +1,70 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProRouteProcessApi {
+  /** MES 工艺路线工序 */
+  export interface RouteProcess {
+    id?: number;
+    routeId?: number;
+    processId?: number;
+    processCode?: string;
+    processName?: string;
+    sort?: number;
+    nextProcessId?: number;
+    nextProcessName?: string;
+    linkType?: number;
+    prepareTime?: number;
+    waitTime?: number;
+    colorCode?: string;
+    keyFlag?: boolean;
+    checkFlag?: boolean;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 按工艺路线查询工序列表 */
+export function getRouteProcessListByRoute(routeId: number) {
+  return requestClient.get<MesProRouteProcessApi.RouteProcess[]>(
+    `/mes/pro/route-process/list-by-route?routeId=${routeId}`,
+  );
+}
+
+/** 按产品查询工序列表（自动查找关联的工艺路线） */
+export function getRouteProcessListByProduct(productId: number) {
+  return requestClient.get<MesProRouteProcessApi.RouteProcess[]>(
+    `/mes/pro/route-process/list-by-product?productId=${productId}`,
+  );
+}
+
+/** 查询工艺路线工序详情 */
+export function getRouteProcess(id: number) {
+  return requestClient.get<MesProRouteProcessApi.RouteProcess>(
+    `/mes/pro/route-process/get?id=${id}`,
+  );
+}
+
+/** 按工艺路线 + 工序精确查询工序配置 */
+export function getRouteProcessByRouteAndProcess(
+  routeId: number,
+  processId: number,
+) {
+  return requestClient.get<MesProRouteProcessApi.RouteProcess>(
+    '/mes/pro/route-process/get-by-route-and-process',
+    { params: { processId, routeId } },
+  );
+}
+
+/** 新增工艺路线工序 */
+export function createRouteProcess(data: MesProRouteProcessApi.RouteProcess) {
+  return requestClient.post('/mes/pro/route-process/create', data);
+}
+
+/** 修改工艺路线工序 */
+export function updateRouteProcess(data: MesProRouteProcessApi.RouteProcess) {
+  return requestClient.put('/mes/pro/route-process/update', data);
+}
+
+/** 删除工艺路线工序 */
+export function deleteRouteProcess(id: number) {
+  return requestClient.delete(`/mes/pro/route-process/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/pro/route/product/index.ts b/apps/web-ele/src/api/mes/pro/route/product/index.ts
new file mode 100644
index 000000000..2312f688c
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/route/product/index.ts
@@ -0,0 +1,48 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProRouteProductApi {
+  /** MES 工艺路线产品 */
+  export interface RouteProduct {
+    id?: number;
+    routeId?: number;
+    itemId?: number;
+    itemCode?: string;
+    itemName?: string;
+    specification?: string;
+    unitName?: string;
+    quantity?: number;
+    productionTime?: number;
+    timeUnitType?: string;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 按工艺路线查询产品列表 */
+export function getRouteProductListByRoute(routeId: number) {
+  return requestClient.get<MesProRouteProductApi.RouteProduct[]>(
+    `/mes/pro/route-product/list-by-route?routeId=${routeId}`,
+  );
+}
+
+/** 查询工艺路线产品详情 */
+export function getRouteProduct(id: number) {
+  return requestClient.get<MesProRouteProductApi.RouteProduct>(
+    `/mes/pro/route-product/get?id=${id}`,
+  );
+}
+
+/** 新增工艺路线产品 */
+export function createRouteProduct(data: MesProRouteProductApi.RouteProduct) {
+  return requestClient.post<number>('/mes/pro/route-product/create', data);
+}
+
+/** 修改工艺路线产品 */
+export function updateRouteProduct(data: MesProRouteProductApi.RouteProduct) {
+  return requestClient.put('/mes/pro/route-product/update', data);
+}
+
+/** 删除工艺路线产品 */
+export function deleteRouteProduct(id: number) {
+  return requestClient.delete(`/mes/pro/route-product/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/pro/route/productbom/index.ts b/apps/web-ele/src/api/mes/pro/route/productbom/index.ts
new file mode 100644
index 000000000..7cfcbcc85
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/route/productbom/index.ts
@@ -0,0 +1,57 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProRouteProductBomApi {
+  /** MES 工艺路线产品 BOM */
+  export interface RouteProductBom {
+    id?: number;
+    routeId?: number;
+    processId?: number;
+    productId?: number;
+    itemId?: number;
+    itemCode?: string;
+    itemName?: string;
+    specification?: string;
+    unitName?: string;
+    quantity?: number;
+    remark?: string;
+    createTime?: Date;
+  }
+}
+
+/** 查询工艺路线产品 BOM 列表 */
+export function getRouteProductBomList(params: {
+  processId?: number;
+  productId?: number;
+  routeId: number;
+}) {
+  return requestClient.get<MesProRouteProductBomApi.RouteProductBom[]>(
+    '/mes/pro/route-product-bom/list',
+    { params },
+  );
+}
+
+/** 查询工艺路线产品 BOM 详情 */
+export function getRouteProductBom(id: number) {
+  return requestClient.get<MesProRouteProductBomApi.RouteProductBom>(
+    `/mes/pro/route-product-bom/get?id=${id}`,
+  );
+}
+
+/** 新增工艺路线产品 BOM */
+export function createRouteProductBom(
+  data: MesProRouteProductBomApi.RouteProductBom,
+) {
+  return requestClient.post('/mes/pro/route-product-bom/create', data);
+}
+
+/** 修改工艺路线产品 BOM */
+export function updateRouteProductBom(
+  data: MesProRouteProductBomApi.RouteProductBom,
+) {
+  return requestClient.put('/mes/pro/route-product-bom/update', data);
+}
+
+/** 删除工艺路线产品 BOM */
+export function deleteRouteProductBom(id: number) {
+  return requestClient.delete(`/mes/pro/route-product-bom/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/views/mes/pro/process/data.ts b/apps/web-ele/src/views/mes/pro/process/data.ts
new file mode 100644
index 000000000..3d21cb071
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/process/data.ts
@@ -0,0 +1,271 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProProcessApi } from '#/api/mes/pro/process';
+import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
+
+import { h } from 'vue';
+
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 新增/修改生产工序的表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '工序编码',
+      component: 'Input',
+      componentProps: {
+        maxLength: 64,
+        placeholder: '请输入工序编码',
+      },
+      rules: z.string().min(1, '工序编码不能为空').max(64),
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.PRO_PROCESS_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '工序名称',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入工序名称',
+      },
+      rules: z.string().min(1, '工序名称不能为空').max(100),
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'attention',
+      label: '工序说明',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        maxLength: 500,
+        placeholder: '请输入工序说明',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        maxLength: 250,
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '工序编码',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入工序编码',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '工序名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入工序名称',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProProcessApi.Process>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '工序编码',
+      minWidth: 150,
+      slots: {
+        default: 'code',
+      },
+    },
+    { field: 'name', title: '工序名称', minWidth: 180 },
+    {
+      field: 'status',
+      title: '状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    { field: 'remark', title: '备注', minWidth: 180 },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 150,
+      fixed: 'right',
+      slots: {
+        default: 'actions',
+      },
+    },
+  ];
+}
+
+/** 工序内容（操作步骤）表单 */
+export function useContentFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'processId',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sort',
+      label: '序号',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        max: 999,
+        min: 1,
+        precision: 0,
+      },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'content',
+      label: '步骤说明',
+      component: 'Textarea',
+      componentProps: {
+        maxLength: 500,
+        placeholder: '请输入步骤说明',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'device',
+      label: '辅助设备',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入辅助设备',
+      },
+    },
+    {
+      fieldName: 'material',
+      label: '辅助材料',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入辅助材料',
+      },
+    },
+    {
+      fieldName: 'docUrl',
+      label: '材料文档 URL',
+      component: 'Input',
+      componentProps: {
+        maxLength: 250,
+        placeholder: '请输入材料文档 URL',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        maxLength: 250,
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 工序内容列表的字段 */
+export function useContentGridColumns(): VxeTableGridOptions<MesProProcessContentApi.ProcessContent>['columns'] {
+  return [
+    { field: 'sort', title: '序号', width: 80, align: 'center' },
+    { field: 'content', title: '步骤说明', minWidth: 220 },
+    { field: 'device', title: '辅助设备', width: 150 },
+    { field: 'material', title: '辅助材料', width: 150 },
+    { field: 'docUrl', title: '材料文档', minWidth: 180 },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/pro/process/index.vue b/apps/web-ele/src/views/mes/pro/process/index.vue
new file mode 100644
index 000000000..26bb42cf6
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/process/index.vue
@@ -0,0 +1,160 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProProcessApi } from '#/api/mes/pro/process';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteProcess,
+  exportProcess,
+  getProcessPage,
+} from '#/api/mes/pro/process';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建生产工序 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑生产工序 */
+function handleEdit(row: MesProProcessApi.Process) {
+  formModalApi.setData({ id: row.id, type: 'update' }).open();
+}
+
+/** 查看生产工序详情 */
+function handleDetail(row: MesProProcessApi.Process) {
+  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+}
+
+/** 删除生产工序 */
+async function handleDelete(row: MesProProcessApi.Process) {
+  const hideLoading = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteProcess(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading.close();
+  }
+}
+
+/** 导出生产工序 */
+async function handleExport() {
+  const data = await exportProcess(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产工序.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getProcessPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProProcessApi.Process>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】工序设置、工艺流程"
+        url="https://doc.iocoder.cn/mes/pro/process-route/"
+      />
+    </template>
+
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="生产工序列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['工序']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-process:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-process:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.EDIT,
+              auth: ['mes:pro-process:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              icon: ACTION_ICON.DELETE,
+              auth: ['mes:pro-process:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/process/modules/content-form.vue b/apps/web-ele/src/views/mes/pro/process/modules/content-form.vue
new file mode 100644
index 000000000..46544dccd
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/process/modules/content-form.vue
@@ -0,0 +1,99 @@
+<script lang="ts" setup>
+import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProcessContent,
+  getProcessContent,
+  updateProcessContent,
+} from '#/api/mes/pro/process/content';
+import { $t } from '#/locales';
+
+import { useContentFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProProcessContentApi.ProcessContent>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['工序步骤'])
+    : $t('ui.actionTitle.create', ['工序步骤']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useContentFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProProcessContentApi.ProcessContent;
+    try {
+      await (formData.value?.id
+        ? updateProcessContent(data)
+        : createProcessContent(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<{
+      id?: number;
+      maxSort?: number;
+      processId: number;
+    }>();
+    if (!data?.id) {
+      // 新增时，默认序号 = maxSort + 1
+      await formApi.setValues({
+        processId: data?.processId,
+        sort: (data?.maxSort || 0) + 1,
+      });
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProcessContent(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue b/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue
new file mode 100644
index 000000000..520bd005f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue
@@ -0,0 +1,133 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
+
+import { ref, watch } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteProcessContent,
+  getProcessContentListByProcessId,
+} from '#/api/mes/pro/process/content';
+import { $t } from '#/locales';
+
+import { useContentGridColumns } from '../data';
+import ContentForm from './content-form.vue';
+
+const props = defineProps<{
+  processId: number;
+  readonly?: boolean;
+}>();
+
+const list = ref<MesProProcessContentApi.ProcessContent[]>([]);
+
+const [ContentFormModal, contentFormModalApi] = useVbenModal({
+  connectedComponent: ContentForm,
+  destroyOnClose: true,
+});
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useContentGridColumns(),
+    data: list.value,
+    minHeight: 240,
+    pagerConfig: { enabled: false },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProProcessContentApi.ProcessContent>,
+});
+
+/** 加载工序内容列表 */
+async function getList() {
+  gridApi.setLoading(true);
+  try {
+    list.value = await getProcessContentListByProcessId(props.processId);
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+/** 新增工序步骤 */
+function handleCreate() {
+  const maxSort =
+    list.value.length > 0
+      ? Math.max(...list.value.map((item) => item.sort || 0))
+      : 0;
+  contentFormModalApi
+    .setData({ maxSort, processId: props.processId })
+    .open();
+}
+
+/** 编辑工序步骤 */
+function handleEdit(row: MesProProcessContentApi.ProcessContent) {
+  contentFormModalApi.setData({ id: row.id, processId: props.processId }).open();
+}
+
+/** 删除工序步骤 */
+async function handleDelete(row: MesProProcessContentApi.ProcessContent) {
+  await deleteProcessContent(row.id!);
+  ElMessage.success($t('ui.actionMessage.deleteSuccess', ['工序步骤']));
+  await getList();
+}
+
+watch(
+  () => props.processId,
+  (value) => {
+    if (value) {
+      getList();
+    }
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <ContentFormModal @success="getList" />
+  <div v-if="!readonly" class="mb-3 flex items-center justify-start">
+    <TableAction
+      :actions="[
+        {
+          label: $t('ui.actionTitle.create', ['步骤']),
+          type: 'primary',
+          onClick: handleCreate,
+        },
+      ]"
+    />
+  </div>
+  <Grid class="w-full" table-title="工序操作步骤">
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: $t('common.edit'),
+            type: 'primary',
+            link: true,
+            ifShow: () => !readonly,
+            onClick: handleEdit.bind(null, row),
+          },
+          {
+            label: $t('common.delete'),
+            type: 'danger',
+            link: true,
+            ifShow: () => !readonly,
+            popConfirm: {
+              title: $t('ui.actionMessage.deleteConfirm', ['工序步骤']),
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/process/modules/form.vue b/apps/web-ele/src/views/mes/pro/process/modules/form.vue
new file mode 100644
index 000000000..92764a5e5
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/process/modules/form.vue
@@ -0,0 +1,117 @@
+<script lang="ts" setup>
+import type { MesProProcessApi } from '#/api/mes/pro/process';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElDivider, ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProcess,
+  getProcess,
+  updateProcess,
+} from '#/api/mes/pro/process';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+import ContentList from './content-list.vue';
+
+type FormMode = 'create' | 'detail' | 'update';
+
+const emit = defineEmits(['success']);
+const formMode = ref<FormMode>('create'); // 表单模式
+const formData = ref<MesProProcessApi.Process>(); // 当前编辑/查看的工序数据
+
+const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const getTitle = computed(() => {
+  if (formMode.value === 'detail') {
+    return $t('ui.actionTitle.detail', ['生产工序']);
+  }
+  return formMode.value === 'update'
+    ? $t('ui.actionTitle.edit', ['生产工序'])
+    : $t('ui.actionTitle.create', ['生产工序']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-3',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data = (await formApi.getValues()) as MesProProcessApi.Process;
+    try {
+      await (formData.value?.id ? updateProcess(data) : createProcess(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
+    formMode.value = data?.type ?? 'create';
+    formApi.setDisabled(formMode.value === 'detail');
+    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getProcess(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+/** 用于工序内容子表的工序编号 */
+const processId = computed(() => formData.value?.id);
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <!-- 编辑/详情模式下展示工序操作步骤子表，新增模式下隐藏 -->
+    <template v-if="processId">
+      <ElDivider class="!my-3" content-position="left">操作步骤</ElDivider>
+      <div class="mx-4">
+        <ContentList :process-id="processId" :readonly="isDetail" />
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/route/data.ts b/apps/web-ele/src/views/mes/pro/route/data.ts
new file mode 100644
index 000000000..d78855ce9
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/data.ts
@@ -0,0 +1,350 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteApi } from '#/api/mes/pro/route';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { h } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { z } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
+
+/** 工艺路线表单 */
+export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'code',
+      label: '路线编码',
+      component: 'Input',
+      componentProps: {
+        maxLength: 64,
+        placeholder: '请输入工艺路线编码',
+      },
+      rules: z.string().min(1, '路线编码不能为空').max(64),
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            type: 'default',
+            onClick: async () => {
+              try {
+                const code = await generateAutoCode(
+                  MesAutoCodeRuleCode.PRO_ROUTE_CODE,
+                );
+                await formApi?.setFieldValue('code', code);
+              } catch (error) {
+                console.error(error);
+              }
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'name',
+      label: '路线名称',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入工艺路线名称',
+      },
+      rules: z.string().min(1, '路线名称不能为空').max(100),
+    },
+    {
+      fieldName: 'description',
+      label: '路线说明',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        maxLength: 500,
+        placeholder: '请输入工艺路线说明',
+        rows: 3,
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        maxLength: 250,
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 列表搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '路线编码',
+      component: 'Input',
+      componentProps: { clearable: true, placeholder: '请输入路线编码' },
+    },
+    {
+      fieldName: 'name',
+      label: '路线名称',
+      component: 'Input',
+      componentProps: { clearable: true, placeholder: '请输入路线名称' },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+  ];
+}
+
+/** 列表字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProRouteApi.Route>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '路线编码',
+      minWidth: 160,
+      slots: { default: 'code' },
+    },
+    { field: 'name', title: '路线名称', minWidth: 180 },
+    { field: 'description', title: '路线说明', minWidth: 200 },
+    {
+      field: 'status',
+      title: '状态',
+      width: 110,
+      slots: { default: 'status' },
+    },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工艺路线工序明细表单 */
+export function useRouteProcessFormSchema(
+  processOptions: Array<{ label: string; value: number }>,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'routeId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'sort',
+      label: '序号',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 1,
+        precision: 0,
+      },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'processId',
+      label: '工序',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        filterable: true,
+        options: processOptions,
+        placeholder: '请选择工序',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'linkType',
+      label: '与下道工序关系',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_LINK_TYPE, 'number'),
+        placeholder: '请选择',
+      },
+      rules: z.number().default(3),
+    },
+    {
+      fieldName: 'colorCode',
+      label: '甘特图颜色',
+      component: 'Input',
+      componentProps: {
+        maxLength: 16,
+        placeholder: '请输入颜色 hex，例如 #00AEF3',
+      },
+    },
+    {
+      fieldName: 'keyFlag',
+      label: '是否关键工序',
+      component: 'Switch',
+      componentProps: { activeText: '是', inactiveText: '否' },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'checkFlag',
+      label: '是否质检确认',
+      component: 'Switch',
+      componentProps: { activeText: '是', inactiveText: '否' },
+      rules: z.boolean().default(false),
+    },
+    {
+      fieldName: 'prepareTime',
+      label: '准备时间(分)',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 0,
+      },
+      rules: z.number().default(0),
+    },
+    {
+      fieldName: 'waitTime',
+      label: '等待时间(分)',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 0,
+      },
+      rules: z.number().default(0),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: { maxLength: 250, placeholder: '请输入备注', rows: 2 },
+    },
+  ];
+}
+
+/** 工艺路线工序列表字段 */
+export function useRouteProcessGridColumns(): VxeTableGridOptions<MesProRouteProcessApi.RouteProcess>['columns'] {
+  return [
+    { field: 'sort', title: '序号', width: 70, align: 'center', fixed: 'left' },
+    { field: 'processCode', title: '工序编码', width: 140, fixed: 'left' },
+    { field: 'processName', title: '工序名称', width: 140, fixed: 'left' },
+    { field: 'nextProcessName', title: '下一道工序', width: 140 },
+    {
+      field: 'linkType',
+      title: '与下一道工序关系',
+      width: 160,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_LINK_TYPE },
+      },
+    },
+    {
+      field: 'keyFlag',
+      title: '关键工序',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'checkFlag',
+      title: '质检确认',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    { field: 'prepareTime', title: '准备时间(分)', width: 110 },
+    { field: 'waitTime', title: '等待时间(分)', width: 110 },
+    {
+      field: 'colorCode',
+      title: '甘特图颜色',
+      width: 130,
+      slots: { default: 'colorCode' },
+    },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工艺路线产品列表字段 */
+export function useRouteProductGridColumns(): VxeTableGridOptions<MesProRouteProductApi.RouteProduct>['columns'] {
+  return [
+    { field: 'itemCode', title: '产品物料编码', width: 150 },
+    { field: 'itemName', title: '产品物料名称', width: 150 },
+    { field: 'specification', title: '规格型号', width: 150 },
+    { field: 'unitName', title: '单位', width: 80 },
+    { field: 'quantity', title: '生产数量', width: 100 },
+    {
+      field: 'productionTime',
+      title: '生产用时',
+      width: 130,
+      slots: { default: 'productionTime' },
+    },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 工艺路线产品 BOM 列表字段 */
+export function useRouteProductBomGridColumns(): VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>['columns'] {
+  return [
+    { field: 'itemCode', title: 'BOM 物料编码', width: 150 },
+    { field: 'itemName', title: 'BOM 物料名称', width: 150 },
+    { field: 'specification', title: '规格型号', width: 150 },
+    { field: 'unitName', title: '单位', width: 80 },
+    { field: 'quantity', title: '用料比例', width: 100 },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 130,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/pro/route/index.vue b/apps/web-ele/src/views/mes/pro/route/index.vue
new file mode 100644
index 000000000..ee4e6cbc2
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/index.vue
@@ -0,0 +1,195 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteApi } from '#/api/mes/pro/route';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { CommonStatusEnum } from '@vben/constants';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import {
+  ElButton,
+  ElLoading,
+  ElMessage,
+  ElMessageBox,
+  ElSwitch,
+  ElTooltip,
+} from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteRoute,
+  exportRoute,
+  getRoutePage,
+  updateRouteStatus,
+} from '#/api/mes/pro/route';
+import { $t } from '#/locales';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+function handleRefresh() {
+  gridApi.query();
+}
+
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+function handleEdit(row: MesProRouteApi.Route) {
+  formModalApi.setData({ id: row.id, type: 'update' }).open();
+}
+
+function handleDetail(row: MesProRouteApi.Route) {
+  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+}
+
+async function handleStatusChange(row: MesProRouteApi.Route, value: number) {
+  const text = value === CommonStatusEnum.ENABLE ? '启用' : '停用';
+  const previousStatus = row.status;
+  try {
+    await ElMessageBox.confirm(
+      `确认要"${text}""${row.name}"工艺路线吗？`,
+      '提示',
+      { type: 'warning' },
+    );
+    await updateRouteStatus(row.id!, value);
+    ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    handleRefresh();
+  } catch {
+    row.status = previousStatus;
+  }
+}
+
+async function handleDelete(row: MesProRouteApi.Route) {
+  const hideLoading = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.name]),
+  });
+  try {
+    await deleteRoute(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading.close();
+  }
+}
+
+async function handleExport() {
+  const data = await exportRoute(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '工艺路线.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: { schema: useGridFormSchema() },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getRoutePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: { isHover: true, keyField: 'id' },
+    toolbarConfig: { refresh: true, search: true },
+  } as VxeTableGridOptions<MesProRouteApi.Route>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】工序设置、工艺流程"
+        url="https://doc.iocoder.cn/mes/pro/process-route/"
+      />
+    </template>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="工艺路线列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['工艺路线']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-route:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-route:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #status="{ row }">
+        <ElSwitch
+          :model-value="row.status === CommonStatusEnum.ENABLE"
+          active-text="启用"
+          inactive-text="停用"
+          @update:model-value="
+            (value: boolean | number | string) =>
+              handleStatusChange(
+                row,
+                value ? CommonStatusEnum.ENABLE : CommonStatusEnum.DISABLE,
+              )
+          "
+        />
+      </template>
+      <template #actions="{ row }">
+        <ElTooltip
+          :disabled="row.status === CommonStatusEnum.DISABLE"
+          content="仅停用状态，才可以操作"
+          placement="top"
+        >
+          <span class="inline-block">
+            <TableAction
+              :actions="[
+                {
+                  label: $t('common.edit'),
+                  type: 'primary',
+                  link: true,
+                  icon: ACTION_ICON.EDIT,
+                  auth: ['mes:pro-route:update'],
+                  disabled: row.status !== CommonStatusEnum.DISABLE,
+                  onClick: handleEdit.bind(null, row),
+                },
+                {
+                  label: $t('common.delete'),
+                  type: 'danger',
+                  link: true,
+                  icon: ACTION_ICON.DELETE,
+                  auth: ['mes:pro-route:delete'],
+                  disabled: row.status !== CommonStatusEnum.DISABLE,
+                  popConfirm: {
+                    title: $t('ui.actionMessage.deleteConfirm', [row.name]),
+                    confirm: handleDelete.bind(null, row),
+                  },
+                },
+              ]"
+            />
+          </span>
+        </ElTooltip>
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/form.vue b/apps/web-ele/src/views/mes/pro/route/modules/form.vue
new file mode 100644
index 000000000..9ece6d945
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/modules/form.vue
@@ -0,0 +1,118 @@
+<script lang="ts" setup>
+import type { MesProRouteApi } from '#/api/mes/pro/route';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage, ElTabPane, ElTabs } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import { createRoute, getRoute, updateRoute } from '#/api/mes/pro/route';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+import ProcessList from './process-list.vue';
+import ProductList from './product-list.vue';
+
+type FormMode = 'create' | 'detail' | 'update';
+
+const emit = defineEmits(['success']);
+const formMode = ref<FormMode>('create');
+const subTab = ref('process');
+const formData = ref<MesProRouteApi.Route>();
+
+const isDetail = computed(() => formMode.value === 'detail');
+const getTitle = computed(() => {
+  if (formMode.value === 'detail') {
+    return $t('ui.actionTitle.detail', ['工艺路线']);
+  }
+  return formMode.value === 'update'
+    ? $t('ui.actionTitle.edit', ['工艺路线'])
+    : $t('ui.actionTitle.create', ['工艺路线']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+formApi.setState({ schema: useFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (isDetail.value) {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    const data = (await formApi.getValues()) as MesProRouteApi.Route;
+    try {
+      if (formMode.value === 'create') {
+        const id = await createRoute(data);
+        formData.value = { ...data, id };
+        await formApi.setFieldValue('id', id);
+        formMode.value = 'update';
+      } else {
+        await updateRoute(data);
+        formData.value = { ...formData.value, ...data };
+      }
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    subTab.value = 'process';
+    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
+    formMode.value = data?.type ?? 'create';
+    formApi.setDisabled(formMode.value === 'detail');
+    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getRoute(data.id);
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-4/5">
+    <Form class="mx-4" />
+    <ElTabs
+      v-if="formMode !== 'create' && formData?.id"
+      v-model="subTab"
+      class="mx-4 mt-4"
+    >
+      <ElTabPane label="组成工序" name="process">
+        <ProcessList :form-mode="formMode" :route-id="formData.id" />
+      </ElTabPane>
+      <ElTabPane label="关联产品" name="product">
+        <ProductList :form-mode="formMode" :route-id="formData.id" />
+      </ElTabPane>
+    </ElTabs>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue b/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue
new file mode 100644
index 000000000..48cef50c6
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue
@@ -0,0 +1,112 @@
+<script lang="ts" setup>
+import type { VbenFormSchema } from '#/adapter/form';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import { getProcessSimpleList } from '#/api/mes/pro/process';
+import {
+  createRouteProcess,
+  updateRouteProcess,
+} from '#/api/mes/pro/route/process';
+import { $t } from '#/locales';
+
+import { useRouteProcessFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProRouteProcessApi.RouteProcess>();
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['工艺路线工序'])
+    : $t('ui.actionTitle.create', ['工艺路线工序']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-1',
+    labelWidth: 130,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+async function loadSchema(): Promise<VbenFormSchema[]> {
+  const list = await getProcessSimpleList();
+  const options = (list || []).map((item) => ({
+    label: item.name ?? '',
+    value: item.id!,
+  }));
+  return useRouteProcessFormSchema(options);
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    const data =
+      (await formApi.getValues()) as MesProRouteProcessApi.RouteProcess;
+    try {
+      await (formData.value?.id
+        ? updateRouteProcess(data)
+        : createRouteProcess(data));
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    modalApi.lock();
+    try {
+      const schema = await loadSchema();
+      formApi.setState({ schema });
+      await formApi.resetForm();
+    } finally {
+      modalApi.unlock();
+    }
+    const data = modalApi.getData<{
+      id?: number;
+      maxSort?: number;
+      routeId: number;
+      row?: MesProRouteProcessApi.RouteProcess;
+    }>();
+    if (!data) {
+      return;
+    }
+    if (!data.id) {
+      await formApi.setValues({
+        colorCode: '#00AEF3',
+        routeId: data.routeId,
+        sort: (data.maxSort || 0) + 1,
+      });
+      return;
+    }
+    if (data.row) {
+      formData.value = data.row;
+      await formApi.setValues(data.row);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue b/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue
new file mode 100644
index 000000000..41936f562
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue
@@ -0,0 +1,136 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
+
+import { ref, watch } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteRouteProcess,
+  getRouteProcessListByRoute,
+} from '#/api/mes/pro/route/process';
+import { $t } from '#/locales';
+
+import { useRouteProcessGridColumns } from '../data';
+import ProcessForm from './process-form.vue';
+
+const props = defineProps<{
+  formMode: 'create' | 'detail' | 'update';
+  routeId: number;
+}>();
+
+const isEditable = ref(props.formMode !== 'detail');
+const list = ref<MesProRouteProcessApi.RouteProcess[]>([]);
+
+const [ProcessFormModal, processFormModalApi] = useVbenModal({
+  connectedComponent: ProcessForm,
+  destroyOnClose: true,
+});
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useRouteProcessGridColumns(),
+    data: list.value,
+    minHeight: 240,
+    pagerConfig: { enabled: false },
+    rowConfig: { isHover: true, keyField: 'id' },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProRouteProcessApi.RouteProcess>,
+});
+
+async function getList() {
+  gridApi.setLoading(true);
+  try {
+    list.value = await getRouteProcessListByRoute(props.routeId);
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+function handleCreate() {
+  const maxSort =
+    list.value.length > 0
+      ? Math.max(...list.value.map((item) => item.sort || 0))
+      : 0;
+  processFormModalApi.setData({ maxSort, routeId: props.routeId }).open();
+}
+
+function handleEdit(row: MesProRouteProcessApi.RouteProcess) {
+  processFormModalApi
+    .setData({ id: row.id, routeId: props.routeId, row })
+    .open();
+}
+
+async function handleDelete(row: MesProRouteProcessApi.RouteProcess) {
+  await deleteRouteProcess(row.id!);
+  ElMessage.success($t('ui.actionMessage.deleteSuccess', ['工艺路线工序']));
+  await getList();
+}
+
+watch(
+  () => props.routeId,
+  (value) => {
+    if (value) {
+      getList();
+    }
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <ProcessFormModal @success="getList" />
+  <div v-if="isEditable" class="mb-3 flex items-center justify-start">
+    <TableAction
+      :actions="[
+        {
+          label: $t('ui.actionTitle.create', ['工序']),
+          type: 'primary',
+          onClick: handleCreate,
+        },
+      ]"
+    />
+  </div>
+  <Grid class="w-full" table-title="组成工序">
+    <template #colorCode="{ row }">
+      <div v-if="row.colorCode" class="flex items-center justify-center gap-1">
+        <div
+          class="h-4 w-4 rounded"
+          :style="{ backgroundColor: row.colorCode }"
+        ></div>
+        <span>{{ row.colorCode }}</span>
+      </div>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: $t('common.edit'),
+            type: 'primary',
+            link: true,
+            ifShow: () => isEditable,
+            onClick: handleEdit.bind(null, row),
+          },
+          {
+            label: $t('common.delete'),
+            type: 'danger',
+            link: true,
+            ifShow: () => isEditable,
+            popConfirm: {
+              title: $t('ui.actionMessage.deleteConfirm', ['工艺路线工序']),
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/product-bom-list.vue b/apps/web-ele/src/views/mes/pro/route/modules/product-bom-list.vue
new file mode 100644
index 000000000..8b288faef
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/modules/product-bom-list.vue
@@ -0,0 +1,278 @@
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus';
+
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { computed, reactive, ref, watch } from 'vue';
+
+import {
+  ElDialog,
+  ElForm,
+  ElFormItem,
+  ElInput,
+  ElInputNumber,
+  ElMessage,
+  ElTabPane,
+  ElTabs,
+} from 'element-plus';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getRouteProcessListByRoute } from '#/api/mes/pro/route/process';
+import {
+  createRouteProductBom,
+  deleteRouteProductBom,
+  getRouteProductBomList,
+  updateRouteProductBom,
+} from '#/api/mes/pro/route/productbom';
+import { $t } from '#/locales';
+import { MdProductBomSelect } from '#/views/mes/md/item/components';
+
+import { useRouteProductBomGridColumns } from '../data';
+
+const props = defineProps<{
+  productId: number;
+  productName?: string;
+  routeId: number;
+}>();
+
+const processOptions = ref<
+  Array<{ processId: number; processName?: string }>
+>([]);
+const activeProcessId = ref<string>('');
+const list = ref<MesProRouteProductBomApi.RouteProductBom[]>([]);
+
+const formVisible = ref(false);
+const formRef = ref<FormInstance>();
+const isUpdate = ref(false);
+const formData = reactive<MesProRouteProductBomApi.RouteProductBom>({
+  quantity: 1,
+});
+const formRules: FormRules = {
+  itemId: [{ message: 'BOM 物料不能为空', required: true }],
+  quantity: [{ message: '用料比例不能为空', required: true }],
+};
+const formTitle = computed(() =>
+  isUpdate.value
+    ? $t('ui.actionTitle.edit', ['BOM 物料'])
+    : $t('ui.actionTitle.create', ['BOM 物料']),
+);
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useRouteProductBomGridColumns(),
+    data: list.value,
+    minHeight: 200,
+    pagerConfig: { enabled: false },
+    rowConfig: { isHover: true, keyField: 'id' },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>,
+});
+
+async function loadProcessList() {
+  const data = await getRouteProcessListByRoute(props.routeId);
+  processOptions.value = (data || []).map((item) => ({
+    processId: item.processId!,
+    processName: item.processName,
+  }));
+  if (processOptions.value.length > 0) {
+    activeProcessId.value = String(processOptions.value[0]!.processId);
+    await getList();
+  } else {
+    activeProcessId.value = '';
+    list.value = [];
+    gridApi.setGridOptions({ data: list.value });
+  }
+}
+
+async function getList() {
+  if (!activeProcessId.value) {
+    return;
+  }
+  gridApi.setLoading(true);
+  try {
+    list.value = await getRouteProductBomList({
+      processId: Number(activeProcessId.value),
+      productId: props.productId,
+      routeId: props.routeId,
+    });
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+function resetForm() {
+  Object.assign(formData, {
+    id: undefined,
+    itemCode: undefined,
+    itemId: undefined,
+    itemName: undefined,
+    processId: Number(activeProcessId.value),
+    productId: props.productId,
+    quantity: 1,
+    remark: undefined,
+    routeId: props.routeId,
+    specification: undefined,
+    unitName: undefined,
+  });
+  formRef.value?.clearValidate();
+}
+
+function handleCreate() {
+  if (!activeProcessId.value) {
+    ElMessage.warning('请先选择工序');
+    return;
+  }
+  resetForm();
+  isUpdate.value = false;
+  formVisible.value = true;
+}
+
+function handleEdit(row: MesProRouteProductBomApi.RouteProductBom) {
+  Object.assign(formData, row);
+  isUpdate.value = true;
+  formVisible.value = true;
+}
+
+async function handleDelete(row: MesProRouteProductBomApi.RouteProductBom) {
+  await deleteRouteProductBom(row.id!);
+  ElMessage.success($t('ui.actionMessage.deleteSuccess', ['BOM 物料']));
+  await getList();
+}
+
+async function submitForm() {
+  try {
+    await formRef.value?.validate();
+  } catch {
+    return;
+  }
+  await (isUpdate.value
+    ? updateRouteProductBom(formData)
+    : createRouteProductBom(formData));
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  formVisible.value = false;
+  await getList();
+}
+
+function handleBomChange(bom?: any) {
+  if (bom) {
+    formData.quantity = bom.quantity ?? 1;
+    formData.itemCode = bom.bomItemCode;
+    formData.itemName = bom.bomItemName;
+    formData.specification = bom.specification;
+    formData.unitName = bom.unitName;
+  }
+}
+
+watch(
+  () => [props.routeId, props.productId],
+  () => {
+    if (props.routeId && props.productId) {
+      loadProcessList();
+    }
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <ElTabs v-model="activeProcessId" @tab-change="getList">
+    <ElTabPane
+      v-for="item in processOptions"
+      :key="String(item.processId)"
+      :label="item.processName"
+      :name="String(item.processId)"
+    />
+  </ElTabs>
+  <div class="mb-3 flex items-center justify-start">
+    <TableAction
+      :actions="[
+        {
+          label: $t('ui.actionTitle.create', ['BOM 物料']),
+          type: 'primary',
+          disabled: !activeProcessId,
+          onClick: handleCreate,
+        },
+      ]"
+    />
+  </div>
+  <Grid class="w-full" table-title="产品 BOM">
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: $t('common.edit'),
+            type: 'primary',
+            link: true,
+            onClick: handleEdit.bind(null, row),
+          },
+          {
+            label: $t('common.delete'),
+            type: 'danger',
+            link: true,
+            popConfirm: {
+              title: $t('ui.actionMessage.deleteConfirm', ['BOM 物料']),
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+
+  <ElDialog v-model="formVisible" :title="formTitle" width="500px">
+    <ElForm
+      ref="formRef"
+      label-width="100px"
+      :model="formData"
+      :rules="formRules"
+    >
+      <ElFormItem label="BOM 物料" prop="itemId">
+        <MdProductBomSelect
+          v-model="formData.itemId"
+          :item-id="productId"
+          placeholder="请选择 BOM 物料"
+          @change="handleBomChange"
+        />
+      </ElFormItem>
+      <ElFormItem label="用料比例" prop="quantity">
+        <ElInputNumber
+          v-model="formData.quantity"
+          class="!w-full"
+          controls-position="right"
+          :min="0"
+          :precision="2"
+        />
+      </ElFormItem>
+      <ElFormItem label="备注" prop="remark">
+        <ElInput
+          v-model="formData.remark"
+          :maxlength="250"
+          placeholder="请输入备注"
+          :rows="2"
+          type="textarea"
+        />
+      </ElFormItem>
+    </ElForm>
+    <template #footer>
+      <TableAction
+        :actions="[
+          {
+            label: $t('common.cancel'),
+            type: 'default',
+            onClick: () => (formVisible = false),
+          },
+          {
+            label: $t('common.confirm'),
+            type: 'primary',
+            onClick: submitForm,
+          },
+        ]"
+      />
+    </template>
+  </ElDialog>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue b/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue
new file mode 100644
index 000000000..8462384e9
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue
@@ -0,0 +1,198 @@
+<script lang="ts" setup>
+import type { FormInstance, FormRules } from 'element-plus';
+
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+
+import { computed, reactive, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import {
+  ElDivider,
+  ElForm,
+  ElFormItem,
+  ElInput,
+  ElInputNumber,
+  ElMessage,
+  ElOption,
+  ElSelect,
+} from 'element-plus';
+
+import {
+  createRouteProduct,
+  updateRouteProduct,
+} from '#/api/mes/pro/route/product';
+import { $t } from '#/locales';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+
+import ProductBomList from './product-bom-list.vue';
+
+const emit = defineEmits(['success']);
+const isUpdate = ref(false);
+const formRef = ref<FormInstance>();
+const formData = reactive<MesProRouteProductApi.RouteProduct>({
+  productionTime: 1,
+  quantity: 1,
+  timeUnitType: 'MINUTE',
+});
+const formRules: FormRules = {
+  itemId: [{ message: '产品不能为空', required: true }],
+  quantity: [{ message: '生产数量不能为空', required: true }],
+};
+const timeUnitOptions = computed(() =>
+  getDictOptions(DICT_TYPE.MES_TIME_UNIT_TYPE),
+);
+const getTitle = computed(() =>
+  isUpdate.value
+    ? $t('ui.actionTitle.edit', ['工艺路线产品'])
+    : $t('ui.actionTitle.create', ['工艺路线产品']),
+);
+
+function resetForm(routeId?: number) {
+  Object.assign(formData, {
+    id: undefined,
+    itemCode: undefined,
+    itemId: undefined,
+    itemName: undefined,
+    productionTime: 1,
+    quantity: 1,
+    remark: undefined,
+    routeId: routeId ?? formData.routeId,
+    specification: undefined,
+    timeUnitType: 'MINUTE',
+    unitName: undefined,
+  });
+  formRef.value?.clearValidate();
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    try {
+      await formRef.value?.validate();
+    } catch {
+      return;
+    }
+    modalApi.lock();
+    try {
+      if (isUpdate.value) {
+        await updateRouteProduct(formData);
+      } else {
+        const id = await createRouteProduct(formData);
+        formData.id = id;
+        isUpdate.value = true;
+      }
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      resetForm();
+      isUpdate.value = false;
+      return;
+    }
+    const data = modalApi.getData<{
+      id?: number;
+      routeId: number;
+      row?: MesProRouteProductApi.RouteProduct;
+    }>();
+    if (!data) {
+      return;
+    }
+    if (data.row) {
+      Object.assign(formData, data.row);
+      isUpdate.value = true;
+    } else {
+      resetForm(data.routeId);
+      isUpdate.value = false;
+    }
+  },
+});
+
+function handleItemChange(item?: any) {
+  if (!item) {
+    return;
+  }
+  formData.itemCode = item.code;
+  formData.itemName = item.name;
+  formData.specification = item.specification;
+  formData.unitName = item.unitName;
+}
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <ElForm
+      ref="formRef"
+      class="mx-4"
+      label-width="120px"
+      :model="formData"
+      :rules="formRules"
+    >
+      <div class="grid grid-cols-2 gap-x-4">
+        <ElFormItem class="col-span-2" label="产品" prop="itemId">
+          <MdItemSelect
+            v-model="formData.itemId"
+            @change="handleItemChange"
+          />
+        </ElFormItem>
+        <ElFormItem label="生产数量" prop="quantity">
+          <ElInputNumber
+            v-model="formData.quantity"
+            class="!w-full"
+            controls-position="right"
+            :min="1"
+            :precision="0"
+          />
+        </ElFormItem>
+        <ElFormItem label="生产用时" prop="productionTime">
+          <ElInputNumber
+            v-model="formData.productionTime"
+            class="!w-full"
+            controls-position="right"
+            :min="0"
+            :precision="2"
+          />
+        </ElFormItem>
+        <ElFormItem label="时间单位" prop="timeUnitType">
+          <ElSelect
+            v-model="formData.timeUnitType"
+            class="!w-full"
+            clearable
+            placeholder="请选择"
+          >
+            <ElOption
+              v-for="dict in timeUnitOptions"
+              :key="dict.value as string"
+              :label="dict.label"
+              :value="dict.value as string"
+            />
+          </ElSelect>
+        </ElFormItem>
+        <ElFormItem class="col-span-2" label="备注" prop="remark">
+          <ElInput
+            v-model="formData.remark"
+            :maxlength="250"
+            placeholder="请输入备注"
+            :rows="2"
+            type="textarea"
+          />
+        </ElFormItem>
+      </div>
+    </ElForm>
+    <template v-if="isUpdate && formData.id && formData.itemId">
+      <ElDivider class="!my-3" content-position="left">产品 BOM 配置</ElDivider>
+      <div class="mx-4">
+        <ProductBomList
+          :route-id="formData.routeId!"
+          :product-id="formData.itemId"
+          :product-name="formData.itemName"
+        />
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue b/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue
new file mode 100644
index 000000000..b65c5037f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue
@@ -0,0 +1,131 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
+
+import { ref, watch } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
+
+import { ElMessage } from 'element-plus';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteRouteProduct,
+  getRouteProductListByRoute,
+} from '#/api/mes/pro/route/product';
+import { $t } from '#/locales';
+
+import { useRouteProductGridColumns } from '../data';
+import ProductForm from './product-form.vue';
+
+const props = defineProps<{
+  formMode: 'create' | 'detail' | 'update';
+  routeId: number;
+}>();
+
+const isEditable = ref(props.formMode !== 'detail');
+const list = ref<MesProRouteProductApi.RouteProduct[]>([]);
+
+const [ProductFormModal, productFormModalApi] = useVbenModal({
+  connectedComponent: ProductForm,
+  destroyOnClose: true,
+});
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useRouteProductGridColumns(),
+    data: list.value,
+    minHeight: 240,
+    pagerConfig: { enabled: false },
+    rowConfig: { isHover: true, keyField: 'id' },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProRouteProductApi.RouteProduct>,
+});
+
+async function getList() {
+  gridApi.setLoading(true);
+  try {
+    list.value = await getRouteProductListByRoute(props.routeId);
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+function handleCreate() {
+  productFormModalApi.setData({ routeId: props.routeId }).open();
+}
+
+function handleEdit(row: MesProRouteProductApi.RouteProduct) {
+  productFormModalApi
+    .setData({ id: row.id, routeId: props.routeId, row })
+    .open();
+}
+
+async function handleDelete(row: MesProRouteProductApi.RouteProduct) {
+  await deleteRouteProduct(row.id!);
+  ElMessage.success($t('ui.actionMessage.deleteSuccess', ['工艺路线产品']));
+  await getList();
+}
+
+watch(
+  () => props.routeId,
+  (value) => {
+    if (value) {
+      getList();
+    }
+  },
+  { immediate: true },
+);
+</script>
+
+<template>
+  <ProductFormModal @success="getList" />
+  <div v-if="isEditable" class="mb-3 flex items-center justify-start">
+    <TableAction
+      :actions="[
+        {
+          label: $t('ui.actionTitle.create', ['关联产品']),
+          type: 'primary',
+          onClick: handleCreate,
+        },
+      ]"
+    />
+  </div>
+  <Grid class="w-full" table-title="关联产品">
+    <template #productionTime="{ row }">
+      <span v-if="row.productionTime">
+        {{ row.productionTime }}
+        {{ getDictLabel(DICT_TYPE.MES_TIME_UNIT_TYPE, row.timeUnitType) }}
+      </span>
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: $t('common.edit'),
+            type: 'primary',
+            link: true,
+            ifShow: () => isEditable,
+            onClick: handleEdit.bind(null, row),
+          },
+          {
+            label: $t('common.delete'),
+            type: 'danger',
+            link: true,
+            ifShow: () => isEditable,
+            popConfirm: {
+              title: $t('ui.actionMessage.deleteConfirm', ['工艺路线产品']),
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>

From 80a25ca7679ad5ebd5a729ac9f5e92d376eabe90 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 25 May 2026 09:25:01 +0800
Subject: [PATCH 02/17] =?UTF-8?q?feat(mes)=EF=BC=9Areview=20=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E5=AE=9A=E4=B9=89=EF=BC=88pro=5Fprocess=EF=BC=89?=
 =?UTF-8?q?=E3=80=81=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF=EF=BC=88pro=5Frou?=
 =?UTF-8?q?te=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/components/pro-process-select.vue |   1 +
 .../src/views/mes/pro/process/data.ts         |   1 +
 .../mes/pro/process/modules/content-list.vue  |   1 +
 apps/web-antd/src/views/mes/pro/route/data.ts | 120 ++++++++++++
 .../views/mes/pro/route/modules/bom-form.vue  | 112 +++++++++++
 .../src/views/mes/pro/route/modules/form.vue  |   2 +
 .../mes/pro/route/modules/process-form.vue    |   1 +
 .../mes/pro/route/modules/process-list.vue    |   4 +
 .../pro/route/modules/product-bom-list.vue    | 152 ++++-----------
 .../mes/pro/route/modules/product-form.vue    | 176 +++++-------------
 .../mes/pro/route/modules/product-list.vue    |   5 +
 11 files changed, 330 insertions(+), 245 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue

diff --git a/apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue b/apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue
index ad50ee802..2b45520a3 100644
--- a/apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue
+++ b/apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue
@@ -39,6 +39,7 @@ const selectValue = computed({
   },
 });
 
+// TODO @AI：是不是要写注释；
 function handleFilter(input: string, option: any) {
   const keyword = input.toLowerCase();
   const item = option?.item as MesProProcessApi.Process | undefined;
diff --git a/apps/web-antd/src/views/mes/pro/process/data.ts b/apps/web-antd/src/views/mes/pro/process/data.ts
index ff8089acd..c4c8ed503 100644
--- a/apps/web-antd/src/views/mes/pro/process/data.ts
+++ b/apps/web-antd/src/views/mes/pro/process/data.ts
@@ -40,6 +40,7 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
+              // TODO @AI：需要 try catch 么？感觉直接去掉也可以？
               try {
                 const code = await generateAutoCode(
                   MesAutoCodeRuleCode.PRO_PROCESS_CODE,
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue b/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
index b54968069..15757bcf4 100644
--- a/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
+++ b/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
@@ -60,6 +60,7 @@ async function getList() {
 
 /** 新增工序步骤 */
 function handleCreate() {
+  // TODO @AI：是不是可以直接 max 然后 || 0；
   const maxSort =
     list.value.length > 0
       ? Math.max(...list.value.map((item) => item.sort || 0))
diff --git a/apps/web-antd/src/views/mes/pro/route/data.ts b/apps/web-antd/src/views/mes/pro/route/data.ts
index f7565ce9f..1e6f7218e 100644
--- a/apps/web-antd/src/views/mes/pro/route/data.ts
+++ b/apps/web-antd/src/views/mes/pro/route/data.ts
@@ -14,6 +14,10 @@ import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import {
+  MdItemSelect,
+  MdProductBomSelect,
+} from '#/views/mes/md/item/components';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 工艺路线表单 */
@@ -333,3 +337,119 @@ export function useRouteProductBomGridColumns(): VxeTableGridOptions<MesProRoute
     },
   ];
 }
+
+
+/** 工艺路线产品表单 */
+export function useRouteProductFormSchema(
+  onItemChange?: (item: any) => void,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'routeId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    // 产品物料：使用业务自定义选择器，change 回填编码/名称/规格/单位
+    {
+      fieldName: 'itemId',
+      label: '产品',
+      component: MdItemSelect as any,
+      componentProps: {
+        onChange: onItemChange,
+      },
+      formItemClass: 'col-span-2',
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '生产数量',
+      component: 'InputNumber',
+      componentProps: { class: '!w-full', min: 1, precision: 0 },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'productionTime',
+      label: '生产用时',
+      component: 'InputNumber',
+      componentProps: { class: '!w-full', min: 0, precision: 2 },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'timeUnitType',
+      label: '时间单位',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_TIME_UNIT_TYPE),
+        placeholder: '请选择',
+      },
+      rules: z.string().default('MINUTE'),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: { maxLength: 250, placeholder: '请输入备注', rows: 2 },
+    },
+  ];
+}
+
+/** 工艺路线产品 BOM 表单 */
+export function useRouteProductBomFormSchema(
+  itemId: () => number,
+  onBomChange?: (bom: any) => void,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'routeId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'processId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'productId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    // BOM 物料：依赖产品物料，使用业务自定义选择器
+    {
+      fieldName: 'itemId',
+      label: 'BOM 物料',
+      component: MdProductBomSelect as any,
+      componentProps: () => ({
+        itemId: itemId(),
+        onChange: onBomChange,
+        placeholder: '请选择 BOM 物料',
+      }),
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '用料比例',
+      component: 'InputNumber',
+      componentProps: { class: '!w-full', min: 0, precision: 2 },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: { maxLength: 250, placeholder: '请输入备注', rows: 2 },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
new file mode 100644
index 000000000..e2d51c132
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
@@ -0,0 +1,112 @@
+<script lang="ts" setup>
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createRouteProductBom,
+  updateRouteProductBom,
+} from '#/api/mes/pro/route/productbom';
+import { $t } from '#/locales';
+
+import { useRouteProductBomFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProRouteProductBomApi.RouteProductBom>(); // 当前编辑的 BOM 数据
+const productId = ref<number>(0); // 当前产品物料编号，供 BOM 选择器筛选可用 BOM
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['BOM 物料'])
+    : $t('ui.actionTitle.create', ['BOM 物料']),
+);
+
+/** MdProductBomSelect change 回调：把 BOM 物料编码/名称/规格/单位/默认用量回填到 form */
+async function handleBomChange(bom?: any) {
+  if (!bom) {
+    return;
+  }
+  await formApi.setValues({
+    itemCode: bom.bomItemCode,
+    itemName: bom.bomItemName,
+    quantity: bom.quantity ?? 1,
+    specification: bom.specification,
+    unitName: bom.unitName,
+  });
+}
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: useRouteProductBomFormSchema(() => productId.value, handleBomChange),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProRouteProductBomApi.RouteProductBom;
+    try {
+      await (formData.value?.id
+        ? updateRouteProductBom(data)
+        : createRouteProductBom(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<{
+      processId: number;
+      productId: number;
+      routeId: number;
+      row?: MesProRouteProductBomApi.RouteProductBom;
+    }>();
+    if (!data) {
+      return;
+    }
+    productId.value = data.productId;
+    if (data.row) {
+      formData.value = data.row;
+      // 设置到 values
+      await formApi.setValues(data.row);
+      return;
+    }
+    await formApi.setValues({
+      processId: data.processId,
+      productId: data.productId,
+      quantity: 1,
+      routeId: data.routeId,
+    });
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-1/3">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/form.vue b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
index baf0d7921..d9a64fdec 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
@@ -48,8 +48,10 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
+// TODO @AI：注释风格，是不是和别的没对齐
 formApi.setState({ schema: useFormSchema(formApi) });
 
+// TODO @AI：注释风格，是不是和别的没对齐
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
index 5b1411c9b..218f99032 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
@@ -48,6 +48,7 @@ async function loadSchema(): Promise<VbenFormSchema[]> {
   return useRouteProcessFormSchema(options);
 }
 
+// TODO @AI：注释风格，是不是和别的没对齐
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
index 31b2dad8c..aecb0eafa 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
@@ -45,6 +45,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesProRouteProcessApi.RouteProcess>,
 });
 
+// TODO @AI：注释风格，是不是和别的没对齐
 async function getList() {
   gridApi.setLoading(true);
   try {
@@ -55,6 +56,7 @@ async function getList() {
   }
 }
 
+// TODO @AI：注释风格，是不是和别的没对齐
 function handleCreate() {
   const maxSort =
     list.value.length > 0
@@ -63,10 +65,12 @@ function handleCreate() {
   processFormModalApi.setData({ maxSort, routeId: props.routeId }).open();
 }
 
+// TODO @AI：注释风格，是不是和别的没对齐
 function handleEdit(row: MesProRouteProcessApi.RouteProcess) {
   processFormModalApi.setData({ id: row.id, routeId: props.routeId, row }).open();
 }
 
+// TODO @AI：注释风格，是不是和别的没对齐
 async function handleDelete(row: MesProRouteProcessApi.RouteProcess) {
   await deleteRouteProcess(row.id!);
   message.success($t('ui.actionMessage.deleteSuccess', ['工艺路线工序']));
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue
index e9f66f9b5..c875379bd 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue
@@ -1,34 +1,23 @@
 <script lang="ts" setup>
-import type { FormInstance } from 'ant-design-vue';
-
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
 
-import { computed, reactive, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 
-import {
-  Form as AForm,
-  FormItem,
-  InputNumber,
-  message,
-  Modal,
-  TabPane,
-  Tabs,
-  Textarea,
-} from 'ant-design-vue';
+import { useVbenModal } from '@vben/common-ui';
+
+import { message, TabPane, Tabs } from 'ant-design-vue';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getRouteProcessListByRoute } from '#/api/mes/pro/route/process';
 import {
-  createRouteProductBom,
   deleteRouteProductBom,
   getRouteProductBomList,
-  updateRouteProductBom,
 } from '#/api/mes/pro/route/productbom';
 import { $t } from '#/locales';
-import { MdProductBomSelect } from '#/views/mes/md/item/components';
 
 import { useRouteProductBomGridColumns } from '../data';
+import BomForm from './bom-form.vue';
 
 const props = defineProps<{
   productId: number;
@@ -36,27 +25,17 @@ const props = defineProps<{
   routeId: number;
 }>();
 
+// TODO @AI：const 的尾注释？别的 vue 文件也看看，遵守 agents md 里说的。
 const processOptions = ref<
   Array<{ processId: number; processName?: string }>
->([]);
-const activeProcessId = ref<string>('');
+>([]); // TODO @AI：是不是不用转换，vue 那直接处理就好了；
+const activeProcessId = ref<string>(''); // TODO @AI：这个好像是 number？看看 vue3 + ep 里的代码。
 const list = ref<MesProRouteProductBomApi.RouteProductBom[]>([]);
 
-const formVisible = ref(false);
-const formRef = ref<FormInstance>();
-const isUpdate = ref(false);
-const formData = reactive<MesProRouteProductBomApi.RouteProductBom>({
-  quantity: 1,
+const [BomFormModal, bomFormModalApi] = useVbenModal({
+  connectedComponent: BomForm,
+  destroyOnClose: true,
 });
-const formRules = {
-  itemId: [{ message: 'BOM 物料不能为空', required: true }],
-  quantity: [{ message: '用料比例不能为空', required: true }],
-};
-const formTitle = computed(() =>
-  isUpdate.value
-    ? $t('ui.actionTitle.edit', ['BOM 物料'])
-    : $t('ui.actionTitle.create', ['BOM 物料']),
-);
 
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
@@ -72,6 +51,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>,
 });
 
+/** 加载路线下的工序列表，用于工序 Tab */
 async function loadProcessList() {
   const data = await getRouteProcessListByRoute(props.routeId);
   processOptions.value = (data || []).map((item) => ({
@@ -88,6 +68,7 @@ async function loadProcessList() {
   }
 }
 
+/** 加载当前工序下的 BOM 列表 */
 async function getList() {
   if (!activeProcessId.value) {
     return;
@@ -105,70 +86,40 @@ async function getList() {
   }
 }
 
-function resetForm() {
-  Object.assign(formData, {
-    id: undefined,
-    itemCode: undefined,
-    itemId: undefined,
-    itemName: undefined,
-    processId: Number(activeProcessId.value),
-    productId: props.productId,
-    quantity: 1,
-    remark: undefined,
-    routeId: props.routeId,
-    specification: undefined,
-    unitName: undefined,
-  });
-  formRef.value?.clearValidate();
-}
-
+/** 新增 BOM */
 function handleCreate() {
   if (!activeProcessId.value) {
     message.warning('请先选择工序');
     return;
   }
-  resetForm();
-  isUpdate.value = false;
-  formVisible.value = true;
+  bomFormModalApi
+    .setData({
+      processId: Number(activeProcessId.value),
+      productId: props.productId,
+      routeId: props.routeId,
+    })
+    .open();
 }
 
+/** 编辑 BOM */
 function handleEdit(row: MesProRouteProductBomApi.RouteProductBom) {
-  Object.assign(formData, row);
-  isUpdate.value = true;
-  formVisible.value = true;
+  bomFormModalApi
+    .setData({
+      processId: Number(activeProcessId.value),
+      productId: props.productId,
+      routeId: props.routeId,
+      row,
+    })
+    .open();
 }
 
+/** 删除 BOM */
 async function handleDelete(row: MesProRouteProductBomApi.RouteProductBom) {
   await deleteRouteProductBom(row.id!);
   message.success($t('ui.actionMessage.deleteSuccess', ['BOM 物料']));
   await getList();
 }
 
-async function submitForm() {
-  try {
-    await formRef.value?.validate();
-  } catch {
-    return;
-  }
-  await (isUpdate.value
-    ? updateRouteProductBom(formData)
-    : createRouteProductBom(formData));
-  message.success($t('ui.actionMessage.operationSuccess'));
-  formVisible.value = false;
-  await getList();
-}
-
-/** BOM 选中后回填用量比例 */
-function handleBomChange(bom?: any) {
-  if (bom) {
-    formData.quantity = bom.quantity ?? 1;
-    formData.itemCode = bom.bomItemCode;
-    formData.itemName = bom.bomItemName;
-    formData.specification = bom.specification;
-    formData.unitName = bom.unitName;
-  }
-}
-
 watch(
   () => [props.routeId, props.productId],
   () => {
@@ -181,6 +132,7 @@ watch(
 </script>
 
 <template>
+  <BomFormModal @success="getList" />
   <Tabs v-model:active-key="activeProcessId" @change="getList">
     <TabPane
       v-for="item in processOptions"
@@ -222,44 +174,4 @@ watch(
       />
     </template>
   </Grid>
-
-  <Modal
-    v-model:open="formVisible"
-    :title="formTitle"
-    width="500px"
-    @ok="submitForm"
-  >
-    <AForm
-      ref="formRef"
-      :label-col="{ span: 6 }"
-      :wrapper-col="{ span: 16 }"
-      :model="formData"
-      :rules="formRules"
-    >
-      <FormItem label="BOM 物料" name="itemId">
-        <MdProductBomSelect
-          v-model="formData.itemId"
-          :item-id="productId"
-          placeholder="请选择 BOM 物料"
-          @change="handleBomChange"
-        />
-      </FormItem>
-      <FormItem label="用料比例" name="quantity">
-        <InputNumber
-          v-model:value="formData.quantity"
-          class="!w-full"
-          :min="0"
-          :precision="2"
-        />
-      </FormItem>
-      <FormItem label="备注" name="remark">
-        <Textarea
-          v-model:value="formData.remark"
-          :max-length="250"
-          placeholder="请输入备注"
-          :rows="2"
-        />
-      </FormItem>
-    </AForm>
-  </Modal>
 </template>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
index a9a2fbe4d..7256c7ece 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
@@ -1,90 +1,73 @@
 <script lang="ts" setup>
-import type { FormInstance } from 'ant-design-vue';
-
 import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
 
-import { computed, reactive, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
 
-import {
-  Form as AForm,
-  Divider,
-  FormItem,
-  InputNumber,
-  message,
-  Select,
-  Textarea,
-} from 'ant-design-vue';
+import { Divider, message } from 'ant-design-vue';
 
+import { useVbenForm } from '#/adapter/form';
 import {
   createRouteProduct,
   updateRouteProduct,
 } from '#/api/mes/pro/route/product';
 import { $t } from '#/locales';
-import { MdItemSelect } from '#/views/mes/md/item/components';
 
+import { useRouteProductFormSchema } from '../data';
 import ProductBomList from './product-bom-list.vue';
 
 const emit = defineEmits(['success']);
-const isUpdate = ref(false);
-const formRef = ref<FormInstance>();
-const formData = reactive<MesProRouteProductApi.RouteProduct>({
-  productionTime: 1,
-  quantity: 1,
-  timeUnitType: 'MINUTE',
-});
-const formRules = {
-  itemId: [{ message: '产品不能为空', required: true }],
-  quantity: [{ message: '生产数量不能为空', required: true }],
-};
-const timeUnitOptions = computed(() =>
-  getDictOptions(DICT_TYPE.MES_TIME_UNIT_TYPE).map((item) => ({
-    label: item.label,
-    value: item.value as string,
-  })),
-);
+const formData = ref<MesProRouteProductApi.RouteProduct>(); // 当前编辑/查看的产品数据
 const getTitle = computed(() =>
-  isUpdate.value
+  formData.value?.id
     ? $t('ui.actionTitle.edit', ['工艺路线产品'])
     : $t('ui.actionTitle.create', ['工艺路线产品']),
 );
 
-/** 重置表单数据 */
-function resetForm(routeId?: number) {
-  Object.assign(formData, {
-    id: undefined,
-    itemCode: undefined,
-    itemId: undefined,
-    itemName: undefined,
-    productionTime: 1,
-    quantity: 1,
-    remark: undefined,
-    routeId: routeId ?? formData.routeId,
-    specification: undefined,
-    timeUnitType: 'MINUTE',
-    unitName: undefined,
+/** MdItemSelect change 回调：把物料编码/名称/规格/单位回填到 form */
+async function handleItemChange(item?: any) {
+  if (!item) {
+    return;
+  }
+  await formApi.setValues({
+    itemCode: item.code,
+    itemName: item.name,
+    specification: item.specification,
+    unitName: item.unitMeasureName,
   });
-  formRef.value?.clearValidate();
 }
 
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useRouteProductFormSchema(handleItemChange),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
 const [Modal, modalApi] = useVbenModal({
+  // TODO @AI：注释风格，是不是和别的没对齐
   async onConfirm() {
-    try {
-      await formRef.value?.validate();
-    } catch {
+    const { valid } = await formApi.validate();
+    if (!valid) {
       return;
     }
     modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProRouteProductApi.RouteProduct;
     try {
-      if (isUpdate.value) {
-        await updateRouteProduct(formData);
+      if (formData.value?.id) {
+        await updateRouteProduct(data);
       } else {
-        const id = await createRouteProduct(formData);
-        formData.id = id;
-        isUpdate.value = true;
+        const id = await createRouteProduct(data);
+        formData.value = { ...data, id };
+        await formApi.setFieldValue('id', id);
       }
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -92,12 +75,13 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.unlock();
     }
   },
-  onOpenChange(isOpen: boolean) {
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      resetForm();
-      isUpdate.value = false;
+      formData.value = undefined;
       return;
     }
+    await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{
       id?: number;
       routeId: number;
@@ -107,79 +91,21 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     if (data.row) {
-      Object.assign(formData, data.row);
-      isUpdate.value = true;
-    } else {
-      resetForm(data.routeId);
-      isUpdate.value = false;
+      formData.value = data.row;
+      // 设置到 values
+      await formApi.setValues(data.row);
+      return;
     }
+    await formApi.setValues({ routeId: data.routeId });
   },
 });
-
-/** 物料编号变化时回填名称等 */
-function handleItemChange(item?: any) {
-  if (!item) {
-    return;
-  }
-  formData.itemCode = item.code;
-  formData.itemName = item.name;
-  formData.specification = item.specification;
-  formData.unitName = item.unitName;
-}
 </script>
 
 <template>
   <Modal :title="getTitle" class="w-3/5">
-    <AForm
-      ref="formRef"
-      class="mx-4"
-      :label-col="{ flex: '0 0 110px' }"
-      :wrapper-col="{ flex: 'auto' }"
-      :model="formData"
-      :rules="formRules"
-    >
-      <div class="grid grid-cols-2 gap-x-4">
-        <FormItem class="col-span-2" label="产品" name="itemId">
-          <MdItemSelect
-            v-model="formData.itemId"
-            @change="handleItemChange"
-          />
-        </FormItem>
-        <FormItem label="生产数量" name="quantity">
-          <InputNumber
-            v-model:value="formData.quantity"
-            class="!w-full"
-            :min="1"
-            :precision="0"
-          />
-        </FormItem>
-        <FormItem label="生产用时" name="productionTime">
-          <InputNumber
-            v-model:value="formData.productionTime"
-            class="!w-full"
-            :min="0"
-            :precision="2"
-          />
-        </FormItem>
-        <FormItem label="时间单位" name="timeUnitType">
-          <Select
-            v-model:value="formData.timeUnitType"
-            allow-clear
-            :options="timeUnitOptions"
-            placeholder="请选择"
-          />
-        </FormItem>
-        <FormItem class="col-span-2" label="备注" name="remark">
-          <Textarea
-            v-model:value="formData.remark"
-            :max-length="250"
-            placeholder="请输入备注"
-            :rows="2"
-          />
-        </FormItem>
-      </div>
-    </AForm>
-    <template v-if="isUpdate && formData.id && formData.itemId">
+    <Form class="mx-4" />
+    <!-- 编辑/详情模式下展示产品 BOM 子表，新增模式下隐藏 -->
+    <template v-if="formData?.id && formData?.itemId">
       <Divider class="!my-3" orientation="left">产品 BOM 配置</Divider>
       <div class="mx-4">
         <ProductBomList
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
index e88f5f15c..0533ce8b4 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
@@ -33,6 +33,7 @@ const [ProductFormModal, productFormModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
+// TODO @AI：代码的排版风格？ps：和别的模块，看看是不是一致；
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     autoResize: true,
@@ -47,6 +48,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesProRouteProductApi.RouteProduct>,
 });
 
+// TODO @AI：注释风格，是不是和别的没对齐
 async function getList() {
   gridApi.setLoading(true);
   try {
@@ -57,14 +59,17 @@ async function getList() {
   }
 }
 
+// TODO @AI：注释风格，是不是和别的没对齐
 function handleCreate() {
   productFormModalApi.setData({ routeId: props.routeId }).open();
 }
 
+// TODO @AI：注释风格，是不是和别的没对齐
 function handleEdit(row: MesProRouteProductApi.RouteProduct) {
   productFormModalApi.setData({ id: row.id, routeId: props.routeId, row }).open();
 }
 
+// TODO @AI：注释风格，是不是和别的没对齐
 async function handleDelete(row: MesProRouteProductApi.RouteProduct) {
   await deleteRouteProduct(row.id!);
   message.success($t('ui.actionMessage.deleteSuccess', ['工艺路线产品']));

From 995666e4ce1813e41b35e997cc631516e8cbacac Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 25 May 2026 09:32:57 +0800
Subject: [PATCH 03/17] =?UTF-8?q?fix(iot)=EF=BC=9A=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=EF=BC=8C=E9=97=B4?=
 =?UTF-8?q?=E9=9A=99=E8=BF=87=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/iot/device/device/modules/card-view.vue    | 9 ++++++++-
 .../src/views/iot/product/product/modules/card-view.vue  | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/web-ele/src/views/iot/device/device/modules/card-view.vue b/apps/web-ele/src/views/iot/device/device/modules/card-view.vue
index 6a5b525c5..75c57c0d4 100644
--- a/apps/web-ele/src/views/iot/device/device/modules/card-view.vue
+++ b/apps/web-ele/src/views/iot/device/device/modules/card-view.vue
@@ -205,7 +205,7 @@ onMounted(() => {
               </div>
             </div>
             <!-- 按钮组 -->
-            <div class="mt-auto flex gap-2 border-t border-border pt-3">
+            <div class="card-action-group mt-auto flex gap-2 border-t border-border pt-3">
               <ElButton
                 v-if="hasAccessByCodes(['iot:device:update'])"
                 size="small"
@@ -274,3 +274,10 @@ onMounted(() => {
     </div>
   </div>
 </template>
+
+<style scoped>
+/* Element Plus 默认会在相邻按钮之间加 margin-left:12px，与父容器的 gap-2 叠加导致按钮间距过大，这里清掉 */
+.card-action-group :deep(.el-button + .el-button) {
+  margin-left: 0;
+}
+</style>
diff --git a/apps/web-ele/src/views/iot/product/product/modules/card-view.vue b/apps/web-ele/src/views/iot/product/product/modules/card-view.vue
index d73e005fd..929c9b00a 100644
--- a/apps/web-ele/src/views/iot/product/product/modules/card-view.vue
+++ b/apps/web-ele/src/views/iot/product/product/modules/card-view.vue
@@ -201,7 +201,7 @@ onMounted(() => {
               </div>
             </div>
             <!-- 按钮组 -->
-            <div class="mt-auto flex gap-2 border-t border-border pt-3">
+            <div class="card-action-group mt-auto flex gap-2 border-t border-border pt-3">
               <ElButton
                 v-if="hasAccessByCodes(['iot:product:update'])"
                 size="small"
@@ -284,3 +284,10 @@ onMounted(() => {
     </div>
   </div>
 </template>
+
+<style scoped>
+/* Element Plus 默认会在相邻按钮之间加 margin-left:12px，与父容器的 gap-2 叠加导致按钮间距过大，这里清掉 */
+.card-action-group :deep(.el-button + .el-button) {
+  margin-left: 0;
+}
+</style>

From 4949ed1c07bd13933e1273c01b3f937b1b2fe3d4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 25 May 2026 12:31:09 +0800
Subject: [PATCH 04/17] =?UTF-8?q?fix(iot)=EF=BC=9A=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=EF=BC=8C=E9=97=B4?=
 =?UTF-8?q?=E9=9A=99=E8=BF=87=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/iot/device/device/modules/card-view.vue    | 9 ++++++++-
 .../src/views/iot/product/product/modules/card-view.vue  | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/web-ele/src/views/iot/device/device/modules/card-view.vue b/apps/web-ele/src/views/iot/device/device/modules/card-view.vue
index 75c57c0d4..c524f41e7 100644
--- a/apps/web-ele/src/views/iot/device/device/modules/card-view.vue
+++ b/apps/web-ele/src/views/iot/device/device/modules/card-view.vue
@@ -205,7 +205,7 @@ onMounted(() => {
               </div>
             </div>
             <!-- 按钮组 -->
-            <div class="card-action-group mt-auto flex gap-2 border-t border-border pt-3">
+            <div class="mt-auto flex gap-2 border-t border-border pt-3 [&_.el-button+.el-button]:!ml-0">
               <ElButton
                 v-if="hasAccessByCodes(['iot:device:update'])"
                 size="small"
@@ -281,3 +281,10 @@ onMounted(() => {
   margin-left: 0;
 }
 </style>
+
+<style scoped>
+/* Element Plus 默认会在相邻按钮之间加 margin-left:12px，与父容器的 gap-2 叠加导致按钮间距过大，这里清掉 */
+.card-action-group :deep(.el-button + .el-button) {
+  margin-left: 0;
+}
+</style>
diff --git a/apps/web-ele/src/views/iot/product/product/modules/card-view.vue b/apps/web-ele/src/views/iot/product/product/modules/card-view.vue
index 929c9b00a..14c1fef5e 100644
--- a/apps/web-ele/src/views/iot/product/product/modules/card-view.vue
+++ b/apps/web-ele/src/views/iot/product/product/modules/card-view.vue
@@ -201,7 +201,7 @@ onMounted(() => {
               </div>
             </div>
             <!-- 按钮组 -->
-            <div class="card-action-group mt-auto flex gap-2 border-t border-border pt-3">
+            <div class="mt-auto flex gap-2 border-t border-border pt-3 [&_.el-button+.el-button]:!ml-0">
               <ElButton
                 v-if="hasAccessByCodes(['iot:product:update'])"
                 size="small"
@@ -291,3 +291,10 @@ onMounted(() => {
   margin-left: 0;
 }
 </style>
+
+<style scoped>
+/* Element Plus 默认会在相邻按钮之间加 margin-left:12px，与父容器的 gap-2 叠加导致按钮间距过大，这里清掉 */
+.card-action-group :deep(.el-button + .el-button) {
+  margin-left: 0;
+}
+</style>

From adb57ed364131c0f72119153e5f0bd7cfb05e4ac Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 25 May 2026 18:10:29 +0800
Subject: [PATCH 05/17] =?UTF-8?q?feat(mes)=EF=BC=9A=E4=BC=98=E5=8C=96=20re?=
 =?UTF-8?q?view=20-=20=E5=B7=A5=E5=BA=8F=E5=AE=9A=E4=B9=89=EF=BC=88pro=5Fp?=
 =?UTF-8?q?rocess=EF=BC=89=E3=80=81=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=EF=BC=88pro=5Froute=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mes/pro/process/data.ts         |   1 -
 .../mes/pro/process/modules/content-list.vue  |  15 +-
 .../views/mes/pro/process/modules/form.vue    |   4 +-
 .../views/mes/pro/route/modules/bom-form.vue  |   2 +-
 .../src/views/mes/pro/route/modules/form.vue  |  20 +-
 .../mes/pro/route/modules/process-form.vue    |  18 +-
 .../mes/pro/route/modules/process-list.vue    |  19 +-
 .../pro/route/modules/product-bom-list.vue    |  34 ++--
 .../mes/pro/route/modules/product-form.vue    |  25 ++-
 .../mes/pro/route/modules/product-list.vue    |  15 +-
 .../mes/pro/process/modules/content-list.vue  |  14 +-
 .../views/mes/pro/process/modules/form.vue    |   4 +-
 apps/web-ele/src/views/mes/pro/route/data.ts  | 135 ++++++++++++
 .../src/views/mes/pro/route/modules/form.vue  |  12 +-
 .../mes/pro/route/modules/process-form.vue    |  18 +-
 .../mes/pro/route/modules/process-list.vue    |  17 +-
 .../pro/route/modules/product-bom-list.vue    | 187 ++++-------------
 .../mes/pro/route/modules/product-form.vue    | 192 ++++++------------
 .../mes/pro/route/modules/product-list.vue    |  12 +-
 19 files changed, 359 insertions(+), 385 deletions(-)

diff --git a/apps/web-antd/src/views/mes/pro/process/data.ts b/apps/web-antd/src/views/mes/pro/process/data.ts
index c4c8ed503..ff8089acd 100644
--- a/apps/web-antd/src/views/mes/pro/process/data.ts
+++ b/apps/web-antd/src/views/mes/pro/process/data.ts
@@ -40,7 +40,6 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
           {
             type: 'default',
             onClick: async () => {
-              // TODO @AI：需要 try catch 么？感觉直接去掉也可以？
               try {
                 const code = await generateAutoCode(
                   MesAutoCodeRuleCode.PRO_PROCESS_CODE,
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue b/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
index 15757bcf4..3d51d5bb5 100644
--- a/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
+++ b/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
@@ -19,10 +19,11 @@ import { useContentGridColumns } from '../data';
 import ContentForm from './content-form.vue';
 
 const props = defineProps<{
+  formMode: 'create' | 'detail' | 'update';
   processId: number;
-  readonly?: boolean;
 }>();
 
+const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
 const list = ref<MesProProcessContentApi.ProcessContent[]>([]);
 
 const [ContentFormModal, contentFormModalApi] = useVbenModal({
@@ -60,11 +61,7 @@ async function getList() {
 
 /** 新增工序步骤 */
 function handleCreate() {
-  // TODO @AI：是不是可以直接 max 然后 || 0；
-  const maxSort =
-    list.value.length > 0
-      ? Math.max(...list.value.map((item) => item.sort || 0))
-      : 0;
+  const maxSort = Math.max(0, ...list.value.map((item) => item.sort || 0));
   contentFormModalApi
     .setData({ maxSort, processId: props.processId })
     .open();
@@ -95,7 +92,7 @@ watch(
 
 <template>
   <ContentFormModal @success="getList" />
-  <div v-if="!readonly" class="mb-3 flex items-center justify-start">
+  <div v-if="isEditable" class="mb-3 flex items-center justify-start">
     <TableAction
       :actions="[
         {
@@ -113,14 +110,14 @@ watch(
           {
             label: $t('common.edit'),
             type: 'link',
-            ifShow: () => !readonly,
+            ifShow: () => isEditable,
             onClick: handleEdit.bind(null, row),
           },
           {
             label: $t('common.delete'),
             type: 'link',
             danger: true,
-            ifShow: () => !readonly,
+            ifShow: () => isEditable,
             popConfirm: {
               title: $t('ui.actionMessage.deleteConfirm', ['工序步骤']),
               confirm: handleDelete.bind(null, row),
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/form.vue b/apps/web-antd/src/views/mes/pro/process/modules/form.vue
index 247ec05a7..94d96bb51 100644
--- a/apps/web-antd/src/views/mes/pro/process/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/process/modules/form.vue
@@ -22,7 +22,7 @@ type FormMode = 'create' | 'detail' | 'update';
 
 const emit = defineEmits(['success']);
 const formMode = ref<FormMode>('create'); // 表单模式
-const formData = ref<MesProProcessApi.Process>(); // 当前编辑/查看的工序数据
+const formData = ref<MesProProcessApi.Process>();
 
 const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
@@ -110,7 +110,7 @@ const processId = computed(() => formData.value?.id);
     <template v-if="processId">
       <Divider class="!my-3" orientation="left">操作步骤</Divider>
       <div class="mx-4">
-        <ContentList :process-id="processId" :readonly="isDetail" />
+        <ContentList :form-mode="formMode" :process-id="processId" />
       </div>
     </template>
   </Modal>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
index e2d51c132..b5931df3a 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
@@ -17,7 +17,7 @@ import { $t } from '#/locales';
 import { useRouteProductBomFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
-const formData = ref<MesProRouteProductBomApi.RouteProductBom>(); // 当前编辑的 BOM 数据
+const formData = ref<MesProRouteProductBomApi.RouteProductBom>();
 const productId = ref<number>(0); // 当前产品物料编号，供 BOM 选择器筛选可用 BOM
 const getTitle = computed(() =>
   formData.value?.id
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/form.vue b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
index d9a64fdec..2ca0303ae 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
@@ -8,11 +8,7 @@ import { useVbenModal } from '@vben/common-ui';
 import { message, TabPane, Tabs } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
-import {
-  createRoute,
-  getRoute,
-  updateRoute,
-} from '#/api/mes/pro/route';
+import { createRoute, getRoute, updateRoute } from '#/api/mes/pro/route';
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
@@ -22,11 +18,11 @@ import ProductList from './product-list.vue';
 type FormMode = 'create' | 'detail' | 'update';
 
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create');
-const subTab = ref('process');
+const formMode = ref<FormMode>('create'); // 表单模式
+const subTab = ref('process'); // 当前激活的子表 Tab
 const formData = ref<MesProRouteApi.Route>();
 
-const isDetail = computed(() => formMode.value === 'detail');
+const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
   if (formMode.value === 'detail') {
     return $t('ui.actionTitle.detail', ['工艺路线']);
@@ -48,10 +44,9 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
-// TODO @AI：注释风格，是不是和别的没对齐
+/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
 formApi.setState({ schema: useFormSchema(formApi) });
 
-// TODO @AI：注释风格，是不是和别的没对齐
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     if (isDetail.value) {
@@ -63,9 +58,11 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesProRouteApi.Route;
     try {
       if (formMode.value === 'create') {
+        // 新增成功后切到编辑模式，方便继续维护组成工序、关联产品
         const id = await createRoute(data);
         formData.value = { ...data, id };
         await formApi.setFieldValue('id', id);
@@ -87,6 +84,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTab.value = 'process';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type ?? 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -97,6 +95,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getRoute(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
@@ -108,6 +107,7 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
+    <!-- 编辑/详情模式下展示子表 Tab，新增模式下隐藏 -->
     <Tabs
       v-if="formMode !== 'create' && formData?.id"
       v-model:active-key="subTab"
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
index 218f99032..d4f7681fa 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/process-form.vue
@@ -12,6 +12,7 @@ import { useVbenForm } from '#/adapter/form';
 import { getProcessSimpleList } from '#/api/mes/pro/process';
 import {
   createRouteProcess,
+  getRouteProcess,
   updateRouteProcess,
 } from '#/api/mes/pro/route/process';
 import { $t } from '#/locales';
@@ -48,7 +49,6 @@ async function loadSchema(): Promise<VbenFormSchema[]> {
   return useRouteProcessFormSchema(options);
 }
 
-// TODO @AI：注释风格，是不是和别的没对齐
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -56,12 +56,14 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data =
       (await formApi.getValues()) as MesProRouteProcessApi.RouteProcess;
     try {
       await (formData.value?.id
         ? updateRouteProcess(data)
         : createRouteProcess(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -76,22 +78,24 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
+      // 工序下拉依赖远程数据，schema 在弹窗打开时再生成
       const schema = await loadSchema();
       formApi.setState({ schema });
       await formApi.resetForm();
     } finally {
       modalApi.unlock();
     }
+    // 加载数据
     const data = modalApi.getData<{
       id?: number;
       maxSort?: number;
       routeId: number;
-      row?: MesProRouteProcessApi.RouteProcess;
     }>();
     if (!data) {
       return;
     }
     if (!data.id) {
+      // 新增时，默认序号 = maxSort + 1，并给一个默认甘特图颜色
       await formApi.setValues({
         colorCode: '#00AEF3',
         routeId: data.routeId,
@@ -99,9 +103,13 @@ const [Modal, modalApi] = useVbenModal({
       });
       return;
     }
-    if (data.row) {
-      formData.value = data.row;
-      await formApi.setValues(data.row);
+    modalApi.lock();
+    try {
+      formData.value = await getRouteProcess(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
index aecb0eafa..89479d1e2 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
@@ -23,8 +23,8 @@ const props = defineProps<{
   routeId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail');
-const list = ref<MesProRouteProcessApi.RouteProcess[]>([]);
+const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const list = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 工艺路线工序列表
 
 const [ProcessFormModal, processFormModalApi] = useVbenModal({
   connectedComponent: ProcessForm,
@@ -45,7 +45,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesProRouteProcessApi.RouteProcess>,
 });
 
-// TODO @AI：注释风格，是不是和别的没对齐
+/** 加载工艺路线工序列表 */
 async function getList() {
   gridApi.setLoading(true);
   try {
@@ -56,21 +56,18 @@ async function getList() {
   }
 }
 
-// TODO @AI：注释风格，是不是和别的没对齐
+/** 新增工艺路线工序 */
 function handleCreate() {
-  const maxSort =
-    list.value.length > 0
-      ? Math.max(...list.value.map((item) => item.sort || 0))
-      : 0;
+  const maxSort = Math.max(0, ...list.value.map((item) => item.sort || 0));
   processFormModalApi.setData({ maxSort, routeId: props.routeId }).open();
 }
 
-// TODO @AI：注释风格，是不是和别的没对齐
+/** 编辑工艺路线工序 */
 function handleEdit(row: MesProRouteProcessApi.RouteProcess) {
-  processFormModalApi.setData({ id: row.id, routeId: props.routeId, row }).open();
+  processFormModalApi.setData({ id: row.id, routeId: props.routeId }).open();
 }
 
-// TODO @AI：注释风格，是不是和别的没对齐
+/** 删除工艺路线工序 */
 async function handleDelete(row: MesProRouteProcessApi.RouteProcess) {
   await deleteRouteProcess(row.id!);
   message.success($t('ui.actionMessage.deleteSuccess', ['工艺路线工序']));
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue
index c875379bd..78ac67284 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-bom-list.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
 import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
 
 import { ref, watch } from 'vue';
@@ -25,12 +26,9 @@ const props = defineProps<{
   routeId: number;
 }>();
 
-// TODO @AI：const 的尾注释？别的 vue 文件也看看，遵守 agents md 里说的。
-const processOptions = ref<
-  Array<{ processId: number; processName?: string }>
->([]); // TODO @AI：是不是不用转换，vue 那直接处理就好了；
-const activeProcessId = ref<string>(''); // TODO @AI：这个好像是 number？看看 vue3 + ep 里的代码。
-const list = ref<MesProRouteProductBomApi.RouteProductBom[]>([]);
+const processList = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 工序列表（用于 Tab）
+const activeProcessId = ref<number>(); // 当前选中的工序 Tab
+const list = ref<MesProRouteProductBomApi.RouteProductBom[]>([]); // 当前工序下的 BOM 列表
 
 const [BomFormModal, bomFormModalApi] = useVbenModal({
   connectedComponent: BomForm,
@@ -53,16 +51,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 /** 加载路线下的工序列表，用于工序 Tab */
 async function loadProcessList() {
-  const data = await getRouteProcessListByRoute(props.routeId);
-  processOptions.value = (data || []).map((item) => ({
-    processId: item.processId!,
-    processName: item.processName,
-  }));
-  if (processOptions.value.length > 0) {
-    activeProcessId.value = String(processOptions.value[0]!.processId);
+  processList.value = (await getRouteProcessListByRoute(props.routeId)) || [];
+  if (processList.value.length > 0) {
+    activeProcessId.value = processList.value[0]!.processId;
     await getList();
   } else {
-    activeProcessId.value = '';
+    activeProcessId.value = undefined;
     list.value = [];
     gridApi.setGridOptions({ data: list.value });
   }
@@ -76,7 +70,7 @@ async function getList() {
   gridApi.setLoading(true);
   try {
     list.value = await getRouteProductBomList({
-      processId: Number(activeProcessId.value),
+      processId: activeProcessId.value,
       productId: props.productId,
       routeId: props.routeId,
     });
@@ -94,7 +88,7 @@ function handleCreate() {
   }
   bomFormModalApi
     .setData({
-      processId: Number(activeProcessId.value),
+      processId: activeProcessId.value,
       productId: props.productId,
       routeId: props.routeId,
     })
@@ -105,10 +99,10 @@ function handleCreate() {
 function handleEdit(row: MesProRouteProductBomApi.RouteProductBom) {
   bomFormModalApi
     .setData({
-      processId: Number(activeProcessId.value),
+      id: row.id,
+      processId: activeProcessId.value!,
       productId: props.productId,
       routeId: props.routeId,
-      row,
     })
     .open();
 }
@@ -135,8 +129,8 @@ watch(
   <BomFormModal @success="getList" />
   <Tabs v-model:active-key="activeProcessId" @change="getList">
     <TabPane
-      v-for="item in processOptions"
-      :key="String(item.processId)"
+      v-for="item in processList"
+      :key="item.processId"
       :tab="item.processName"
     />
   </Tabs>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
index 7256c7ece..47ce4ba12 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-form.vue
@@ -10,6 +10,7 @@ import { Divider, message } from 'ant-design-vue';
 import { useVbenForm } from '#/adapter/form';
 import {
   createRouteProduct,
+  getRouteProduct,
   updateRouteProduct,
 } from '#/api/mes/pro/route/product';
 import { $t } from '#/locales';
@@ -18,7 +19,7 @@ import { useRouteProductFormSchema } from '../data';
 import ProductBomList from './product-bom-list.vue';
 
 const emit = defineEmits(['success']);
-const formData = ref<MesProRouteProductApi.RouteProduct>(); // 当前编辑/查看的产品数据
+const formData = ref<MesProRouteProductApi.RouteProduct>();
 const getTitle = computed(() =>
   formData.value?.id
     ? $t('ui.actionTitle.edit', ['工艺路线产品'])
@@ -51,7 +52,6 @@ const [Form, formApi] = useVbenForm({
 });
 
 const [Modal, modalApi] = useVbenModal({
-  // TODO @AI：注释风格，是不是和别的没对齐
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
@@ -64,7 +64,10 @@ const [Modal, modalApi] = useVbenModal({
     try {
       if (formData.value?.id) {
         await updateRouteProduct(data);
+        // 用最新表单值同步 formData，确保产品 BOM 子表绑定的 itemId 与表单一致
+        formData.value = { ...formData.value, ...data };
       } else {
+        // 新增成功后切换到编辑模式，方便继续维护产品 BOM
         const id = await createRouteProduct(data);
         formData.value = { ...data, id };
         await formApi.setFieldValue('id', id);
@@ -85,18 +88,22 @@ const [Modal, modalApi] = useVbenModal({
     const data = modalApi.getData<{
       id?: number;
       routeId: number;
-      row?: MesProRouteProductApi.RouteProduct;
     }>();
     if (!data) {
       return;
     }
-    if (data.row) {
-      formData.value = data.row;
-      // 设置到 values
-      await formApi.setValues(data.row);
+    if (!data.id) {
+      await formApi.setValues({ routeId: data.routeId });
       return;
     }
-    await formApi.setValues({ routeId: data.routeId });
+    modalApi.lock();
+    try {
+      formData.value = await getRouteProduct(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
   },
 });
 </script>
@@ -104,7 +111,7 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal :title="getTitle" class="w-3/5">
     <Form class="mx-4" />
-    <!-- 编辑/详情模式下展示产品 BOM 子表，新增模式下隐藏 -->
+    <!-- 编辑模式下展示产品 BOM 子表，新增模式下隐藏 -->
     <template v-if="formData?.id && formData?.itemId">
       <Divider class="!my-3" orientation="left">产品 BOM 配置</Divider>
       <div class="mx-4">
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
index 0533ce8b4..4279d6f48 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
@@ -25,15 +25,14 @@ const props = defineProps<{
   routeId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail');
-const list = ref<MesProRouteProductApi.RouteProduct[]>([]);
+const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const list = ref<MesProRouteProductApi.RouteProduct[]>([]); // 工艺路线产品列表
 
 const [ProductFormModal, productFormModalApi] = useVbenModal({
   connectedComponent: ProductForm,
   destroyOnClose: true,
 });
 
-// TODO @AI：代码的排版风格？ps：和别的模块，看看是不是一致；
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     autoResize: true,
@@ -48,7 +47,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesProRouteProductApi.RouteProduct>,
 });
 
-// TODO @AI：注释风格，是不是和别的没对齐
+/** 加载工艺路线产品列表 */
 async function getList() {
   gridApi.setLoading(true);
   try {
@@ -59,17 +58,17 @@ async function getList() {
   }
 }
 
-// TODO @AI：注释风格，是不是和别的没对齐
+/** 新增工艺路线产品 */
 function handleCreate() {
   productFormModalApi.setData({ routeId: props.routeId }).open();
 }
 
-// TODO @AI：注释风格，是不是和别的没对齐
+/** 编辑工艺路线产品 */
 function handleEdit(row: MesProRouteProductApi.RouteProduct) {
-  productFormModalApi.setData({ id: row.id, routeId: props.routeId, row }).open();
+  productFormModalApi.setData({ id: row.id, routeId: props.routeId }).open();
 }
 
-// TODO @AI：注释风格，是不是和别的没对齐
+/** 删除工艺路线产品 */
 async function handleDelete(row: MesProRouteProductApi.RouteProduct) {
   await deleteRouteProduct(row.id!);
   message.success($t('ui.actionMessage.deleteSuccess', ['工艺路线产品']));
diff --git a/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue b/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue
index 520bd005f..8e1a7b3c6 100644
--- a/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue
+++ b/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue
@@ -19,10 +19,11 @@ import { useContentGridColumns } from '../data';
 import ContentForm from './content-form.vue';
 
 const props = defineProps<{
+  formMode: 'create' | 'detail' | 'update';
   processId: number;
-  readonly?: boolean;
 }>();
 
+const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
 const list = ref<MesProProcessContentApi.ProcessContent[]>([]);
 
 const [ContentFormModal, contentFormModalApi] = useVbenModal({
@@ -60,10 +61,7 @@ async function getList() {
 
 /** 新增工序步骤 */
 function handleCreate() {
-  const maxSort =
-    list.value.length > 0
-      ? Math.max(...list.value.map((item) => item.sort || 0))
-      : 0;
+  const maxSort = Math.max(0, ...list.value.map((item) => item.sort || 0));
   contentFormModalApi
     .setData({ maxSort, processId: props.processId })
     .open();
@@ -94,7 +92,7 @@ watch(
 
 <template>
   <ContentFormModal @success="getList" />
-  <div v-if="!readonly" class="mb-3 flex items-center justify-start">
+  <div v-if="isEditable" class="mb-3 flex items-center justify-start">
     <TableAction
       :actions="[
         {
@@ -113,14 +111,14 @@ watch(
             label: $t('common.edit'),
             type: 'primary',
             link: true,
-            ifShow: () => !readonly,
+            ifShow: () => isEditable,
             onClick: handleEdit.bind(null, row),
           },
           {
             label: $t('common.delete'),
             type: 'danger',
             link: true,
-            ifShow: () => !readonly,
+            ifShow: () => isEditable,
             popConfirm: {
               title: $t('ui.actionMessage.deleteConfirm', ['工序步骤']),
               confirm: handleDelete.bind(null, row),
diff --git a/apps/web-ele/src/views/mes/pro/process/modules/form.vue b/apps/web-ele/src/views/mes/pro/process/modules/form.vue
index 92764a5e5..1011829f4 100644
--- a/apps/web-ele/src/views/mes/pro/process/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/process/modules/form.vue
@@ -22,7 +22,7 @@ type FormMode = 'create' | 'detail' | 'update';
 
 const emit = defineEmits(['success']);
 const formMode = ref<FormMode>('create'); // 表单模式
-const formData = ref<MesProProcessApi.Process>(); // 当前编辑/查看的工序数据
+const formData = ref<MesProProcessApi.Process>();
 
 const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
@@ -110,7 +110,7 @@ const processId = computed(() => formData.value?.id);
     <template v-if="processId">
       <ElDivider class="!my-3" content-position="left">操作步骤</ElDivider>
       <div class="mx-4">
-        <ContentList :process-id="processId" :readonly="isDetail" />
+        <ContentList :form-mode="formMode" :process-id="processId" />
       </div>
     </template>
   </Modal>
diff --git a/apps/web-ele/src/views/mes/pro/route/data.ts b/apps/web-ele/src/views/mes/pro/route/data.ts
index d78855ce9..ac2864c5e 100644
--- a/apps/web-ele/src/views/mes/pro/route/data.ts
+++ b/apps/web-ele/src/views/mes/pro/route/data.ts
@@ -14,6 +14,10 @@ import { ElButton } from 'element-plus';
 
 import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import {
+  MdItemSelect,
+  MdProductBomSelect,
+} from '#/views/mes/md/item/components';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 /** 工艺路线表单 */
@@ -348,3 +352,134 @@ export function useRouteProductBomGridColumns(): VxeTableGridOptions<MesProRoute
     },
   ];
 }
+
+
+/** 工艺路线产品表单 */
+export function useRouteProductFormSchema(
+  onItemChange?: (item: any) => void,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'routeId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    // 产品物料：使用业务自定义选择器，change 回填编码/名称/规格/单位
+    {
+      fieldName: 'itemId',
+      label: '产品',
+      component: MdItemSelect as any,
+      componentProps: {
+        onChange: onItemChange,
+      },
+      formItemClass: 'col-span-2',
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '生产数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 1,
+        precision: 0,
+      },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'productionTime',
+      label: '生产用时',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 2,
+      },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'timeUnitType',
+      label: '时间单位',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_TIME_UNIT_TYPE),
+        placeholder: '请选择',
+      },
+      rules: z.string().default('MINUTE'),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-2',
+      componentProps: { maxLength: 250, placeholder: '请输入备注', rows: 2 },
+    },
+  ];
+}
+
+/** 工艺路线产品 BOM 表单 */
+export function useRouteProductBomFormSchema(
+  itemId: () => number,
+  onBomChange?: (bom: any) => void,
+): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'routeId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'processId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'productId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    // BOM 物料：依赖产品物料，使用业务自定义选择器
+    {
+      fieldName: 'itemId',
+      label: 'BOM 物料',
+      component: MdProductBomSelect as any,
+      componentProps: () => ({
+        itemId: itemId(),
+        onChange: onBomChange,
+        placeholder: '请选择 BOM 物料',
+      }),
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'quantity',
+      label: '用料比例',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 2,
+      },
+      rules: z.number().default(1),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: { maxLength: 250, placeholder: '请输入备注', rows: 2 },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/form.vue b/apps/web-ele/src/views/mes/pro/route/modules/form.vue
index 9ece6d945..c57eabd07 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/form.vue
@@ -18,11 +18,11 @@ import ProductList from './product-list.vue';
 type FormMode = 'create' | 'detail' | 'update';
 
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create');
-const subTab = ref('process');
+const formMode = ref<FormMode>('create'); // 表单模式
+const subTab = ref('process'); // 当前激活的子表 Tab
 const formData = ref<MesProRouteApi.Route>();
 
-const isDetail = computed(() => formMode.value === 'detail');
+const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
   if (formMode.value === 'detail') {
     return $t('ui.actionTitle.detail', ['工艺路线']);
@@ -44,6 +44,7 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
+/** 表单 schema 需要 formApi 引用（生成编码按钮），所以通过 setState 设置 schema */
 formApi.setState({ schema: useFormSchema(formApi) });
 
 const [Modal, modalApi] = useVbenModal({
@@ -57,9 +58,11 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data = (await formApi.getValues()) as MesProRouteApi.Route;
     try {
       if (formMode.value === 'create') {
+        // 新增成功后切到编辑模式，方便继续维护组成工序、关联产品
         const id = await createRoute(data);
         formData.value = { ...data, id };
         await formApi.setFieldValue('id', id);
@@ -81,6 +84,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     subTab.value = 'process';
+    // 加载数据
     const data = modalApi.getData<{ id?: number; type?: FormMode }>();
     formMode.value = data?.type ?? 'create';
     formApi.setDisabled(formMode.value === 'detail');
@@ -91,6 +95,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getRoute(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
@@ -102,6 +107,7 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
+    <!-- 编辑/详情模式下展示子表 Tab，新增模式下隐藏 -->
     <ElTabs
       v-if="formMode !== 'create' && formData?.id"
       v-model="subTab"
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue b/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue
index 48cef50c6..eb5fe30a0 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/process-form.vue
@@ -12,6 +12,7 @@ import { useVbenForm } from '#/adapter/form';
 import { getProcessSimpleList } from '#/api/mes/pro/process';
 import {
   createRouteProcess,
+  getRouteProcess,
   updateRouteProcess,
 } from '#/api/mes/pro/route/process';
 import { $t } from '#/locales';
@@ -38,6 +39,7 @@ const [Form, formApi] = useVbenForm({
   wrapperClass: 'grid-cols-2',
 });
 
+/** 加载工序选项后再生成 schema（避免下拉空选项） */
 async function loadSchema(): Promise<VbenFormSchema[]> {
   const list = await getProcessSimpleList();
   const options = (list || []).map((item) => ({
@@ -54,12 +56,14 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data =
       (await formApi.getValues()) as MesProRouteProcessApi.RouteProcess;
     try {
       await (formData.value?.id
         ? updateRouteProcess(data)
         : createRouteProcess(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
@@ -74,22 +78,24 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
+      // 工序下拉依赖远程数据，schema 在弹窗打开时再生成
       const schema = await loadSchema();
       formApi.setState({ schema });
       await formApi.resetForm();
     } finally {
       modalApi.unlock();
     }
+    // 加载数据
     const data = modalApi.getData<{
       id?: number;
       maxSort?: number;
       routeId: number;
-      row?: MesProRouteProcessApi.RouteProcess;
     }>();
     if (!data) {
       return;
     }
     if (!data.id) {
+      // 新增时，默认序号 = maxSort + 1，并给一个默认甘特图颜色
       await formApi.setValues({
         colorCode: '#00AEF3',
         routeId: data.routeId,
@@ -97,9 +103,13 @@ const [Modal, modalApi] = useVbenModal({
       });
       return;
     }
-    if (data.row) {
-      formData.value = data.row;
-      await formApi.setValues(data.row);
+    modalApi.lock();
+    try {
+      formData.value = await getRouteProcess(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue b/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue
index 41936f562..f9b08c9b0 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue
@@ -23,8 +23,8 @@ const props = defineProps<{
   routeId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail');
-const list = ref<MesProRouteProcessApi.RouteProcess[]>([]);
+const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const list = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 工艺路线工序列表
 
 const [ProcessFormModal, processFormModalApi] = useVbenModal({
   connectedComponent: ProcessForm,
@@ -45,6 +45,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesProRouteProcessApi.RouteProcess>,
 });
 
+/** 加载工艺路线工序列表 */
 async function getList() {
   gridApi.setLoading(true);
   try {
@@ -55,20 +56,18 @@ async function getList() {
   }
 }
 
+/** 新增工艺路线工序 */
 function handleCreate() {
-  const maxSort =
-    list.value.length > 0
-      ? Math.max(...list.value.map((item) => item.sort || 0))
-      : 0;
+  const maxSort = Math.max(0, ...list.value.map((item) => item.sort || 0));
   processFormModalApi.setData({ maxSort, routeId: props.routeId }).open();
 }
 
+/** 编辑工艺路线工序 */
 function handleEdit(row: MesProRouteProcessApi.RouteProcess) {
-  processFormModalApi
-    .setData({ id: row.id, routeId: props.routeId, row })
-    .open();
+  processFormModalApi.setData({ id: row.id, routeId: props.routeId }).open();
 }
 
+/** 删除工艺路线工序 */
 async function handleDelete(row: MesProRouteProcessApi.RouteProcess) {
   await deleteRouteProcess(row.id!);
   ElMessage.success($t('ui.actionMessage.deleteSuccess', ['工艺路线工序']));
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/product-bom-list.vue b/apps/web-ele/src/views/mes/pro/route/modules/product-bom-list.vue
index 8b288faef..b2ba09192 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/product-bom-list.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/product-bom-list.vue
@@ -1,34 +1,24 @@
 <script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus';
-
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
 import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
 
-import { computed, reactive, ref, watch } from 'vue';
+import { ref, watch } from 'vue';
 
-import {
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElInputNumber,
-  ElMessage,
-  ElTabPane,
-  ElTabs,
-} from 'element-plus';
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage, ElTabPane, ElTabs } from 'element-plus';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getRouteProcessListByRoute } from '#/api/mes/pro/route/process';
 import {
-  createRouteProductBom,
   deleteRouteProductBom,
   getRouteProductBomList,
-  updateRouteProductBom,
 } from '#/api/mes/pro/route/productbom';
 import { $t } from '#/locales';
-import { MdProductBomSelect } from '#/views/mes/md/item/components';
 
 import { useRouteProductBomGridColumns } from '../data';
+import BomForm from './bom-form.vue';
 
 const props = defineProps<{
   productId: number;
@@ -36,27 +26,14 @@ const props = defineProps<{
   routeId: number;
 }>();
 
-const processOptions = ref<
-  Array<{ processId: number; processName?: string }>
->([]);
-const activeProcessId = ref<string>('');
-const list = ref<MesProRouteProductBomApi.RouteProductBom[]>([]);
+const processList = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 工序列表（用于 Tab）
+const activeProcessId = ref<number>(); // 当前选中的工序 Tab
+const list = ref<MesProRouteProductBomApi.RouteProductBom[]>([]); // 当前工序下的 BOM 列表
 
-const formVisible = ref(false);
-const formRef = ref<FormInstance>();
-const isUpdate = ref(false);
-const formData = reactive<MesProRouteProductBomApi.RouteProductBom>({
-  quantity: 1,
+const [BomFormModal, bomFormModalApi] = useVbenModal({
+  connectedComponent: BomForm,
+  destroyOnClose: true,
 });
-const formRules: FormRules = {
-  itemId: [{ message: 'BOM 物料不能为空', required: true }],
-  quantity: [{ message: '用料比例不能为空', required: true }],
-};
-const formTitle = computed(() =>
-  isUpdate.value
-    ? $t('ui.actionTitle.edit', ['BOM 物料'])
-    : $t('ui.actionTitle.create', ['BOM 物料']),
-);
 
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
@@ -72,22 +49,20 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>,
 });
 
+/** 加载路线下的工序列表，用于工序 Tab */
 async function loadProcessList() {
-  const data = await getRouteProcessListByRoute(props.routeId);
-  processOptions.value = (data || []).map((item) => ({
-    processId: item.processId!,
-    processName: item.processName,
-  }));
-  if (processOptions.value.length > 0) {
-    activeProcessId.value = String(processOptions.value[0]!.processId);
+  processList.value = (await getRouteProcessListByRoute(props.routeId)) || [];
+  if (processList.value.length > 0) {
+    activeProcessId.value = processList.value[0]!.processId;
     await getList();
   } else {
-    activeProcessId.value = '';
+    activeProcessId.value = undefined;
     list.value = [];
     gridApi.setGridOptions({ data: list.value });
   }
 }
 
+/** 加载当前工序下的 BOM 列表 */
 async function getList() {
   if (!activeProcessId.value) {
     return;
@@ -95,7 +70,7 @@ async function getList() {
   gridApi.setLoading(true);
   try {
     list.value = await getRouteProductBomList({
-      processId: Number(activeProcessId.value),
+      processId: activeProcessId.value,
       productId: props.productId,
       routeId: props.routeId,
     });
@@ -105,69 +80,40 @@ async function getList() {
   }
 }
 
-function resetForm() {
-  Object.assign(formData, {
-    id: undefined,
-    itemCode: undefined,
-    itemId: undefined,
-    itemName: undefined,
-    processId: Number(activeProcessId.value),
-    productId: props.productId,
-    quantity: 1,
-    remark: undefined,
-    routeId: props.routeId,
-    specification: undefined,
-    unitName: undefined,
-  });
-  formRef.value?.clearValidate();
-}
-
+/** 新增 BOM */
 function handleCreate() {
   if (!activeProcessId.value) {
     ElMessage.warning('请先选择工序');
     return;
   }
-  resetForm();
-  isUpdate.value = false;
-  formVisible.value = true;
+  bomFormModalApi
+    .setData({
+      processId: activeProcessId.value,
+      productId: props.productId,
+      routeId: props.routeId,
+    })
+    .open();
 }
 
+/** 编辑 BOM */
 function handleEdit(row: MesProRouteProductBomApi.RouteProductBom) {
-  Object.assign(formData, row);
-  isUpdate.value = true;
-  formVisible.value = true;
+  bomFormModalApi
+    .setData({
+      id: row.id,
+      processId: activeProcessId.value!,
+      productId: props.productId,
+      routeId: props.routeId,
+    })
+    .open();
 }
 
+/** 删除 BOM */
 async function handleDelete(row: MesProRouteProductBomApi.RouteProductBom) {
   await deleteRouteProductBom(row.id!);
   ElMessage.success($t('ui.actionMessage.deleteSuccess', ['BOM 物料']));
   await getList();
 }
 
-async function submitForm() {
-  try {
-    await formRef.value?.validate();
-  } catch {
-    return;
-  }
-  await (isUpdate.value
-    ? updateRouteProductBom(formData)
-    : createRouteProductBom(formData));
-  ElMessage.success($t('ui.actionMessage.operationSuccess'));
-  formVisible.value = false;
-  await getList();
-}
-
-function handleBomChange(bom?: any) {
-  if (bom) {
-    formData.quantity = bom.quantity ?? 1;
-    formData.itemCode = bom.bomItemCode;
-    formData.itemName = bom.bomItemName;
-    formData.specification = bom.specification;
-    formData.unitName = bom.unitName;
-  }
-}
-
 watch(
   () => [props.routeId, props.productId],
   () => {
@@ -180,12 +126,13 @@ watch(
 </script>
 
 <template>
+  <BomFormModal @success="getList" />
   <ElTabs v-model="activeProcessId" @tab-change="getList">
     <ElTabPane
-      v-for="item in processOptions"
-      :key="String(item.processId)"
+      v-for="item in processList"
+      :key="item.processId"
       :label="item.processName"
-      :name="String(item.processId)"
+      :name="item.processId"
     />
   </ElTabs>
   <div class="mb-3 flex items-center justify-start">
@@ -223,56 +170,4 @@ watch(
       />
     </template>
   </Grid>
-
-  <ElDialog v-model="formVisible" :title="formTitle" width="500px">
-    <ElForm
-      ref="formRef"
-      label-width="100px"
-      :model="formData"
-      :rules="formRules"
-    >
-      <ElFormItem label="BOM 物料" prop="itemId">
-        <MdProductBomSelect
-          v-model="formData.itemId"
-          :item-id="productId"
-          placeholder="请选择 BOM 物料"
-          @change="handleBomChange"
-        />
-      </ElFormItem>
-      <ElFormItem label="用料比例" prop="quantity">
-        <ElInputNumber
-          v-model="formData.quantity"
-          class="!w-full"
-          controls-position="right"
-          :min="0"
-          :precision="2"
-        />
-      </ElFormItem>
-      <ElFormItem label="备注" prop="remark">
-        <ElInput
-          v-model="formData.remark"
-          :maxlength="250"
-          placeholder="请输入备注"
-          :rows="2"
-          type="textarea"
-        />
-      </ElFormItem>
-    </ElForm>
-    <template #footer>
-      <TableAction
-        :actions="[
-          {
-            label: $t('common.cancel'),
-            type: 'default',
-            onClick: () => (formVisible = false),
-          },
-          {
-            label: $t('common.confirm'),
-            type: 'primary',
-            onClick: submitForm,
-          },
-        ]"
-      />
-    </template>
-  </ElDialog>
 </template>
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue b/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue
index 8462384e9..f07c1a532 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/product-form.vue
@@ -1,87 +1,76 @@
 <script lang="ts" setup>
-import type { FormInstance, FormRules } from 'element-plus';
-
 import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
 
-import { computed, reactive, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
 
-import {
-  ElDivider,
-  ElForm,
-  ElFormItem,
-  ElInput,
-  ElInputNumber,
-  ElMessage,
-  ElOption,
-  ElSelect,
-} from 'element-plus';
+import { ElDivider, ElMessage } from 'element-plus';
 
+import { useVbenForm } from '#/adapter/form';
 import {
   createRouteProduct,
+  getRouteProduct,
   updateRouteProduct,
 } from '#/api/mes/pro/route/product';
 import { $t } from '#/locales';
-import { MdItemSelect } from '#/views/mes/md/item/components';
 
+import { useRouteProductFormSchema } from '../data';
 import ProductBomList from './product-bom-list.vue';
 
 const emit = defineEmits(['success']);
-const isUpdate = ref(false);
-const formRef = ref<FormInstance>();
-const formData = reactive<MesProRouteProductApi.RouteProduct>({
-  productionTime: 1,
-  quantity: 1,
-  timeUnitType: 'MINUTE',
-});
-const formRules: FormRules = {
-  itemId: [{ message: '产品不能为空', required: true }],
-  quantity: [{ message: '生产数量不能为空', required: true }],
-};
-const timeUnitOptions = computed(() =>
-  getDictOptions(DICT_TYPE.MES_TIME_UNIT_TYPE),
-);
+const formData = ref<MesProRouteProductApi.RouteProduct>();
 const getTitle = computed(() =>
-  isUpdate.value
+  formData.value?.id
     ? $t('ui.actionTitle.edit', ['工艺路线产品'])
     : $t('ui.actionTitle.create', ['工艺路线产品']),
 );
 
-function resetForm(routeId?: number) {
-  Object.assign(formData, {
-    id: undefined,
-    itemCode: undefined,
-    itemId: undefined,
-    itemName: undefined,
-    productionTime: 1,
-    quantity: 1,
-    remark: undefined,
-    routeId: routeId ?? formData.routeId,
-    specification: undefined,
-    timeUnitType: 'MINUTE',
-    unitName: undefined,
+/** MdItemSelect change 回调：把物料编码/名称/规格/单位回填到 form */
+async function handleItemChange(item?: any) {
+  if (!item) {
+    return;
+  }
+  await formApi.setValues({
+    itemCode: item.code,
+    itemName: item.name,
+    specification: item.specification,
+    unitName: item.unitMeasureName,
   });
-  formRef.value?.clearValidate();
 }
 
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-1',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useRouteProductFormSchema(handleItemChange),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    try {
-      await formRef.value?.validate();
-    } catch {
+    const { valid } = await formApi.validate();
+    if (!valid) {
       return;
     }
     modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProRouteProductApi.RouteProduct;
     try {
-      if (isUpdate.value) {
-        await updateRouteProduct(formData);
+      if (formData.value?.id) {
+        await updateRouteProduct(data);
+        // 用最新表单值同步 formData，确保产品 BOM 子表绑定的 itemId 与表单一致
+        formData.value = { ...formData.value, ...data };
       } else {
-        const id = await createRouteProduct(formData);
-        formData.id = id;
-        isUpdate.value = true;
+        // 新增成功后切换到编辑模式，方便继续维护产品 BOM
+        const id = await createRouteProduct(data);
+        formData.value = { ...data, id };
+        await formApi.setFieldValue('id', id);
       }
       emit('success');
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
@@ -89,102 +78,41 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.unlock();
     }
   },
-  onOpenChange(isOpen: boolean) {
+  async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      resetForm();
-      isUpdate.value = false;
+      formData.value = undefined;
       return;
     }
+    await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<{
       id?: number;
       routeId: number;
-      row?: MesProRouteProductApi.RouteProduct;
     }>();
     if (!data) {
       return;
     }
-    if (data.row) {
-      Object.assign(formData, data.row);
-      isUpdate.value = true;
-    } else {
-      resetForm(data.routeId);
-      isUpdate.value = false;
+    if (!data.id) {
+      await formApi.setValues({ routeId: data.routeId });
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getRouteProduct(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
     }
   },
 });
-
-function handleItemChange(item?: any) {
-  if (!item) {
-    return;
-  }
-  formData.itemCode = item.code;
-  formData.itemName = item.name;
-  formData.specification = item.specification;
-  formData.unitName = item.unitName;
-}
 </script>
 
 <template>
   <Modal :title="getTitle" class="w-3/5">
-    <ElForm
-      ref="formRef"
-      class="mx-4"
-      label-width="120px"
-      :model="formData"
-      :rules="formRules"
-    >
-      <div class="grid grid-cols-2 gap-x-4">
-        <ElFormItem class="col-span-2" label="产品" prop="itemId">
-          <MdItemSelect
-            v-model="formData.itemId"
-            @change="handleItemChange"
-          />
-        </ElFormItem>
-        <ElFormItem label="生产数量" prop="quantity">
-          <ElInputNumber
-            v-model="formData.quantity"
-            class="!w-full"
-            controls-position="right"
-            :min="1"
-            :precision="0"
-          />
-        </ElFormItem>
-        <ElFormItem label="生产用时" prop="productionTime">
-          <ElInputNumber
-            v-model="formData.productionTime"
-            class="!w-full"
-            controls-position="right"
-            :min="0"
-            :precision="2"
-          />
-        </ElFormItem>
-        <ElFormItem label="时间单位" prop="timeUnitType">
-          <ElSelect
-            v-model="formData.timeUnitType"
-            class="!w-full"
-            clearable
-            placeholder="请选择"
-          >
-            <ElOption
-              v-for="dict in timeUnitOptions"
-              :key="dict.value as string"
-              :label="dict.label"
-              :value="dict.value as string"
-            />
-          </ElSelect>
-        </ElFormItem>
-        <ElFormItem class="col-span-2" label="备注" prop="remark">
-          <ElInput
-            v-model="formData.remark"
-            :maxlength="250"
-            placeholder="请输入备注"
-            :rows="2"
-            type="textarea"
-          />
-        </ElFormItem>
-      </div>
-    </ElForm>
-    <template v-if="isUpdate && formData.id && formData.itemId">
+    <Form class="mx-4" />
+    <!-- 编辑模式下展示产品 BOM 子表，新增模式下隐藏 -->
+    <template v-if="formData?.id && formData?.itemId">
       <ElDivider class="!my-3" content-position="left">产品 BOM 配置</ElDivider>
       <div class="mx-4">
         <ProductBomList
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue b/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue
index b65c5037f..bca6e686e 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue
@@ -25,8 +25,8 @@ const props = defineProps<{
   routeId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail');
-const list = ref<MesProRouteProductApi.RouteProduct[]>([]);
+const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const list = ref<MesProRouteProductApi.RouteProduct[]>([]); // 工艺路线产品列表
 
 const [ProductFormModal, productFormModalApi] = useVbenModal({
   connectedComponent: ProductForm,
@@ -47,6 +47,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesProRouteProductApi.RouteProduct>,
 });
 
+/** 加载工艺路线产品列表 */
 async function getList() {
   gridApi.setLoading(true);
   try {
@@ -57,16 +58,17 @@ async function getList() {
   }
 }
 
+/** 新增工艺路线产品 */
 function handleCreate() {
   productFormModalApi.setData({ routeId: props.routeId }).open();
 }
 
+/** 编辑工艺路线产品 */
 function handleEdit(row: MesProRouteProductApi.RouteProduct) {
-  productFormModalApi
-    .setData({ id: row.id, routeId: props.routeId, row })
-    .open();
+  productFormModalApi.setData({ id: row.id, routeId: props.routeId }).open();
 }
 
+/** 删除工艺路线产品 */
 async function handleDelete(row: MesProRouteProductApi.RouteProduct) {
   await deleteRouteProduct(row.id!);
   ElMessage.success($t('ui.actionMessage.deleteSuccess', ['工艺路线产品']));

From be3d9eaed7bb693c2386af4ae7a9b20d809dce65 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 25 May 2026 18:10:37 +0800
Subject: [PATCH 06/17] =?UTF-8?q?feat(mes)=EF=BC=9A=E4=BC=98=E5=8C=96=20re?=
 =?UTF-8?q?view=20-=20=E5=B7=A5=E5=BA=8F=E5=AE=9A=E4=B9=89=EF=BC=88pro=5Fp?=
 =?UTF-8?q?rocess=EF=BC=89=E3=80=81=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=EF=BC=88pro=5Froute=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/components/pro-process-select.vue |   4 +-
 .../views/mes/pro/route/modules/bom-form.vue  | 112 ++++++++++++++++++
 2 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue

diff --git a/apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue b/apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue
index 2b45520a3..b174168d4 100644
--- a/apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue
+++ b/apps/web-antd/src/views/mes/pro/process/components/pro-process-select.vue
@@ -39,13 +39,13 @@ const selectValue = computed({
   },
 });
 
-// TODO @AI：是不是要写注释；
+/** 前端过滤：按工序名称或编码模糊匹配 */
 function handleFilter(input: string, option: any) {
   const keyword = input.toLowerCase();
   const item = option?.item as MesProProcessApi.Process | undefined;
   return Boolean(
     item?.name?.toLowerCase().includes(keyword) ||
-    item?.code?.toLowerCase().includes(keyword),
+      item?.code?.toLowerCase().includes(keyword),
   );
 }
 
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue b/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue
new file mode 100644
index 000000000..a44a3da24
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue
@@ -0,0 +1,112 @@
+<script lang="ts" setup>
+import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createRouteProductBom,
+  updateRouteProductBom,
+} from '#/api/mes/pro/route/productbom';
+import { $t } from '#/locales';
+
+import { useRouteProductBomFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProRouteProductBomApi.RouteProductBom>();
+const productId = ref<number>(0); // 当前产品物料编号，供 BOM 选择器筛选可用 BOM
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['BOM 物料'])
+    : $t('ui.actionTitle.create', ['BOM 物料']),
+);
+
+/** MdProductBomSelect change 回调：把 BOM 物料编码/名称/规格/单位/默认用量回填到 form */
+async function handleBomChange(bom?: any) {
+  if (!bom) {
+    return;
+  }
+  await formApi.setValues({
+    itemCode: bom.bomItemCode,
+    itemName: bom.bomItemName,
+    quantity: bom.quantity ?? 1,
+    specification: bom.specification,
+    unitName: bom.unitName,
+  });
+}
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: useRouteProductBomFormSchema(() => productId.value, handleBomChange),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProRouteProductBomApi.RouteProductBom;
+    try {
+      await (formData.value?.id
+        ? updateRouteProductBom(data)
+        : createRouteProductBom(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    // 加载数据
+    const data = modalApi.getData<{
+      processId: number;
+      productId: number;
+      routeId: number;
+      row?: MesProRouteProductBomApi.RouteProductBom;
+    }>();
+    if (!data) {
+      return;
+    }
+    productId.value = data.productId;
+    if (data.row) {
+      formData.value = data.row;
+      // 设置到 values
+      await formApi.setValues(data.row);
+      return;
+    }
+    await formApi.setValues({
+      processId: data.processId,
+      productId: data.productId,
+      quantity: 1,
+      routeId: data.routeId,
+    });
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-1/3">
+    <Form class="mx-4" />
+  </Modal>
+</template>

From 6b6228bc9cde76ebd41e0c2f2db383d0707729c0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 25 May 2026 22:28:23 +0800
Subject: [PATCH 07/17] =?UTF-8?q?feat(mes)=EF=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E2=80=9C=E5=AE=89=E7=81=AF=EF=BC=88pro=5Fandon=EF=BC=89?=
 =?UTF-8?q?=E2=80=9D=E7=9A=84=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/pro/andon/config/index.ts     |  48 +++
 .../src/api/mes/pro/andon/record/index.ts     |  76 ++++
 .../src/api/mes/pro/workorder/index.ts        |  53 +++
 .../config/components/andon-config-select.vue |  88 +++++
 .../mes/pro/andon/config/components/index.ts  |   1 +
 .../pro/andon/config/modules/config-form.vue  |  91 +++++
 .../pro/andon/config/modules/config-modal.vue | 122 ++++++
 .../src/views/mes/pro/andon/record/data.ts    | 368 +++++++++++++++++
 .../src/views/mes/pro/andon/record/index.vue  | 174 +++++++++
 .../mes/pro/andon/record/modules/form.vue     | 205 ++++++++++
 .../mes/pro/route/components/color-picker.vue |  66 ++++
 .../views/mes/pro/route/components/index.ts   |   1 +
 apps/web-antd/src/views/mes/pro/route/data.ts |  29 +-
 .../src/views/mes/pro/route/index.vue         |  55 ++-
 .../views/mes/pro/route/modules/bom-form.vue  |  29 +-
 .../mes/pro/workorder/components/index.ts     |   1 +
 .../components/pro-work-order-select.vue      | 144 +++++++
 .../web-antd/src/views/mes/utils/constants.ts |  21 +-
 .../src/api/mes/pro/andon/config/index.ts     |  48 +++
 .../src/api/mes/pro/andon/record/index.ts     |  76 ++++
 .../src/api/mes/pro/workorder/index.ts        |  53 +++
 .../config/components/andon-config-select.vue |  94 +++++
 .../mes/pro/andon/config/components/index.ts  |   1 +
 .../pro/andon/config/modules/config-form.vue  |  90 +++++
 .../pro/andon/config/modules/config-modal.vue | 128 ++++++
 .../src/views/mes/pro/andon/record/data.ts    | 369 ++++++++++++++++++
 .../src/views/mes/pro/andon/record/index.vue  | 175 +++++++++
 .../mes/pro/andon/record/modules/form.vue     | 199 ++++++++++
 .../mes/pro/route/components/color-picker.vue |  40 ++
 .../views/mes/pro/route/components/index.ts   |   1 +
 apps/web-ele/src/views/mes/pro/route/data.ts  |  29 +-
 .../web-ele/src/views/mes/pro/route/index.vue |  46 ++-
 .../views/mes/pro/route/modules/bom-form.vue  |  29 +-
 .../mes/pro/workorder/components/index.ts     |   1 +
 .../components/pro-work-order-select.vue      | 150 +++++++
 apps/web-ele/src/views/mes/utils/constants.ts |  21 +-
 36 files changed, 3005 insertions(+), 117 deletions(-)
 create mode 100644 apps/web-antd/src/api/mes/pro/andon/config/index.ts
 create mode 100644 apps/web-antd/src/api/mes/pro/andon/record/index.ts
 create mode 100644 apps/web-antd/src/api/mes/pro/workorder/index.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/andon/config/components/andon-config-select.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/andon/config/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/andon/record/data.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/andon/record/index.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/route/components/color-picker.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/route/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/workorder/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue
 create mode 100644 apps/web-ele/src/api/mes/pro/andon/config/index.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/andon/record/index.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/workorder/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/andon/config/components/andon-config-select.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/andon/config/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/andon/config/modules/config-form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/andon/config/modules/config-modal.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/andon/record/data.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/andon/record/index.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/route/components/color-picker.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/route/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/workorder/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue

diff --git a/apps/web-antd/src/api/mes/pro/andon/config/index.ts b/apps/web-antd/src/api/mes/pro/andon/config/index.ts
new file mode 100644
index 000000000..317c6cc50
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/andon/config/index.ts
@@ -0,0 +1,48 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProAndonConfigApi {
+  /** MES 安灯配置 */
+  export interface AndonConfig {
+    id?: number;
+    reason?: string; // 呼叫原因
+    level?: number; // 级别
+    handlerRoleId?: number; // 处置角色编号
+    handlerUserId?: number; // 处置人编号
+    handlerUserNickname?: string; // 处置人姓名（详情回显）
+    remark?: string;
+  }
+}
+
+/** 查询安灯配置分页 */
+export function getAndonConfigPage(params: any) {
+  return requestClient.get('/mes/pro/andon-config/page', { params });
+}
+
+/** 查询安灯配置列表 */
+export function getAndonConfigList() {
+  return requestClient.get<MesProAndonConfigApi.AndonConfig[]>(
+    '/mes/pro/andon-config/list',
+  );
+}
+
+/** 查询安灯配置详情 */
+export function getAndonConfig(id: number) {
+  return requestClient.get<MesProAndonConfigApi.AndonConfig>(
+    `/mes/pro/andon-config/get?id=${id}`,
+  );
+}
+
+/** 新增安灯配置 */
+export function createAndonConfig(data: MesProAndonConfigApi.AndonConfig) {
+  return requestClient.post('/mes/pro/andon-config/create', data);
+}
+
+/** 修改安灯配置 */
+export function updateAndonConfig(data: MesProAndonConfigApi.AndonConfig) {
+  return requestClient.put('/mes/pro/andon-config/update', data);
+}
+
+/** 删除安灯配置 */
+export function deleteAndonConfig(id: number) {
+  return requestClient.delete(`/mes/pro/andon-config/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/pro/andon/record/index.ts b/apps/web-antd/src/api/mes/pro/andon/record/index.ts
new file mode 100644
index 000000000..b8cf4349b
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/andon/record/index.ts
@@ -0,0 +1,76 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProAndonRecordApi {
+  /** MES 安灯记录 */
+  export interface AndonRecord {
+    id?: number;
+    configId?: number; // 安灯配置编号
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 工单编码
+    processId?: number; // 工序编号
+    processName?: string; // 工序名称
+    userId?: number; // 发起用户编号
+    userNickname?: string; // 发起人昵称
+    reason?: string; // 呼叫原因
+    level?: number; // 级别
+    status?: number; // 处置状态
+    handleTime?: number; // 处置时间（毫秒时间戳）
+    handlerUserId?: number; // 处置人编号
+    handlerUserNickname?: string; // 处置人昵称
+    remark?: string; // 备注
+    createTime?: number; // 发起时间
+  }
+
+  /** MES 安灯记录分页查询参数 */
+  export interface PageParams extends PageParam {
+    workstationId?: number; // 工作站编号
+    userId?: number; // 发起用户编号
+    handlerUserId?: number; // 处置人编号
+    status?: number; // 处置状态
+    createTime?: string[]; // 发起时间区间
+  }
+}
+
+/** 查询安灯记录分页 */
+export function getAndonRecordPage(params: MesProAndonRecordApi.PageParams) {
+  return requestClient.get<PageResult<MesProAndonRecordApi.AndonRecord>>(
+    '/mes/pro/andon-record/page',
+    { params },
+  );
+}
+
+/** 查询安灯记录详情 */
+export function getAndonRecord(id: number) {
+  return requestClient.get<MesProAndonRecordApi.AndonRecord>(
+    `/mes/pro/andon-record/get?id=${id}`,
+  );
+}
+
+/** 新增安灯记录 */
+export function createAndonRecord(data: MesProAndonRecordApi.AndonRecord) {
+  return requestClient.post('/mes/pro/andon-record/create', data);
+}
+
+/** 删除安灯记录 */
+export function deleteAndonRecord(id: number) {
+  return requestClient.delete(`/mes/pro/andon-record/delete?id=${id}`);
+}
+
+/** 更新安灯记录（保存/已处置） */
+export function updateAndonRecord(data: MesProAndonRecordApi.AndonRecord) {
+  return requestClient.put('/mes/pro/andon-record/update', data);
+}
+
+/** 导出安灯记录 Excel */
+export function exportAndonRecord(
+  params: Partial<MesProAndonRecordApi.PageParams>,
+) {
+  return requestClient.download('/mes/pro/andon-record/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/pro/workorder/index.ts b/apps/web-antd/src/api/mes/pro/workorder/index.ts
new file mode 100644
index 000000000..fcc22b79e
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/workorder/index.ts
@@ -0,0 +1,53 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProWorkOrderApi {
+  /** MES 生产工单 */
+  export interface WorkOrder {
+    id?: number;
+    code?: string; // 工单编码
+    name?: string; // 工单名称
+    type?: number; // 工单类型
+    status?: number; // 工单状态
+    sourceType?: number;
+    productId?: number; // 产品物料编号
+    productCode?: string;
+    productName?: string;
+    productSpecification?: string;
+    quantity?: number;
+    unitName?: string;
+    routeId?: number;
+    routeName?: string;
+    clientId?: number;
+    clientName?: string;
+    planStartTime?: number | string;
+    planEndTime?: number | string;
+    actualStartTime?: number | string;
+    actualEndTime?: number | string;
+    remark?: string;
+    createTime?: number | string;
+  }
+
+  export interface PageParams extends PageParam {
+    code?: string;
+    name?: string;
+    status?: number;
+    type?: number;
+  }
+}
+
+/** 查询生产工单分页 */
+export function getWorkOrderPage(params: MesProWorkOrderApi.PageParams) {
+  return requestClient.get<PageResult<MesProWorkOrderApi.WorkOrder>>(
+    '/mes/pro/work-order/page',
+    { params },
+  );
+}
+
+/** 查询生产工单详情 */
+export function getWorkOrder(id: number) {
+  return requestClient.get<MesProWorkOrderApi.WorkOrder>(
+    `/mes/pro/work-order/get?id=${id}`,
+  );
+}
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/components/andon-config-select.vue b/apps/web-antd/src/views/mes/pro/andon/config/components/andon-config-select.vue
new file mode 100644
index 000000000..7901e4700
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/andon/config/components/andon-config-select.vue
@@ -0,0 +1,88 @@
+<script lang="ts" setup>
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+
+import { computed, onMounted, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Select } from 'ant-design-vue';
+
+import { getAndonConfigList } from '#/api/mes/pro/andon/config';
+import DictTag from '#/components/dict-tag/dict-tag.vue';
+
+/** MES 安灯配置选择器：纯下拉，前端按 reason 过滤 */
+defineOptions({ name: 'AndonConfigSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择呼叫原因',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesProAndonConfigApi.AndonConfig | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const allList = ref<MesProAndonConfigApi.AndonConfig[]>([]);
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value: number | undefined) => {
+    emit('update:modelValue', value);
+  },
+});
+
+/** 前端过滤：按 reason 模糊匹配 */
+function handleFilter(input: string, option: any) {
+  const keyword = input.toLowerCase();
+  const item = option?.item as MesProAndonConfigApi.AndonConfig | undefined;
+  return Boolean(item?.reason?.toLowerCase().includes(keyword));
+}
+
+/** 选中变化 */
+function handleChange(value: any) {
+  const nextValue = value === undefined ? undefined : Number(value);
+  const item = allList.value.find((o) => o.id === nextValue);
+  emit('change', item);
+}
+
+onMounted(async () => {
+  allList.value = (await getAndonConfigList()) || [];
+});
+</script>
+
+<template>
+  <Select
+    v-bind="$attrs"
+    v-model:value="selectValue"
+    :allow-clear="allowClear"
+    :disabled="disabled"
+    :filter-option="handleFilter"
+    :placeholder="placeholder"
+    class="w-full"
+    show-search
+    @change="handleChange"
+  >
+    <Select.Option
+      v-for="item in allList"
+      :key="item.id"
+      :item="item"
+      :value="item.id"
+    >
+      <div class="flex items-center gap-2">
+        <span>{{ item.reason }}</span>
+        <DictTag :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="item.level" />
+      </div>
+    </Select.Option>
+  </Select>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/components/index.ts b/apps/web-antd/src/views/mes/pro/andon/config/components/index.ts
new file mode 100644
index 000000000..e7a766883
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/andon/config/components/index.ts
@@ -0,0 +1 @@
+export { default as AndonConfigSelect } from './andon-config-select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue b/apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue
new file mode 100644
index 000000000..00ef94418
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue
@@ -0,0 +1,91 @@
+<script lang="ts" setup>
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createAndonConfig,
+  getAndonConfig,
+  updateAndonConfig,
+} from '#/api/mes/pro/andon/config';
+import { $t } from '#/locales';
+
+import { useConfigFormSchema } from '../../record/data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProAndonConfigApi.AndonConfig>();
+
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['安灯配置'])
+    : $t('ui.actionTitle.create', ['安灯配置']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-2',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useConfigFormSchema(),
+  showDefaultActions: false,
+});
+
+// TODO @AI：注释缺少
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    const data =
+      (await formApi.getValues()) as MesProAndonConfigApi.AndonConfig;
+    if (!data.handlerRoleId && !data.handlerUserId) {
+      message.warning('处置角色和处置人至少填一个');
+      modalApi.unlock();
+      return;
+    }
+    try {
+      await (formData.value?.id
+        ? updateAndonConfig(data)
+        : createAndonConfig(data));
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    const data = modalApi.getData<MesProAndonConfigApi.AndonConfig>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getAndonConfig(data.id);
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue b/apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue
new file mode 100644
index 000000000..1ef2d8b44
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue
@@ -0,0 +1,122 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteAndonConfig,
+  getAndonConfigList,
+} from '#/api/mes/pro/andon/config';
+import { $t } from '#/locales';
+
+import { useConfigGridColumns } from '../../record/data';
+import ConfigForm from './config-form.vue';
+
+const list = ref<MesProAndonConfigApi.AndonConfig[]>([]);
+
+const [ConfigFormModal, configFormModalApi] = useVbenModal({
+  connectedComponent: ConfigForm,
+  destroyOnClose: true,
+});
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useConfigGridColumns(),
+    data: list.value,
+    minHeight: 320,
+    pagerConfig: { enabled: false },
+    rowConfig: { isHover: true, keyField: 'id' },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>,
+});
+
+/** 加载安灯配置列表 */
+async function getList() {
+  gridApi.setLoading(true);
+  try {
+    list.value = (await getAndonConfigList()) || [];
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+/** 新增配置 */
+function handleCreate() {
+  configFormModalApi.setData({}).open();
+}
+
+/** 编辑配置 */
+function handleEdit(row: MesProAndonConfigApi.AndonConfig) {
+  configFormModalApi.setData({ id: row.id }).open();
+}
+
+/** 删除配置 */
+async function handleDelete(row: MesProAndonConfigApi.AndonConfig) {
+  await deleteAndonConfig(row.id!);
+  message.success($t('ui.actionMessage.deleteSuccess', ['安灯配置']));
+  await getList();
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      return;
+    }
+    await getList();
+  },
+});
+
+defineExpose({ open: () => modalApi.open() });
+</script>
+
+<template>
+  <Modal :show-cancel-button="false" :show-confirm-button="false" class="w-3/5" title="安灯设置">
+    <ConfigFormModal @success="getList" />
+    <div class="mb-3 flex items-center justify-start">
+      <TableAction
+        :actions="[
+          {
+            label: $t('ui.actionTitle.create', ['安灯配置']),
+            type: 'primary',
+            auth: ['mes:pro-andon-config:create'],
+            onClick: handleCreate,
+          },
+        ]"
+      />
+    </div>
+    <Grid class="w-full" table-title="安灯配置">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              auth: ['mes:pro-andon-config:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              auth: ['mes:pro-andon-config:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', ['安灯配置']),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/data.ts b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
new file mode 100644
index 000000000..36cb24d93
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
@@ -0,0 +1,368 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { z } from '#/adapter/form';
+import { getSimpleUserList } from '#/api/system/user';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProProcessSelect } from '#/views/mes/pro/process/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
+
+import { AndonConfigSelect } from '../config/components';
+
+/** 列表搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: MdWorkstationSelect as any,
+      componentProps: { allowClear: true, placeholder: '请选择工作站' },
+    },
+    {
+      fieldName: 'userId',
+      label: '发起人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择发起人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'handlerUserId',
+      label: '处置人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择处置人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '处理状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '发起时间',
+      component: 'RangePicker',
+      componentProps: {
+        allowClear: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        showTime: true,
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      },
+    },
+  ];
+}
+
+/** 列表字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.AndonRecord>['columns'] {
+  return [
+    { field: 'workstationCode', title: '工作站编码', width: 140 },
+    { field: 'workstationName', title: '工作站名称', minWidth: 140 },
+    { field: 'workOrderCode', title: '工单编码', width: 140 },
+    { field: 'processName', title: '工序名称', width: 140 },
+    { field: 'userNickname', title: '发起人', width: 110 },
+    {
+      field: 'createTime',
+      title: '发起时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    { field: 'reason', title: '呼叫原因', minWidth: 160 },
+    {
+      field: 'level',
+      title: '级别',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
+      },
+    },
+    {
+      field: 'handleTime',
+      title: '处理时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    { field: 'handlerUserNickname', title: '处理人', width: 110 },
+    {
+      field: 'status',
+      title: '处置状态',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_ANDON_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 安灯记录表单（按表单类型动态切换字段） */
+export function useFormSchema(
+  formType: 'create' | 'detail' | 'update',
+  onConfigChange?: (config: MesProAndonConfigApi.AndonConfig | undefined) => void,
+): VbenFormSchema[] {
+  const isCreate = formType === 'create';
+  const isUpdate = formType === 'update';
+  const isDetail = formType === 'detail';
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    isCreate
+      ? {
+          fieldName: 'workstationId',
+          label: '工作站',
+          component: MdWorkstationSelect as any,
+          componentProps: { placeholder: '请选择工作站' },
+          rules: 'selectRequired',
+        }
+      : {
+          fieldName: 'workstationName',
+          label: '工作站',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    isCreate
+      ? {
+          fieldName: 'userId',
+          label: '发起人',
+          component: 'ApiSelect',
+          componentProps: {
+            allowClear: true,
+            api: getSimpleUserList,
+            labelField: 'nickname',
+            placeholder: '请选择发起人',
+            valueField: 'id',
+          },
+        }
+      : {
+          fieldName: 'userNickname',
+          label: '发起人',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    isCreate
+      ? {
+          fieldName: 'workOrderId',
+          label: '生产工单',
+          component: ProWorkOrderSelect as any,
+          componentProps: {
+            placeholder: '请选择工单（可选）',
+            status: MesProWorkOrderStatusEnum.CONFIRMED,
+          },
+        }
+      : {
+          fieldName: 'workOrderCode',
+          label: '生产工单',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    isCreate
+      ? {
+          fieldName: 'processId',
+          label: '工序',
+          component: ProProcessSelect as any,
+          componentProps: { placeholder: '请选择工序（可选）' },
+        }
+      : {
+          fieldName: 'processName',
+          label: '工序',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    isCreate
+      ? {
+          fieldName: 'configId',
+          label: '呼叫原因',
+          component: AndonConfigSelect as any,
+          componentProps: { onChange: onConfigChange },
+          rules: 'selectRequired',
+        }
+      : {
+          fieldName: 'reason',
+          label: '呼叫原因',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    {
+      fieldName: 'level',
+      label: '级别',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL, 'number'),
+        placeholder: '由呼叫原因自动带出',
+      },
+    },
+    // 处置信息：update / detail 才展示
+    ...(isCreate
+      ? []
+      : ([
+          {
+            fieldName: 'status',
+            label: '状态',
+            component: 'Select',
+            componentProps: {
+              disabled: true,
+              options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_STATUS, 'number'),
+            },
+          },
+          {
+            fieldName: 'handleTime',
+            label: '处置时间',
+            component: 'DatePicker',
+            componentProps: {
+              disabled: !isUpdate,
+              format: 'YYYY-MM-DD HH:mm:ss',
+              placeholder: isUpdate ? '请选择处置时间' : undefined,
+              showTime: true,
+              valueFormat: 'x',
+            },
+          },
+          isUpdate
+            ? {
+                fieldName: 'handlerUserId',
+                label: '处置人',
+                component: 'ApiSelect',
+                componentProps: {
+                  allowClear: true,
+                  api: getSimpleUserList,
+                  labelField: 'nickname',
+                  placeholder: '请选择处置人',
+                  valueField: 'id',
+                },
+              }
+            : {
+                fieldName: 'handlerUserNickname',
+                label: '处置人',
+                component: 'Input',
+                componentProps: { disabled: true },
+              },
+        ] as VbenFormSchema[])),
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        disabled: isDetail,
+        maxLength: 250,
+        placeholder: '请输入备注',
+        rows: 2,
+      },
+    },
+  ];
+}
+
+/** 安灯配置表格列（弹窗内嵌网格） */
+export function useConfigGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>['columns'] {
+  return [
+    { field: 'reason', title: '呼叫原因', minWidth: 200 },
+    {
+      field: 'level',
+      title: '级别',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
+      },
+    },
+    { field: 'handlerUserNickname', title: '处置人', width: 140 },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 安灯配置表单（弹窗内的新增/编辑表单） */
+export function useConfigFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'reason',
+      label: '呼叫原因',
+      component: 'Textarea',
+      componentProps: {
+        autoSize: { maxRows: 3, minRows: 1 },
+        maxLength: 200,
+        placeholder: '请输入呼叫原因',
+      },
+      rules: z.string().min(1, '呼叫原因不能为空').max(200),
+    },
+    {
+      fieldName: 'level',
+      label: '级别',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL, 'number'),
+        placeholder: '请选择级别',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'handlerRoleId',
+      label: '处置角色',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: () =>
+          import('#/api/system/role').then((m) => m.getSimpleRoleList()),
+        labelField: 'name',
+        placeholder: '请选择角色（与处置人至少填一个）',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'handlerUserId',
+      label: '处置人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择处置人（与角色至少填一个）',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      componentProps: { maxLength: 100, placeholder: '请输入备注' },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/index.vue b/apps/web-antd/src/views/mes/pro/andon/record/index.vue
new file mode 100644
index 000000000..d6d4921d8
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/andon/record/index.vue
@@ -0,0 +1,174 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
+
+import { ref } from 'vue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteAndonRecord,
+  exportAndonRecord,
+  getAndonRecordPage,
+} from '#/api/mes/pro/andon/record';
+import { $t } from '#/locales';
+import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
+
+import ConfigModal from '../config/modules/config-modal.vue';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const configModalRef = ref<InstanceType<typeof ConfigModal>>();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增记录 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 处置记录 */
+function handleHandle(row: MesProAndonRecordApi.AndonRecord) {
+  formModalApi.setData({ id: row.id, type: 'update' }).open();
+}
+
+/** 详情 */
+function handleDetail(row: MesProAndonRecordApi.AndonRecord) {
+  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+}
+
+/** 删除 */
+async function handleDelete(row: MesProAndonRecordApi.AndonRecord) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.workstationName]),
+    duration: 0,
+  });
+  try {
+    await deleteAndonRecord(row.id!);
+    message.success(
+      $t('ui.actionMessage.deleteSuccess', [row.workstationName]),
+    );
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出 */
+async function handleExport() {
+  const data = await exportAndonRecord(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '安灯呼叫记录.xls', source: data });
+}
+
+/** 打开安灯设置弹窗 */
+function handleOpenConfig() {
+  configModalRef.value?.open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: { schema: useGridFormSchema() },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getAndonRecordPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: { isHover: true, keyField: 'id' },
+    toolbarConfig: { refresh: true, search: true },
+  } as VxeTableGridOptions<MesProAndonRecordApi.AndonRecord>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】安灯配置、安灯呼叫"
+        url="https://doc.iocoder.cn/mes/pro/andon/"
+      />
+    </template>
+    <FormModal @success="handleRefresh" />
+    <ConfigModal ref="configModalRef" />
+    <Grid table-title="安灯呼叫记录">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['安灯呼叫']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-andon-record:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: '安灯设置',
+              type: 'primary',
+              auth: ['mes:pro-andon-config:query'],
+              onClick: handleOpenConfig,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-andon-record:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '处置',
+              type: 'link',
+              auth: ['mes:pro-andon-record:update'],
+              ifShow: () => row.status === MesProAndonStatusEnum.ACTIVE,
+              onClick: handleHandle.bind(null, row),
+            },
+            {
+              label: '详情',
+              type: 'link',
+              auth: ['mes:pro-andon-record:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              auth: ['mes:pro-andon-record:delete'],
+              ifShow: () => row.status === MesProAndonStatusEnum.ACTIVE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.workstationName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
new file mode 100644
index 000000000..62b08097f
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
@@ -0,0 +1,205 @@
+<script lang="ts" setup>
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
+import { formatDate } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createAndonRecord,
+  getAndonRecord,
+  updateAndonRecord,
+} from '#/api/mes/pro/andon/record';
+import { $t } from '#/locales';
+import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formType = ref<'create' | 'detail' | 'update'>('create'); // 表单类型
+const formData = ref<MesProAndonRecordApi.AndonRecord>({}); // 表单数据
+const userStore = useUserStore();
+
+const dialogTitle = computed(() => {
+  switch (formType.value) {
+    case 'create': {
+      return '新增安灯呼叫';
+    }
+    case 'detail': {
+      return '安灯呼叫详情';
+    }
+    case 'update': {
+      return '处置安灯呼叫';
+    }
+    default: {
+      return '安灯呼叫';
+    }
+  }
+});
+
+/** 选择呼叫原因后自动填充级别 */
+function handleConfigChange(config: MesProAndonConfigApi.AndonConfig | undefined) {
+  if (!config) {
+    formApi.setValues({ level: undefined, reason: undefined });
+    return;
+  }
+  formApi.setValues({ level: config.level, reason: config.reason });
+}
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-2',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useFormSchema('create', handleConfigChange),
+  showDefaultActions: false,
+});
+
+/** 提交：新增 */
+async function handleCreate() {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const data =
+      (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
+    await createAndonRecord(data);
+    await modalApi.close();
+    emit('success');
+    message.success($t('ui.actionMessage.operationSuccess'));
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 处置：保存（保持 ACTIVE） */
+async function handleSave() {
+  modalApi.lock();
+  try {
+    const values =
+      (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
+    await updateAndonRecord({
+      handlerUserId: values.handlerUserId,
+      handleTime: values.handleTime,
+      id: formData.value.id,
+      remark: values.remark,
+      status: MesProAndonStatusEnum.ACTIVE,
+    });
+    await modalApi.close();
+    emit('success');
+    message.success('保存成功');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 处置：标记已处置 */
+async function handleFinish() {
+  const values =
+    (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
+  if (!values.handleTime) {
+    message.warning('标记已处置时，处置时间不能为空');
+    return;
+  }
+  if (!values.handlerUserId) {
+    message.warning('标记已处置时，处置人不能为空');
+    return;
+  }
+  modalApi.lock();
+  try {
+    await updateAndonRecord({
+      handlerUserId: values.handlerUserId,
+      handleTime: values.handleTime,
+      id: formData.value.id,
+      remark: values.remark,
+      status: MesProAndonStatusEnum.HANDLED,
+    });
+    await modalApi.close();
+    emit('success');
+    message.success('处置成功');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+// TODO @AI：注释缺少
+// TODO @AI：代码风格，貌似和别的模块不同；
+const [Modal, modalApi] = useVbenModal({
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = {};
+      return;
+    }
+    const data = modalApi.getData<{
+      id?: number;
+      type: 'create' | 'detail' | 'update';
+    }>();
+    if (!data) {
+      return;
+    }
+    formType.value = data.type;
+    // 重新挂载 schema，以便按 type 切换字段表现
+    formApi.setState({ schema: useFormSchema(data.type, handleConfigChange) });
+    await formApi.resetForm();
+
+    if (data.type === 'create') {
+      // 新增时默认填发起人为当前用户
+      const currentUserId = userStore.userInfo?.id;
+      formData.value = { userId: currentUserId };
+      await formApi.setValues({ userId: currentUserId });
+      return;
+    }
+    // 处置 / 详情：加载详情
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getAndonRecord(data.id);
+      const initial: MesProAndonRecordApi.AndonRecord = { ...formData.value };
+      // 处置模式下，默认填充处置时间和处置人
+      if (data.type === 'update') {
+        if (!initial.handleTime) {
+          initial.handleTime = formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss');
+        }
+        if (!initial.handlerUserId) {
+          initial.handlerUserId = userStore.userInfo?.id;
+        }
+      }
+      await formApi.setValues(initial);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="dialogTitle" class="w-1/2">
+    <Form />
+    <template #footer>
+      <template v-if="formType === 'create'">
+        <Button @click="modalApi.close()">取消</Button>
+        <Button type="primary" @click="handleCreate">确定</Button>
+      </template>
+      <template v-else-if="formType === 'update'">
+        <Button @click="modalApi.close()">关闭</Button>
+        <Button type="primary" @click="handleSave">保存</Button>
+        <Button type="primary" danger @click="handleFinish">已处置</Button>
+      </template>
+      <template v-else>
+        <Button @click="modalApi.close()">关闭</Button>
+      </template>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/route/components/color-picker.vue b/apps/web-antd/src/views/mes/pro/route/components/color-picker.vue
new file mode 100644
index 000000000..76623fcb0
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/components/color-picker.vue
@@ -0,0 +1,66 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+
+/** 甘特图颜色选择器（ant-design-vue 4.x 暂未提供 ColorPicker，封装原生 input[type=color]） */
+defineOptions({ name: 'RouteColorPicker' });
+
+const props = withDefaults(
+  defineProps<{
+    disabled?: boolean;
+    modelValue?: string;
+  }>(),
+  {
+    disabled: false,
+    modelValue: '',
+  },
+);
+
+const emit = defineEmits<{
+  change: [value: string];
+  'update:modelValue': [value: string];
+}>();
+
+/** 用于 input[type=color] 的展示值，必须是合法 hex；非法时回退到 #000000 但不修改 modelValue */
+const swatchValue = computed(() =>
+  /^#[0-9a-f]{6}$/i.test(props.modelValue ?? '')
+    ? (props.modelValue as string)
+    : '#000000',
+);
+
+/** 颜色变化时同步 modelValue */
+function handleColorChange(event: Event) {
+  const value = (event.target as HTMLInputElement).value;
+  emit('update:modelValue', value);
+  emit('change', value);
+}
+</script>
+
+<template>
+  <div class="flex items-center gap-2">
+    <input
+      class="route-color-picker__swatch"
+      :disabled="disabled"
+      type="color"
+      :value="swatchValue"
+      @change="handleColorChange"
+      @input="handleColorChange"
+    />
+    <span v-if="modelValue">{{ modelValue }}</span>
+  </div>
+</template>
+
+<style scoped>
+.route-color-picker__swatch {
+  block-size: 28px;
+  border: 1px solid var(--ant-color-border, #d9d9d9);
+  border-radius: 4px;
+  cursor: pointer;
+  inline-size: 36px;
+  padding: 2px;
+}
+
+.route-color-picker__swatch:disabled {
+  cursor: not-allowed;
+  opacity: 0.6;
+}
+</style>
diff --git a/apps/web-antd/src/views/mes/pro/route/components/index.ts b/apps/web-antd/src/views/mes/pro/route/components/index.ts
new file mode 100644
index 000000000..4a78a4ce4
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/route/components/index.ts
@@ -0,0 +1 @@
+export { default as RouteColorPicker } from './color-picker.vue';
diff --git a/apps/web-antd/src/views/mes/pro/route/data.ts b/apps/web-antd/src/views/mes/pro/route/data.ts
index 1e6f7218e..4fa8916fd 100644
--- a/apps/web-antd/src/views/mes/pro/route/data.ts
+++ b/apps/web-antd/src/views/mes/pro/route/data.ts
@@ -7,7 +7,7 @@ import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
@@ -20,6 +20,8 @@ import {
 } from '#/views/mes/md/item/components';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+import { RouteColorPicker } from './components';
+
 /** 工艺路线表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
@@ -120,7 +122,13 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表字段 */
-export function useGridColumns(): VxeTableGridOptions<MesProRouteApi.Route>['columns'] {
+export function useGridColumns(
+  onStatusChange?: (
+    newStatus: number,
+    row: MesProRouteApi.Route,
+  ) => PromiseLike<boolean | undefined>,
+  statusEditable = true,
+): VxeTableGridOptions<MesProRouteApi.Route>['columns'] {
   return [
     {
       field: 'code',
@@ -134,7 +142,16 @@ export function useGridColumns(): VxeTableGridOptions<MesProRouteApi.Route>['col
       field: 'status',
       title: '状态',
       width: 110,
-      slots: { default: 'status' },
+      align: 'center',
+      cellRender: {
+        attrs: { beforeChange: onStatusChange },
+        name: 'CellSwitch',
+        props: {
+          checkedValue: CommonStatusEnum.ENABLE,
+          disabled: !statusEditable,
+          unCheckedValue: CommonStatusEnum.DISABLE,
+        },
+      },
     },
     { field: 'remark', title: '备注', minWidth: 160 },
     {
@@ -200,11 +217,7 @@ export function useRouteProcessFormSchema(
     {
       fieldName: 'colorCode',
       label: '甘特图颜色',
-      component: 'Input',
-      componentProps: {
-        maxLength: 16,
-        placeholder: '请输入颜色 hex，例如 #00AEF3',
-      },
+      component: RouteColorPicker,
     },
     {
       fieldName: 'keyFlag',
diff --git a/apps/web-antd/src/views/mes/pro/route/index.vue b/apps/web-antd/src/views/mes/pro/route/index.vue
index cdfc72f71..4f066ffa6 100644
--- a/apps/web-antd/src/views/mes/pro/route/index.vue
+++ b/apps/web-antd/src/views/mes/pro/route/index.vue
@@ -2,11 +2,13 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProRouteApi } from '#/api/mes/pro/route';
 
+import { useAccess } from '@vben/access';
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { CommonStatusEnum } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
-import { Button, message, Modal, Switch, Tooltip } from 'ant-design-vue';
+import { Button, message, Modal, Tooltip } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -20,6 +22,9 @@ import { $t } from '#/locales';
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 
+const { hasAccessByCodes } = useAccess();
+const statusEditable = hasAccessByCodes(['mes:pro-route:update']); // 是否可切换状态
+
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
   destroyOnClose: true,
@@ -46,20 +51,22 @@ function handleDetail(row: MesProRouteApi.Route) {
 }
 
 /** 切换状态 */
-async function handleStatusChange(row: MesProRouteApi.Route, value: number) {
-  const text = value === CommonStatusEnum.ENABLE ? '启用' : '停用';
-  const previousStatus = row.status;
-  Modal.confirm({
-    title: `确认要"${text}""${row.name}"工艺路线吗？`,
-    onOk: async () => {
-      await updateRouteStatus(row.id!, value);
-      message.success($t('ui.actionMessage.operationSuccess'));
-      handleRefresh();
-    },
-    onCancel: () => {
-      // 用户取消时回滚开关状态
-      row.status = previousStatus;
-    },
+async function handleStatusChange(
+  newStatus: number,
+  row: MesProRouteApi.Route,
+): Promise<boolean | undefined> {
+  return new Promise((resolve, reject) => {
+    Modal.confirm({
+      content: `确认要将"${row.name}"工艺路线切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
+      async onOk() {
+        await updateRouteStatus(row.id!, newStatus);
+        message.success($t('ui.actionMessage.operationSuccess'));
+        resolve(true);
+      },
+      onCancel() {
+        reject(new Error('取消操作'));
+      },
+    });
   });
 }
 
@@ -89,7 +96,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
-    columns: useGridColumns(),
+    columns: useGridColumns(handleStatusChange, statusEditable),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
@@ -146,20 +153,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <template #code="{ row }">
         <Button type="link" @click="handleDetail(row)">{{ row.code }}</Button>
       </template>
-      <template #status="{ row }">
-        <Switch
-          :checked="row.status === CommonStatusEnum.ENABLE"
-          checked-children="启用"
-          un-checked-children="停用"
-          @change="
-            (checked: boolean | number | string) =>
-              handleStatusChange(
-                row,
-                checked ? CommonStatusEnum.ENABLE : CommonStatusEnum.DISABLE,
-              )
-          "
-        />
-      </template>
       <template #actions="{ row }">
         <Tooltip
           :open="row.status === CommonStatusEnum.DISABLE ? false : undefined"
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue b/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
index b5931df3a..8e2f4c243 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/bom-form.vue
@@ -10,6 +10,7 @@ import { message } from 'ant-design-vue';
 import { useVbenForm } from '#/adapter/form';
 import {
   createRouteProductBom,
+  getRouteProductBom,
   updateRouteProductBom,
 } from '#/api/mes/pro/route/productbom';
 import { $t } from '#/locales';
@@ -80,27 +81,33 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
+      id?: number;
       processId: number;
       productId: number;
       routeId: number;
-      row?: MesProRouteProductBomApi.RouteProductBom;
     }>();
     if (!data) {
       return;
     }
     productId.value = data.productId;
-    if (data.row) {
-      formData.value = data.row;
-      // 设置到 values
-      await formApi.setValues(data.row);
+    if (!data.id) {
+      // 新增时，给 routeId/processId/productId 兜底默认值
+      await formApi.setValues({
+        processId: data.processId,
+        productId: data.productId,
+        quantity: 1,
+        routeId: data.routeId,
+      });
       return;
     }
-    await formApi.setValues({
-      processId: data.processId,
-      productId: data.productId,
-      quantity: 1,
-      routeId: data.routeId,
-    });
+    modalApi.lock();
+    try {
+      formData.value = await getRouteProductBom(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
   },
 });
 </script>
diff --git a/apps/web-antd/src/views/mes/pro/workorder/components/index.ts b/apps/web-antd/src/views/mes/pro/workorder/components/index.ts
new file mode 100644
index 000000000..1059f8a79
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workorder/components/index.ts
@@ -0,0 +1 @@
+export { default as ProWorkOrderSelect } from './pro-work-order-select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue b/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue
new file mode 100644
index 000000000..8b3907b1a
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workorder/components/pro-work-order-select.vue
@@ -0,0 +1,144 @@
+<script lang="ts" setup>
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { computed, onMounted, ref, watch } from 'vue';
+
+import { Select, Tag, Tooltip } from 'ant-design-vue';
+
+import { getWorkOrder, getWorkOrderPage } from '#/api/mes/pro/workorder';
+
+/**
+ * MES 生产工单选择器（轻量版）
+ *
+ * 当前用于安灯记录等只需要单选工单 ID 的业务页面：
+ * - 默认按 `status` 过滤拉取首页 100 条工单作为下拉
+ * - 编辑回显走 `getWorkOrder(id)`
+ * - 后续 `mes/pro/workorder` 完整迁移后，可替换为带弹窗的复杂选择器
+ */
+defineOptions({ name: 'ProWorkOrderSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    pageSize?: number;
+    placeholder?: string;
+    status?: number;
+    type?: number;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    pageSize: 100,
+    placeholder: '请选择工单',
+    status: undefined,
+    type: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesProWorkOrderApi.WorkOrder | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const allList = ref<MesProWorkOrderApi.WorkOrder[]>([]);
+const selectedItem = ref<MesProWorkOrderApi.WorkOrder>();
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value: number | undefined) => {
+    emit('update:modelValue', value);
+  },
+});
+
+/** 前端过滤：按工单编码或名称模糊匹配 */
+function handleFilter(input: string, option: any) {
+  const keyword = input.toLowerCase();
+  const item = option?.item as MesProWorkOrderApi.WorkOrder | undefined;
+  return Boolean(
+    item?.code?.toLowerCase().includes(keyword) ||
+      item?.name?.toLowerCase().includes(keyword),
+  );
+}
+
+/** 同步选中工单详情，未在列表内时单独拉取 */
+async function syncSelectedItem(value: number | undefined) {
+  if (value === undefined) {
+    selectedItem.value = undefined;
+    return;
+  }
+  const found = allList.value.find((item) => item.id === value);
+  if (found) {
+    selectedItem.value = found;
+    return;
+  }
+  try {
+    selectedItem.value = await getWorkOrder(value);
+  } catch (error) {
+    console.error('[ProWorkOrderSelect] resolveItemById failed:', error);
+  }
+}
+
+/** 除 v-model 外，额外抛出完整工单对象给业务表单使用 */
+function handleChange(value: any) {
+  const nextValue = value === undefined ? undefined : Number(value);
+  syncSelectedItem(nextValue);
+  emit('change', selectedItem.value);
+}
+
+watch(
+  () => props.modelValue,
+  (value) => {
+    syncSelectedItem(value);
+  },
+);
+
+onMounted(async () => {
+  const data = await getWorkOrderPage({
+    pageNo: 1,
+    pageSize: props.pageSize,
+    status: props.status,
+    type: props.type,
+  });
+  allList.value = data.list ?? [];
+  syncSelectedItem(props.modelValue);
+});
+</script>
+
+<template>
+  <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+    <template #title>
+      <div v-if="selectedItem" class="leading-6">
+        <div>编码：{{ selectedItem.code || '-' }}</div>
+        <div>名称：{{ selectedItem.name || '-' }}</div>
+        <div>产品：{{ selectedItem.productName || '-' }}</div>
+        <div>数量：{{ selectedItem.quantity ?? '-' }}</div>
+      </div>
+    </template>
+    <Select
+      v-bind="$attrs"
+      v-model:value="selectValue"
+      :allow-clear="allowClear"
+      :disabled="disabled"
+      :filter-option="handleFilter"
+      :placeholder="placeholder"
+      class="w-full"
+      show-search
+      @change="handleChange"
+    >
+      <Select.Option
+        v-for="item in allList"
+        :key="item.id"
+        :item="item"
+        :value="item.id"
+      >
+        <div class="flex items-center gap-2">
+          <span>{{ item.code }}</span>
+          <Tag v-if="item.name" color="default">{{ item.name }}</Tag>
+        </div>
+      </Select.Option>
+    </Select>
+  </Tooltip>
+</template>
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index a436eabd5..2fd061dc6 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -181,20 +181,17 @@ export const MesProCardStatusEnum = {
   CANCELLED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
-/** MES 安灯类型枚举 */
-export const MesProAndonTypeEnum = {
-  QUALITY: 1,
-  EQUIPMENT: 2,
-  MATERIAL: 3,
-  PROCESS: 4,
-  OTHER: 9,
+/** MES 安灯处置状态枚举 */
+export const MesProAndonStatusEnum = {
+  ACTIVE: 0, // 未处置
+  HANDLED: 1, // 已处置
 } as const;
 
-/** MES 安灯状态枚举 */
-export const MesProAndonStatusEnum = {
-  TRIGGERED: 1,
-  HANDLING: 2,
-  CLOSED: 3,
+/** MES 安灯级别枚举 */
+export const MesProAndonLevelEnum = {
+  LEVEL1: 1,
+  LEVEL2: 2,
+  LEVEL3: 3,
 } as const;
 
 /** MES 编码规则分段类型枚举 */
diff --git a/apps/web-ele/src/api/mes/pro/andon/config/index.ts b/apps/web-ele/src/api/mes/pro/andon/config/index.ts
new file mode 100644
index 000000000..317c6cc50
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/andon/config/index.ts
@@ -0,0 +1,48 @@
+import { requestClient } from '#/api/request';
+
+export namespace MesProAndonConfigApi {
+  /** MES 安灯配置 */
+  export interface AndonConfig {
+    id?: number;
+    reason?: string; // 呼叫原因
+    level?: number; // 级别
+    handlerRoleId?: number; // 处置角色编号
+    handlerUserId?: number; // 处置人编号
+    handlerUserNickname?: string; // 处置人姓名（详情回显）
+    remark?: string;
+  }
+}
+
+/** 查询安灯配置分页 */
+export function getAndonConfigPage(params: any) {
+  return requestClient.get('/mes/pro/andon-config/page', { params });
+}
+
+/** 查询安灯配置列表 */
+export function getAndonConfigList() {
+  return requestClient.get<MesProAndonConfigApi.AndonConfig[]>(
+    '/mes/pro/andon-config/list',
+  );
+}
+
+/** 查询安灯配置详情 */
+export function getAndonConfig(id: number) {
+  return requestClient.get<MesProAndonConfigApi.AndonConfig>(
+    `/mes/pro/andon-config/get?id=${id}`,
+  );
+}
+
+/** 新增安灯配置 */
+export function createAndonConfig(data: MesProAndonConfigApi.AndonConfig) {
+  return requestClient.post('/mes/pro/andon-config/create', data);
+}
+
+/** 修改安灯配置 */
+export function updateAndonConfig(data: MesProAndonConfigApi.AndonConfig) {
+  return requestClient.put('/mes/pro/andon-config/update', data);
+}
+
+/** 删除安灯配置 */
+export function deleteAndonConfig(id: number) {
+  return requestClient.delete(`/mes/pro/andon-config/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/pro/andon/record/index.ts b/apps/web-ele/src/api/mes/pro/andon/record/index.ts
new file mode 100644
index 000000000..b8cf4349b
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/andon/record/index.ts
@@ -0,0 +1,76 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProAndonRecordApi {
+  /** MES 安灯记录 */
+  export interface AndonRecord {
+    id?: number;
+    configId?: number; // 安灯配置编号
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 工单编码
+    processId?: number; // 工序编号
+    processName?: string; // 工序名称
+    userId?: number; // 发起用户编号
+    userNickname?: string; // 发起人昵称
+    reason?: string; // 呼叫原因
+    level?: number; // 级别
+    status?: number; // 处置状态
+    handleTime?: number; // 处置时间（毫秒时间戳）
+    handlerUserId?: number; // 处置人编号
+    handlerUserNickname?: string; // 处置人昵称
+    remark?: string; // 备注
+    createTime?: number; // 发起时间
+  }
+
+  /** MES 安灯记录分页查询参数 */
+  export interface PageParams extends PageParam {
+    workstationId?: number; // 工作站编号
+    userId?: number; // 发起用户编号
+    handlerUserId?: number; // 处置人编号
+    status?: number; // 处置状态
+    createTime?: string[]; // 发起时间区间
+  }
+}
+
+/** 查询安灯记录分页 */
+export function getAndonRecordPage(params: MesProAndonRecordApi.PageParams) {
+  return requestClient.get<PageResult<MesProAndonRecordApi.AndonRecord>>(
+    '/mes/pro/andon-record/page',
+    { params },
+  );
+}
+
+/** 查询安灯记录详情 */
+export function getAndonRecord(id: number) {
+  return requestClient.get<MesProAndonRecordApi.AndonRecord>(
+    `/mes/pro/andon-record/get?id=${id}`,
+  );
+}
+
+/** 新增安灯记录 */
+export function createAndonRecord(data: MesProAndonRecordApi.AndonRecord) {
+  return requestClient.post('/mes/pro/andon-record/create', data);
+}
+
+/** 删除安灯记录 */
+export function deleteAndonRecord(id: number) {
+  return requestClient.delete(`/mes/pro/andon-record/delete?id=${id}`);
+}
+
+/** 更新安灯记录（保存/已处置） */
+export function updateAndonRecord(data: MesProAndonRecordApi.AndonRecord) {
+  return requestClient.put('/mes/pro/andon-record/update', data);
+}
+
+/** 导出安灯记录 Excel */
+export function exportAndonRecord(
+  params: Partial<MesProAndonRecordApi.PageParams>,
+) {
+  return requestClient.download('/mes/pro/andon-record/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/pro/workorder/index.ts b/apps/web-ele/src/api/mes/pro/workorder/index.ts
new file mode 100644
index 000000000..fcc22b79e
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/workorder/index.ts
@@ -0,0 +1,53 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProWorkOrderApi {
+  /** MES 生产工单 */
+  export interface WorkOrder {
+    id?: number;
+    code?: string; // 工单编码
+    name?: string; // 工单名称
+    type?: number; // 工单类型
+    status?: number; // 工单状态
+    sourceType?: number;
+    productId?: number; // 产品物料编号
+    productCode?: string;
+    productName?: string;
+    productSpecification?: string;
+    quantity?: number;
+    unitName?: string;
+    routeId?: number;
+    routeName?: string;
+    clientId?: number;
+    clientName?: string;
+    planStartTime?: number | string;
+    planEndTime?: number | string;
+    actualStartTime?: number | string;
+    actualEndTime?: number | string;
+    remark?: string;
+    createTime?: number | string;
+  }
+
+  export interface PageParams extends PageParam {
+    code?: string;
+    name?: string;
+    status?: number;
+    type?: number;
+  }
+}
+
+/** 查询生产工单分页 */
+export function getWorkOrderPage(params: MesProWorkOrderApi.PageParams) {
+  return requestClient.get<PageResult<MesProWorkOrderApi.WorkOrder>>(
+    '/mes/pro/work-order/page',
+    { params },
+  );
+}
+
+/** 查询生产工单详情 */
+export function getWorkOrder(id: number) {
+  return requestClient.get<MesProWorkOrderApi.WorkOrder>(
+    `/mes/pro/work-order/get?id=${id}`,
+  );
+}
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/components/andon-config-select.vue b/apps/web-ele/src/views/mes/pro/andon/config/components/andon-config-select.vue
new file mode 100644
index 000000000..e7c2ba137
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/andon/config/components/andon-config-select.vue
@@ -0,0 +1,94 @@
+<script lang="ts" setup>
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+
+import { computed, onMounted, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { ElOption, ElSelect } from 'element-plus';
+
+import { getAndonConfigList } from '#/api/mes/pro/andon/config';
+import DictTag from '#/components/dict-tag/dict-tag.vue';
+
+/** MES 安灯配置选择器：纯下拉，前端按 reason 过滤 */
+defineOptions({ name: 'AndonConfigSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择呼叫原因',
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesProAndonConfigApi.AndonConfig | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const allList = ref<MesProAndonConfigApi.AndonConfig[]>([]);
+const filteredList = ref<MesProAndonConfigApi.AndonConfig[]>([]);
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value: number | undefined) => {
+    emit('update:modelValue', value);
+  },
+});
+
+/** 前端过滤：按 reason 模糊匹配 */
+function handleFilter(query: string) {
+  if (!query) {
+    filteredList.value = allList.value;
+    return;
+  }
+  const keyword = query.toLowerCase();
+  filteredList.value = allList.value.filter((item) =>
+    item.reason?.toLowerCase().includes(keyword),
+  );
+}
+
+/** 选中变化 */
+function handleChange(value: number | undefined) {
+  const item = allList.value.find((o) => o.id === value);
+  emit('change', item);
+}
+
+onMounted(async () => {
+  allList.value = (await getAndonConfigList()) || [];
+  filteredList.value = allList.value;
+});
+</script>
+
+<template>
+  <ElSelect
+    v-bind="$attrs"
+    v-model="selectValue"
+    :clearable="clearable"
+    :disabled="disabled"
+    :filter-method="handleFilter"
+    :placeholder="placeholder"
+    class="w-full"
+    filterable
+    @change="handleChange"
+  >
+    <ElOption
+      v-for="item in filteredList"
+      :key="item.id"
+      :label="item.reason"
+      :value="item.id!"
+    >
+      <div class="flex items-center gap-2">
+        <span>{{ item.reason }}</span>
+        <DictTag :type="DICT_TYPE.MES_PRO_ANDON_LEVEL" :value="item.level" />
+      </div>
+    </ElOption>
+  </ElSelect>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/components/index.ts b/apps/web-ele/src/views/mes/pro/andon/config/components/index.ts
new file mode 100644
index 000000000..e7a766883
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/andon/config/components/index.ts
@@ -0,0 +1 @@
+export { default as AndonConfigSelect } from './andon-config-select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/modules/config-form.vue b/apps/web-ele/src/views/mes/pro/andon/config/modules/config-form.vue
new file mode 100644
index 000000000..d411ba9b6
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/andon/config/modules/config-form.vue
@@ -0,0 +1,90 @@
+<script lang="ts" setup>
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createAndonConfig,
+  getAndonConfig,
+  updateAndonConfig,
+} from '#/api/mes/pro/andon/config';
+import { $t } from '#/locales';
+
+import { useConfigFormSchema } from '../../record/data';
+
+const emit = defineEmits(['success']);
+const formData = ref<MesProAndonConfigApi.AndonConfig>();
+
+const getTitle = computed(() =>
+  formData.value?.id
+    ? $t('ui.actionTitle.edit', ['安灯配置'])
+    : $t('ui.actionTitle.create', ['安灯配置']),
+);
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-2',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useConfigFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    const data =
+      (await formApi.getValues()) as MesProAndonConfigApi.AndonConfig;
+    if (!data.handlerRoleId && !data.handlerUserId) {
+      ElMessage.warning('处置角色和处置人至少填一个');
+      modalApi.unlock();
+      return;
+    }
+    try {
+      await (formData.value?.id
+        ? updateAndonConfig(data)
+        : createAndonConfig(data));
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      return;
+    }
+    await formApi.resetForm();
+    const data = modalApi.getData<MesProAndonConfigApi.AndonConfig>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getAndonConfig(data.id);
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/modules/config-modal.vue b/apps/web-ele/src/views/mes/pro/andon/config/modules/config-modal.vue
new file mode 100644
index 000000000..13ab75340
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/andon/config/modules/config-modal.vue
@@ -0,0 +1,128 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { ElMessage } from 'element-plus';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteAndonConfig,
+  getAndonConfigList,
+} from '#/api/mes/pro/andon/config';
+import { $t } from '#/locales';
+
+import { useConfigGridColumns } from '../../record/data';
+import ConfigForm from './config-form.vue';
+
+const list = ref<MesProAndonConfigApi.AndonConfig[]>([]);
+
+const [ConfigFormModal, configFormModalApi] = useVbenModal({
+  connectedComponent: ConfigForm,
+  destroyOnClose: true,
+});
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    autoResize: true,
+    border: true,
+    columns: useConfigGridColumns(),
+    data: list.value,
+    minHeight: 320,
+    pagerConfig: { enabled: false },
+    rowConfig: { isHover: true, keyField: 'id' },
+    showOverflow: true,
+    toolbarConfig: { enabled: false },
+  } as VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>,
+});
+
+/** 加载安灯配置列表 */
+async function getList() {
+  gridApi.setLoading(true);
+  try {
+    list.value = (await getAndonConfigList()) || [];
+    gridApi.setGridOptions({ data: list.value });
+  } finally {
+    gridApi.setLoading(false);
+  }
+}
+
+/** 新增配置 */
+function handleCreate() {
+  configFormModalApi.setData({}).open();
+}
+
+/** 编辑配置 */
+function handleEdit(row: MesProAndonConfigApi.AndonConfig) {
+  configFormModalApi.setData({ id: row.id }).open();
+}
+
+/** 删除配置 */
+async function handleDelete(row: MesProAndonConfigApi.AndonConfig) {
+  await deleteAndonConfig(row.id!);
+  ElMessage.success($t('ui.actionMessage.deleteSuccess', ['安灯配置']));
+  await getList();
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      return;
+    }
+    await getList();
+  },
+});
+
+defineExpose({ open: () => modalApi.open() });
+</script>
+
+<template>
+  <Modal
+    :show-cancel-button="false"
+    :show-confirm-button="false"
+    class="w-3/5"
+    title="安灯设置"
+  >
+    <ConfigFormModal @success="getList" />
+    <div class="mb-3 flex items-center justify-start">
+      <TableAction
+        :actions="[
+          {
+            label: $t('ui.actionTitle.create', ['安灯配置']),
+            type: 'primary',
+            auth: ['mes:pro-andon-config:create'],
+            onClick: handleCreate,
+          },
+        ]"
+      />
+    </div>
+    <Grid class="w-full" table-title="安灯配置">
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-andon-config:update'],
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              auth: ['mes:pro-andon-config:delete'],
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', ['安灯配置']),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/data.ts b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
new file mode 100644
index 000000000..04f85ac3c
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
@@ -0,0 +1,369 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { z } from '#/adapter/form';
+import { getSimpleUserList } from '#/api/system/user';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProProcessSelect } from '#/views/mes/pro/process/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
+
+import { AndonConfigSelect } from '../config/components';
+
+/** 列表搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: MdWorkstationSelect as any,
+      componentProps: { clearable: true, placeholder: '请选择工作站' },
+    },
+    {
+      fieldName: 'userId',
+      label: '发起人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择发起人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'handlerUserId',
+      label: '处置人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择处置人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '处理状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '发起时间',
+      component: 'DatePicker',
+      componentProps: {
+        clearable: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        type: 'datetimerange',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      },
+    },
+  ];
+}
+
+/** 列表字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.AndonRecord>['columns'] {
+  return [
+    { field: 'workstationCode', title: '工作站编码', width: 140 },
+    { field: 'workstationName', title: '工作站名称', minWidth: 140 },
+    { field: 'workOrderCode', title: '工单编码', width: 140 },
+    { field: 'processName', title: '工序名称', width: 140 },
+    { field: 'userNickname', title: '发起人', width: 110 },
+    {
+      field: 'createTime',
+      title: '发起时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    { field: 'reason', title: '呼叫原因', minWidth: 160 },
+    {
+      field: 'level',
+      title: '级别',
+      width: 90,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
+      },
+    },
+    {
+      field: 'handleTime',
+      title: '处理时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    { field: 'handlerUserNickname', title: '处理人', width: 110 },
+    {
+      field: 'status',
+      title: '处置状态',
+      width: 110,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_ANDON_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 200,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 安灯记录表单（按表单类型动态切换字段） */
+export function useFormSchema(
+  formType: 'create' | 'detail' | 'update',
+  onConfigChange?: (config: MesProAndonConfigApi.AndonConfig | undefined) => void,
+): VbenFormSchema[] {
+  const isCreate = formType === 'create';
+  const isUpdate = formType === 'update';
+  const isDetail = formType === 'detail';
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    isCreate
+      ? {
+          fieldName: 'workstationId',
+          label: '工作站',
+          component: MdWorkstationSelect as any,
+          componentProps: { placeholder: '请选择工作站' },
+          rules: 'selectRequired',
+        }
+      : {
+          fieldName: 'workstationName',
+          label: '工作站',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    isCreate
+      ? {
+          fieldName: 'userId',
+          label: '发起人',
+          component: 'ApiSelect',
+          componentProps: {
+            api: getSimpleUserList,
+            clearable: true,
+            labelField: 'nickname',
+            placeholder: '请选择发起人',
+            valueField: 'id',
+          },
+        }
+      : {
+          fieldName: 'userNickname',
+          label: '发起人',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    isCreate
+      ? {
+          fieldName: 'workOrderId',
+          label: '生产工单',
+          component: ProWorkOrderSelect as any,
+          componentProps: {
+            placeholder: '请选择工单（可选）',
+            status: MesProWorkOrderStatusEnum.CONFIRMED,
+          },
+        }
+      : {
+          fieldName: 'workOrderCode',
+          label: '生产工单',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    isCreate
+      ? {
+          fieldName: 'processId',
+          label: '工序',
+          component: ProProcessSelect as any,
+          componentProps: { placeholder: '请选择工序（可选）' },
+        }
+      : {
+          fieldName: 'processName',
+          label: '工序',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    isCreate
+      ? {
+          fieldName: 'configId',
+          label: '呼叫原因',
+          component: AndonConfigSelect as any,
+          componentProps: { onChange: onConfigChange },
+          rules: 'selectRequired',
+        }
+      : {
+          fieldName: 'reason',
+          label: '呼叫原因',
+          component: 'Input',
+          componentProps: { disabled: true },
+        },
+    {
+      fieldName: 'level',
+      label: '级别',
+      component: 'Select',
+      componentProps: {
+        disabled: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL, 'number'),
+        placeholder: '由呼叫原因自动带出',
+      },
+    },
+    // 处置信息：update / detail 才展示
+    ...(isCreate
+      ? []
+      : ([
+          {
+            fieldName: 'status',
+            label: '状态',
+            component: 'Select',
+            componentProps: {
+              disabled: true,
+              options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_STATUS, 'number'),
+            },
+          },
+          {
+            fieldName: 'handleTime',
+            label: '处置时间',
+            component: 'DatePicker',
+            componentProps: {
+              class: '!w-full',
+              disabled: !isUpdate,
+              format: 'YYYY-MM-DD HH:mm:ss',
+              placeholder: isUpdate ? '请选择处置时间' : undefined,
+              type: 'datetime',
+              valueFormat: 'x',
+            },
+          },
+          isUpdate
+            ? {
+                fieldName: 'handlerUserId',
+                label: '处置人',
+                component: 'ApiSelect',
+                componentProps: {
+                  api: getSimpleUserList,
+                  clearable: true,
+                  labelField: 'nickname',
+                  placeholder: '请选择处置人',
+                  valueField: 'id',
+                },
+              }
+            : {
+                fieldName: 'handlerUserNickname',
+                label: '处置人',
+                component: 'Input',
+                componentProps: { disabled: true },
+              },
+        ] as VbenFormSchema[])),
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      componentProps: {
+        autosize: { maxRows: 3, minRows: 2 },
+        disabled: isDetail,
+        maxLength: 250,
+        placeholder: '请输入备注',
+      },
+    },
+  ];
+}
+
+/** 安灯配置表格列（弹窗内嵌网格） */
+export function useConfigGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>['columns'] {
+  return [
+    { field: 'reason', title: '呼叫原因', minWidth: 200 },
+    {
+      field: 'level',
+      title: '级别',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
+      },
+    },
+    { field: 'handlerUserNickname', title: '处置人', width: 140 },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 安灯配置表单（弹窗内的新增/编辑表单） */
+export function useConfigFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'reason',
+      label: '呼叫原因',
+      component: 'Textarea',
+      componentProps: {
+        autosize: { maxRows: 3, minRows: 1 },
+        maxLength: 200,
+        placeholder: '请输入呼叫原因',
+      },
+      rules: z.string().min(1, '呼叫原因不能为空').max(200),
+    },
+    {
+      fieldName: 'level',
+      label: '级别',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL, 'number'),
+        placeholder: '请选择级别',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'handlerRoleId',
+      label: '处置角色',
+      component: 'ApiSelect',
+      componentProps: {
+        api: () =>
+          import('#/api/system/role').then((m) => m.getSimpleRoleList()),
+        clearable: true,
+        labelField: 'name',
+        placeholder: '请选择角色（与处置人至少填一个）',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'handlerUserId',
+      label: '处置人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择处置人（与角色至少填一个）',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      componentProps: { maxLength: 100, placeholder: '请输入备注' },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/index.vue b/apps/web-ele/src/views/mes/pro/andon/record/index.vue
new file mode 100644
index 000000000..68e44734d
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/andon/record/index.vue
@@ -0,0 +1,175 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
+
+import { ref } from 'vue';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteAndonRecord,
+  exportAndonRecord,
+  getAndonRecordPage,
+} from '#/api/mes/pro/andon/record';
+import { $t } from '#/locales';
+import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
+
+import ConfigModal from '../config/modules/config-modal.vue';
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const configModalRef = ref<InstanceType<typeof ConfigModal>>();
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 新增记录 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 处置记录 */
+function handleHandle(row: MesProAndonRecordApi.AndonRecord) {
+  formModalApi.setData({ id: row.id, type: 'update' }).open();
+}
+
+/** 详情 */
+function handleDetail(row: MesProAndonRecordApi.AndonRecord) {
+  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+}
+
+/** 删除 */
+async function handleDelete(row: MesProAndonRecordApi.AndonRecord) {
+  const hideLoading = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.workstationName]),
+  });
+  try {
+    await deleteAndonRecord(row.id!);
+    ElMessage.success(
+      $t('ui.actionMessage.deleteSuccess', [row.workstationName]),
+    );
+    handleRefresh();
+  } finally {
+    hideLoading.close();
+  }
+}
+
+/** 导出 */
+async function handleExport() {
+  const data = await exportAndonRecord(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '安灯呼叫记录.xls', source: data });
+}
+
+/** 打开安灯设置弹窗 */
+function handleOpenConfig() {
+  configModalRef.value?.open();
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: { schema: useGridFormSchema() },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getAndonRecordPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: { isHover: true, keyField: 'id' },
+    toolbarConfig: { refresh: true, search: true },
+  } as VxeTableGridOptions<MesProAndonRecordApi.AndonRecord>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】安灯配置、安灯呼叫"
+        url="https://doc.iocoder.cn/mes/pro/andon/"
+      />
+    </template>
+    <FormModal @success="handleRefresh" />
+    <ConfigModal ref="configModalRef" />
+    <Grid table-title="安灯呼叫记录">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['安灯呼叫']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-andon-record:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: '安灯设置',
+              type: 'primary',
+              auth: ['mes:pro-andon-config:query'],
+              onClick: handleOpenConfig,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-andon-record:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: '处置',
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-andon-record:update'],
+              ifShow: () => row.status === MesProAndonStatusEnum.ACTIVE,
+              onClick: handleHandle.bind(null, row),
+            },
+            {
+              label: '详情',
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-andon-record:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              auth: ['mes:pro-andon-record:delete'],
+              ifShow: () => row.status === MesProAndonStatusEnum.ACTIVE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [
+                  row.workstationName,
+                ]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
new file mode 100644
index 000000000..b7bb6d1ee
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
@@ -0,0 +1,199 @@
+<script lang="ts" setup>
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
+import { formatDate } from '@vben/utils';
+
+import { ElButton, ElMessage } from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createAndonRecord,
+  getAndonRecord,
+  updateAndonRecord,
+} from '#/api/mes/pro/andon/record';
+import { $t } from '#/locales';
+import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formType = ref<'create' | 'detail' | 'update'>('create');
+const formData = ref<MesProAndonRecordApi.AndonRecord>({});
+const userStore = useUserStore();
+
+const dialogTitle = computed(() => {
+  switch (formType.value) {
+    case 'create': {
+      return '新增安灯呼叫';
+    }
+    case 'detail': {
+      return '安灯呼叫详情';
+    }
+    case 'update': {
+      return '处置安灯呼叫';
+    }
+    default: {
+      return '安灯呼叫';
+    }
+  }
+});
+
+/** 选择呼叫原因后自动填充级别 */
+function handleConfigChange(config: MesProAndonConfigApi.AndonConfig | undefined) {
+  if (!config) {
+    formApi.setValues({ level: undefined, reason: undefined });
+    return;
+  }
+  formApi.setValues({ level: config.level, reason: config.reason });
+}
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+    formItemClass: 'col-span-2',
+    labelWidth: 100,
+  },
+  layout: 'horizontal',
+  schema: useFormSchema('create', handleConfigChange),
+  showDefaultActions: false,
+});
+
+/** 提交：新增 */
+async function handleCreate() {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const data =
+      (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
+    await createAndonRecord(data);
+    await modalApi.close();
+    emit('success');
+    ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 处置：保存（保持 ACTIVE） */
+async function handleSave() {
+  modalApi.lock();
+  try {
+    const values =
+      (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
+    await updateAndonRecord({
+      handlerUserId: values.handlerUserId,
+      handleTime: values.handleTime,
+      id: formData.value.id,
+      remark: values.remark,
+      status: MesProAndonStatusEnum.ACTIVE,
+    });
+    await modalApi.close();
+    emit('success');
+    ElMessage.success('保存成功');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 处置：标记已处置 */
+async function handleFinish() {
+  const values =
+    (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
+  if (!values.handleTime) {
+    ElMessage.warning('标记已处置时，处置时间不能为空');
+    return;
+  }
+  if (!values.handlerUserId) {
+    ElMessage.warning('标记已处置时，处置人不能为空');
+    return;
+  }
+  modalApi.lock();
+  try {
+    await updateAndonRecord({
+      handlerUserId: values.handlerUserId,
+      handleTime: values.handleTime,
+      id: formData.value.id,
+      remark: values.remark,
+      status: MesProAndonStatusEnum.HANDLED,
+    });
+    await modalApi.close();
+    emit('success');
+    ElMessage.success('处置成功');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = {};
+      return;
+    }
+    const data = modalApi.getData<{
+      id?: number;
+      type: 'create' | 'detail' | 'update';
+    }>();
+    if (!data) {
+      return;
+    }
+    formType.value = data.type;
+    formApi.setState({ schema: useFormSchema(data.type, handleConfigChange) });
+    await formApi.resetForm();
+
+    if (data.type === 'create') {
+      const currentUserId = userStore.userInfo?.id;
+      formData.value = { userId: currentUserId };
+      await formApi.setValues({ userId: currentUserId });
+      return;
+    }
+    if (!data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getAndonRecord(data.id);
+      const initial: MesProAndonRecordApi.AndonRecord = { ...formData.value };
+      if (data.type === 'update') {
+        if (!initial.handleTime) {
+          initial.handleTime = formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss');
+        }
+        if (!initial.handlerUserId) {
+          initial.handlerUserId = userStore.userInfo?.id;
+        }
+      }
+      await formApi.setValues(initial);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="dialogTitle" class="w-1/2">
+    <Form />
+    <template #footer>
+      <template v-if="formType === 'create'">
+        <ElButton @click="modalApi.close()">取消</ElButton>
+        <ElButton type="primary" @click="handleCreate">确定</ElButton>
+      </template>
+      <template v-else-if="formType === 'update'">
+        <ElButton @click="modalApi.close()">关闭</ElButton>
+        <ElButton type="primary" @click="handleSave">保存</ElButton>
+        <ElButton type="success" @click="handleFinish">已处置</ElButton>
+      </template>
+      <template v-else>
+        <ElButton @click="modalApi.close()">关闭</ElButton>
+      </template>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/route/components/color-picker.vue b/apps/web-ele/src/views/mes/pro/route/components/color-picker.vue
new file mode 100644
index 000000000..47eee7973
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/components/color-picker.vue
@@ -0,0 +1,40 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+
+import { ElColorPicker } from 'element-plus';
+
+/** 甘特图颜色选择器（封装 ElColorPicker，并在右侧展示 hex 文本） */
+defineOptions({ name: 'RouteColorPicker' });
+
+const props = withDefaults(
+  defineProps<{
+    disabled?: boolean;
+    modelValue?: string;
+  }>(),
+  {
+    disabled: false,
+    modelValue: '',
+  },
+);
+
+const emit = defineEmits<{
+  change: [value: string];
+  'update:modelValue': [value: string];
+}>();
+
+/** 内部 v-model 适配 ElColorPicker，避免对外抛出 null */
+const color = computed({
+  get: () => props.modelValue || '',
+  set: (value: null | string | undefined) => {
+    emit('update:modelValue', value ?? '');
+    emit('change', value ?? '');
+  },
+});
+</script>
+
+<template>
+  <div class="flex items-center gap-2">
+    <ElColorPicker v-model="color" :disabled="disabled" />
+    <span v-if="color">{{ color }}</span>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/route/components/index.ts b/apps/web-ele/src/views/mes/pro/route/components/index.ts
new file mode 100644
index 000000000..4a78a4ce4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/route/components/index.ts
@@ -0,0 +1 @@
+export { default as RouteColorPicker } from './color-picker.vue';
diff --git a/apps/web-ele/src/views/mes/pro/route/data.ts b/apps/web-ele/src/views/mes/pro/route/data.ts
index ac2864c5e..cf770344e 100644
--- a/apps/web-ele/src/views/mes/pro/route/data.ts
+++ b/apps/web-ele/src/views/mes/pro/route/data.ts
@@ -7,7 +7,7 @@ import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom';
 
 import { h } from 'vue';
 
-import { DICT_TYPE } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { ElButton } from 'element-plus';
@@ -20,6 +20,8 @@ import {
 } from '#/views/mes/md/item/components';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+import { RouteColorPicker } from './components';
+
 /** 工艺路线表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
@@ -120,7 +122,13 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表字段 */
-export function useGridColumns(): VxeTableGridOptions<MesProRouteApi.Route>['columns'] {
+export function useGridColumns(
+  onStatusChange?: (
+    newStatus: number,
+    row: MesProRouteApi.Route,
+  ) => PromiseLike<boolean | undefined>,
+  statusEditable = true,
+): VxeTableGridOptions<MesProRouteApi.Route>['columns'] {
   return [
     {
       field: 'code',
@@ -134,7 +142,16 @@ export function useGridColumns(): VxeTableGridOptions<MesProRouteApi.Route>['col
       field: 'status',
       title: '状态',
       width: 110,
-      slots: { default: 'status' },
+      align: 'center',
+      cellRender: {
+        attrs: { beforeChange: onStatusChange },
+        name: 'CellSwitch',
+        props: {
+          activeValue: CommonStatusEnum.ENABLE,
+          disabled: !statusEditable,
+          inactiveValue: CommonStatusEnum.DISABLE,
+        },
+      },
     },
     { field: 'remark', title: '备注', minWidth: 160 },
     {
@@ -205,11 +222,7 @@ export function useRouteProcessFormSchema(
     {
       fieldName: 'colorCode',
       label: '甘特图颜色',
-      component: 'Input',
-      componentProps: {
-        maxLength: 16,
-        placeholder: '请输入颜色 hex，例如 #00AEF3',
-      },
+      component: RouteColorPicker,
     },
     {
       fieldName: 'keyFlag',
diff --git a/apps/web-ele/src/views/mes/pro/route/index.vue b/apps/web-ele/src/views/mes/pro/route/index.vue
index ee4e6cbc2..07482a5a4 100644
--- a/apps/web-ele/src/views/mes/pro/route/index.vue
+++ b/apps/web-ele/src/views/mes/pro/route/index.vue
@@ -2,8 +2,10 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProRouteApi } from '#/api/mes/pro/route';
 
+import { useAccess } from '@vben/access';
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { CommonStatusEnum } from '@vben/constants';
+import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
 import {
@@ -11,7 +13,6 @@ import {
   ElLoading,
   ElMessage,
   ElMessageBox,
-  ElSwitch,
   ElTooltip,
 } from 'element-plus';
 
@@ -27,44 +28,54 @@ import { $t } from '#/locales';
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 
+const { hasAccessByCodes } = useAccess();
+const statusEditable = hasAccessByCodes(['mes:pro-route:update']); // 是否可切换状态
+
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
   destroyOnClose: true,
 });
 
+/** 刷新表格 */
 function handleRefresh() {
   gridApi.query();
 }
 
+/** 创建工艺路线 */
 function handleCreate() {
   formModalApi.setData({ type: 'create' }).open();
 }
 
+/** 编辑工艺路线（仅停用状态可编辑） */
 function handleEdit(row: MesProRouteApi.Route) {
   formModalApi.setData({ id: row.id, type: 'update' }).open();
 }
 
+/** 详情查看 */
 function handleDetail(row: MesProRouteApi.Route) {
   formModalApi.setData({ id: row.id, type: 'detail' }).open();
 }
 
-async function handleStatusChange(row: MesProRouteApi.Route, value: number) {
-  const text = value === CommonStatusEnum.ENABLE ? '启用' : '停用';
-  const previousStatus = row.status;
+/** 切换状态 */
+async function handleStatusChange(
+  newStatus: number,
+  row: MesProRouteApi.Route,
+): Promise<boolean | undefined> {
   try {
     await ElMessageBox.confirm(
-      `确认要"${text}""${row.name}"工艺路线吗？`,
+      `确认要将"${row.name}"工艺路线切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
       '提示',
       { type: 'warning' },
     );
-    await updateRouteStatus(row.id!, value);
+    await updateRouteStatus(row.id!, newStatus);
     ElMessage.success($t('ui.actionMessage.operationSuccess'));
-    handleRefresh();
+    return true;
   } catch {
-    row.status = previousStatus;
+    return false;
   }
 }
 
+/** 删除（仅停用状态可删除） */
 async function handleDelete(row: MesProRouteApi.Route) {
   const hideLoading = ElLoading.service({
     text: $t('ui.actionMessage.deleting', [row.name]),
@@ -78,6 +89,7 @@ async function handleDelete(row: MesProRouteApi.Route) {
   }
 }
 
+/** 导出 */
 async function handleExport() {
   const data = await exportRoute(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '工艺路线.xls', source: data });
@@ -86,7 +98,7 @@ async function handleExport() {
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: { schema: useGridFormSchema() },
   gridOptions: {
-    columns: useGridColumns(),
+    columns: useGridColumns(handleStatusChange, statusEditable),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
@@ -141,20 +153,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
           {{ row.code }}
         </ElButton>
       </template>
-      <template #status="{ row }">
-        <ElSwitch
-          :model-value="row.status === CommonStatusEnum.ENABLE"
-          active-text="启用"
-          inactive-text="停用"
-          @update:model-value="
-            (value: boolean | number | string) =>
-              handleStatusChange(
-                row,
-                value ? CommonStatusEnum.ENABLE : CommonStatusEnum.DISABLE,
-              )
-          "
-        />
-      </template>
       <template #actions="{ row }">
         <ElTooltip
           :disabled="row.status === CommonStatusEnum.DISABLE"
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue b/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue
index a44a3da24..e348b31b4 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/bom-form.vue
@@ -10,6 +10,7 @@ import { ElMessage } from 'element-plus';
 import { useVbenForm } from '#/adapter/form';
 import {
   createRouteProductBom,
+  getRouteProductBom,
   updateRouteProductBom,
 } from '#/api/mes/pro/route/productbom';
 import { $t } from '#/locales';
@@ -80,27 +81,33 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     // 加载数据
     const data = modalApi.getData<{
+      id?: number;
       processId: number;
       productId: number;
       routeId: number;
-      row?: MesProRouteProductBomApi.RouteProductBom;
     }>();
     if (!data) {
       return;
     }
     productId.value = data.productId;
-    if (data.row) {
-      formData.value = data.row;
-      // 设置到 values
-      await formApi.setValues(data.row);
+    if (!data.id) {
+      // 新增时，给 routeId/processId/productId 兜底默认值
+      await formApi.setValues({
+        processId: data.processId,
+        productId: data.productId,
+        quantity: 1,
+        routeId: data.routeId,
+      });
       return;
     }
-    await formApi.setValues({
-      processId: data.processId,
-      productId: data.productId,
-      quantity: 1,
-      routeId: data.routeId,
-    });
+    modalApi.lock();
+    try {
+      formData.value = await getRouteProductBom(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
+    }
   },
 });
 </script>
diff --git a/apps/web-ele/src/views/mes/pro/workorder/components/index.ts b/apps/web-ele/src/views/mes/pro/workorder/components/index.ts
new file mode 100644
index 000000000..1059f8a79
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workorder/components/index.ts
@@ -0,0 +1 @@
+export { default as ProWorkOrderSelect } from './pro-work-order-select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue b/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue
new file mode 100644
index 000000000..d02e67dd9
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workorder/components/pro-work-order-select.vue
@@ -0,0 +1,150 @@
+<script lang="ts" setup>
+import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+
+import { computed, onMounted, ref, watch } from 'vue';
+
+import { ElOption, ElSelect, ElTag, ElTooltip } from 'element-plus';
+
+import { getWorkOrder, getWorkOrderPage } from '#/api/mes/pro/workorder';
+
+/**
+ * MES 生产工单选择器（轻量版）
+ *
+ * 当前用于安灯记录等只需要单选工单 ID 的业务页面：
+ * - 默认按 `status` 过滤拉取首页 100 条工单作为下拉
+ * - 编辑回显走 `getWorkOrder(id)`
+ * - 后续 `mes/pro/workorder` 完整迁移后，可替换为带弹窗的复杂选择器
+ */
+defineOptions({ name: 'ProWorkOrderSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    pageSize?: number;
+    placeholder?: string;
+    status?: number;
+    type?: number;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    pageSize: 100,
+    placeholder: '请选择工单',
+    status: undefined,
+    type: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesProWorkOrderApi.WorkOrder | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const allList = ref<MesProWorkOrderApi.WorkOrder[]>([]);
+const filteredList = ref<MesProWorkOrderApi.WorkOrder[]>([]);
+const selectedItem = ref<MesProWorkOrderApi.WorkOrder>();
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value: number | undefined) => {
+    emit('update:modelValue', value);
+  },
+});
+
+function handleFilter(query: string) {
+  if (!query) {
+    filteredList.value = allList.value;
+    return;
+  }
+  const keyword = query.toLowerCase();
+  filteredList.value = allList.value.filter(
+    (item) =>
+      item.code?.toLowerCase().includes(keyword) ||
+      item.name?.toLowerCase().includes(keyword),
+  );
+}
+
+/** 同步选中工单详情，未在列表内时单独拉取 */
+async function syncSelectedItem(value: number | undefined) {
+  if (value === undefined) {
+    selectedItem.value = undefined;
+    return;
+  }
+  const found = allList.value.find((item) => item.id === value);
+  if (found) {
+    selectedItem.value = found;
+    return;
+  }
+  try {
+    selectedItem.value = await getWorkOrder(value);
+  } catch (error) {
+    console.error('[ProWorkOrderSelect] resolveItemById failed:', error);
+  }
+}
+
+/** 除 v-model 外，额外抛出完整工单对象给业务表单使用 */
+function handleChange(value: number | undefined) {
+  syncSelectedItem(value);
+  emit('change', selectedItem.value);
+}
+
+watch(
+  () => props.modelValue,
+  (value) => {
+    syncSelectedItem(value);
+  },
+);
+
+onMounted(async () => {
+  const data = await getWorkOrderPage({
+    pageNo: 1,
+    pageSize: props.pageSize,
+    status: props.status,
+    type: props.type,
+  });
+  allList.value = data.list ?? [];
+  filteredList.value = allList.value;
+  syncSelectedItem(props.modelValue);
+});
+</script>
+
+<template>
+  <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+    <template #content>
+      <div v-if="selectedItem" class="leading-6">
+        <div>编码：{{ selectedItem.code || '-' }}</div>
+        <div>名称：{{ selectedItem.name || '-' }}</div>
+        <div>产品：{{ selectedItem.productName || '-' }}</div>
+        <div>数量：{{ selectedItem.quantity ?? '-' }}</div>
+      </div>
+    </template>
+    <ElSelect
+      v-bind="$attrs"
+      v-model="selectValue"
+      :clearable="clearable"
+      :disabled="disabled"
+      :filter-method="handleFilter"
+      :placeholder="placeholder"
+      class="w-full"
+      filterable
+      @change="handleChange"
+    >
+      <ElOption
+        v-for="item in filteredList"
+        :key="item.id"
+        :label="item.code"
+        :value="item.id!"
+      >
+        <div class="flex items-center gap-2">
+          <span>{{ item.code }}</span>
+          <ElTag v-if="item.name" size="small" type="info">
+            {{ item.name }}
+          </ElTag>
+        </div>
+      </ElOption>
+    </ElSelect>
+  </ElTooltip>
+</template>
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index a436eabd5..2fd061dc6 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -181,20 +181,17 @@ export const MesProCardStatusEnum = {
   CANCELLED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
-/** MES 安灯类型枚举 */
-export const MesProAndonTypeEnum = {
-  QUALITY: 1,
-  EQUIPMENT: 2,
-  MATERIAL: 3,
-  PROCESS: 4,
-  OTHER: 9,
+/** MES 安灯处置状态枚举 */
+export const MesProAndonStatusEnum = {
+  ACTIVE: 0, // 未处置
+  HANDLED: 1, // 已处置
 } as const;
 
-/** MES 安灯状态枚举 */
-export const MesProAndonStatusEnum = {
-  TRIGGERED: 1,
-  HANDLING: 2,
-  CLOSED: 3,
+/** MES 安灯级别枚举 */
+export const MesProAndonLevelEnum = {
+  LEVEL1: 1,
+  LEVEL2: 2,
+  LEVEL3: 3,
 } as const;
 
 /** MES 编码规则分段类型枚举 */

From f4e71137e0e775a63961cef5c57e23efb0b52d53 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 25 May 2026 22:50:42 +0800
Subject: [PATCH 08/17] =?UTF-8?q?feat(mes)=EF=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E2=80=9C=E5=AE=89=E7=81=AF=EF=BC=88pro=5Fandon=EF=BC=89?=
 =?UTF-8?q?=E2=80=9D=E7=9A=84=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/pro/andon/config/index.ts     | 16 ++++++++++-----
 .../pro/andon/config/modules/config-form.vue  |  1 -
 .../pro/andon/config/modules/config-modal.vue | 19 +++++++++++++++---
 .../src/views/mes/pro/andon/record/data.ts    |  9 +++++++--
 .../mes/pro/andon/record/modules/form.vue     | 20 +++++++++----------
 5 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/apps/web-antd/src/api/mes/pro/andon/config/index.ts b/apps/web-antd/src/api/mes/pro/andon/config/index.ts
index 317c6cc50..7a2ac2ad1 100644
--- a/apps/web-antd/src/api/mes/pro/andon/config/index.ts
+++ b/apps/web-antd/src/api/mes/pro/andon/config/index.ts
@@ -1,21 +1,27 @@
+import type { PageParam, PageResult } from '@vben/request';
+
 import { requestClient } from '#/api/request';
 
 export namespace MesProAndonConfigApi {
   /** MES 安灯配置 */
   export interface AndonConfig {
-    id?: number;
+    id?: number; // 编号
     reason?: string; // 呼叫原因
     level?: number; // 级别
     handlerRoleId?: number; // 处置角色编号
+    handlerRoleName?: string; // 处置角色名称（前端通过角色精简列表回显）
     handlerUserId?: number; // 处置人编号
-    handlerUserNickname?: string; // 处置人姓名（详情回显）
-    remark?: string;
+    handlerUserNickname?: string; // 处置人昵称
+    remark?: string; // 备注
   }
 }
 
 /** 查询安灯配置分页 */
-export function getAndonConfigPage(params: any) {
-  return requestClient.get('/mes/pro/andon-config/page', { params });
+export function getAndonConfigPage(params: PageParam) {
+  return requestClient.get<PageResult<MesProAndonConfigApi.AndonConfig>>(
+    '/mes/pro/andon-config/page',
+    { params },
+  );
 }
 
 /** 查询安灯配置列表 */
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue b/apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue
index 00ef94418..46a6a5ed2 100644
--- a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue
@@ -37,7 +37,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-// TODO @AI：注释缺少
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue b/apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue
index 1ef2d8b44..5b01674b6 100644
--- a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue
@@ -13,18 +13,20 @@ import {
   deleteAndonConfig,
   getAndonConfigList,
 } from '#/api/mes/pro/andon/config';
+import { getSimpleRoleList } from '#/api/system/role';
 import { $t } from '#/locales';
 
 import { useConfigGridColumns } from '../../record/data';
 import ConfigForm from './config-form.vue';
 
-const list = ref<MesProAndonConfigApi.AndonConfig[]>([]);
+const list = ref<MesProAndonConfigApi.AndonConfig[]>([]); // 安灯配置列表（已回填处置角色名称）
 
 const [ConfigFormModal, configFormModalApi] = useVbenModal({
   connectedComponent: ConfigForm,
   destroyOnClose: true,
 });
 
+// TODO @AI：这个格式，是不是有问题？应该要换行？看看别的模块也是；
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     autoResize: true,
@@ -39,11 +41,22 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>,
 });
 
-/** 加载安灯配置列表 */
+/** 加载安灯配置列表，并通过角色精简列表回填处置角色名称 */
+// TODO @AI：这里需要 getAndonConfigList、getSimpleRoleList 么？通过 data.ts 里处理，是不是更主流？？？
 async function getList() {
   gridApi.setLoading(true);
   try {
-    list.value = (await getAndonConfigList()) || [];
+    const [configList, roleList] = await Promise.all([
+      getAndonConfigList(),
+      getSimpleRoleList(),
+    ]);
+    const roleMap = new Map(roleList.map((role) => [role.id!, role.name!]));
+    list.value = (configList || []).map((item) => ({
+      ...item,
+      handlerRoleName: item.handlerRoleId
+        ? roleMap.get(item.handlerRoleId)
+        : undefined,
+    }));
     gridApi.setGridOptions({ data: list.value });
   } finally {
     gridApi.setLoading(false);
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/data.ts b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
index 36cb24d93..3badb717b 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/data.ts
+++ b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
@@ -7,6 +7,7 @@ import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { z } from '#/adapter/form';
+import { getSimpleRoleList } from '#/api/system/role';
 import { getSimpleUserList } from '#/api/system/user';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
@@ -64,6 +65,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'RangePicker',
       componentProps: {
         allowClear: true,
+        defaultTime: [
+          new Date(2000, 0, 1, 0, 0, 0),
+          new Date(2000, 0, 1, 23, 59, 59),
+        ],
         format: 'YYYY-MM-DD HH:mm:ss',
         showTime: true,
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -293,6 +298,7 @@ export function useConfigGridColumns(): VxeTableGridOptions<MesProAndonConfigApi
         props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
       },
     },
+    { field: 'handlerRoleName', title: '处置角色', width: 140 },
     { field: 'handlerUserNickname', title: '处置人', width: 140 },
     { field: 'remark', title: '备注', minWidth: 160 },
     {
@@ -339,8 +345,7 @@ export function useConfigFormSchema(): VbenFormSchema[] {
       component: 'ApiSelect',
       componentProps: {
         allowClear: true,
-        api: () =>
-          import('#/api/system/role').then((m) => m.getSimpleRoleList()),
+        api: getSimpleRoleList,
         labelField: 'name',
         placeholder: '请选择角色（与处置人至少填一个）',
         valueField: 'id',
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
index 62b08097f..0e43f9b9e 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
@@ -6,7 +6,6 @@ import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { useUserStore } from '@vben/stores';
-import { formatDate } from '@vben/utils';
 
 import { Button, message } from 'ant-design-vue';
 
@@ -22,8 +21,8 @@ import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 import { useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
-const formType = ref<'create' | 'detail' | 'update'>('create'); // 表单类型
-const formData = ref<MesProAndonRecordApi.AndonRecord>({}); // 表单数据
+const formType = ref<'create' | 'detail' | 'update'>('create'); // 表单当前模式：新增 / 处置 / 详情
+const formData = ref<MesProAndonRecordApi.AndonRecord>();
 const userStore = useUserStore();
 
 const dialogTitle = computed(() => {
@@ -83,6 +82,7 @@ async function handleCreate() {
 }
 
 /** 处置：保存（保持 ACTIVE） */
+// TODO @AI：这里写下注释；
 async function handleSave() {
   modalApi.lock();
   try {
@@ -91,7 +91,7 @@ async function handleSave() {
     await updateAndonRecord({
       handlerUserId: values.handlerUserId,
       handleTime: values.handleTime,
-      id: formData.value.id,
+      id: formData.value?.id,
       remark: values.remark,
       status: MesProAndonStatusEnum.ACTIVE,
     });
@@ -104,6 +104,7 @@ async function handleSave() {
 }
 
 /** 处置：标记已处置 */
+// TODO @AI：这里写下注释；
 async function handleFinish() {
   const values =
     (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
@@ -120,7 +121,7 @@ async function handleFinish() {
     await updateAndonRecord({
       handlerUserId: values.handlerUserId,
       handleTime: values.handleTime,
-      id: formData.value.id,
+      id: formData.value?.id,
       remark: values.remark,
       status: MesProAndonStatusEnum.HANDLED,
     });
@@ -132,12 +133,11 @@ async function handleFinish() {
   }
 }
 
-// TODO @AI：注释缺少
-// TODO @AI：代码风格，貌似和别的模块不同；
+// TODO @AI：这里的代码风格？！！
 const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      formData.value = {};
+      formData.value = undefined;
       return;
     }
     const data = modalApi.getData<{
@@ -167,10 +167,10 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getAndonRecord(data.id);
       const initial: MesProAndonRecordApi.AndonRecord = { ...formData.value };
-      // 处置模式下，默认填充处置时间和处置人
+      // 处置模式下，默认填充处置时间和处置人，方便快速保存
       if (data.type === 'update') {
         if (!initial.handleTime) {
-          initial.handleTime = formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss');
+          initial.handleTime = Date.now();
         }
         if (!initial.handlerUserId) {
           initial.handlerUserId = userStore.userInfo?.id;

From 9c7986d230f83434ead9d4936d93b846870f3cca Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 25 May 2026 23:29:41 +0800
Subject: [PATCH 09/17] =?UTF-8?q?feat(mes)=EF=BC=9A=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E2=80=9C=E5=AE=89=E7=81=AF=EF=BC=88pro=5Fandon=EF=BC=89?=
 =?UTF-8?q?=E2=80=9D=E7=9A=84=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/pro/andon/config/index.ts     |   1 -
 .../src/views/mes/pro/andon/config/data.ts    | 111 +++++++
 .../modules/{config-form.vue => form.vue}     |  22 +-
 .../modules/{config-modal.vue => list.vue}    |  66 ++--
 .../src/views/mes/pro/andon/record/data.ts    | 301 ++++++------------
 .../src/views/mes/pro/andon/record/index.vue  |   6 +-
 .../mes/pro/andon/record/modules/form.vue     | 149 ++++-----
 .../src/api/mes/pro/andon/config/index.ts     |  15 +-
 .../src/views/mes/pro/andon/config/data.ts    | 111 +++++++
 .../modules/{config-form.vue => form.vue}     |  22 +-
 .../modules/{config-modal.vue => list.vue}    |  44 +--
 .../src/views/mes/pro/andon/record/data.ts    | 298 ++++++-----------
 .../src/views/mes/pro/andon/record/index.vue  |   6 +-
 .../mes/pro/andon/record/modules/form.vue     | 159 +++++----
 14 files changed, 652 insertions(+), 659 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/pro/andon/config/data.ts
 rename apps/web-antd/src/views/mes/pro/andon/config/modules/{config-form.vue => form.vue} (85%)
 rename apps/web-antd/src/views/mes/pro/andon/config/modules/{config-modal.vue => list.vue} (59%)
 create mode 100644 apps/web-ele/src/views/mes/pro/andon/config/data.ts
 rename apps/web-ele/src/views/mes/pro/andon/config/modules/{config-form.vue => form.vue} (85%)
 rename apps/web-ele/src/views/mes/pro/andon/config/modules/{config-modal.vue => list.vue} (77%)

diff --git a/apps/web-antd/src/api/mes/pro/andon/config/index.ts b/apps/web-antd/src/api/mes/pro/andon/config/index.ts
index 7a2ac2ad1..d21621877 100644
--- a/apps/web-antd/src/api/mes/pro/andon/config/index.ts
+++ b/apps/web-antd/src/api/mes/pro/andon/config/index.ts
@@ -9,7 +9,6 @@ export namespace MesProAndonConfigApi {
     reason?: string; // 呼叫原因
     level?: number; // 级别
     handlerRoleId?: number; // 处置角色编号
-    handlerRoleName?: string; // 处置角色名称（前端通过角色精简列表回显）
     handlerUserId?: number; // 处置人编号
     handlerUserNickname?: string; // 处置人昵称
     remark?: string; // 备注
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/data.ts b/apps/web-antd/src/views/mes/pro/andon/config/data.ts
new file mode 100644
index 000000000..f8ff65c18
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/andon/config/data.ts
@@ -0,0 +1,111 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+import type { SystemRoleApi } from '#/api/system/role';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { z } from '#/adapter/form';
+import { getSimpleRoleList } from '#/api/system/role';
+import { getSimpleUserList } from '#/api/system/user';
+
+/** 关联数据 */
+let roleList: SystemRoleApi.Role[] = [];
+getSimpleRoleList().then((data) => (roleList = data));
+
+/** 安灯配置列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>['columns'] {
+  return [
+    { field: 'reason', title: '呼叫原因', minWidth: 200 },
+    {
+      field: 'level',
+      title: '级别',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
+      },
+    },
+    {
+      field: 'handlerRoleId',
+      title: '处置角色',
+      width: 140,
+      formatter: ({ cellValue }) =>
+        roleList.find((role) => role.id === cellValue)?.name ?? '',
+    },
+    { field: 'handlerUserNickname', title: '处置人', width: 140 },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 新增/修改安灯配置的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'reason',
+      label: '呼叫原因',
+      component: 'Textarea',
+      componentProps: {
+        autoSize: { maxRows: 3, minRows: 1 },
+        maxLength: 200,
+        placeholder: '请输入呼叫原因',
+      },
+      rules: z.string().min(1, '呼叫原因不能为空').max(200),
+    },
+    {
+      fieldName: 'level',
+      label: '级别',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL, 'number'),
+        placeholder: '请选择级别',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'handlerRoleId',
+      label: '处置角色',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleRoleList,
+        labelField: 'name',
+        placeholder: '请选择角色（与处置人至少填一个）',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'handlerUserId',
+      label: '处置人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择处置人（与角色至少填一个）',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入备注',
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue b/apps/web-antd/src/views/mes/pro/andon/config/modules/form.vue
similarity index 85%
rename from apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue
rename to apps/web-antd/src/views/mes/pro/andon/config/modules/form.vue
index 46a6a5ed2..e421a4d31 100644
--- a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-form.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/config/modules/form.vue
@@ -15,25 +15,26 @@ import {
 } from '#/api/mes/pro/andon/config';
 import { $t } from '#/locales';
 
-import { useConfigFormSchema } from '../../record/data';
+import { useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
 const formData = ref<MesProAndonConfigApi.AndonConfig>();
-
-const getTitle = computed(() =>
-  formData.value?.id
+const getTitle = computed(() => {
+  return formData.value?.id
     ? $t('ui.actionTitle.edit', ['安灯配置'])
-    : $t('ui.actionTitle.create', ['安灯配置']),
-);
+    : $t('ui.actionTitle.create', ['安灯配置']);
+});
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
-    componentProps: { class: 'w-full' },
+    componentProps: {
+      class: 'w-full',
+    },
     formItemClass: 'col-span-2',
     labelWidth: 100,
   },
   layout: 'horizontal',
-  schema: useConfigFormSchema(),
+  schema: useFormSchema(),
   showDefaultActions: false,
 });
 
@@ -44,6 +45,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data =
       (await formApi.getValues()) as MesProAndonConfigApi.AndonConfig;
     if (!data.handlerRoleId && !data.handlerUserId) {
@@ -55,6 +57,7 @@ const [Modal, modalApi] = useVbenModal({
       await (formData.value?.id
         ? updateAndonConfig(data)
         : createAndonConfig(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -67,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<MesProAndonConfigApi.AndonConfig>();
     if (!data || !data.id) {
       return;
@@ -75,6 +78,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getAndonConfig(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue b/apps/web-antd/src/views/mes/pro/andon/config/modules/list.vue
similarity index 59%
rename from apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue
rename to apps/web-antd/src/views/mes/pro/andon/config/modules/list.vue
index 5b01674b6..0b992e320 100644
--- a/apps/web-antd/src/views/mes/pro/andon/config/modules/config-modal.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/config/modules/list.vue
@@ -2,8 +2,6 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
 
-import { ref } from 'vue';
-
 import { useVbenModal } from '@vben/common-ui';
 
 import { message } from 'ant-design-vue';
@@ -13,67 +11,58 @@ import {
   deleteAndonConfig,
   getAndonConfigList,
 } from '#/api/mes/pro/andon/config';
-import { getSimpleRoleList } from '#/api/system/role';
 import { $t } from '#/locales';
 
-import { useConfigGridColumns } from '../../record/data';
-import ConfigForm from './config-form.vue';
+import { useGridColumns } from '../data';
+import Form from './form.vue';
 
-const list = ref<MesProAndonConfigApi.AndonConfig[]>([]); // 安灯配置列表（已回填处置角色名称）
-
-const [ConfigFormModal, configFormModalApi] = useVbenModal({
-  connectedComponent: ConfigForm,
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
-// TODO @AI：这个格式，是不是有问题？应该要换行？看看别的模块也是；
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     autoResize: true,
     border: true,
-    columns: useConfigGridColumns(),
-    data: list.value,
+    columns: useGridColumns(),
     minHeight: 320,
-    pagerConfig: { enabled: false },
-    rowConfig: { isHover: true, keyField: 'id' },
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
     showOverflow: true,
-    toolbarConfig: { enabled: false },
+    toolbarConfig: {
+      enabled: false,
+    },
   } as VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>,
 });
 
-/** 加载安灯配置列表，并通过角色精简列表回填处置角色名称 */
-// TODO @AI：这里需要 getAndonConfigList、getSimpleRoleList 么？通过 data.ts 里处理，是不是更主流？？？
+/** 加载安灯配置列表 */
 async function getList() {
   gridApi.setLoading(true);
   try {
-    const [configList, roleList] = await Promise.all([
-      getAndonConfigList(),
-      getSimpleRoleList(),
-    ]);
-    const roleMap = new Map(roleList.map((role) => [role.id!, role.name!]));
-    list.value = (configList || []).map((item) => ({
-      ...item,
-      handlerRoleName: item.handlerRoleId
-        ? roleMap.get(item.handlerRoleId)
-        : undefined,
-    }));
-    gridApi.setGridOptions({ data: list.value });
+    const data = (await getAndonConfigList()) || [];
+    gridApi.setGridOptions({ data });
   } finally {
     gridApi.setLoading(false);
   }
 }
 
-/** 新增配置 */
+/** 创建安灯配置 */
 function handleCreate() {
-  configFormModalApi.setData({}).open();
+  formModalApi.setData({}).open();
 }
 
-/** 编辑配置 */
+/** 编辑安灯配置 */
 function handleEdit(row: MesProAndonConfigApi.AndonConfig) {
-  configFormModalApi.setData({ id: row.id }).open();
+  formModalApi.setData({ id: row.id }).open();
 }
 
-/** 删除配置 */
+/** 删除安灯配置 */
 async function handleDelete(row: MesProAndonConfigApi.AndonConfig) {
   await deleteAndonConfig(row.id!);
   message.success($t('ui.actionMessage.deleteSuccess', ['安灯配置']));
@@ -93,8 +82,13 @@ defineExpose({ open: () => modalApi.open() });
 </script>
 
 <template>
-  <Modal :show-cancel-button="false" :show-confirm-button="false" class="w-3/5" title="安灯设置">
-    <ConfigFormModal @success="getList" />
+  <Modal
+    :show-cancel-button="false"
+    :show-confirm-button="false"
+    class="w-3/5"
+    title="安灯设置"
+  >
+    <FormModal @success="getList" />
     <div class="mb-3 flex items-center justify-start">
       <TableAction
         :actions="[
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/data.ts b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
index 3badb717b..0a58427b1 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/data.ts
+++ b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
@@ -1,14 +1,15 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
 import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 
+import { markRaw } from 'vue';
+
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { z } from '#/adapter/form';
-import { getSimpleRoleList } from '#/api/system/role';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
@@ -16,14 +17,17 @@ import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
 
 import { AndonConfigSelect } from '../config/components';
 
-/** 列表搜索表单 */
+/** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
       fieldName: 'workstationId',
       label: '工作站',
-      component: MdWorkstationSelect as any,
-      componentProps: { allowClear: true, placeholder: '请选择工作站' },
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        allowClear: true,
+        placeholder: '请选择工作站',
+      },
     },
     {
       fieldName: 'userId',
@@ -64,20 +68,14 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '发起时间',
       component: 'RangePicker',
       componentProps: {
+        ...getRangePickerDefaultProps(),
         allowClear: true,
-        defaultTime: [
-          new Date(2000, 0, 1, 0, 0, 0),
-          new Date(2000, 0, 1, 23, 59, 59),
-        ],
-        format: 'YYYY-MM-DD HH:mm:ss',
-        showTime: true,
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
       },
     },
   ];
 }
 
-/** 列表字段 */
+/** 列表的字段 */
 export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.AndonRecord>['columns'] {
   return [
     { field: 'workstationCode', title: '工作站编码', width: 140 },
@@ -126,96 +124,83 @@ export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.Andon
   ];
 }
 
-/** 安灯记录表单（按表单类型动态切换字段） */
+/**
+ * 新增/处置/详情安灯呼叫记录的表单
+ *
+ * - create：录入呼叫主体信息（工作站/发起人/工单/工序/呼叫原因/备注）
+ * - update：呼叫主体信息只读，编辑处置时间/处置人/备注
+ * - detail：所有字段只读
+ */
 export function useFormSchema(
-  formType: 'create' | 'detail' | 'update',
-  onConfigChange?: (config: MesProAndonConfigApi.AndonConfig | undefined) => void,
+  formType: string,
+  formApi?: VbenFormApi,
 ): VbenFormSchema[] {
   const isCreate = formType === 'create';
   const isUpdate = formType === 'update';
-  const isDetail = formType === 'detail';
   return [
     {
       fieldName: 'id',
       component: 'Input',
       dependencies: { triggerFields: [''], show: () => false },
     },
-    isCreate
-      ? {
-          fieldName: 'workstationId',
-          label: '工作站',
-          component: MdWorkstationSelect as any,
-          componentProps: { placeholder: '请选择工作站' },
-          rules: 'selectRequired',
-        }
-      : {
-          fieldName: 'workstationName',
-          label: '工作站',
-          component: 'Input',
-          componentProps: { disabled: true },
-        },
-    isCreate
-      ? {
-          fieldName: 'userId',
-          label: '发起人',
-          component: 'ApiSelect',
-          componentProps: {
-            allowClear: true,
-            api: getSimpleUserList,
-            labelField: 'nickname',
-            placeholder: '请选择发起人',
-            valueField: 'id',
-          },
-        }
-      : {
-          fieldName: 'userNickname',
-          label: '发起人',
-          component: 'Input',
-          componentProps: { disabled: true },
-        },
-    isCreate
-      ? {
-          fieldName: 'workOrderId',
-          label: '生产工单',
-          component: ProWorkOrderSelect as any,
-          componentProps: {
-            placeholder: '请选择工单（可选）',
-            status: MesProWorkOrderStatusEnum.CONFIRMED,
-          },
-        }
-      : {
-          fieldName: 'workOrderCode',
-          label: '生产工单',
-          component: 'Input',
-          componentProps: { disabled: true },
-        },
-    isCreate
-      ? {
-          fieldName: 'processId',
-          label: '工序',
-          component: ProProcessSelect as any,
-          componentProps: { placeholder: '请选择工序（可选）' },
-        }
-      : {
-          fieldName: 'processName',
-          label: '工序',
-          component: 'Input',
-          componentProps: { disabled: true },
-        },
-    isCreate
-      ? {
-          fieldName: 'configId',
-          label: '呼叫原因',
-          component: AndonConfigSelect as any,
-          componentProps: { onChange: onConfigChange },
-          rules: 'selectRequired',
-        }
-      : {
-          fieldName: 'reason',
-          label: '呼叫原因',
-          component: 'Input',
-          componentProps: { disabled: true },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        disabled: !isCreate,
+        placeholder: '请选择工作站',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'userId',
+      label: '发起人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        disabled: !isCreate,
+        labelField: 'nickname',
+        placeholder: '请选择发起人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        disabled: !isCreate,
+        placeholder: '请选择工单（可选）',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+    },
+    {
+      fieldName: 'processId',
+      label: '工序',
+      component: markRaw(ProProcessSelect),
+      componentProps: {
+        disabled: !isCreate,
+        placeholder: '请选择工序（可选）',
+      },
+    },
+    {
+      fieldName: 'configId',
+      label: '呼叫原因',
+      component: markRaw(AndonConfigSelect),
+      componentProps: {
+        disabled: !isCreate,
+        // 选择呼叫原因后，自动填充对应的级别
+        onChange: async (config?: MesProAndonConfigApi.AndonConfig) => {
+          await formApi?.setValues({
+            level: config?.level,
+            reason: config?.reason,
+          });
         },
+      },
+      rules: 'selectRequired',
+    },
     {
       fieldName: 'level',
       label: '级别',
@@ -226,7 +211,7 @@ export function useFormSchema(
         placeholder: '由呼叫原因自动带出',
       },
     },
-    // 处置信息：update / detail 才展示
+    // 处置信息：update / detail 模式才展示
     ...(isCreate
       ? []
       : ([
@@ -236,7 +221,10 @@ export function useFormSchema(
             component: 'Select',
             componentProps: {
               disabled: true,
-              options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_STATUS, 'number'),
+              options: getDictOptions(
+                DICT_TYPE.MES_PRO_ANDON_STATUS,
+                'number',
+              ),
             },
           },
           {
@@ -246,37 +234,31 @@ export function useFormSchema(
             componentProps: {
               disabled: !isUpdate,
               format: 'YYYY-MM-DD HH:mm:ss',
-              placeholder: isUpdate ? '请选择处置时间' : undefined,
+              placeholder: '请选择处置时间',
               showTime: true,
               valueFormat: 'x',
             },
           },
-          isUpdate
-            ? {
-                fieldName: 'handlerUserId',
-                label: '处置人',
-                component: 'ApiSelect',
-                componentProps: {
-                  allowClear: true,
-                  api: getSimpleUserList,
-                  labelField: 'nickname',
-                  placeholder: '请选择处置人',
-                  valueField: 'id',
-                },
-              }
-            : {
-                fieldName: 'handlerUserNickname',
-                label: '处置人',
-                component: 'Input',
-                componentProps: { disabled: true },
-              },
+          {
+            fieldName: 'handlerUserId',
+            label: '处置人',
+            component: 'ApiSelect',
+            componentProps: {
+              allowClear: true,
+              api: getSimpleUserList,
+              disabled: !isUpdate,
+              labelField: 'nickname',
+              placeholder: '请选择处置人',
+              valueField: 'id',
+            },
+          },
         ] as VbenFormSchema[])),
     {
       fieldName: 'remark',
       label: '备注',
       component: 'Textarea',
       componentProps: {
-        disabled: isDetail,
+        disabled: formType === 'detail',
         maxLength: 250,
         placeholder: '请输入备注',
         rows: 2,
@@ -284,90 +266,3 @@ export function useFormSchema(
     },
   ];
 }
-
-/** 安灯配置表格列（弹窗内嵌网格） */
-export function useConfigGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>['columns'] {
-  return [
-    { field: 'reason', title: '呼叫原因', minWidth: 200 },
-    {
-      field: 'level',
-      title: '级别',
-      width: 100,
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
-      },
-    },
-    { field: 'handlerRoleName', title: '处置角色', width: 140 },
-    { field: 'handlerUserNickname', title: '处置人', width: 140 },
-    { field: 'remark', title: '备注', minWidth: 160 },
-    {
-      title: '操作',
-      width: 160,
-      fixed: 'right',
-      slots: { default: 'actions' },
-    },
-  ];
-}
-
-/** 安灯配置表单（弹窗内的新增/编辑表单） */
-export function useConfigFormSchema(): VbenFormSchema[] {
-  return [
-    {
-      fieldName: 'id',
-      component: 'Input',
-      dependencies: { triggerFields: [''], show: () => false },
-    },
-    {
-      fieldName: 'reason',
-      label: '呼叫原因',
-      component: 'Textarea',
-      componentProps: {
-        autoSize: { maxRows: 3, minRows: 1 },
-        maxLength: 200,
-        placeholder: '请输入呼叫原因',
-      },
-      rules: z.string().min(1, '呼叫原因不能为空').max(200),
-    },
-    {
-      fieldName: 'level',
-      label: '级别',
-      component: 'Select',
-      componentProps: {
-        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL, 'number'),
-        placeholder: '请选择级别',
-      },
-      rules: 'selectRequired',
-    },
-    {
-      fieldName: 'handlerRoleId',
-      label: '处置角色',
-      component: 'ApiSelect',
-      componentProps: {
-        allowClear: true,
-        api: getSimpleRoleList,
-        labelField: 'name',
-        placeholder: '请选择角色（与处置人至少填一个）',
-        valueField: 'id',
-      },
-    },
-    {
-      fieldName: 'handlerUserId',
-      label: '处置人',
-      component: 'ApiSelect',
-      componentProps: {
-        allowClear: true,
-        api: getSimpleUserList,
-        labelField: 'nickname',
-        placeholder: '请选择处置人（与角色至少填一个）',
-        valueField: 'id',
-      },
-    },
-    {
-      fieldName: 'remark',
-      label: '备注',
-      component: 'Input',
-      componentProps: { maxLength: 100, placeholder: '请输入备注' },
-    },
-  ];
-}
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/index.vue b/apps/web-antd/src/views/mes/pro/andon/record/index.vue
index d6d4921d8..c3c819160 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/index.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/record/index.vue
@@ -18,7 +18,7 @@ import {
 import { $t } from '#/locales';
 import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
-import ConfigModal from '../config/modules/config-modal.vue';
+import ConfigList from '../config/modules/list.vue';
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 
@@ -27,7 +27,7 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-const configModalRef = ref<InstanceType<typeof ConfigModal>>();
+const configModalRef = ref<InstanceType<typeof ConfigList>>();
 
 /** 刷新表格 */
 function handleRefresh() {
@@ -109,7 +109,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
     <FormModal @success="handleRefresh" />
-    <ConfigModal ref="configModalRef" />
+    <ConfigList ref="configModalRef" />
     <Grid table-title="安灯呼叫记录">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
index 0e43f9b9e..295b2489d 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
 import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 
 import { computed, ref } from 'vue';
@@ -7,7 +6,7 @@ import { computed, ref } from 'vue';
 import { useVbenModal } from '@vben/common-ui';
 import { useUserStore } from '@vben/stores';
 
-import { Button, message } from 'ant-design-vue';
+import { Button, message, Popconfirm } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import {
@@ -20,69 +19,40 @@ import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 
+type FormMode = 'create' | 'detail' | 'update';
+
 const emit = defineEmits(['success']);
-const formType = ref<'create' | 'detail' | 'update'>('create'); // 表单当前模式：新增 / 处置 / 详情
+const formMode = ref<FormMode>('create'); // 表单模式：新增 / 处置 / 详情
 const formData = ref<MesProAndonRecordApi.AndonRecord>();
 const userStore = useUserStore();
 
-const dialogTitle = computed(() => {
-  switch (formType.value) {
-    case 'create': {
-      return '新增安灯呼叫';
-    }
-    case 'detail': {
-      return '安灯呼叫详情';
-    }
-    case 'update': {
-      return '处置安灯呼叫';
-    }
-    default: {
-      return '安灯呼叫';
-    }
+const isUpdate = computed(() => formMode.value === 'update'); // 是否处置模式
+const getTitle = computed(() => {
+  if (formMode.value === 'detail') {
+    return $t('ui.actionTitle.view', ['安灯呼叫']);
   }
+  return formMode.value === 'update'
+    ? $t('ui.actionTitle.edit', ['安灯呼叫'])
+    : $t('ui.actionTitle.create', ['安灯呼叫']);
 });
 
-/** 选择呼叫原因后自动填充级别 */
-function handleConfigChange(config: MesProAndonConfigApi.AndonConfig | undefined) {
-  if (!config) {
-    formApi.setValues({ level: undefined, reason: undefined });
-    return;
-  }
-  formApi.setValues({ level: config.level, reason: config.reason });
-}
-
 const [Form, formApi] = useVbenForm({
   commonConfig: {
-    componentProps: { class: 'w-full' },
+    componentProps: {
+      class: 'w-full',
+    },
     formItemClass: 'col-span-2',
     labelWidth: 100,
   },
   layout: 'horizontal',
-  schema: useFormSchema('create', handleConfigChange),
+  schema: [],
   showDefaultActions: false,
 });
 
-/** 提交：新增 */
-async function handleCreate() {
-  const { valid } = await formApi.validate();
-  if (!valid) {
-    return;
-  }
-  modalApi.lock();
-  try {
-    const data =
-      (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
-    await createAndonRecord(data);
-    await modalApi.close();
-    emit('success');
-    message.success($t('ui.actionMessage.operationSuccess'));
-  } finally {
-    modalApi.unlock();
-  }
-}
+/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
 
-/** 处置：保存（保持 ACTIVE） */
-// TODO @AI：这里写下注释；
+/** 处置：保存（保持 ACTIVE 状态） */
 async function handleSave() {
   modalApi.lock();
   try {
@@ -103,8 +73,7 @@ async function handleSave() {
   }
 }
 
-/** 处置：标记已处置 */
-// TODO @AI：这里写下注释；
+/** 处置：标记已处置（状态变为 HANDLED） */
 async function handleFinish() {
   const values =
     (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
@@ -133,34 +102,47 @@ async function handleFinish() {
   }
 }
 
-// TODO @AI：这里的代码风格？！！
 const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formMode.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
+    try {
+      await createAndonRecord(data);
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
       return;
     }
-    const data = modalApi.getData<{
-      id?: number;
-      type: 'create' | 'detail' | 'update';
-    }>();
-    if (!data) {
-      return;
-    }
-    formType.value = data.type;
-    // 重新挂载 schema，以便按 type 切换字段表现
-    formApi.setState({ schema: useFormSchema(data.type, handleConfigChange) });
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
+    formMode.value = data?.type || 'create';
+    formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+    modalApi.setState({ showConfirmButton: formMode.value === 'create' });
     await formApi.resetForm();
-
-    if (data.type === 'create') {
-      // 新增时默认填发起人为当前用户
-      const currentUserId = userStore.userInfo?.id;
-      formData.value = { userId: currentUserId };
-      await formApi.setValues({ userId: currentUserId });
+    if (formMode.value === 'create') {
+      // 新增时，发起人默认为当前用户
+      await formApi.setValues({ userId: userStore.userInfo?.id });
       return;
     }
-    // 处置 / 详情：加载详情
-    if (!data.id) {
+    if (!data?.id) {
       return;
     }
     modalApi.lock();
@@ -168,7 +150,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = await getAndonRecord(data.id);
       const initial: MesProAndonRecordApi.AndonRecord = { ...formData.value };
       // 处置模式下，默认填充处置时间和处置人，方便快速保存
-      if (data.type === 'update') {
+      if (isUpdate.value) {
         if (!initial.handleTime) {
           initial.handleTime = Date.now();
         }
@@ -176,6 +158,7 @@ const [Modal, modalApi] = useVbenModal({
           initial.handlerUserId = userStore.userInfo?.id;
         }
       }
+      // 设置到 values
       await formApi.setValues(initial);
     } finally {
       modalApi.unlock();
@@ -185,21 +168,17 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal :title="dialogTitle" class="w-1/2">
-    <Form />
-    <template #footer>
-      <template v-if="formType === 'create'">
-        <Button @click="modalApi.close()">取消</Button>
-        <Button type="primary" @click="handleCreate">确定</Button>
-      </template>
-      <template v-else-if="formType === 'update'">
-        <Button @click="modalApi.close()">关闭</Button>
-        <Button type="primary" @click="handleSave">保存</Button>
-        <Button type="primary" danger @click="handleFinish">已处置</Button>
-      </template>
-      <template v-else>
-        <Button @click="modalApi.close()">关闭</Button>
-      </template>
+  <Modal :title="getTitle" class="w-1/2">
+    <Form class="mx-4" />
+    <template #prepend-footer>
+      <div v-if="isUpdate" class="flex flex-auto items-center justify-end gap-2">
+        <Popconfirm title="确认保存当前处置进度？" @confirm="handleSave">
+          <Button type="primary">保存</Button>
+        </Popconfirm>
+        <Popconfirm title="确认标记为已处置？" @confirm="handleFinish">
+          <Button danger type="primary">已处置</Button>
+        </Popconfirm>
+      </div>
     </template>
   </Modal>
 </template>
diff --git a/apps/web-ele/src/api/mes/pro/andon/config/index.ts b/apps/web-ele/src/api/mes/pro/andon/config/index.ts
index 317c6cc50..d21621877 100644
--- a/apps/web-ele/src/api/mes/pro/andon/config/index.ts
+++ b/apps/web-ele/src/api/mes/pro/andon/config/index.ts
@@ -1,21 +1,26 @@
+import type { PageParam, PageResult } from '@vben/request';
+
 import { requestClient } from '#/api/request';
 
 export namespace MesProAndonConfigApi {
   /** MES 安灯配置 */
   export interface AndonConfig {
-    id?: number;
+    id?: number; // 编号
     reason?: string; // 呼叫原因
     level?: number; // 级别
     handlerRoleId?: number; // 处置角色编号
     handlerUserId?: number; // 处置人编号
-    handlerUserNickname?: string; // 处置人姓名（详情回显）
-    remark?: string;
+    handlerUserNickname?: string; // 处置人昵称
+    remark?: string; // 备注
   }
 }
 
 /** 查询安灯配置分页 */
-export function getAndonConfigPage(params: any) {
-  return requestClient.get('/mes/pro/andon-config/page', { params });
+export function getAndonConfigPage(params: PageParam) {
+  return requestClient.get<PageResult<MesProAndonConfigApi.AndonConfig>>(
+    '/mes/pro/andon-config/page',
+    { params },
+  );
 }
 
 /** 查询安灯配置列表 */
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/data.ts b/apps/web-ele/src/views/mes/pro/andon/config/data.ts
new file mode 100644
index 000000000..a83f6cef4
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/andon/config/data.ts
@@ -0,0 +1,111 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
+import type { SystemRoleApi } from '#/api/system/role';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { z } from '#/adapter/form';
+import { getSimpleRoleList } from '#/api/system/role';
+import { getSimpleUserList } from '#/api/system/user';
+
+/** 关联数据 */
+let roleList: SystemRoleApi.Role[] = [];
+getSimpleRoleList().then((data) => (roleList = data));
+
+/** 安灯配置列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>['columns'] {
+  return [
+    { field: 'reason', title: '呼叫原因', minWidth: 200 },
+    {
+      field: 'level',
+      title: '级别',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
+      },
+    },
+    {
+      field: 'handlerRoleId',
+      title: '处置角色',
+      width: 140,
+      formatter: ({ cellValue }) =>
+        roleList.find((role) => role.id === cellValue)?.name ?? '',
+    },
+    { field: 'handlerUserNickname', title: '处置人', width: 140 },
+    { field: 'remark', title: '备注', minWidth: 160 },
+    {
+      title: '操作',
+      width: 160,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 新增/修改安灯配置的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'reason',
+      label: '呼叫原因',
+      component: 'Textarea',
+      componentProps: {
+        autosize: { maxRows: 3, minRows: 1 },
+        maxLength: 200,
+        placeholder: '请输入呼叫原因',
+      },
+      rules: z.string().min(1, '呼叫原因不能为空').max(200),
+    },
+    {
+      fieldName: 'level',
+      label: '级别',
+      component: 'Select',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL, 'number'),
+        placeholder: '请选择级别',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'handlerRoleId',
+      label: '处置角色',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleRoleList,
+        clearable: true,
+        labelField: 'name',
+        placeholder: '请选择角色（与处置人至少填一个）',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'handlerUserId',
+      label: '处置人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择处置人（与角色至少填一个）',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+        placeholder: '请输入备注',
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/modules/config-form.vue b/apps/web-ele/src/views/mes/pro/andon/config/modules/form.vue
similarity index 85%
rename from apps/web-ele/src/views/mes/pro/andon/config/modules/config-form.vue
rename to apps/web-ele/src/views/mes/pro/andon/config/modules/form.vue
index d411ba9b6..af6b32037 100644
--- a/apps/web-ele/src/views/mes/pro/andon/config/modules/config-form.vue
+++ b/apps/web-ele/src/views/mes/pro/andon/config/modules/form.vue
@@ -15,25 +15,26 @@ import {
 } from '#/api/mes/pro/andon/config';
 import { $t } from '#/locales';
 
-import { useConfigFormSchema } from '../../record/data';
+import { useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
 const formData = ref<MesProAndonConfigApi.AndonConfig>();
-
-const getTitle = computed(() =>
-  formData.value?.id
+const getTitle = computed(() => {
+  return formData.value?.id
     ? $t('ui.actionTitle.edit', ['安灯配置'])
-    : $t('ui.actionTitle.create', ['安灯配置']),
-);
+    : $t('ui.actionTitle.create', ['安灯配置']);
+});
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
-    componentProps: { class: 'w-full' },
+    componentProps: {
+      class: 'w-full',
+    },
     formItemClass: 'col-span-2',
     labelWidth: 100,
   },
   layout: 'horizontal',
-  schema: useConfigFormSchema(),
+  schema: useFormSchema(),
   showDefaultActions: false,
 });
 
@@ -44,6 +45,7 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    // 提交表单
     const data =
       (await formApi.getValues()) as MesProAndonConfigApi.AndonConfig;
     if (!data.handlerRoleId && !data.handlerUserId) {
@@ -55,6 +57,7 @@ const [Modal, modalApi] = useVbenModal({
       await (formData.value?.id
         ? updateAndonConfig(data)
         : createAndonConfig(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
@@ -67,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({
       formData.value = undefined;
       return;
     }
-    await formApi.resetForm();
+    // 加载数据
     const data = modalApi.getData<MesProAndonConfigApi.AndonConfig>();
     if (!data || !data.id) {
       return;
@@ -75,6 +78,7 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getAndonConfig(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/modules/config-modal.vue b/apps/web-ele/src/views/mes/pro/andon/config/modules/list.vue
similarity index 77%
rename from apps/web-ele/src/views/mes/pro/andon/config/modules/config-modal.vue
rename to apps/web-ele/src/views/mes/pro/andon/config/modules/list.vue
index 13ab75340..ba237cec0 100644
--- a/apps/web-ele/src/views/mes/pro/andon/config/modules/config-modal.vue
+++ b/apps/web-ele/src/views/mes/pro/andon/config/modules/list.vue
@@ -2,8 +2,6 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
 
-import { ref } from 'vue';
-
 import { useVbenModal } from '@vben/common-ui';
 
 import { ElMessage } from 'element-plus';
@@ -15,13 +13,11 @@ import {
 } from '#/api/mes/pro/andon/config';
 import { $t } from '#/locales';
 
-import { useConfigGridColumns } from '../../record/data';
-import ConfigForm from './config-form.vue';
+import { useGridColumns } from '../data';
+import Form from './form.vue';
 
-const list = ref<MesProAndonConfigApi.AndonConfig[]>([]);
-
-const [ConfigFormModal, configFormModalApi] = useVbenModal({
-  connectedComponent: ConfigForm,
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
@@ -29,13 +25,19 @@ const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     autoResize: true,
     border: true,
-    columns: useConfigGridColumns(),
-    data: list.value,
+    columns: useGridColumns(),
     minHeight: 320,
-    pagerConfig: { enabled: false },
-    rowConfig: { isHover: true, keyField: 'id' },
+    pagerConfig: {
+      enabled: false,
+    },
+    rowConfig: {
+      isHover: true,
+      keyField: 'id',
+    },
     showOverflow: true,
-    toolbarConfig: { enabled: false },
+    toolbarConfig: {
+      enabled: false,
+    },
   } as VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>,
 });
 
@@ -43,24 +45,24 @@ const [Grid, gridApi] = useVbenVxeGrid({
 async function getList() {
   gridApi.setLoading(true);
   try {
-    list.value = (await getAndonConfigList()) || [];
-    gridApi.setGridOptions({ data: list.value });
+    const data = (await getAndonConfigList()) || [];
+    gridApi.setGridOptions({ data });
   } finally {
     gridApi.setLoading(false);
   }
 }
 
-/** 新增配置 */
+/** 创建安灯配置 */
 function handleCreate() {
-  configFormModalApi.setData({}).open();
+  formModalApi.setData({}).open();
 }
 
-/** 编辑配置 */
+/** 编辑安灯配置 */
 function handleEdit(row: MesProAndonConfigApi.AndonConfig) {
-  configFormModalApi.setData({ id: row.id }).open();
+  formModalApi.setData({ id: row.id }).open();
 }
 
-/** 删除配置 */
+/** 删除安灯配置 */
 async function handleDelete(row: MesProAndonConfigApi.AndonConfig) {
   await deleteAndonConfig(row.id!);
   ElMessage.success($t('ui.actionMessage.deleteSuccess', ['安灯配置']));
@@ -86,7 +88,7 @@ defineExpose({ open: () => modalApi.open() });
     class="w-3/5"
     title="安灯设置"
   >
-    <ConfigFormModal @success="getList" />
+    <FormModal @success="getList" />
     <div class="mb-3 flex items-center justify-start">
       <TableAction
         :actions="[
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/data.ts b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
index 04f85ac3c..a0734a6e0 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/data.ts
+++ b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
@@ -1,13 +1,15 @@
-import type { VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
 import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 
+import { markRaw } from 'vue';
+
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { z } from '#/adapter/form';
 import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
 import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
 import { ProProcessSelect } from '#/views/mes/pro/process/components';
 import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
@@ -15,14 +17,17 @@ import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
 
 import { AndonConfigSelect } from '../config/components';
 
-/** 列表搜索表单 */
+/** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
     {
       fieldName: 'workstationId',
       label: '工作站',
-      component: MdWorkstationSelect as any,
-      componentProps: { clearable: true, placeholder: '请选择工作站' },
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        clearable: true,
+        placeholder: '请选择工作站',
+      },
     },
     {
       fieldName: 'userId',
@@ -61,18 +66,16 @@ export function useGridFormSchema(): VbenFormSchema[] {
     {
       fieldName: 'createTime',
       label: '发起时间',
-      component: 'DatePicker',
+      component: 'RangePicker',
       componentProps: {
+        ...getRangePickerDefaultProps(),
         clearable: true,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        type: 'datetimerange',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
       },
     },
   ];
 }
 
-/** 列表字段 */
+/** 列表的字段 */
 export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.AndonRecord>['columns'] {
   return [
     { field: 'workstationCode', title: '工作站编码', width: 140 },
@@ -121,96 +124,83 @@ export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.Andon
   ];
 }
 
-/** 安灯记录表单（按表单类型动态切换字段） */
+/**
+ * 新增/处置/详情安灯呼叫记录的表单
+ *
+ * - create：录入呼叫主体信息（工作站/发起人/工单/工序/呼叫原因/备注）
+ * - update：呼叫主体信息只读，编辑处置时间/处置人/备注
+ * - detail：所有字段只读
+ */
 export function useFormSchema(
-  formType: 'create' | 'detail' | 'update',
-  onConfigChange?: (config: MesProAndonConfigApi.AndonConfig | undefined) => void,
+  formType: string,
+  formApi?: VbenFormApi,
 ): VbenFormSchema[] {
   const isCreate = formType === 'create';
   const isUpdate = formType === 'update';
-  const isDetail = formType === 'detail';
   return [
     {
       fieldName: 'id',
       component: 'Input',
       dependencies: { triggerFields: [''], show: () => false },
     },
-    isCreate
-      ? {
-          fieldName: 'workstationId',
-          label: '工作站',
-          component: MdWorkstationSelect as any,
-          componentProps: { placeholder: '请选择工作站' },
-          rules: 'selectRequired',
-        }
-      : {
-          fieldName: 'workstationName',
-          label: '工作站',
-          component: 'Input',
-          componentProps: { disabled: true },
-        },
-    isCreate
-      ? {
-          fieldName: 'userId',
-          label: '发起人',
-          component: 'ApiSelect',
-          componentProps: {
-            api: getSimpleUserList,
-            clearable: true,
-            labelField: 'nickname',
-            placeholder: '请选择发起人',
-            valueField: 'id',
-          },
-        }
-      : {
-          fieldName: 'userNickname',
-          label: '发起人',
-          component: 'Input',
-          componentProps: { disabled: true },
-        },
-    isCreate
-      ? {
-          fieldName: 'workOrderId',
-          label: '生产工单',
-          component: ProWorkOrderSelect as any,
-          componentProps: {
-            placeholder: '请选择工单（可选）',
-            status: MesProWorkOrderStatusEnum.CONFIRMED,
-          },
-        }
-      : {
-          fieldName: 'workOrderCode',
-          label: '生产工单',
-          component: 'Input',
-          componentProps: { disabled: true },
-        },
-    isCreate
-      ? {
-          fieldName: 'processId',
-          label: '工序',
-          component: ProProcessSelect as any,
-          componentProps: { placeholder: '请选择工序（可选）' },
-        }
-      : {
-          fieldName: 'processName',
-          label: '工序',
-          component: 'Input',
-          componentProps: { disabled: true },
-        },
-    isCreate
-      ? {
-          fieldName: 'configId',
-          label: '呼叫原因',
-          component: AndonConfigSelect as any,
-          componentProps: { onChange: onConfigChange },
-          rules: 'selectRequired',
-        }
-      : {
-          fieldName: 'reason',
-          label: '呼叫原因',
-          component: 'Input',
-          componentProps: { disabled: true },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        disabled: !isCreate,
+        placeholder: '请选择工作站',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'userId',
+      label: '发起人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        disabled: !isCreate,
+        labelField: 'nickname',
+        placeholder: '请选择发起人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        disabled: !isCreate,
+        placeholder: '请选择工单（可选）',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+      },
+    },
+    {
+      fieldName: 'processId',
+      label: '工序',
+      component: markRaw(ProProcessSelect),
+      componentProps: {
+        disabled: !isCreate,
+        placeholder: '请选择工序（可选）',
+      },
+    },
+    {
+      fieldName: 'configId',
+      label: '呼叫原因',
+      component: markRaw(AndonConfigSelect),
+      componentProps: {
+        disabled: !isCreate,
+        // 选择呼叫原因后，自动填充对应的级别
+        onChange: async (config?: MesProAndonConfigApi.AndonConfig) => {
+          await formApi?.setValues({
+            level: config?.level,
+            reason: config?.reason,
+          });
         },
+      },
+      rules: 'selectRequired',
+    },
     {
       fieldName: 'level',
       label: '级别',
@@ -221,7 +211,7 @@ export function useFormSchema(
         placeholder: '由呼叫原因自动带出',
       },
     },
-    // 处置信息：update / detail 才展示
+    // 处置信息：update / detail 模式才展示
     ...(isCreate
       ? []
       : ([
@@ -231,7 +221,10 @@ export function useFormSchema(
             component: 'Select',
             componentProps: {
               disabled: true,
-              options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_STATUS, 'number'),
+              options: getDictOptions(
+                DICT_TYPE.MES_PRO_ANDON_STATUS,
+                'number',
+              ),
             },
           },
           {
@@ -242,30 +235,24 @@ export function useFormSchema(
               class: '!w-full',
               disabled: !isUpdate,
               format: 'YYYY-MM-DD HH:mm:ss',
-              placeholder: isUpdate ? '请选择处置时间' : undefined,
+              placeholder: '请选择处置时间',
               type: 'datetime',
               valueFormat: 'x',
             },
           },
-          isUpdate
-            ? {
-                fieldName: 'handlerUserId',
-                label: '处置人',
-                component: 'ApiSelect',
-                componentProps: {
-                  api: getSimpleUserList,
-                  clearable: true,
-                  labelField: 'nickname',
-                  placeholder: '请选择处置人',
-                  valueField: 'id',
-                },
-              }
-            : {
-                fieldName: 'handlerUserNickname',
-                label: '处置人',
-                component: 'Input',
-                componentProps: { disabled: true },
-              },
+          {
+            fieldName: 'handlerUserId',
+            label: '处置人',
+            component: 'ApiSelect',
+            componentProps: {
+              api: getSimpleUserList,
+              clearable: true,
+              disabled: !isUpdate,
+              labelField: 'nickname',
+              placeholder: '请选择处置人',
+              valueField: 'id',
+            },
+          },
         ] as VbenFormSchema[])),
     {
       fieldName: 'remark',
@@ -273,97 +260,10 @@ export function useFormSchema(
       component: 'Textarea',
       componentProps: {
         autosize: { maxRows: 3, minRows: 2 },
-        disabled: isDetail,
+        disabled: formType === 'detail',
         maxLength: 250,
         placeholder: '请输入备注',
       },
     },
   ];
 }
-
-/** 安灯配置表格列（弹窗内嵌网格） */
-export function useConfigGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>['columns'] {
-  return [
-    { field: 'reason', title: '呼叫原因', minWidth: 200 },
-    {
-      field: 'level',
-      title: '级别',
-      width: 100,
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
-      },
-    },
-    { field: 'handlerUserNickname', title: '处置人', width: 140 },
-    { field: 'remark', title: '备注', minWidth: 160 },
-    {
-      title: '操作',
-      width: 160,
-      fixed: 'right',
-      slots: { default: 'actions' },
-    },
-  ];
-}
-
-/** 安灯配置表单（弹窗内的新增/编辑表单） */
-export function useConfigFormSchema(): VbenFormSchema[] {
-  return [
-    {
-      fieldName: 'id',
-      component: 'Input',
-      dependencies: { triggerFields: [''], show: () => false },
-    },
-    {
-      fieldName: 'reason',
-      label: '呼叫原因',
-      component: 'Textarea',
-      componentProps: {
-        autosize: { maxRows: 3, minRows: 1 },
-        maxLength: 200,
-        placeholder: '请输入呼叫原因',
-      },
-      rules: z.string().min(1, '呼叫原因不能为空').max(200),
-    },
-    {
-      fieldName: 'level',
-      label: '级别',
-      component: 'Select',
-      componentProps: {
-        options: getDictOptions(DICT_TYPE.MES_PRO_ANDON_LEVEL, 'number'),
-        placeholder: '请选择级别',
-      },
-      rules: 'selectRequired',
-    },
-    {
-      fieldName: 'handlerRoleId',
-      label: '处置角色',
-      component: 'ApiSelect',
-      componentProps: {
-        api: () =>
-          import('#/api/system/role').then((m) => m.getSimpleRoleList()),
-        clearable: true,
-        labelField: 'name',
-        placeholder: '请选择角色（与处置人至少填一个）',
-        valueField: 'id',
-      },
-    },
-    {
-      fieldName: 'handlerUserId',
-      label: '处置人',
-      component: 'ApiSelect',
-      componentProps: {
-        api: getSimpleUserList,
-        clearable: true,
-        labelField: 'nickname',
-        placeholder: '请选择处置人（与角色至少填一个）',
-        valueField: 'id',
-      },
-    },
-    {
-      fieldName: 'remark',
-      label: '备注',
-      component: 'Input',
-      componentProps: { maxLength: 100, placeholder: '请输入备注' },
-    },
-  ];
-}
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/index.vue b/apps/web-ele/src/views/mes/pro/andon/record/index.vue
index 68e44734d..aaba8a21d 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/index.vue
+++ b/apps/web-ele/src/views/mes/pro/andon/record/index.vue
@@ -18,7 +18,7 @@ import {
 import { $t } from '#/locales';
 import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
-import ConfigModal from '../config/modules/config-modal.vue';
+import ConfigList from '../config/modules/list.vue';
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 
@@ -27,7 +27,7 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-const configModalRef = ref<InstanceType<typeof ConfigModal>>();
+const configModalRef = ref<InstanceType<typeof ConfigList>>();
 
 /** 刷新表格 */
 function handleRefresh() {
@@ -108,7 +108,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
     <FormModal @success="handleRefresh" />
-    <ConfigModal ref="configModalRef" />
+    <ConfigList ref="configModalRef" />
     <Grid table-title="安灯呼叫记录">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
index b7bb6d1ee..518146b5e 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
@@ -1,14 +1,12 @@
 <script lang="ts" setup>
-import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
 import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 
 import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { useUserStore } from '@vben/stores';
-import { formatDate } from '@vben/utils';
 
-import { ElButton, ElMessage } from 'element-plus';
+import { ElButton, ElMessage, ElPopconfirm } from 'element-plus';
 
 import { useVbenForm } from '#/adapter/form';
 import {
@@ -21,68 +19,40 @@ import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 
+type FormMode = 'create' | 'detail' | 'update';
+
 const emit = defineEmits(['success']);
-const formType = ref<'create' | 'detail' | 'update'>('create');
-const formData = ref<MesProAndonRecordApi.AndonRecord>({});
+const formMode = ref<FormMode>('create'); // 表单模式：新增 / 处置 / 详情
+const formData = ref<MesProAndonRecordApi.AndonRecord>();
 const userStore = useUserStore();
 
-const dialogTitle = computed(() => {
-  switch (formType.value) {
-    case 'create': {
-      return '新增安灯呼叫';
-    }
-    case 'detail': {
-      return '安灯呼叫详情';
-    }
-    case 'update': {
-      return '处置安灯呼叫';
-    }
-    default: {
-      return '安灯呼叫';
-    }
+const isUpdate = computed(() => formMode.value === 'update'); // 是否处置模式
+const getTitle = computed(() => {
+  if (formMode.value === 'detail') {
+    return $t('ui.actionTitle.view', ['安灯呼叫']);
   }
+  return formMode.value === 'update'
+    ? $t('ui.actionTitle.edit', ['安灯呼叫'])
+    : $t('ui.actionTitle.create', ['安灯呼叫']);
 });
 
-/** 选择呼叫原因后自动填充级别 */
-function handleConfigChange(config: MesProAndonConfigApi.AndonConfig | undefined) {
-  if (!config) {
-    formApi.setValues({ level: undefined, reason: undefined });
-    return;
-  }
-  formApi.setValues({ level: config.level, reason: config.reason });
-}
-
 const [Form, formApi] = useVbenForm({
   commonConfig: {
-    componentProps: { class: 'w-full' },
+    componentProps: {
+      class: 'w-full',
+    },
     formItemClass: 'col-span-2',
     labelWidth: 100,
   },
   layout: 'horizontal',
-  schema: useFormSchema('create', handleConfigChange),
+  schema: [],
   showDefaultActions: false,
 });
 
-/** 提交：新增 */
-async function handleCreate() {
-  const { valid } = await formApi.validate();
-  if (!valid) {
-    return;
-  }
-  modalApi.lock();
-  try {
-    const data =
-      (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
-    await createAndonRecord(data);
-    await modalApi.close();
-    emit('success');
-    ElMessage.success($t('ui.actionMessage.operationSuccess'));
-  } finally {
-    modalApi.unlock();
-  }
-}
+/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
 
-/** 处置：保存（保持 ACTIVE） */
+/** 处置：保存（保持 ACTIVE 状态） */
 async function handleSave() {
   modalApi.lock();
   try {
@@ -91,7 +61,7 @@ async function handleSave() {
     await updateAndonRecord({
       handlerUserId: values.handlerUserId,
       handleTime: values.handleTime,
-      id: formData.value.id,
+      id: formData.value?.id,
       remark: values.remark,
       status: MesProAndonStatusEnum.ACTIVE,
     });
@@ -103,7 +73,7 @@ async function handleSave() {
   }
 }
 
-/** 处置：标记已处置 */
+/** 处置：标记已处置（状态变为 HANDLED） */
 async function handleFinish() {
   const values =
     (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
@@ -120,7 +90,7 @@ async function handleFinish() {
     await updateAndonRecord({
       handlerUserId: values.handlerUserId,
       handleTime: values.handleTime,
-      id: formData.value.id,
+      id: formData.value?.id,
       remark: values.remark,
       status: MesProAndonStatusEnum.HANDLED,
     });
@@ -133,43 +103,62 @@ async function handleFinish() {
 }
 
 const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formMode.value === 'detail') {
+      await modalApi.close();
+      return;
+    }
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as MesProAndonRecordApi.AndonRecord;
+    try {
+      await createAndonRecord(data);
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      formData.value = {};
+      formData.value = undefined;
       return;
     }
-    const data = modalApi.getData<{
-      id?: number;
-      type: 'create' | 'detail' | 'update';
-    }>();
-    if (!data) {
-      return;
-    }
-    formType.value = data.type;
-    formApi.setState({ schema: useFormSchema(data.type, handleConfigChange) });
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
+    formMode.value = data?.type || 'create';
+    formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+    modalApi.setState({ showConfirmButton: formMode.value === 'create' });
     await formApi.resetForm();
-
-    if (data.type === 'create') {
-      const currentUserId = userStore.userInfo?.id;
-      formData.value = { userId: currentUserId };
-      await formApi.setValues({ userId: currentUserId });
+    if (formMode.value === 'create') {
+      // 新增时，发起人默认为当前用户
+      await formApi.setValues({ userId: userStore.userInfo?.id });
       return;
     }
-    if (!data.id) {
+    if (!data?.id) {
       return;
     }
     modalApi.lock();
     try {
       formData.value = await getAndonRecord(data.id);
       const initial: MesProAndonRecordApi.AndonRecord = { ...formData.value };
-      if (data.type === 'update') {
+      // 处置模式下，默认填充处置时间和处置人，方便快速保存
+      if (isUpdate.value) {
         if (!initial.handleTime) {
-          initial.handleTime = formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss');
+          initial.handleTime = Date.now();
         }
         if (!initial.handlerUserId) {
           initial.handlerUserId = userStore.userInfo?.id;
         }
       }
+      // 设置到 values
       await formApi.setValues(initial);
     } finally {
       modalApi.unlock();
@@ -179,21 +168,21 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal :title="dialogTitle" class="w-1/2">
-    <Form />
-    <template #footer>
-      <template v-if="formType === 'create'">
-        <ElButton @click="modalApi.close()">取消</ElButton>
-        <ElButton type="primary" @click="handleCreate">确定</ElButton>
-      </template>
-      <template v-else-if="formType === 'update'">
-        <ElButton @click="modalApi.close()">关闭</ElButton>
-        <ElButton type="primary" @click="handleSave">保存</ElButton>
-        <ElButton type="success" @click="handleFinish">已处置</ElButton>
-      </template>
-      <template v-else>
-        <ElButton @click="modalApi.close()">关闭</ElButton>
-      </template>
+  <Modal :title="getTitle" class="w-1/2">
+    <Form class="mx-4" />
+    <template #prepend-footer>
+      <div v-if="isUpdate" class="flex flex-auto items-center justify-end gap-2">
+        <ElPopconfirm title="确认保存当前处置进度？" @confirm="handleSave">
+          <template #reference>
+            <ElButton type="primary">保存</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm title="确认标记为已处置？" @confirm="handleFinish">
+          <template #reference>
+            <ElButton type="success">已处置</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
     </template>
   </Modal>
 </template>

From 4a92762d441c5e9c2df58fc9ee1f083a4d33f8e1 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 26 May 2026 00:08:46 +0800
Subject: [PATCH 10/17] =?UTF-8?q?fix(mes):=20=E4=BF=AE=E6=AD=A3=E5=AE=89?=
 =?UTF-8?q?=E7=81=AF=E8=BF=81=E7=A7=BB=E7=9A=84=E9=85=8D=E7=BD=AE=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA=E5=92=8C=E8=AE=B0=E5=BD=95=E5=8F=AA?=
 =?UTF-8?q?=E8=AF=BB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/pro/andon/config/index.ts     |   1 +
 .../src/views/mes/pro/andon/config/data.ts    |  13 +-
 .../src/views/mes/pro/andon/record/data.ts    | 190 +++++++++++-------
 .../src/api/mes/pro/andon/config/index.ts     |   1 +
 .../src/views/mes/pro/andon/config/data.ts    |  13 +-
 .../src/views/mes/pro/andon/record/data.ts    | 190 +++++++++++-------
 6 files changed, 242 insertions(+), 166 deletions(-)

diff --git a/apps/web-antd/src/api/mes/pro/andon/config/index.ts b/apps/web-antd/src/api/mes/pro/andon/config/index.ts
index d21621877..9309a0c8c 100644
--- a/apps/web-antd/src/api/mes/pro/andon/config/index.ts
+++ b/apps/web-antd/src/api/mes/pro/andon/config/index.ts
@@ -9,6 +9,7 @@ export namespace MesProAndonConfigApi {
     reason?: string; // 呼叫原因
     level?: number; // 级别
     handlerRoleId?: number; // 处置角色编号
+    handlerRoleName?: string; // 处置角色名称
     handlerUserId?: number; // 处置人编号
     handlerUserNickname?: string; // 处置人昵称
     remark?: string; // 备注
diff --git a/apps/web-antd/src/views/mes/pro/andon/config/data.ts b/apps/web-antd/src/views/mes/pro/andon/config/data.ts
index f8ff65c18..42b7c1860 100644
--- a/apps/web-antd/src/views/mes/pro/andon/config/data.ts
+++ b/apps/web-antd/src/views/mes/pro/andon/config/data.ts
@@ -1,7 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
-import type { SystemRoleApi } from '#/api/system/role';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -10,10 +9,6 @@ import { z } from '#/adapter/form';
 import { getSimpleRoleList } from '#/api/system/role';
 import { getSimpleUserList } from '#/api/system/user';
 
-/** 关联数据 */
-let roleList: SystemRoleApi.Role[] = [];
-getSimpleRoleList().then((data) => (roleList = data));
-
 /** 安灯配置列表的字段 */
 export function useGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>['columns'] {
   return [
@@ -27,13 +22,7 @@ export function useGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.Andon
         props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
       },
     },
-    {
-      field: 'handlerRoleId',
-      title: '处置角色',
-      width: 140,
-      formatter: ({ cellValue }) =>
-        roleList.find((role) => role.id === cellValue)?.name ?? '',
-    },
+    { field: 'handlerRoleName', title: '处置角色', width: 140 },
     { field: 'handlerUserNickname', title: '处置人', width: 140 },
     { field: 'remark', title: '备注', minWidth: 160 },
     {
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/data.ts b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
index 0a58427b1..017596872 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/data.ts
+++ b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
@@ -128,7 +128,7 @@ export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.Andon
  * 新增/处置/详情安灯呼叫记录的表单
  *
  * - create：录入呼叫主体信息（工作站/发起人/工单/工序/呼叫原因/备注）
- * - update：呼叫主体信息只读，编辑处置时间/处置人/备注
+ * - update：呼叫主体只读展示创建时的快照字段（workstationName/workOrderCode/processName/reason），编辑处置时间/处置人/备注
  * - detail：所有字段只读
  */
 export function useFormSchema(
@@ -143,64 +143,104 @@ export function useFormSchema(
       component: 'Input',
       dependencies: { triggerFields: [''], show: () => false },
     },
-    {
-      fieldName: 'workstationId',
-      label: '工作站',
-      component: markRaw(MdWorkstationSelect),
-      componentProps: {
-        disabled: !isCreate,
-        placeholder: '请选择工作站',
-      },
-      rules: 'selectRequired',
-    },
-    {
-      fieldName: 'userId',
-      label: '发起人',
-      component: 'ApiSelect',
-      componentProps: {
-        allowClear: true,
-        api: getSimpleUserList,
-        disabled: !isCreate,
-        labelField: 'nickname',
-        placeholder: '请选择发起人',
-        valueField: 'id',
-      },
-    },
-    {
-      fieldName: 'workOrderId',
-      label: '生产工单',
-      component: markRaw(ProWorkOrderSelect),
-      componentProps: {
-        disabled: !isCreate,
-        placeholder: '请选择工单（可选）',
-        status: MesProWorkOrderStatusEnum.CONFIRMED,
-      },
-    },
-    {
-      fieldName: 'processId',
-      label: '工序',
-      component: markRaw(ProProcessSelect),
-      componentProps: {
-        disabled: !isCreate,
-        placeholder: '请选择工序（可选）',
-      },
-    },
-    {
-      fieldName: 'configId',
-      label: '呼叫原因',
-      component: markRaw(AndonConfigSelect),
-      componentProps: {
-        disabled: !isCreate,
-        // 选择呼叫原因后，自动填充对应的级别
-        onChange: async (config?: MesProAndonConfigApi.AndonConfig) => {
-          await formApi?.setValues({
-            level: config?.level,
-            reason: config?.reason,
-          });
+    isCreate
+      ? {
+          fieldName: 'workstationId',
+          label: '工作站',
+          component: markRaw(MdWorkstationSelect),
+          componentProps: {
+            placeholder: '请选择工作站',
+          },
+          rules: 'selectRequired',
+        }
+      : {
+          fieldName: 'workstationName',
+          label: '工作站',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
+        },
+    isCreate
+      ? {
+          fieldName: 'userId',
+          label: '发起人',
+          component: 'ApiSelect',
+          componentProps: {
+            allowClear: true,
+            api: getSimpleUserList,
+            labelField: 'nickname',
+            placeholder: '请选择发起人',
+            valueField: 'id',
+          },
+        }
+      : {
+          fieldName: 'userNickname',
+          label: '发起人',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
+        },
+    isCreate
+      ? {
+          fieldName: 'workOrderId',
+          label: '生产工单',
+          component: markRaw(ProWorkOrderSelect),
+          componentProps: {
+            placeholder: '请选择工单（可选）',
+            status: MesProWorkOrderStatusEnum.CONFIRMED,
+          },
+        }
+      : {
+          fieldName: 'workOrderCode',
+          label: '生产工单',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
+        },
+    isCreate
+      ? {
+          fieldName: 'processId',
+          label: '工序',
+          component: markRaw(ProProcessSelect),
+          componentProps: {
+            placeholder: '请选择工序（可选）',
+          },
+        }
+      : {
+          fieldName: 'processName',
+          label: '工序',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
+        },
+    isCreate
+      ? {
+          fieldName: 'configId',
+          label: '呼叫原因',
+          component: markRaw(AndonConfigSelect),
+          componentProps: {
+            // 选择呼叫原因后，自动填充对应的级别
+            onChange: async (config?: MesProAndonConfigApi.AndonConfig) => {
+              await formApi?.setValues({
+                level: config?.level,
+                reason: config?.reason,
+              });
+            },
+          },
+          rules: 'selectRequired',
+        }
+      : {
+          fieldName: 'reason',
+          label: '呼叫原因',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
         },
-      },
-      rules: 'selectRequired',
-    },
     {
       fieldName: 'level',
       label: '级别',
@@ -239,19 +279,27 @@ export function useFormSchema(
               valueFormat: 'x',
             },
           },
-          {
-            fieldName: 'handlerUserId',
-            label: '处置人',
-            component: 'ApiSelect',
-            componentProps: {
-              allowClear: true,
-              api: getSimpleUserList,
-              disabled: !isUpdate,
-              labelField: 'nickname',
-              placeholder: '请选择处置人',
-              valueField: 'id',
-            },
-          },
+          isUpdate
+            ? {
+                fieldName: 'handlerUserId',
+                label: '处置人',
+                component: 'ApiSelect',
+                componentProps: {
+                  allowClear: true,
+                  api: getSimpleUserList,
+                  labelField: 'nickname',
+                  placeholder: '请选择处置人',
+                  valueField: 'id',
+                },
+              }
+            : {
+                fieldName: 'handlerUserNickname',
+                label: '处置人',
+                component: 'Input',
+                componentProps: {
+                  disabled: true,
+                },
+              },
         ] as VbenFormSchema[])),
     {
       fieldName: 'remark',
diff --git a/apps/web-ele/src/api/mes/pro/andon/config/index.ts b/apps/web-ele/src/api/mes/pro/andon/config/index.ts
index d21621877..9309a0c8c 100644
--- a/apps/web-ele/src/api/mes/pro/andon/config/index.ts
+++ b/apps/web-ele/src/api/mes/pro/andon/config/index.ts
@@ -9,6 +9,7 @@ export namespace MesProAndonConfigApi {
     reason?: string; // 呼叫原因
     level?: number; // 级别
     handlerRoleId?: number; // 处置角色编号
+    handlerRoleName?: string; // 处置角色名称
     handlerUserId?: number; // 处置人编号
     handlerUserNickname?: string; // 处置人昵称
     remark?: string; // 备注
diff --git a/apps/web-ele/src/views/mes/pro/andon/config/data.ts b/apps/web-ele/src/views/mes/pro/andon/config/data.ts
index a83f6cef4..ea3288193 100644
--- a/apps/web-ele/src/views/mes/pro/andon/config/data.ts
+++ b/apps/web-ele/src/views/mes/pro/andon/config/data.ts
@@ -1,7 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
-import type { SystemRoleApi } from '#/api/system/role';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -10,10 +9,6 @@ import { z } from '#/adapter/form';
 import { getSimpleRoleList } from '#/api/system/role';
 import { getSimpleUserList } from '#/api/system/user';
 
-/** 关联数据 */
-let roleList: SystemRoleApi.Role[] = [];
-getSimpleRoleList().then((data) => (roleList = data));
-
 /** 安灯配置列表的字段 */
 export function useGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.AndonConfig>['columns'] {
   return [
@@ -27,13 +22,7 @@ export function useGridColumns(): VxeTableGridOptions<MesProAndonConfigApi.Andon
         props: { type: DICT_TYPE.MES_PRO_ANDON_LEVEL },
       },
     },
-    {
-      field: 'handlerRoleId',
-      title: '处置角色',
-      width: 140,
-      formatter: ({ cellValue }) =>
-        roleList.find((role) => role.id === cellValue)?.name ?? '',
-    },
+    { field: 'handlerRoleName', title: '处置角色', width: 140 },
     { field: 'handlerUserNickname', title: '处置人', width: 140 },
     { field: 'remark', title: '备注', minWidth: 160 },
     {
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/data.ts b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
index a0734a6e0..affc820bb 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/data.ts
+++ b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
@@ -128,7 +128,7 @@ export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.Andon
  * 新增/处置/详情安灯呼叫记录的表单
  *
  * - create：录入呼叫主体信息（工作站/发起人/工单/工序/呼叫原因/备注）
- * - update：呼叫主体信息只读，编辑处置时间/处置人/备注
+ * - update：呼叫主体只读展示创建时的快照字段（workstationName/workOrderCode/processName/reason），编辑处置时间/处置人/备注
  * - detail：所有字段只读
  */
 export function useFormSchema(
@@ -143,64 +143,104 @@ export function useFormSchema(
       component: 'Input',
       dependencies: { triggerFields: [''], show: () => false },
     },
-    {
-      fieldName: 'workstationId',
-      label: '工作站',
-      component: markRaw(MdWorkstationSelect),
-      componentProps: {
-        disabled: !isCreate,
-        placeholder: '请选择工作站',
-      },
-      rules: 'selectRequired',
-    },
-    {
-      fieldName: 'userId',
-      label: '发起人',
-      component: 'ApiSelect',
-      componentProps: {
-        api: getSimpleUserList,
-        clearable: true,
-        disabled: !isCreate,
-        labelField: 'nickname',
-        placeholder: '请选择发起人',
-        valueField: 'id',
-      },
-    },
-    {
-      fieldName: 'workOrderId',
-      label: '生产工单',
-      component: markRaw(ProWorkOrderSelect),
-      componentProps: {
-        disabled: !isCreate,
-        placeholder: '请选择工单（可选）',
-        status: MesProWorkOrderStatusEnum.CONFIRMED,
-      },
-    },
-    {
-      fieldName: 'processId',
-      label: '工序',
-      component: markRaw(ProProcessSelect),
-      componentProps: {
-        disabled: !isCreate,
-        placeholder: '请选择工序（可选）',
-      },
-    },
-    {
-      fieldName: 'configId',
-      label: '呼叫原因',
-      component: markRaw(AndonConfigSelect),
-      componentProps: {
-        disabled: !isCreate,
-        // 选择呼叫原因后，自动填充对应的级别
-        onChange: async (config?: MesProAndonConfigApi.AndonConfig) => {
-          await formApi?.setValues({
-            level: config?.level,
-            reason: config?.reason,
-          });
+    isCreate
+      ? {
+          fieldName: 'workstationId',
+          label: '工作站',
+          component: markRaw(MdWorkstationSelect),
+          componentProps: {
+            placeholder: '请选择工作站',
+          },
+          rules: 'selectRequired',
+        }
+      : {
+          fieldName: 'workstationName',
+          label: '工作站',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
+        },
+    isCreate
+      ? {
+          fieldName: 'userId',
+          label: '发起人',
+          component: 'ApiSelect',
+          componentProps: {
+            api: getSimpleUserList,
+            clearable: true,
+            labelField: 'nickname',
+            placeholder: '请选择发起人',
+            valueField: 'id',
+          },
+        }
+      : {
+          fieldName: 'userNickname',
+          label: '发起人',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
+        },
+    isCreate
+      ? {
+          fieldName: 'workOrderId',
+          label: '生产工单',
+          component: markRaw(ProWorkOrderSelect),
+          componentProps: {
+            placeholder: '请选择工单（可选）',
+            status: MesProWorkOrderStatusEnum.CONFIRMED,
+          },
+        }
+      : {
+          fieldName: 'workOrderCode',
+          label: '生产工单',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
+        },
+    isCreate
+      ? {
+          fieldName: 'processId',
+          label: '工序',
+          component: markRaw(ProProcessSelect),
+          componentProps: {
+            placeholder: '请选择工序（可选）',
+          },
+        }
+      : {
+          fieldName: 'processName',
+          label: '工序',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
+        },
+    isCreate
+      ? {
+          fieldName: 'configId',
+          label: '呼叫原因',
+          component: markRaw(AndonConfigSelect),
+          componentProps: {
+            // 选择呼叫原因后，自动填充对应的级别
+            onChange: async (config?: MesProAndonConfigApi.AndonConfig) => {
+              await formApi?.setValues({
+                level: config?.level,
+                reason: config?.reason,
+              });
+            },
+          },
+          rules: 'selectRequired',
+        }
+      : {
+          fieldName: 'reason',
+          label: '呼叫原因',
+          component: 'Input',
+          componentProps: {
+            disabled: true,
+          },
         },
-      },
-      rules: 'selectRequired',
-    },
     {
       fieldName: 'level',
       label: '级别',
@@ -240,19 +280,27 @@ export function useFormSchema(
               valueFormat: 'x',
             },
           },
-          {
-            fieldName: 'handlerUserId',
-            label: '处置人',
-            component: 'ApiSelect',
-            componentProps: {
-              api: getSimpleUserList,
-              clearable: true,
-              disabled: !isUpdate,
-              labelField: 'nickname',
-              placeholder: '请选择处置人',
-              valueField: 'id',
-            },
-          },
+          isUpdate
+            ? {
+                fieldName: 'handlerUserId',
+                label: '处置人',
+                component: 'ApiSelect',
+                componentProps: {
+                  api: getSimpleUserList,
+                  clearable: true,
+                  labelField: 'nickname',
+                  placeholder: '请选择处置人',
+                  valueField: 'id',
+                },
+              }
+            : {
+                fieldName: 'handlerUserNickname',
+                label: '处置人',
+                component: 'Input',
+                componentProps: {
+                  disabled: true,
+                },
+              },
         ] as VbenFormSchema[])),
     {
       fieldName: 'remark',

From 3acc821de57026fa86a8d092310b6e19b942b6ec Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 26 May 2026 08:42:49 +0800
Subject: [PATCH 11/17] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=E2=80=9C?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=EF=BC=88pro=5Ffeedback?=
 =?UTF-8?q?=EF=BC=89=E2=80=9D=E7=9A=84=20antd=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/pro/feedback/index.ts         | 113 ++++
 apps/web-antd/src/api/mes/pro/task/index.ts   |  68 +++
 .../src/api/mes/wm/itemconsume/line/index.ts  |  37 ++
 .../api/mes/wm/productproduce/line/index.ts   |  37 ++
 .../src/views/mes/pro/feedback/data.ts        | 575 ++++++++++++++++++
 .../src/views/mes/pro/feedback/index.vue      | 182 ++++++
 .../views/mes/pro/feedback/modules/form.vue   | 307 ++++++++++
 .../feedback/modules/item-consume-list.vue    |  57 ++
 .../feedback/modules/product-produce-list.vue |  68 +++
 .../views/mes/pro/task/components/index.ts    |   1 +
 .../pro/task/components/pro-task-select.vue   | 163 +++++
 packages/constants/src/dict-enum.ts           |   1 +
 packages/locales/src/langs/en-US/common.json  |   2 +
 packages/locales/src/langs/zh-CN/common.json  |   2 +
 14 files changed, 1613 insertions(+)
 create mode 100644 apps/web-antd/src/api/mes/pro/feedback/index.ts
 create mode 100644 apps/web-antd/src/api/mes/pro/task/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/itemconsume/line/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/productproduce/line/index.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/feedback/data.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/feedback/index.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/feedback/modules/item-consume-list.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/feedback/modules/product-produce-list.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/task/components/index.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue

diff --git a/apps/web-antd/src/api/mes/pro/feedback/index.ts b/apps/web-antd/src/api/mes/pro/feedback/index.ts
new file mode 100644
index 000000000..21a988ba8
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/feedback/index.ts
@@ -0,0 +1,113 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProFeedbackApi {
+  /** MES 生产报工 */
+  export interface Feedback {
+    id?: number;
+    code?: string; // 报工单编号
+    type?: number; // 报工类型
+    channel?: string; // 报工途径
+    feedbackTime?: number; // 报工时间
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    routeId?: number; // 工艺路线编号
+    routeCode?: string; // 工艺路线编码
+    processId?: number; // 工序编号
+    processCode?: string; // 工序编码
+    processName?: string; // 工序名称
+    checkFlag?: boolean; // 是否需要检验
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 工单编码
+    workOrderName?: string; // 工单名称
+    taskId?: number; // 生产任务编号
+    taskCode?: string; // 任务编码
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    itemSpecification?: string; // 规格型号
+    unitMeasureId?: number; // 单位编号
+    unitMeasureName?: string; // 单位名称
+    expireDate?: number; // 过期日期
+    scheduledQuantity?: number; // 排产数量
+    feedbackQuantity?: number; // 本次报工数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不良品数量
+    uncheckQuantity?: number; // 待检测数量
+    laborScrapQuantity?: number; // 工废数量
+    materialScrapQuantity?: number; // 料废数量
+    otherScrapQuantity?: number; // 其他废品数量
+    feedbackUserId?: number; // 报工用户编号
+    feedbackUserNickname?: string; // 报工人昵称
+    approveUserId?: number; // 审核用户编号
+    approveUserNickname?: string; // 审核人昵称
+    status?: number; // 状态
+    remark?: string; // 备注
+    creator?: string; // 创建人
+    createTime?: number; // 创建时间
+  }
+
+  /** MES 生产报工分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    type?: number;
+    workOrderId?: number;
+    itemId?: number;
+    feedbackUserId?: number;
+    creator?: string;
+    status?: number;
+    feedbackTime?: string[];
+  }
+}
+
+/** 查询生产报工分页 */
+export function getFeedbackPage(params: MesProFeedbackApi.PageParams) {
+  return requestClient.get<PageResult<MesProFeedbackApi.Feedback>>(
+    '/mes/pro/feedback/page',
+    { params },
+  );
+}
+
+/** 查询生产报工详情 */
+export function getFeedback(id: number) {
+  return requestClient.get<MesProFeedbackApi.Feedback>(
+    `/mes/pro/feedback/get?id=${id}`,
+  );
+}
+
+/** 新增生产报工 */
+export function createFeedback(data: MesProFeedbackApi.Feedback) {
+  return requestClient.post<number>('/mes/pro/feedback/create', data);
+}
+
+/** 修改生产报工 */
+export function updateFeedback(data: MesProFeedbackApi.Feedback) {
+  return requestClient.put('/mes/pro/feedback/update', data);
+}
+
+/** 删除生产报工 */
+export function deleteFeedback(id: number) {
+  return requestClient.delete(`/mes/pro/feedback/delete?id=${id}`);
+}
+
+/** 导出生产报工 Excel */
+export function exportFeedback(params: Partial<MesProFeedbackApi.PageParams>) {
+  return requestClient.download('/mes/pro/feedback/export-excel', { params });
+}
+
+/** 提交生产报工 */
+export function submitFeedback(id: number) {
+  return requestClient.put(`/mes/pro/feedback/submit?id=${id}`);
+}
+
+/** 驳回生产报工 */
+export function rejectFeedback(id: number) {
+  return requestClient.put(`/mes/pro/feedback/reject?id=${id}`);
+}
+
+/** 审批生产报工（返回是否已审批完成） */
+export function approveFeedback(id: number) {
+  return requestClient.put<boolean>(`/mes/pro/feedback/approve?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/pro/task/index.ts b/apps/web-antd/src/api/mes/pro/task/index.ts
new file mode 100644
index 000000000..d7bfd2f5e
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/task/index.ts
@@ -0,0 +1,68 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProTaskApi {
+  /** MES 生产任务 */
+  export interface Task {
+    id?: number;
+    code?: string; // 任务编码
+    name?: string; // 任务名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 工单编码
+    workOrderName?: string; // 工单名称
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    routeId?: number; // 工艺路线编号
+    processId?: number; // 工序编号
+    processName?: string; // 工序名称
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 产品编码
+    itemName?: string; // 产品名称
+    itemSpecification?: string; // 规格型号
+    unitMeasureId?: number; // 单位编号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 排产数量
+    producedQuantity?: number; // 已生产数量
+    qualifyQuantity?: number; // 合格品数量
+    unqualifyQuantity?: number; // 不良品数量
+    changedQuantity?: number; // 调整数量
+    clientId?: number; // 客户编号
+    clientName?: string; // 客户名称
+    startTime?: number; // 开始生产时间
+    endTime?: number; // 结束生产时间
+    duration?: number; // 生产时长（工作日，1=8小时）
+    requestDate?: number; // 需求日期（从工单查）
+    finishDate?: number; // 完成日期
+    cancelDate?: number; // 取消日期
+    colorCode?: string; // 甘特图显示颜色
+    status?: number; // 任务状态
+    checkFlag?: boolean; // 是否质检（派生自工艺路线工序）
+    remark?: string; // 备注
+  }
+
+  /** MES 生产任务分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    name?: string;
+    workOrderId?: number;
+    workstationId?: number;
+    itemId?: number;
+    statuses?: number[];
+    status?: number;
+  }
+}
+
+/** 查询生产任务分页 */
+export function getTaskPage(params: MesProTaskApi.PageParams) {
+  return requestClient.get<PageResult<MesProTaskApi.Task>>(
+    '/mes/pro/task/page',
+    { params },
+  );
+}
+
+/** 查询生产任务详情 */
+export function getTask(id: number) {
+  return requestClient.get<MesProTaskApi.Task>(`/mes/pro/task/get?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/itemconsume/line/index.ts b/apps/web-antd/src/api/mes/wm/itemconsume/line/index.ts
new file mode 100644
index 000000000..2a353b766
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/itemconsume/line/index.ts
@@ -0,0 +1,37 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmItemConsumeLineApi {
+  /** MES 物料消耗行 */
+  export interface ItemConsumeLine {
+    id?: number;
+    feedbackId?: number; // 报工编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物资编码
+    itemName?: string; // 物资名称
+    specification?: string; // 规格型号
+    unitId?: number; // 单位编号
+    unitName?: string; // 单位
+    quantity?: number; // 消耗数量
+    batchCode?: string; // 批次号
+    locationId?: number; // 库位编号
+    locationName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+
+  /** MES 物料消耗行分页查询参数 */
+  export interface PageParams extends PageParam {
+    feedbackId?: number;
+  }
+}
+
+/** 查询物料消耗行分页 */
+export function getItemConsumeLinePage(
+  params: MesWmItemConsumeLineApi.PageParams,
+) {
+  return requestClient.get<PageResult<MesWmItemConsumeLineApi.ItemConsumeLine>>(
+    '/mes/wm/item-consume-line/page',
+    { params },
+  );
+}
diff --git a/apps/web-antd/src/api/mes/wm/productproduce/line/index.ts b/apps/web-antd/src/api/mes/wm/productproduce/line/index.ts
new file mode 100644
index 000000000..ab3f49f29
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/productproduce/line/index.ts
@@ -0,0 +1,37 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductProduceLineApi {
+  /** MES 产品产出行 */
+  export interface ProductProduceLine {
+    id?: number;
+    feedbackId?: number; // 报工编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物资编码
+    itemName?: string; // 物资名称
+    specification?: string; // 规格型号
+    unitMeasureId?: number; // 单位编号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 产出数量
+    batchCode?: string; // 批次号
+    qualityStatus?: number; // 质量状态
+    locationId?: number; // 库位编号
+    locationName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+
+  /** MES 产品产出行分页查询参数 */
+  export interface PageParams extends PageParam {
+    feedbackId?: number;
+  }
+}
+
+/** 查询产品产出行分页 */
+export function getProductProduceLinePage(
+  params: MesWmProductProduceLineApi.PageParams,
+) {
+  return requestClient.get<
+    PageResult<MesWmProductProduceLineApi.ProductProduceLine>
+  >('/mes/wm/product-produce-line/page', { params });
+}
diff --git a/apps/web-antd/src/views/mes/pro/feedback/data.ts b/apps/web-antd/src/views/mes/pro/feedback/data.ts
new file mode 100644
index 000000000..4d1af1810
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/feedback/data.ts
@@ -0,0 +1,575 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { Button } from 'ant-design-vue';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProTaskSelect } from '#/views/mes/pro/task/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import {
+  MesAutoCodeRuleCode,
+  MesProTaskStatusEnum,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '报工单号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入报工单号',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '报工类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_FEEDBACK_TYPE, 'number'),
+        placeholder: '请选择报工类型',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        allowClear: true,
+        placeholder: '请选择工单',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        allowClear: true,
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'feedbackUserId',
+      label: '报工人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择报工人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'creator',
+      label: '记录人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择记录人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_FEEDBACK_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+    {
+      fieldName: 'feedbackTime',
+      label: '报工时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProFeedbackApi.Feedback>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '报工单号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'type',
+      title: '报工类型',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_FEEDBACK_TYPE },
+      },
+    },
+    { field: 'workstationName', title: '工作站', width: 120 },
+    { field: 'processName', title: '工序', width: 100 },
+    { field: 'workOrderCode', title: '生产工单编码', width: 160 },
+    { field: 'itemCode', title: '产品物料编码', width: 120 },
+    { field: 'itemName', title: '产品物料名称', minWidth: 140 },
+    { field: 'itemSpecification', title: '规格型号', width: 120 },
+    { field: 'unitMeasureName', title: '单位', width: 80 },
+    { field: 'feedbackQuantity', title: '报工数量', width: 100 },
+    { field: 'feedbackUserNickname', title: '报工人', width: 100 },
+    {
+      field: 'feedbackTime',
+      title: '报工时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    { field: 'approveUserNickname', title: '审核人', width: 100 },
+    {
+      field: 'status',
+      title: '状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_FEEDBACK_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/**
+ * 新增/编辑/提交/审批/详情生产报工的表单
+ *
+ * - create / update：录入报工主体信息和数量
+ * - submit / approve / detail：主体字段只读
+ *
+ * 数量区域根据 `checkFlag` 和 `unqualifiedQuantity` 动态显示：
+ * - 非质检工序：报工数量 = 合格 + 不良；不良 > 0 时再展开工废/料废/其他废品
+ * - 质检工序：只填报工数量（视为待检数量）
+ */
+export function useFormSchema(
+  formType: string,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const isHeaderReadonly = ['approve', 'detail', 'submit'].includes(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'checkFlag',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+      defaultValue: true,
+    },
+    {
+      fieldName: 'routeId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'processId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'itemId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'code',
+      label: '报工单号',
+      component: 'Input',
+      componentProps: {
+        disabled: isHeaderReadonly,
+        placeholder: '请输入报工单号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          Button,
+          {
+            disabled: isHeaderReadonly,
+            type: 'default',
+            onClick: async () => {
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.PRO_FEEDBACK_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'type',
+      label: '报工类型',
+      component: 'Select',
+      componentProps: {
+        disabled: isHeaderReadonly,
+        options: getDictOptions(DICT_TYPE.MES_PRO_FEEDBACK_TYPE, 'number'),
+        placeholder: '请选择报工类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        disabled: isHeaderReadonly,
+        placeholder: '请选择工单',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+        // 工单变更：清空任务及任务带出的产品信息、数量区域控制位
+        onChange: async () => {
+          await formApi?.setValues({
+            checkFlag: true,
+            itemCode: undefined,
+            itemId: undefined,
+            itemName: undefined,
+            itemSpecification: undefined,
+            processId: undefined,
+            routeId: undefined,
+            taskId: undefined,
+            unitMeasureName: undefined,
+            workstationId: undefined,
+          });
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'taskId',
+      label: '生产任务',
+      component: markRaw(ProTaskSelect),
+      dependencies: {
+        triggerFields: ['workOrderId', 'workstationId'],
+        componentProps: (values) => ({
+          disabled: isHeaderReadonly || !values.workOrderId,
+          placeholder: values.workOrderId ? '请选择任务' : '请先选择工单',
+          statuses: [MesProTaskStatusEnum.PREPARE],
+          workOrderId: values.workOrderId,
+          workstationId: values.workstationId,
+        }),
+      },
+      // 任务变更：自动填充关联字段、产品信息、checkFlag
+      componentProps: {
+        onChange: async (task?: MesProTaskApi.Task) => {
+          if (!task) {
+            return;
+          }
+          await formApi?.setValues({
+            itemCode: task.itemCode,
+            itemId: task.itemId,
+            itemName: task.itemName,
+            itemSpecification: task.itemSpecification,
+            processId: task.processId,
+            routeId: task.routeId,
+            unitMeasureName: task.unitMeasureName,
+            workstationId: task.workstationId,
+          });
+          // 工艺路线工序的 checkFlag 决定数量区域展示
+          if (task.routeId && task.processId) {
+            try {
+              const routeProcess = await getRouteProcessByRouteAndProcess(
+                task.routeId,
+                task.processId,
+              );
+              await formApi?.setFieldValue(
+                'checkFlag',
+                routeProcess?.checkFlag ?? false,
+              );
+            } catch {
+              await formApi?.setFieldValue('checkFlag', true);
+            }
+          }
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        disabled: isHeaderReadonly,
+        placeholder: '请选择工作站',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemCode',
+      label: '产品编码',
+      component: 'Input',
+      componentProps: { disabled: true },
+      dependencies: {
+        triggerFields: ['itemCode'],
+        show: (values) => !!values.itemCode,
+      },
+    },
+    {
+      fieldName: 'itemName',
+      label: '产品名称',
+      component: 'Input',
+      componentProps: { disabled: true },
+      dependencies: {
+        triggerFields: ['itemCode'],
+        show: (values) => !!values.itemCode,
+      },
+    },
+    {
+      fieldName: 'unitMeasureName',
+      label: '单位',
+      component: 'Input',
+      componentProps: { disabled: true },
+      dependencies: {
+        triggerFields: ['itemCode'],
+        show: (values) => !!values.itemCode,
+      },
+    },
+    {
+      fieldName: 'itemSpecification',
+      label: '规格',
+      component: 'Input',
+      componentProps: { disabled: true },
+      dependencies: {
+        triggerFields: ['itemCode'],
+        show: (values) => !!values.itemCode,
+      },
+    },
+    {
+      fieldName: 'feedbackQuantity',
+      label: '报工数量',
+      component: 'InputNumber',
+      componentProps: { class: 'w-full', min: 0, precision: 2 },
+      dependencies: {
+        triggerFields: ['checkFlag'],
+        // 非质检工序时，报工数量 = 合格 + 不良，禁用直接编辑
+        componentProps: (values) => ({
+          class: 'w-full',
+          disabled: !values.checkFlag,
+          min: 0,
+          placeholder: '请输入报工数量',
+          precision: 2,
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: 'w-full',
+        min: 0,
+        precision: 2,
+        // 合格/不良变更，自动累计为报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          await formApi?.setFieldValue(
+            'feedbackQuantity',
+            (values?.qualifiedQuantity || 0) +
+              (values?.unqualifiedQuantity || 0),
+          );
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag'],
+        show: (values) => !values.checkFlag,
+      },
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不良品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: 'w-full',
+        min: 0,
+        precision: 2,
+        // 合格/不良变更，自动累计为报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          await formApi?.setFieldValue(
+            'feedbackQuantity',
+            (values?.qualifiedQuantity || 0) +
+              (values?.unqualifiedQuantity || 0),
+          );
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag'],
+        show: (values) => !values.checkFlag,
+      },
+    },
+    {
+      fieldName: 'laborScrapQuantity',
+      label: '工废数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: 'w-full',
+        min: 0,
+        precision: 2,
+        // 废品分类变更，自动累计为不良品数量及报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          const unqualified =
+            (values?.laborScrapQuantity || 0) +
+            (values?.materialScrapQuantity || 0) +
+            (values?.otherScrapQuantity || 0);
+          await formApi?.setValues({
+            feedbackQuantity:
+              (values?.qualifiedQuantity || 0) + unqualified,
+            unqualifiedQuantity: unqualified,
+          });
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag', 'unqualifiedQuantity'],
+        show: (values) =>
+          !values.checkFlag && (values.unqualifiedQuantity || 0) > 0,
+      },
+    },
+    {
+      fieldName: 'materialScrapQuantity',
+      label: '料废数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: 'w-full',
+        min: 0,
+        precision: 2,
+        // 废品分类变更，自动累计为不良品数量及报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          const unqualified =
+            (values?.laborScrapQuantity || 0) +
+            (values?.materialScrapQuantity || 0) +
+            (values?.otherScrapQuantity || 0);
+          await formApi?.setValues({
+            feedbackQuantity:
+              (values?.qualifiedQuantity || 0) + unqualified,
+            unqualifiedQuantity: unqualified,
+          });
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag', 'unqualifiedQuantity'],
+        show: (values) =>
+          !values.checkFlag && (values.unqualifiedQuantity || 0) > 0,
+      },
+    },
+    {
+      fieldName: 'otherScrapQuantity',
+      label: '其他废品',
+      component: 'InputNumber',
+      componentProps: {
+        class: 'w-full',
+        min: 0,
+        precision: 2,
+        // 废品分类变更，自动累计为不良品数量及报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          const unqualified =
+            (values?.laborScrapQuantity || 0) +
+            (values?.materialScrapQuantity || 0) +
+            (values?.otherScrapQuantity || 0);
+          await formApi?.setValues({
+            feedbackQuantity:
+              (values?.qualifiedQuantity || 0) + unqualified,
+            unqualifiedQuantity: unqualified,
+          });
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag', 'unqualifiedQuantity'],
+        show: (values) =>
+          !values.checkFlag && (values.unqualifiedQuantity || 0) > 0,
+      },
+    },
+    {
+      fieldName: 'feedbackUserId',
+      label: '报工人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        disabled: isHeaderReadonly,
+        labelField: 'nickname',
+        placeholder: '请选择报工人',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'feedbackTime',
+      label: '报工时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: 'w-full',
+        disabled: isHeaderReadonly,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择报工时间',
+        showTime: true,
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'approveUserId',
+      label: '审核人',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        disabled: isHeaderReadonly,
+        labelField: 'nickname',
+        placeholder: '请选择审核人',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        disabled: formType === 'detail',
+        placeholder: '请输入备注',
+        rows: 3,
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/pro/feedback/index.vue b/apps/web-antd/src/views/mes/pro/feedback/index.vue
new file mode 100644
index 000000000..d2a045908
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/feedback/index.vue
@@ -0,0 +1,182 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, message } from 'ant-design-vue';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteFeedback,
+  exportFeedback,
+  getFeedbackPage,
+} from '#/api/mes/pro/feedback';
+import { $t } from '#/locales';
+import { MesProFeedbackStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const userStore = useUserStore();
+const currentUserId = userStore.userInfo?.id; // 当前登录用户 ID，用于审批人权限判断
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建生产报工 */
+function handleCreate() {
+  formModalApi.setData({ type: 'create' }).open();
+}
+
+/** 编辑生产报工 */
+function handleEdit(row: MesProFeedbackApi.Feedback) {
+  formModalApi.setData({ id: row.id, type: 'update' }).open();
+}
+
+/** 提交生产报工 */
+function handleSubmit(row: MesProFeedbackApi.Feedback) {
+  formModalApi.setData({ id: row.id, type: 'submit' }).open();
+}
+
+/** 审批生产报工 */
+function handleApprove(row: MesProFeedbackApi.Feedback) {
+  formModalApi.setData({ id: row.id, type: 'approve' }).open();
+}
+
+/** 详情生产报工 */
+function handleDetail(row: MesProFeedbackApi.Feedback) {
+  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+}
+
+/** 删除生产报工 */
+async function handleDelete(row: MesProFeedbackApi.Feedback) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.code]),
+    duration: 0,
+  });
+  try {
+    await deleteFeedback(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportFeedback(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产报工.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: { schema: useGridFormSchema() },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getFeedbackPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: { isHover: true, keyField: 'id' },
+    toolbarConfig: { refresh: true, search: true },
+  } as VxeTableGridOptions<MesProFeedbackApi.Feedback>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产报工"
+        url="https://doc.iocoder.cn/mes/pro/feedback/"
+      />
+    </template>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="生产报工列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['生产报工']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-feedback:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-feedback:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <Button type="link" @click="handleDetail(row)">
+          {{ row.code }}
+        </Button>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'link',
+              auth: ['mes:pro-feedback:update'],
+              ifShow: () => row.status === MesProFeedbackStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.submit'),
+              type: 'link',
+              auth: ['mes:pro-feedback:update'],
+              ifShow: () => row.status === MesProFeedbackStatusEnum.PREPARE,
+              onClick: handleSubmit.bind(null, row),
+            },
+            {
+              label: $t('common.approve'),
+              type: 'link',
+              auth: ['mes:pro-feedback:approve'],
+              ifShow: () =>
+                row.status === MesProFeedbackStatusEnum.APPROVING &&
+                row.approveUserId === currentUserId,
+              onClick: handleApprove.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'link',
+              danger: true,
+              auth: ['mes:pro-feedback:delete'],
+              ifShow: () => row.status === MesProFeedbackStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
new file mode 100644
index 000000000..4d770d825
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
@@ -0,0 +1,307 @@
+<script lang="ts" setup>
+import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
+
+import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import {
+  approveFeedback,
+  createFeedback,
+  getFeedback,
+  rejectFeedback,
+  submitFeedback,
+  updateFeedback,
+} from '#/api/mes/pro/feedback';
+import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { $t } from '#/locales';
+import {
+  MesAutoCodeRuleCode,
+  MesProFeedbackStatusEnum,
+} from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import ItemConsumeList from './item-consume-list.vue';
+import ProductProduceList from './product-produce-list.vue';
+
+// TODO @AI：formType？
+type FormMode = 'approve' | 'create' | 'detail' | 'submit' | 'update';
+
+const emit = defineEmits(['success']);
+const formMode = ref<FormMode>('create');
+const formData = ref<MesProFeedbackApi.Feedback>();
+const userStore = useUserStore();
+const subTabsName = ref('itemConsume');
+
+const isEditable = computed(() =>
+  ['create', 'submit', 'update'].includes(formMode.value),
+);
+// TODO @AI：是不是都是 isXXXX 风格？
+const canSubmitDirectly = computed(
+  () =>
+    isEditable.value &&
+    formData.value?.status === MesProFeedbackStatusEnum.PREPARE,
+);
+const canApprove = computed(() => formMode.value === 'approve');
+const showSubTabs = computed(
+  () =>
+    !!formData.value?.id &&
+    formData.value?.status !== MesProFeedbackStatusEnum.PREPARE &&
+    formData.value?.status !== MesProFeedbackStatusEnum.APPROVING,
+);
+const getTitle = computed(() => {
+  if (formMode.value === 'detail') {
+    return $t('ui.actionTitle.view', ['生产报工']);
+  }
+  if (formMode.value === 'approve') {
+    return '审批生产报工';
+  }
+  if (formMode.value === 'submit') {
+    return '提交生产报工';
+  }
+  return formMode.value === 'update'
+    ? $t('ui.actionTitle.edit', ['生产报工'])
+    : $t('ui.actionTitle.create', ['生产报工']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+
+/** 提交前对齐数量：根据 checkFlag 决定 uncheck/合格/不良归零策略 */
+function alignQuantity(data: MesProFeedbackApi.Feedback) {
+  if (data.checkFlag) {
+    data.uncheckQuantity = data.feedbackQuantity;
+    data.qualifiedQuantity = 0;
+    data.unqualifiedQuantity = 0;
+    data.laborScrapQuantity = 0;
+    data.materialScrapQuantity = 0;
+    data.otherScrapQuantity = 0;
+  } else {
+    data.feedbackQuantity =
+      (data.qualifiedQuantity || 0) + (data.unqualifiedQuantity || 0);
+    data.uncheckQuantity = 0;
+  }
+}
+
+/** 保存：create 后切换为 update 模式 */
+async function handleSave() {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+    alignQuantity(data);
+    if (formMode.value === 'create') {
+      const id = await createFeedback(data);
+      formData.value = {
+        ...data,
+        id,
+        status: MesProFeedbackStatusEnum.PREPARE,
+      };
+      formMode.value = 'update';
+      formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+      await formApi.setFieldValue('id', id);
+      message.success($t('common.createSuccess'));
+    } else {
+      await updateFeedback(data);
+      formData.value = { ...formData.value, ...data };
+      message.success($t('common.updateSuccess'));
+    }
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 提交：保存最新内容后调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+    alignQuantity(data);
+    let id = formData.value?.id;
+    if (formMode.value === 'create' || !id) {
+      id = await createFeedback(data);
+    } else {
+      await updateFeedback(data);
+    }
+    await submitFeedback(id!);
+    await modalApi.close();
+    emit('success');
+    message.success('报工单已提交');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 审批通过 */
+async function handleApprove() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const finished = await approveFeedback(formData.value.id);
+    await modalApi.close();
+    emit('success');
+    message.success(finished ? '报工单已审批完成' : '报工成功，请等待质量检验完成！');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 审批不通过 */
+async function handleReject() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await rejectFeedback(formData.value.id);
+    await modalApi.close();
+    emit('success');
+    message.success('报工单已驳回');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 加载工序的 checkFlag 用于回显数量区域 */
+async function resolveCheckFlag(routeId?: number, processId?: number) {
+  if (!routeId || !processId) {
+    return true;
+  }
+  try {
+    const routeProcess = await getRouteProcessByRouteAndProcess(
+      routeId,
+      processId,
+    );
+    return routeProcess?.checkFlag ?? false;
+  } catch {
+    return true;
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formMode.value === 'detail' || formMode.value === 'approve') {
+      await modalApi.close();
+      return;
+    }
+    await handleSave();
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      subTabsName.value = 'itemConsume';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
+    formMode.value = data?.type || 'create';
+    formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+    // 审批/详情整表禁用，避免审核人误改未提交的字段
+    formApi.setDisabled(
+      formMode.value === 'approve' || formMode.value === 'detail',
+    );
+    modalApi.setState({
+      showConfirmButton:
+        formMode.value !== 'detail' && formMode.value !== 'approve',
+    });
+    await formApi.resetForm();
+    if (!data?.id) {
+      // 新增：默认报工人和报工时间，并自动生成报工单号
+      const code = await generateAutoCode(
+        MesAutoCodeRuleCode.PRO_FEEDBACK_CODE,
+      );
+      await formApi.setValues({
+        code,
+        feedbackTime: Date.now(),
+        feedbackUserId: userStore.userInfo?.id,
+      });
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getFeedback(data.id);
+      const checkFlag = await resolveCheckFlag(
+        formData.value.routeId,
+        formData.value.processId,
+      );
+      // 设置到 values
+      await formApi.setValues({ ...formData.value, checkFlag });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <Tabs
+      v-if="showSubTabs"
+      v-model:active-key="subTabsName"
+      type="card"
+      class="mx-4 mt-2"
+    >
+      <Tabs.TabPane key="itemConsume" tab="BOM 物资消耗">
+        <ItemConsumeList :feedback-id="formData!.id!" />
+      </Tabs.TabPane>
+      <Tabs.TabPane key="productProduce" tab="产品产出">
+        <ProductProduceList :feedback-id="formData!.id!" />
+      </Tabs.TabPane>
+    </Tabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center justify-end gap-2">
+        <Popconfirm
+          v-if="canSubmitDirectly"
+          title="确认提交该报工单？提交后将不能修改。"
+          @confirm="handleSubmit"
+        >
+          <Button type="primary">{{ $t('common.submit') }}</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="canApprove"
+          title="确认审批通过该报工单？"
+          @confirm="handleApprove"
+        >
+          <Button type="primary">通过</Button>
+        </Popconfirm>
+        <Popconfirm
+          v-if="canApprove"
+          title="确认驳回该报工单？"
+          @confirm="handleReject"
+        >
+          <Button danger>不通过</Button>
+        </Popconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/item-consume-list.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/item-consume-list.vue
new file mode 100644
index 000000000..6ac69a535
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/feedback/modules/item-consume-list.vue
@@ -0,0 +1,57 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmItemConsumeLineApi } from '#/api/mes/wm/itemconsume/line';
+
+import { watch } from 'vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getItemConsumeLinePage } from '#/api/mes/wm/itemconsume/line';
+
+const props = defineProps<{
+  feedbackId: number;
+}>();
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: [
+      { field: 'itemCode', title: '物资编码', minWidth: 120 },
+      { field: 'itemName', title: '物资名称', minWidth: 140 },
+      { field: 'specification', title: '规格型号', minWidth: 120 },
+      { field: 'quantity', title: '消耗数量', minWidth: 100 },
+      { field: 'unitName', title: '单位', minWidth: 80 },
+      { field: 'batchCode', title: '批次号', minWidth: 120 },
+    ],
+    height: 320,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          // TODO @AI：换行风格？？？
+          if (!props.feedbackId) {
+            return { list: [], total: 0 };
+          }
+          return await getItemConsumeLinePage({
+            feedbackId: props.feedbackId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    // TODO @AI：换行风格；
+    rowConfig: { isHover: true, keyField: 'id' },
+    toolbarConfig: { refresh: false, search: false },
+  } as VxeTableGridOptions<MesWmItemConsumeLineApi.ItemConsumeLine>,
+});
+
+watch(
+  () => props.feedbackId,
+  () => {
+    gridApi.query();
+  },
+);
+</script>
+
+<template>
+  <Grid />
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/product-produce-list.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/product-produce-list.vue
new file mode 100644
index 000000000..9b313f0cb
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/feedback/modules/product-produce-list.vue
@@ -0,0 +1,68 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductProduceLineApi } from '#/api/mes/wm/productproduce/line';
+
+import { watch } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProductProduceLinePage } from '#/api/mes/wm/productproduce/line';
+
+const props = defineProps<{
+  feedbackId: number;
+}>();
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: [
+      { field: 'itemCode', title: '物资编码', minWidth: 120 },
+      { field: 'itemName', title: '物资名称', minWidth: 140 },
+      { field: 'specification', title: '规格型号', minWidth: 120 },
+      { field: 'quantity', title: '产出数量', minWidth: 100 },
+      { field: 'unitMeasureName', title: '单位', minWidth: 80 },
+      { field: 'batchCode', title: '批次号', minWidth: 120 },
+      {
+        field: 'qualityStatus',
+        title: '质量状态',
+        minWidth: 100,
+        cellRender: {
+          name: 'CellDict',
+          props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
+        },
+      },
+    ],
+    height: 320,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          // TODO @AI：换行风格？？？
+          if (!props.feedbackId) {
+            return { list: [], total: 0 };
+          }
+          return await getProductProduceLinePage({
+            feedbackId: props.feedbackId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    // TODO @AI：换行风格；
+    rowConfig: { isHover: true, keyField: 'id' },
+    toolbarConfig: { refresh: false, search: false },
+  } as VxeTableGridOptions<MesWmProductProduceLineApi.ProductProduceLine>,
+});
+
+watch(
+  () => props.feedbackId,
+  () => {
+    gridApi.query();
+  },
+);
+</script>
+
+<template>
+  <Grid />
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/task/components/index.ts b/apps/web-antd/src/views/mes/pro/task/components/index.ts
new file mode 100644
index 000000000..0642acb68
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/components/index.ts
@@ -0,0 +1 @@
+export { default as ProTaskSelect } from './pro-task-select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
new file mode 100644
index 000000000..d8edc8e0a
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { computed, onMounted, ref, watch } from 'vue';
+
+import { Select, Tag, Tooltip } from 'ant-design-vue';
+
+import { getTask, getTaskPage } from '#/api/mes/pro/task';
+
+// TODO @AI：直接完整迁移！
+/**
+ * MES 生产任务选择器（轻量版）
+ *
+ * 当前用于生产报工等只需要单选任务 ID 的业务页面：
+ * - 默认按 `workOrderId` / `workstationId` / `statuses` 过滤拉取首页 100 条任务作为下拉
+ * - 编辑回显走 `getTask(id)`
+ * - 后续 `mes/pro/task` 完整迁移后，可替换为带弹窗的复杂选择器
+ */
+defineOptions({ name: 'ProTaskSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    allowClear?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    pageSize?: number;
+    placeholder?: string;
+    statuses?: number[];
+    workOrderId?: number;
+    workstationId?: number;
+  }>(),
+  {
+    allowClear: true,
+    disabled: false,
+    modelValue: undefined,
+    pageSize: 100,
+    placeholder: '请选择任务',
+    statuses: undefined,
+    workOrderId: undefined,
+    workstationId: undefined,
+  },
+);
+
+const emit = defineEmits<{
+  change: [item: MesProTaskApi.Task | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+
+const allList = ref<MesProTaskApi.Task[]>([]);
+const selectedItem = ref<MesProTaskApi.Task>();
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (value: number | undefined) => {
+    emit('update:modelValue', value);
+  },
+});
+
+/** 前端过滤：按任务编号或名称模糊匹配 */
+function handleFilter(input: string, option: any) {
+  const keyword = input.toLowerCase();
+  const item = option?.item as MesProTaskApi.Task | undefined;
+  return Boolean(
+    item?.code?.toLowerCase().includes(keyword) ||
+      item?.name?.toLowerCase().includes(keyword),
+  );
+}
+
+/** 同步选中任务详情，未在列表内时单独拉取 */
+async function syncSelectedItem(value: number | undefined) {
+  if (value === undefined) {
+    selectedItem.value = undefined;
+    return;
+  }
+  const found = allList.value.find((item) => item.id === value);
+  if (found) {
+    selectedItem.value = found;
+    return;
+  }
+  try {
+    selectedItem.value = await getTask(value);
+  } catch (error) {
+    console.error('[ProTaskSelect] resolveItemById failed:', error);
+  }
+}
+
+/** 除 v-model 外，额外抛出完整任务对象给业务表单使用 */
+function handleChange(value: any) {
+  const nextValue = value === undefined ? undefined : Number(value);
+  syncSelectedItem(nextValue);
+  emit('change', selectedItem.value);
+}
+
+/** 重新拉取候选任务列表 */
+async function loadList() {
+  const data = await getTaskPage({
+    pageNo: 1,
+    pageSize: props.pageSize,
+    statuses: props.statuses,
+    workOrderId: props.workOrderId,
+    workstationId: props.workstationId,
+  });
+  allList.value = data.list ?? [];
+}
+
+watch(
+  () => props.modelValue,
+  (value) => {
+    syncSelectedItem(value);
+  },
+);
+
+watch(
+  () => [props.workOrderId, props.workstationId],
+  async () => {
+    await loadList();
+    syncSelectedItem(props.modelValue);
+  },
+);
+
+onMounted(async () => {
+  await loadList();
+  syncSelectedItem(props.modelValue);
+});
+</script>
+
+<template>
+  <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+    <template #title>
+      <div v-if="selectedItem" class="leading-6">
+        <div>任务编号：{{ selectedItem.code || '-' }}</div>
+        <div>任务名称：{{ selectedItem.name || '-' }}</div>
+        <div>工序：{{ selectedItem.processName || '-' }}</div>
+        <div>工作站：{{ selectedItem.workstationName || '-' }}</div>
+        <div>物料：{{ selectedItem.itemName || '-' }}</div>
+        <div>规格：{{ selectedItem.itemSpecification || '-' }}</div>
+      </div>
+    </template>
+    <Select
+      v-bind="$attrs"
+      v-model:value="selectValue"
+      :allow-clear="allowClear"
+      :disabled="disabled"
+      :filter-option="handleFilter"
+      :placeholder="placeholder"
+      class="w-full"
+      show-search
+      @change="handleChange"
+    >
+      <Select.Option
+        v-for="item in allList"
+        :key="item.id"
+        :item="item"
+        :value="item.id"
+      >
+        <div class="flex items-center gap-2">
+          <span>{{ item.code }}</span>
+          <Tag v-if="item.itemName" color="default">{{ item.itemName }}</Tag>
+        </div>
+      </Select.Option>
+    </Select>
+  </Tooltip>
+</template>
diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts
index 7a127bbc1..9ef6e2310 100644
--- a/packages/constants/src/dict-enum.ts
+++ b/packages/constants/src/dict-enum.ts
@@ -216,6 +216,7 @@ const MES_DICT = {
   MES_WM_BARCODE_BIZ_TYPE: 'mes_wm_barcode_biz_type', // MES 条码业务类型
   MES_WM_BARCODE_FORMAT: 'mes_wm_barcode_format', // MES 条码格式
   MES_WM_PRODUCT_SALES_STATUS: 'mes_wm_product_sales_status', // MES 销售出库单状态
+  MES_WM_QUALITY_STATUS: 'mes_wm_quality_status', // MES 质量状态
 } as const;
 
 /** ========== WMS - 仓储管理模块 ========== */
diff --git a/packages/locales/src/langs/en-US/common.json b/packages/locales/src/langs/en-US/common.json
index 0d289b3ab..308c26ea3 100644
--- a/packages/locales/src/langs/en-US/common.json
+++ b/packages/locales/src/langs/en-US/common.json
@@ -21,6 +21,8 @@
   "detail": "Detail",
   "yes": "Yes",
   "no": "No",
+  "submit": "Submit",
+  "approve": "Approve",
   "showSearchPanel": "Show search panel",
   "hideSearchPanel": "Hide search panel"
 }
diff --git a/packages/locales/src/langs/zh-CN/common.json b/packages/locales/src/langs/zh-CN/common.json
index b90087f1a..9905b4738 100644
--- a/packages/locales/src/langs/zh-CN/common.json
+++ b/packages/locales/src/langs/zh-CN/common.json
@@ -21,6 +21,8 @@
   "detail": "详情",
   "yes": "是",
   "no": "否",
+  "submit": "提交",
+  "approve": "审批",
   "showSearchPanel": "显示搜索面板",
   "hideSearchPanel": "隐藏搜索面板"
 }

From 44b62e14ac3db55a9627ba13716880b8a9eb58a5 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 26 May 2026 12:36:01 +0800
Subject: [PATCH 12/17] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=20Vben=20?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=B9=E7=AA=97=E6=A8=A1=E5=BC=8F=E4=B8=BA?=
 =?UTF-8?q?=20formType=20=E5=B9=B6=E6=9B=B4=E6=96=B0=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/erp/finance/payment/data.ts     |  5 +-
 .../src/views/erp/finance/payment/index.vue   |  6 +--
 .../erp/finance/payment/modules/form.vue      |  8 ++--
 .../src/views/erp/finance/receipt/data.ts     |  5 +-
 .../src/views/erp/finance/receipt/index.vue   |  6 +--
 .../erp/finance/receipt/modules/form.vue      |  8 ++--
 .../src/views/erp/purchase/in/data.ts         |  5 +-
 .../src/views/erp/purchase/in/index.vue       |  6 +--
 .../views/erp/purchase/in/modules/form.vue    |  8 ++--
 .../src/views/erp/purchase/order/data.ts      |  5 +-
 .../src/views/erp/purchase/order/index.vue    |  6 +--
 .../views/erp/purchase/order/modules/form.vue |  8 ++--
 .../src/views/erp/purchase/return/data.ts     |  5 +-
 .../src/views/erp/purchase/return/index.vue   |  6 +--
 .../erp/purchase/return/modules/form.vue      |  8 ++--
 .../web-antd/src/views/erp/sale/order/data.ts |  5 +-
 .../src/views/erp/sale/order/index.vue        |  6 +--
 .../src/views/erp/sale/order/modules/form.vue |  8 ++--
 apps/web-antd/src/views/erp/sale/out/data.ts  |  5 +-
 .../web-antd/src/views/erp/sale/out/index.vue |  6 +--
 .../src/views/erp/sale/out/modules/form.vue   |  8 ++--
 .../src/views/erp/sale/return/data.ts         |  5 +-
 .../src/views/erp/sale/return/index.vue       |  6 +--
 .../views/erp/sale/return/modules/form.vue    |  8 ++--
 .../src/views/erp/stock/check/data.ts         |  5 +-
 .../src/views/erp/stock/check/index.vue       |  6 +--
 .../views/erp/stock/check/modules/form.vue    |  8 ++--
 apps/web-antd/src/views/erp/stock/in/data.ts  |  5 +-
 .../web-antd/src/views/erp/stock/in/index.vue |  6 +--
 .../src/views/erp/stock/in/modules/form.vue   |  8 ++--
 .../web-antd/src/views/erp/stock/move/data.ts |  5 +-
 .../src/views/erp/stock/move/index.vue        |  6 +--
 .../src/views/erp/stock/move/modules/form.vue |  8 ++--
 apps/web-antd/src/views/erp/stock/out/data.ts |  5 +-
 .../src/views/erp/stock/out/index.vue         |  6 +--
 .../src/views/erp/stock/out/modules/form.vue  |  8 ++--
 .../src/views/iot/ota/firmware/index.vue      |  4 +-
 apps/web-antd/src/views/mes/cal/plan/data.ts  |  3 ++
 .../web-antd/src/views/mes/cal/plan/index.vue |  6 +--
 .../src/views/mes/cal/plan/modules/form.vue   | 32 ++++++-------
 .../views/mes/cal/plan/modules/shift-list.vue |  4 +-
 .../views/mes/cal/plan/modules/team-list.vue  |  4 +-
 apps/web-antd/src/views/mes/cal/team/data.ts  |  3 ++
 .../web-antd/src/views/mes/cal/team/index.vue |  6 +--
 .../src/views/mes/cal/team/modules/form.vue   | 28 +++++------
 .../mes/cal/team/modules/member-list.vue      |  4 +-
 .../src/views/mes/dv/checkplan/data.ts        |  3 ++
 .../src/views/mes/dv/checkplan/index.vue      |  6 +--
 .../views/mes/dv/checkplan/modules/form.vue   | 30 ++++++------
 .../dv/checkplan/modules/machinery-list.vue   |  4 +-
 .../mes/dv/checkplan/modules/subject-list.vue |  4 +-
 .../src/views/mes/dv/checkrecord/data.ts      |  3 ++
 .../src/views/mes/dv/checkrecord/index.vue    |  6 +--
 .../views/mes/dv/checkrecord/modules/form.vue | 26 +++++------
 .../src/views/mes/dv/machinery/data.ts        | 11 +++--
 .../src/views/mes/dv/machinery/index.vue      |  6 +--
 .../views/mes/dv/machinery/modules/form.vue   | 25 +++++-----
 .../src/views/mes/dv/maintenrecord/data.ts    |  3 ++
 .../src/views/mes/dv/maintenrecord/index.vue  |  6 +--
 .../mes/dv/maintenrecord/modules/form.vue     | 26 +++++------
 apps/web-antd/src/views/mes/dv/repair/data.ts |  3 ++
 .../src/views/mes/dv/repair/index.vue         | 10 ++--
 .../src/views/mes/dv/repair/modules/form.vue  | 32 ++++++-------
 .../web-antd/src/views/mes/dv/subject/data.ts |  3 ++
 .../src/views/mes/dv/subject/index.vue        |  6 +--
 .../src/views/mes/dv/subject/modules/form.vue | 20 ++++----
 apps/web-antd/src/views/mes/md/client/data.ts |  3 ++
 .../src/views/mes/md/client/index.vue         |  6 +--
 .../src/views/mes/md/client/modules/form.vue  | 22 ++++-----
 .../modules/product-sales-line-list.vue       |  2 +-
 apps/web-antd/src/views/mes/md/item/data.ts   |  3 ++
 apps/web-antd/src/views/mes/md/item/index.vue |  6 +--
 .../src/views/mes/md/item/modules/form.vue    | 34 +++++++-------
 .../item/modules/item-batch-config-form.vue   |  4 +-
 .../mes/md/item/modules/product-bom-form.vue  |  4 +-
 .../md/item/modules/product-media-list.vue    |  4 +-
 .../mes/md/item/modules/product-sip-form.vue  |  4 +-
 .../mes/md/item/modules/product-sop-form.vue  |  4 +-
 apps/web-antd/src/views/mes/md/vendor/data.ts |  3 ++
 .../src/views/mes/md/vendor/index.vue         |  6 +--
 .../src/views/mes/md/vendor/modules/form.vue  | 22 ++++-----
 .../vendor/modules/item-receipt-line-list.vue |  2 +-
 .../src/views/mes/md/workstation/data.ts      |  3 ++
 .../src/views/mes/md/workstation/index.vue    |  6 +--
 .../views/mes/md/workstation/modules/form.vue | 32 ++++++-------
 .../md/workstation/modules/machine-list.vue   |  4 +-
 .../mes/md/workstation/modules/tool-list.vue  |  4 +-
 .../md/workstation/modules/worker-list.vue    |  4 +-
 .../views/mes/md/workstation/workshop/data.ts |  3 ++
 .../mes/md/workstation/workshop/index.vue     |  6 +--
 .../md/workstation/workshop/modules/form.vue  | 20 ++++----
 .../src/views/mes/pro/andon/record/data.ts    |  5 +-
 .../src/views/mes/pro/andon/record/index.vue  |  6 +--
 .../mes/pro/andon/record/modules/form.vue     | 26 +++++------
 .../src/views/mes/pro/feedback/data.ts        |  5 +-
 .../src/views/mes/pro/feedback/index.vue      | 10 ++--
 .../views/mes/pro/feedback/modules/form.vue   | 46 +++++++++----------
 .../feedback/modules/item-consume-list.vue    | 12 +++--
 .../feedback/modules/product-produce-list.vue | 12 +++--
 .../src/views/mes/pro/process/data.ts         |  3 ++
 .../src/views/mes/pro/process/index.vue       |  6 +--
 .../mes/pro/process/modules/content-list.vue  |  6 ++-
 .../views/mes/pro/process/modules/form.vue    | 22 ++++-----
 apps/web-antd/src/views/mes/pro/route/data.ts |  3 ++
 .../src/views/mes/pro/route/index.vue         |  6 +--
 .../src/views/mes/pro/route/modules/form.vue  | 30 ++++++------
 .../mes/pro/route/modules/process-list.vue    |  6 ++-
 .../mes/pro/route/modules/product-list.vue    |  6 ++-
 apps/web-antd/src/views/mes/tm/tool/data.ts   |  3 ++
 apps/web-antd/src/views/mes/tm/tool/index.vue |  6 +--
 .../src/views/mes/tm/tool/modules/form.vue    | 20 ++++----
 .../src/views/mes/tm/tool/type/data.ts        |  3 ++
 .../src/views/mes/tm/tool/type/index.vue      |  6 +--
 .../views/mes/tm/tool/type/modules/form.vue   | 20 ++++----
 .../src/views/wms/order/check/data.ts         |  3 ++
 .../src/views/wms/order/check/index.vue       |  4 +-
 .../views/wms/order/check/modules/form.vue    | 15 +++---
 .../src/views/wms/order/movement/data.ts      |  3 ++
 .../src/views/wms/order/movement/index.vue    |  4 +-
 .../views/wms/order/movement/modules/form.vue | 15 +++---
 .../src/views/wms/order/receipt/data.ts       |  3 ++
 .../src/views/wms/order/receipt/index.vue     |  4 +-
 .../views/wms/order/receipt/modules/form.vue  | 15 +++---
 .../src/views/wms/order/shipment/data.ts      |  3 ++
 .../src/views/wms/order/shipment/index.vue    |  4 +-
 .../views/wms/order/shipment/modules/form.vue | 15 +++---
 .../src/views/erp/finance/payment/data.ts     |  5 +-
 .../src/views/erp/finance/payment/index.vue   |  6 +--
 .../erp/finance/payment/modules/form.vue      |  8 ++--
 .../src/views/erp/finance/receipt/data.ts     |  5 +-
 .../src/views/erp/finance/receipt/index.vue   |  6 +--
 .../erp/finance/receipt/modules/form.vue      |  8 ++--
 .../src/views/erp/purchase/in/data.ts         |  5 +-
 .../src/views/erp/purchase/in/index.vue       |  6 +--
 .../views/erp/purchase/in/modules/form.vue    |  8 ++--
 .../src/views/erp/purchase/order/data.ts      |  5 +-
 .../src/views/erp/purchase/order/index.vue    |  6 +--
 .../views/erp/purchase/order/modules/form.vue |  8 ++--
 .../src/views/erp/purchase/return/data.ts     |  5 +-
 .../src/views/erp/purchase/return/index.vue   |  6 +--
 .../erp/purchase/return/modules/form.vue      |  8 ++--
 .../src/views/erp/sale/order/data.ts          |  5 +-
 .../src/views/erp/sale/order/index.vue        |  6 +--
 .../src/views/erp/sale/order/modules/form.vue |  8 ++--
 .../src/views/erp/sale/out/data.ts            |  5 +-
 .../src/views/erp/sale/out/index.vue          |  6 +--
 .../src/views/erp/sale/out/modules/form.vue   |  8 ++--
 .../src/views/erp/sale/return/data.ts         |  5 +-
 .../src/views/erp/sale/return/index.vue       |  6 +--
 .../views/erp/sale/return/modules/form.vue    |  8 ++--
 .../src/views/erp/stock/check/data.ts         |  5 +-
 .../src/views/erp/stock/check/index.vue       |  6 +--
 .../views/erp/stock/check/modules/form.vue    |  8 ++--
 .../src/views/erp/stock/in/data.ts            |  5 +-
 .../src/views/erp/stock/in/index.vue          |  6 +--
 .../src/views/erp/stock/in/modules/form.vue   |  8 ++--
 .../src/views/erp/stock/move/data.ts          |  5 +-
 .../src/views/erp/stock/move/index.vue        |  6 +--
 .../src/views/erp/stock/move/modules/form.vue |  8 ++--
 .../src/views/erp/stock/out/data.ts           |  5 +-
 .../src/views/erp/stock/out/index.vue         |  6 +--
 .../src/views/erp/stock/out/modules/form.vue  |  8 ++--
 .../src/views/iot/ota/firmware/index.vue      |  4 +-
 .../src/views/iot/rule/data/index.vue         |  4 +-
 .../src/views/iot/rule/data/rule/index.vue    |  4 +-
 .../src/views/iot/rule/data/sink/index.vue    |  4 +-
 .../src/views/erp/finance/payment/data.ts     |  5 +-
 .../src/views/erp/finance/payment/index.vue   |  6 +--
 .../erp/finance/payment/modules/form.vue      |  8 ++--
 .../src/views/erp/finance/receipt/data.ts     |  5 +-
 .../src/views/erp/finance/receipt/index.vue   |  6 +--
 .../erp/finance/receipt/modules/form.vue      |  8 ++--
 .../web-ele/src/views/erp/purchase/in/data.ts |  5 +-
 .../src/views/erp/purchase/in/index.vue       |  6 +--
 .../views/erp/purchase/in/modules/form.vue    |  8 ++--
 .../src/views/erp/purchase/order/data.ts      |  5 +-
 .../src/views/erp/purchase/order/index.vue    |  6 +--
 .../views/erp/purchase/order/modules/form.vue |  8 ++--
 .../src/views/erp/purchase/return/data.ts     |  5 +-
 .../src/views/erp/purchase/return/index.vue   |  6 +--
 .../erp/purchase/return/modules/form.vue      |  8 ++--
 apps/web-ele/src/views/erp/sale/order/data.ts |  5 +-
 .../src/views/erp/sale/order/index.vue        |  6 +--
 .../src/views/erp/sale/order/modules/form.vue |  8 ++--
 apps/web-ele/src/views/erp/sale/out/data.ts   |  5 +-
 apps/web-ele/src/views/erp/sale/out/index.vue |  6 +--
 .../src/views/erp/sale/out/modules/form.vue   |  8 ++--
 .../web-ele/src/views/erp/sale/return/data.ts |  5 +-
 .../src/views/erp/sale/return/index.vue       |  6 +--
 .../views/erp/sale/return/modules/form.vue    |  8 ++--
 .../web-ele/src/views/erp/stock/check/data.ts |  5 +-
 .../src/views/erp/stock/check/index.vue       |  6 +--
 .../views/erp/stock/check/modules/form.vue    |  8 ++--
 apps/web-ele/src/views/erp/stock/in/data.ts   |  5 +-
 apps/web-ele/src/views/erp/stock/in/index.vue |  6 +--
 .../src/views/erp/stock/in/modules/form.vue   |  8 ++--
 apps/web-ele/src/views/erp/stock/move/data.ts |  5 +-
 .../src/views/erp/stock/move/index.vue        |  6 +--
 .../src/views/erp/stock/move/modules/form.vue |  8 ++--
 apps/web-ele/src/views/erp/stock/out/data.ts  |  5 +-
 .../web-ele/src/views/erp/stock/out/index.vue |  6 +--
 .../src/views/erp/stock/out/modules/form.vue  |  8 ++--
 .../src/views/iot/ota/firmware/index.vue      |  4 +-
 apps/web-ele/src/views/mes/cal/plan/data.ts   |  3 ++
 apps/web-ele/src/views/mes/cal/plan/index.vue |  6 +--
 .../src/views/mes/cal/plan/modules/form.vue   | 32 ++++++-------
 .../views/mes/cal/plan/modules/shift-list.vue |  4 +-
 .../views/mes/cal/plan/modules/team-list.vue  |  4 +-
 apps/web-ele/src/views/mes/cal/team/data.ts   |  3 ++
 apps/web-ele/src/views/mes/cal/team/index.vue |  6 +--
 .../src/views/mes/cal/team/modules/form.vue   | 28 +++++------
 .../mes/cal/team/modules/member-list.vue      |  4 +-
 .../src/views/mes/dv/checkplan/data.ts        |  3 ++
 .../src/views/mes/dv/checkplan/index.vue      |  6 +--
 .../views/mes/dv/checkplan/modules/form.vue   | 30 ++++++------
 .../dv/checkplan/modules/machinery-list.vue   |  4 +-
 .../mes/dv/checkplan/modules/subject-list.vue |  4 +-
 .../src/views/mes/dv/checkrecord/data.ts      |  3 ++
 .../src/views/mes/dv/checkrecord/index.vue    |  6 +--
 .../views/mes/dv/checkrecord/modules/form.vue | 26 +++++------
 .../src/views/mes/dv/machinery/data.ts        | 11 +++--
 .../src/views/mes/dv/machinery/index.vue      |  6 +--
 .../views/mes/dv/machinery/modules/form.vue   | 25 +++++-----
 .../src/views/mes/dv/maintenrecord/data.ts    |  3 ++
 .../src/views/mes/dv/maintenrecord/index.vue  |  6 +--
 .../mes/dv/maintenrecord/modules/form.vue     | 26 +++++------
 apps/web-ele/src/views/mes/dv/repair/data.ts  |  3 ++
 .../web-ele/src/views/mes/dv/repair/index.vue | 10 ++--
 .../src/views/mes/dv/repair/modules/form.vue  | 32 ++++++-------
 apps/web-ele/src/views/mes/dv/subject/data.ts |  3 ++
 .../src/views/mes/dv/subject/index.vue        |  6 +--
 .../src/views/mes/dv/subject/modules/form.vue | 20 ++++----
 apps/web-ele/src/views/mes/md/client/data.ts  |  3 ++
 .../web-ele/src/views/mes/md/client/index.vue |  6 +--
 .../src/views/mes/md/client/modules/form.vue  | 22 ++++-----
 .../modules/product-sales-line-list.vue       |  2 +-
 apps/web-ele/src/views/mes/md/item/data.ts    |  3 ++
 apps/web-ele/src/views/mes/md/item/index.vue  |  6 +--
 .../src/views/mes/md/item/modules/form.vue    | 34 +++++++-------
 .../item/modules/item-batch-config-form.vue   |  4 +-
 .../mes/md/item/modules/product-bom-form.vue  |  4 +-
 .../md/item/modules/product-media-list.vue    |  4 +-
 .../mes/md/item/modules/product-sip-form.vue  |  4 +-
 .../mes/md/item/modules/product-sop-form.vue  |  4 +-
 apps/web-ele/src/views/mes/md/vendor/data.ts  |  3 ++
 .../web-ele/src/views/mes/md/vendor/index.vue |  6 +--
 .../src/views/mes/md/vendor/modules/form.vue  | 22 ++++-----
 .../vendor/modules/item-receipt-line-list.vue |  2 +-
 .../src/views/mes/md/workstation/data.ts      |  3 ++
 .../src/views/mes/md/workstation/index.vue    |  6 +--
 .../views/mes/md/workstation/modules/form.vue | 32 ++++++-------
 .../md/workstation/modules/machine-list.vue   |  4 +-
 .../mes/md/workstation/modules/tool-list.vue  |  4 +-
 .../md/workstation/modules/worker-list.vue    |  4 +-
 .../views/mes/md/workstation/workshop/data.ts |  3 ++
 .../mes/md/workstation/workshop/index.vue     |  6 +--
 .../md/workstation/workshop/modules/form.vue  | 20 ++++----
 .../src/views/mes/pro/andon/record/data.ts    |  5 +-
 .../src/views/mes/pro/andon/record/index.vue  |  6 +--
 .../mes/pro/andon/record/modules/form.vue     | 26 +++++------
 .../web-ele/src/views/mes/pro/process/data.ts |  3 ++
 .../src/views/mes/pro/process/index.vue       |  6 +--
 .../mes/pro/process/modules/content-list.vue  |  6 ++-
 .../views/mes/pro/process/modules/form.vue    | 22 ++++-----
 apps/web-ele/src/views/mes/pro/route/data.ts  |  3 ++
 .../web-ele/src/views/mes/pro/route/index.vue |  6 +--
 .../src/views/mes/pro/route/modules/form.vue  | 30 ++++++------
 .../mes/pro/route/modules/process-list.vue    |  6 ++-
 .../mes/pro/route/modules/product-list.vue    |  6 ++-
 apps/web-ele/src/views/mes/tm/tool/data.ts    |  3 ++
 apps/web-ele/src/views/mes/tm/tool/index.vue  |  6 +--
 .../src/views/mes/tm/tool/modules/form.vue    | 20 ++++----
 .../src/views/mes/tm/tool/type/data.ts        |  3 ++
 .../src/views/mes/tm/tool/type/index.vue      |  6 +--
 .../views/mes/tm/tool/type/modules/form.vue   | 20 ++++----
 .../web-ele/src/views/wms/order/check/data.ts |  3 ++
 .../src/views/wms/order/check/index.vue       |  4 +-
 .../views/wms/order/check/modules/form.vue    | 15 +++---
 .../src/views/wms/order/movement/data.ts      |  3 ++
 .../src/views/wms/order/movement/index.vue    |  4 +-
 .../views/wms/order/movement/modules/form.vue | 15 +++---
 .../src/views/wms/order/receipt/data.ts       |  3 ++
 .../src/views/wms/order/receipt/index.vue     |  4 +-
 .../views/wms/order/receipt/modules/form.vue  | 15 +++---
 .../src/views/wms/order/shipment/data.ts      |  3 ++
 .../src/views/wms/order/shipment/index.vue    |  4 +-
 .../views/wms/order/shipment/modules/form.vue | 15 +++---
 287 files changed, 1389 insertions(+), 1014 deletions(-)

diff --git a/apps/web-antd/src/views/erp/finance/payment/data.ts b/apps/web-antd/src/views/erp/finance/payment/data.ts
index cd8e32712..771fd0c31 100644
--- a/apps/web-antd/src/views/erp/finance/payment/data.ts
+++ b/apps/web-antd/src/views/erp/finance/payment/data.ts
@@ -10,8 +10,11 @@ import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/finance/payment/index.vue b/apps/web-antd/src/views/erp/finance/payment/index.vue
index 03c88b777..d44b11be0 100644
--- a/apps/web-antd/src/views/erp/finance/payment/index.vue
+++ b/apps/web-antd/src/views/erp/finance/payment/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增付款单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑付款单 */
 function handleEdit(row: ErpFinancePaymentApi.FinancePayment) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除付款单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpFinancePaymentApi.FinancePayment) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/form.vue b/apps/web-antd/src/views/erp/finance/payment/modules/form.vue
index 767bd13b2..25caa7b05 100644
--- a/apps/web-antd/src/views/erp/finance/payment/modules/form.vue
+++ b/apps/web-antd/src/views/erp/finance/payment/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpFinancePaymentApi } from '#/api/erp/finance/payment';
 
 import { computed, ref } from 'vue';
@@ -40,7 +42,7 @@ const formData = ref<
   status: 0,
 });
 
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -145,8 +147,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/finance/receipt/data.ts b/apps/web-antd/src/views/erp/finance/receipt/data.ts
index 4e325aa8b..abe109bca 100644
--- a/apps/web-antd/src/views/erp/finance/receipt/data.ts
+++ b/apps/web-antd/src/views/erp/finance/receipt/data.ts
@@ -10,8 +10,11 @@ import { getCustomerSimpleList } from '#/api/erp/sale/customer';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/finance/receipt/index.vue b/apps/web-antd/src/views/erp/finance/receipt/index.vue
index 258de73fb..4abcf0fd3 100644
--- a/apps/web-antd/src/views/erp/finance/receipt/index.vue
+++ b/apps/web-antd/src/views/erp/finance/receipt/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增收款单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑收款单 */
 function handleEdit(row: ErpFinanceReceiptApi.FinanceReceipt) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除收款单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpFinanceReceiptApi.FinanceReceipt) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue b/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue
index f26f53ea5..3b13253dc 100644
--- a/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue
+++ b/apps/web-antd/src/views/erp/finance/receipt/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpFinanceReceiptApi } from '#/api/erp/finance/receipt';
 
 import { computed, ref } from 'vue';
@@ -40,7 +42,7 @@ const formData = ref<
   status: 0,
 });
 
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -159,8 +161,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/purchase/in/data.ts b/apps/web-antd/src/views/erp/purchase/in/data.ts
index e86c71a25..0e3ab1e25 100644
--- a/apps/web-antd/src/views/erp/purchase/in/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/in/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/purchase/in/index.vue b/apps/web-antd/src/views/erp/purchase/in/index.vue
index fb87f1bfa..8f9f9b6aa 100644
--- a/apps/web-antd/src/views/erp/purchase/in/index.vue
+++ b/apps/web-antd/src/views/erp/purchase/in/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增采购入库 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑采购入库 */
 function handleEdit(row: ErpPurchaseInApi.PurchaseIn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除采购入库 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpPurchaseInApi.PurchaseIn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/form.vue b/apps/web-antd/src/views/erp/purchase/in/modules/form.vue
index 7aa3d5cf9..11da2a489 100644
--- a/apps/web-antd/src/views/erp/purchase/in/modules/form.vue
+++ b/apps/web-antd/src/views/erp/purchase/in/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpPurchaseInApi } from '#/api/erp/purchase/in';
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
@@ -46,7 +48,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -175,8 +177,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/purchase/order/data.ts b/apps/web-antd/src/views/erp/purchase/order/data.ts
index d57964b69..e8575a1d3 100644
--- a/apps/web-antd/src/views/erp/purchase/order/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/order/data.ts
@@ -12,8 +12,11 @@ import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/purchase/order/index.vue b/apps/web-antd/src/views/erp/purchase/order/index.vue
index 0f34f55df..ec768440f 100644
--- a/apps/web-antd/src/views/erp/purchase/order/index.vue
+++ b/apps/web-antd/src/views/erp/purchase/order/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增采购订单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑采购订单 */
 function handleEdit(row: ErpPurchaseOrderApi.PurchaseOrder) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除采购订单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpPurchaseOrderApi.PurchaseOrder) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/purchase/order/modules/form.vue b/apps/web-antd/src/views/erp/purchase/order/modules/form.vue
index cdd036f62..ad43db4e4 100644
--- a/apps/web-antd/src/views/erp/purchase/order/modules/form.vue
+++ b/apps/web-antd/src/views/erp/purchase/order/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
 import { computed, ref } from 'vue';
@@ -21,7 +23,7 @@ import PurchaseOrderItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpPurchaseOrderApi.PurchaseOrder>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof PurchaseOrderItemForm>>();
 
 const getTitle = computed(() => {
@@ -124,8 +126,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/purchase/return/data.ts b/apps/web-antd/src/views/erp/purchase/return/data.ts
index db3dc016b..c4d80d38d 100644
--- a/apps/web-antd/src/views/erp/purchase/return/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/return/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/purchase/return/index.vue b/apps/web-antd/src/views/erp/purchase/return/index.vue
index aa4c3cc53..2761d000e 100644
--- a/apps/web-antd/src/views/erp/purchase/return/index.vue
+++ b/apps/web-antd/src/views/erp/purchase/return/index.vue
@@ -45,17 +45,17 @@ function handleRowCheckboxChange({
 
 /** 新增采购退货 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑采购退货 */
 function handleEdit(row: ErpPurchaseReturnApi.PurchaseReturn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 查看详情 */
 function handleDetail(row: ErpPurchaseReturnApi.PurchaseReturn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 /** 删除采购退货 */
diff --git a/apps/web-antd/src/views/erp/purchase/return/modules/form.vue b/apps/web-antd/src/views/erp/purchase/return/modules/form.vue
index 65d5834b3..9efd64660 100644
--- a/apps/web-antd/src/views/erp/purchase/return/modules/form.vue
+++ b/apps/web-antd/src/views/erp/purchase/return/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 import type { ErpPurchaseReturnApi } from '#/api/erp/purchase/return';
 
@@ -46,7 +48,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 /* eslint-disable unicorn/no-nested-ternary */
@@ -175,8 +177,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/sale/order/data.ts b/apps/web-antd/src/views/erp/sale/order/data.ts
index f6114e56d..51aa9087f 100644
--- a/apps/web-antd/src/views/erp/sale/order/data.ts
+++ b/apps/web-antd/src/views/erp/sale/order/data.ts
@@ -12,8 +12,11 @@ import { getCustomerSimpleList } from '#/api/erp/sale/customer';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/sale/order/index.vue b/apps/web-antd/src/views/erp/sale/order/index.vue
index f0fa24c08..ac59d0241 100644
--- a/apps/web-antd/src/views/erp/sale/order/index.vue
+++ b/apps/web-antd/src/views/erp/sale/order/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增销售订单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑销售订单 */
 function handleEdit(row: ErpSaleOrderApi.SaleOrder) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除销售订单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpSaleOrderApi.SaleOrder) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/sale/order/modules/form.vue b/apps/web-antd/src/views/erp/sale/order/modules/form.vue
index b5d306aed..33114ac71 100644
--- a/apps/web-antd/src/views/erp/sale/order/modules/form.vue
+++ b/apps/web-antd/src/views/erp/sale/order/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
 import { computed, ref } from 'vue';
@@ -21,7 +23,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpSaleOrderApi.SaleOrder>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -114,8 +116,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/sale/out/data.ts b/apps/web-antd/src/views/erp/sale/out/data.ts
index ba1527b75..e4ffcea5d 100644
--- a/apps/web-antd/src/views/erp/sale/out/data.ts
+++ b/apps/web-antd/src/views/erp/sale/out/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/sale/out/index.vue b/apps/web-antd/src/views/erp/sale/out/index.vue
index 06f21645b..c21a66c8d 100644
--- a/apps/web-antd/src/views/erp/sale/out/index.vue
+++ b/apps/web-antd/src/views/erp/sale/out/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增销售出库 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑销售出库 */
 function handleEdit(row: ErpSaleOutApi.SaleOut) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除销售出库 */
@@ -91,7 +91,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpSaleOutApi.SaleOut) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/sale/out/modules/form.vue b/apps/web-antd/src/views/erp/sale/out/modules/form.vue
index adaf59c83..5aff9e351 100644
--- a/apps/web-antd/src/views/erp/sale/out/modules/form.vue
+++ b/apps/web-antd/src/views/erp/sale/out/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { ErpSaleOutApi } from '#/api/erp/sale/out';
 
@@ -42,7 +44,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 /* eslint-disable unicorn/no-nested-ternary */
@@ -170,8 +172,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/sale/return/data.ts b/apps/web-antd/src/views/erp/sale/return/data.ts
index d325cab83..a0ec6071a 100644
--- a/apps/web-antd/src/views/erp/sale/return/data.ts
+++ b/apps/web-antd/src/views/erp/sale/return/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/sale/return/index.vue b/apps/web-antd/src/views/erp/sale/return/index.vue
index 9d63d0dd0..e4ed85cf7 100644
--- a/apps/web-antd/src/views/erp/sale/return/index.vue
+++ b/apps/web-antd/src/views/erp/sale/return/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增销售退货 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑销售退货 */
 function handleEdit(row: ErpSaleReturnApi.SaleReturn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除销售退货 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpSaleReturnApi.SaleReturn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/sale/return/modules/form.vue b/apps/web-antd/src/views/erp/sale/return/modules/form.vue
index c8c12ecf0..7fa489a75 100644
--- a/apps/web-antd/src/views/erp/sale/return/modules/form.vue
+++ b/apps/web-antd/src/views/erp/sale/return/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { ErpSaleReturnApi } from '#/api/erp/sale/return';
 
@@ -46,7 +48,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -175,8 +177,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/stock/check/data.ts b/apps/web-antd/src/views/erp/stock/check/data.ts
index f78fa4a38..d2082b7be 100644
--- a/apps/web-antd/src/views/erp/stock/check/data.ts
+++ b/apps/web-antd/src/views/erp/stock/check/data.ts
@@ -9,8 +9,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/stock/check/index.vue b/apps/web-antd/src/views/erp/stock/check/index.vue
index 3edef5eb3..c5ab0001e 100644
--- a/apps/web-antd/src/views/erp/stock/check/index.vue
+++ b/apps/web-antd/src/views/erp/stock/check/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增库存盘点单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑库存盘点单 */
 function handleEdit(row: ErpStockCheckApi.StockCheck) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除库存盘点单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockCheckApi.StockCheck) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/stock/check/modules/form.vue b/apps/web-antd/src/views/erp/stock/check/modules/form.vue
index 2bdcec37b..dc493f721 100644
--- a/apps/web-antd/src/views/erp/stock/check/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/check/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockCheckApi } from '#/api/erp/stock/check';
 
 import { computed, ref } from 'vue';
@@ -20,7 +22,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockCheckApi.StockCheck>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -93,8 +95,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/stock/in/data.ts b/apps/web-antd/src/views/erp/stock/in/data.ts
index 5668018de..c521b325f 100644
--- a/apps/web-antd/src/views/erp/stock/in/data.ts
+++ b/apps/web-antd/src/views/erp/stock/in/data.ts
@@ -10,8 +10,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/stock/in/index.vue b/apps/web-antd/src/views/erp/stock/in/index.vue
index 4b362c25f..0de28de87 100644
--- a/apps/web-antd/src/views/erp/stock/in/index.vue
+++ b/apps/web-antd/src/views/erp/stock/in/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增其它入库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑其它入库单 */
 function handleEdit(row: ErpStockInApi.StockIn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除其它入库单 */
@@ -91,7 +91,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockInApi.StockIn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/stock/in/modules/form.vue b/apps/web-antd/src/views/erp/stock/in/modules/form.vue
index 06b614032..f52aa6c71 100644
--- a/apps/web-antd/src/views/erp/stock/in/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/in/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockInApi } from '#/api/erp/stock/in';
 
 import { computed, ref } from 'vue';
@@ -16,7 +18,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockInApi.StockIn>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -89,8 +91,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/stock/move/data.ts b/apps/web-antd/src/views/erp/stock/move/data.ts
index 5cda3ed99..7c05d4d55 100644
--- a/apps/web-antd/src/views/erp/stock/move/data.ts
+++ b/apps/web-antd/src/views/erp/stock/move/data.ts
@@ -9,8 +9,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/stock/move/index.vue b/apps/web-antd/src/views/erp/stock/move/index.vue
index f5da612cd..e8e876090 100644
--- a/apps/web-antd/src/views/erp/stock/move/index.vue
+++ b/apps/web-antd/src/views/erp/stock/move/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增库存调拨单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑库存调拨单 */
 function handleEdit(row: ErpStockMoveApi.StockMove) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除库存调拨单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockMoveApi.StockMove) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/stock/move/modules/form.vue b/apps/web-antd/src/views/erp/stock/move/modules/form.vue
index 772bc82f3..899aca9a2 100644
--- a/apps/web-antd/src/views/erp/stock/move/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/move/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockMoveApi } from '#/api/erp/stock/move';
 
 import { computed, ref } from 'vue';
@@ -20,7 +22,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockMoveApi.StockMove>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -93,8 +95,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/erp/stock/out/data.ts b/apps/web-antd/src/views/erp/stock/out/data.ts
index 7906b03f5..c4dac24b6 100644
--- a/apps/web-antd/src/views/erp/stock/out/data.ts
+++ b/apps/web-antd/src/views/erp/stock/out/data.ts
@@ -10,8 +10,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antd/src/views/erp/stock/out/index.vue b/apps/web-antd/src/views/erp/stock/out/index.vue
index 8cd238561..4c2b55e27 100644
--- a/apps/web-antd/src/views/erp/stock/out/index.vue
+++ b/apps/web-antd/src/views/erp/stock/out/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增其它出库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑其它出库单 */
 function handleEdit(row: ErpStockOutApi.StockOut) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除其它出库单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockOutApi.StockOut) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/stock/out/modules/form.vue b/apps/web-antd/src/views/erp/stock/out/modules/form.vue
index 3c900af97..7fc1641b2 100644
--- a/apps/web-antd/src/views/erp/stock/out/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/out/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockOutApi } from '#/api/erp/stock/out';
 
 import { computed, ref } from 'vue';
@@ -20,7 +22,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockOutApi.StockOut>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -93,8 +95,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antd/src/views/iot/ota/firmware/index.vue b/apps/web-antd/src/views/iot/ota/firmware/index.vue
index 36beb27cc..9f0a48466 100644
--- a/apps/web-antd/src/views/iot/ota/firmware/index.vue
+++ b/apps/web-antd/src/views/iot/ota/firmware/index.vue
@@ -34,12 +34,12 @@ function handleRefresh() {
 
 /** 创建固件 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData(null).open();
 }
 
 /** 编辑固件 */
 function handleEdit(row: IoTOtaFirmwareApi.Firmware) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData({ id: row.id }).open();
 }
 
 /** 删除固件 */
diff --git a/apps/web-antd/src/views/mes/cal/plan/data.ts b/apps/web-antd/src/views/mes/cal/plan/data.ts
index a12ad2e13..e1c001147 100644
--- a/apps/web-antd/src/views/mes/cal/plan/data.ts
+++ b/apps/web-antd/src/views/mes/cal/plan/data.ts
@@ -18,6 +18,9 @@ import {
   MesCalShiftTypeEnum,
 } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改排班计划的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/cal/plan/index.vue b/apps/web-antd/src/views/mes/cal/plan/index.vue
index bf6e77dbb..94ae51603 100644
--- a/apps/web-antd/src/views/mes/cal/plan/index.vue
+++ b/apps/web-antd/src/views/mes/cal/plan/index.vue
@@ -27,17 +27,17 @@ function handleRefresh() {
 
 /** 创建排班计划 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看排班计划 */
 function handleDetail(row: MesCalPlanApi.Plan) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑排班计划 */
 function handleEdit(row: MesCalPlanApi.Plan) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除排班计划 */
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 fb2202b4f..bbfdac011 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesCalPlanApi } from '#/api/mes/cal/plan';
 
 import { computed, ref } from 'vue';
@@ -16,21 +18,19 @@ import { useFormSchema } from '../data';
 import ShiftList from './shift-list.vue';
 import PlanTeamList from './team-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('shift'); // 当前资源页签
 const formData = ref<MesCalPlanApi.Plan>();
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const canConfirm = computed(
-  () => formMode.value === 'update' && formData.value?.status === MesCalPlanStatusEnum.PREPARE,
+  () => formType.value === 'update' && formData.value?.status === MesCalPlanStatusEnum.PREPARE,
 ); // 是否可确认计划
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['排班计划']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['排班计划'])
     : $t('ui.actionTitle.create', ['排班计划']);
 });
@@ -86,11 +86,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesCalPlanApi.Plan;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createPlan(data);
         formData.value = { ...data, id: id as number, status: MesCalPlanStatusEnum.PREPARE };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updatePlan(data);
         formData.value = { ...formData.value, ...data };
@@ -109,10 +109,10 @@ 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');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -132,15 +132,15 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <Tabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model:active-key="subTabsName"
       class="mx-4 mt-4"
     >
       <Tabs.TabPane key="shift" tab="班次">
-        <ShiftList :form-type="formMode" :plan-id="formData.id" />
+        <ShiftList :form-type="formType" :plan-id="formData.id" />
       </Tabs.TabPane>
       <Tabs.TabPane key="team" tab="班组">
-        <PlanTeamList :form-type="formMode" :plan-id="formData.id" />
+        <PlanTeamList :form-type="formType" :plan-id="formData.id" />
       </Tabs.TabPane>
     </Tabs>
     <template #prepend-footer>
diff --git a/apps/web-antd/src/views/mes/cal/plan/modules/shift-list.vue b/apps/web-antd/src/views/mes/cal/plan/modules/shift-list.vue
index d2cf20c2c..0c33c73a2 100644
--- a/apps/web-antd/src/views/mes/cal/plan/modules/shift-list.vue
+++ b/apps/web-antd/src/views/mes/cal/plan/modules/shift-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesCalPlanShiftApi } from '#/api/mes/cal/plan/shift';
 
@@ -16,7 +18,7 @@ import {
 } from '#/api/mes/cal/plan/shift';
 import { $t } from '#/locales';
 
-const props = withDefaults(defineProps<{ formType?: string; planId: number }>(), {
+const props = withDefaults(defineProps<{ formType?: FormType; planId: number }>(), {
   formType: 'update',
 });
 const isEditable = computed(() => props.formType !== 'detail'); // 是否可编辑
diff --git a/apps/web-antd/src/views/mes/cal/plan/modules/team-list.vue b/apps/web-antd/src/views/mes/cal/plan/modules/team-list.vue
index cac43c757..8e4e73e4b 100644
--- a/apps/web-antd/src/views/mes/cal/plan/modules/team-list.vue
+++ b/apps/web-antd/src/views/mes/cal/plan/modules/team-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesCalPlanTeamApi } from '#/api/mes/cal/plan/team';
 import type { MesCalTeamApi } from '#/api/mes/cal/team';
@@ -14,7 +16,7 @@ import { getTeamMemberListByTeam } from '#/api/mes/cal/team/member';
 import { $t } from '#/locales';
 import { CalTeamSelectDialog } from '#/views/mes/cal/team/components';
 
-const props = withDefaults(defineProps<{ formType?: string; planId: number }>(), {
+const props = withDefaults(defineProps<{ formType?: FormType; planId: number }>(), {
   formType: 'update',
 });
 const isEditable = computed(() => props.formType !== 'detail'); // 是否可编辑
diff --git a/apps/web-antd/src/views/mes/cal/team/data.ts b/apps/web-antd/src/views/mes/cal/team/data.ts
index 3c0f83f96..17df1d06a 100644
--- a/apps/web-antd/src/views/mes/cal/team/data.ts
+++ b/apps/web-antd/src/views/mes/cal/team/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改班组的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/cal/team/index.vue b/apps/web-antd/src/views/mes/cal/team/index.vue
index d5d10fb95..fc08306e3 100644
--- a/apps/web-antd/src/views/mes/cal/team/index.vue
+++ b/apps/web-antd/src/views/mes/cal/team/index.vue
@@ -26,17 +26,17 @@ function handleRefresh() {
 
 /** 创建班组 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看班组 */
 function handleDetail(row: MesCalTeamApi.Team) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑班组 */
 function handleEdit(row: MesCalTeamApi.Team) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除班组 */
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 91860306b..4f4128b48 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesCalTeamApi } from '#/api/mes/cal/team';
 
 import { computed, ref } from 'vue';
@@ -15,18 +17,16 @@ import { useFormSchema } from '../data';
 import MemberList from './member-list.vue';
 
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('member'); // 当前资源页签
 const formData = ref<MesCalTeamApi.Team>();
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['班组']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['班组'])
     : $t('ui.actionTitle.create', ['班组']);
 });
@@ -62,11 +62,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesCalTeamApi.Team;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createTeam(data);
         formData.value = { ...data, id: id as number };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateTeam(data);
         formData.value = { ...formData.value, ...data };
@@ -85,10 +85,10 @@ 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');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -108,12 +108,12 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <Tabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model:active-key="subTabsName"
       class="mx-4 mt-4"
     >
       <Tabs.TabPane key="member" tab="班组成员">
-        <MemberList :form-type="formMode" :team-id="formData.id" />
+        <MemberList :form-type="formType" :team-id="formData.id" />
       </Tabs.TabPane>
     </Tabs>
   </Modal>
diff --git a/apps/web-antd/src/views/mes/cal/team/modules/member-list.vue b/apps/web-antd/src/views/mes/cal/team/modules/member-list.vue
index 0630dd10d..766be7372 100644
--- a/apps/web-antd/src/views/mes/cal/team/modules/member-list.vue
+++ b/apps/web-antd/src/views/mes/cal/team/modules/member-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesCalTeamMemberApi } from '#/api/mes/cal/team/member';
 
@@ -16,7 +18,7 @@ import {
 import { getSimpleUserList } from '#/api/system/user';
 import { $t } from '#/locales';
 
-const props = withDefaults(defineProps<{ formType?: string; teamId: number }>(), {
+const props = withDefaults(defineProps<{ formType?: FormType; teamId: number }>(), {
   formType: 'update',
 });
 const isEditable = computed(() => ['create', 'update'].includes(props.formType)); // 是否可编辑
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/data.ts b/apps/web-antd/src/views/mes/dv/checkplan/data.ts
index ab9a41f84..6c2b9ad0b 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/data.ts
+++ b/apps/web-antd/src/views/mes/dv/checkplan/data.ts
@@ -18,6 +18,9 @@ import {
   MesDvSubjectTypeEnum,
 } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改点检保养方案的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/index.vue b/apps/web-antd/src/views/mes/dv/checkplan/index.vue
index 0f9ada592..e3fd69f70 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/index.vue
+++ b/apps/web-antd/src/views/mes/dv/checkplan/index.vue
@@ -34,17 +34,17 @@ function handleRefresh() {
 
 /** 创建点检计划 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看点检计划 */
 function handleDetail(row: MesDvCheckPlanApi.CheckPlan) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑点检计划 */
 function handleEdit(row: MesDvCheckPlanApi.CheckPlan) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除点检计划 */
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 516b8a532..3277e9f77 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
 
 import { computed, ref } from 'vue';
@@ -16,18 +18,16 @@ import { useFormSchema } from '../data';
 import MachineryList from './machinery-list.vue';
 import SubjectList from './subject-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create');
+const formType = ref<FormType>('create');
 const subTabsName = ref('machinery');
 const formData = ref<MesDvCheckPlanApi.CheckPlan>();
-const isDetail = computed(() => formMode.value === 'detail');
+const isDetail = computed(() => formType.value === 'detail');
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看点检保养方案';
   }
-  return formMode.value === 'update' ? '修改点检保养方案' : '新增点检保养方案';
+  return formType.value === 'update' ? '修改点检保养方案' : '新增点检保养方案';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -61,11 +61,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesDvCheckPlanApi.CheckPlan;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createCheckPlan(data);
         formData.value = { ...data, id: id as number, status: MesDvCheckPlanStatusEnum.PREPARE };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateCheckPlan(data);
         formData.value = { ...formData.value, ...data };
@@ -84,10 +84,10 @@ 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');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -106,15 +106,15 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <Tabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model:active-key="subTabsName"
       class="mx-4 mt-4"
     >
       <Tabs.TabPane key="machinery" tab="设备">
-        <MachineryList :form-type="formMode" :plan-id="formData.id" />
+        <MachineryList :form-type="formType" :plan-id="formData.id" />
       </Tabs.TabPane>
       <Tabs.TabPane key="subject" tab="项目">
-        <SubjectList :form-type="formMode" :plan-id="formData.id" :plan-type="formData.type" />
+        <SubjectList :form-type="formType" :plan-id="formData.id" :plan-type="formData.type" />
       </Tabs.TabPane>
     </Tabs>
   </Modal>
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/modules/machinery-list.vue b/apps/web-antd/src/views/mes/dv/checkplan/modules/machinery-list.vue
index 09ce92880..c2b0143f2 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/modules/machinery-list.vue
+++ b/apps/web-antd/src/views/mes/dv/checkplan/modules/machinery-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvCheckPlanMachineryApi } from '#/api/mes/dv/checkplan/machinery';
 
@@ -17,7 +19,7 @@ import { $t } from '#/locales';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
 
 const props = withDefaults(
-  defineProps<{ formType?: string; planId: number; planType?: number }>(),
+  defineProps<{ formType?: FormType; planId: number; planType?: number }>(),
   { formType: 'update', planType: undefined },
 );
 const isEditable = computed(() => props.formType !== 'detail');
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/modules/subject-list.vue b/apps/web-antd/src/views/mes/dv/checkplan/modules/subject-list.vue
index 7765cdbaf..71dba2889 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/modules/subject-list.vue
+++ b/apps/web-antd/src/views/mes/dv/checkplan/modules/subject-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvCheckPlanSubjectApi } from '#/api/mes/dv/checkplan/subject';
 
@@ -19,7 +21,7 @@ import { $t } from '#/locales';
 import { DvSubjectSelect } from '#/views/mes/dv/subject/components';
 
 const props = withDefaults(
-  defineProps<{ formType?: string; planId: number; planType?: number }>(),
+  defineProps<{ formType?: FormType; planId: number; planType?: number }>(),
   { formType: 'update', planType: undefined },
 );
 const isEditable = computed(() => props.formType !== 'detail');
diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/data.ts b/apps/web-antd/src/views/mes/dv/checkrecord/data.ts
index 68ffa8567..fce03470a 100644
--- a/apps/web-antd/src/views/mes/dv/checkrecord/data.ts
+++ b/apps/web-antd/src/views/mes/dv/checkrecord/data.ts
@@ -17,6 +17,9 @@ import {
   MesDvSubjectTypeEnum,
 } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改点检记录的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/index.vue b/apps/web-antd/src/views/mes/dv/checkrecord/index.vue
index cc76f8423..0e5346ac7 100644
--- a/apps/web-antd/src/views/mes/dv/checkrecord/index.vue
+++ b/apps/web-antd/src/views/mes/dv/checkrecord/index.vue
@@ -27,17 +27,17 @@ function handleRefresh() {
 
 /** 创建点检记录 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看点检记录 */
 function handleDetail(row: MesDvCheckRecordApi.CheckRecord) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑点检记录 */
 function handleEdit(row: MesDvCheckRecordApi.CheckRecord) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除点检记录 */
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 d8093f428..95c7aa8de 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord';
 
 import { computed, ref } from 'vue';
@@ -20,20 +22,18 @@ import { MesDvCheckRecordStatusEnum } from '#/views/mes/utils/constants';
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create');
+const formType = ref<FormType>('create');
 const formData = ref<MesDvCheckRecordApi.CheckRecord>();
-const isDetail = computed(() => formMode.value === 'detail');
+const isDetail = computed(() => formType.value === 'detail');
 const canSubmit = computed(
-  () => formMode.value === 'update' && formData.value?.status === MesDvCheckRecordStatusEnum.DRAFT,
+  () => formType.value === 'update' && formData.value?.status === MesDvCheckRecordStatusEnum.DRAFT,
 );
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看点检记录';
   }
-  return formMode.value === 'update' ? '修改点检记录' : '新增点检记录';
+  return formType.value === 'update' ? '修改点检记录' : '新增点检记录';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -83,11 +83,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesDvCheckRecordApi.CheckRecord;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createCheckRecord(data);
         formData.value = { ...data, id: id as number, status: MesDvCheckRecordStatusEnum.DRAFT };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateCheckRecord(data);
         formData.value = { ...formData.value, ...data };
@@ -105,10 +105,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-antd/src/views/mes/dv/machinery/data.ts b/apps/web-antd/src/views/mes/dv/machinery/data.ts
index ad6b99f20..27cfbe5dc 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/data.ts
+++ b/apps/web-antd/src/views/mes/dv/machinery/data.ts
@@ -1,5 +1,3 @@
-import type { Ref } from 'vue';
-
 import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
@@ -18,8 +16,11 @@ import { MesAutoCodeRuleCode, MesDvMachineryStatusEnum } from '#/views/mes/utils
 
 import { DvMachineryTypeSelect } from './type/components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改设备的表单 */
-export function useFormSchema(formApi?: VbenFormApi, formMode?: Ref<string>): VbenFormSchema[] {
+export function useFormSchema(formType: FormType, formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -125,7 +126,7 @@ export function useFormSchema(formApi?: VbenFormApi, formMode?: Ref<string>): Vb
       },
       dependencies: {
         triggerFields: ['id'],
-        show: () => formMode?.value === 'detail',
+        show: () => formType === 'detail',
       },
     },
     {
@@ -141,7 +142,7 @@ export function useFormSchema(formApi?: VbenFormApi, formMode?: Ref<string>): Vb
       },
       dependencies: {
         triggerFields: ['id'],
-        show: () => formMode?.value === 'detail',
+        show: () => formType === 'detail',
       },
     },
     {
diff --git a/apps/web-antd/src/views/mes/dv/machinery/index.vue b/apps/web-antd/src/views/mes/dv/machinery/index.vue
index cac7195df..8fb60e84f 100644
--- a/apps/web-antd/src/views/mes/dv/machinery/index.vue
+++ b/apps/web-antd/src/views/mes/dv/machinery/index.vue
@@ -37,17 +37,17 @@ function handleRefresh() {
 
 /** 创建设备 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看设备 */
 function handleDetail(row: MesDvMachineryApi.Machinery) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑设备 */
 function handleEdit(row: MesDvMachineryApi.Machinery) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除设备 */
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 e8f590eed..b148583a8 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
 
 import { computed, ref } from 'vue';
@@ -18,19 +20,17 @@ import CheckRecordList from './check-record-list.vue';
 import MaintenRecordList from './mainten-record-list.vue';
 import RepairList from './repair-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('check'); // 当前资源页签
 const formData = ref<MesDvMachineryApi.Machinery>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看设备';
   }
-  return formMode.value === 'update' ? '修改设备' : '新增设备';
+  return formType.value === 'update' ? '修改设备' : '新增设备';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -48,7 +48,7 @@ const [Form, formApi] = useVbenForm({
 });
 
 /** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi, formMode) });
+formApi.setState({ schema: useFormSchema(formType.value, formApi) });
 
 /** 查看设备条码 */
 function handleBarcode() {
@@ -94,10 +94,11 @@ 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');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -117,7 +118,7 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <Tabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model:active-key="subTabsName"
       class="mx-4 mt-4"
     >
diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts b/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts
index 56368a6b4..4a7b0e2d4 100644
--- a/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts
+++ b/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts
@@ -17,6 +17,9 @@ import {
   MesDvSubjectTypeEnum,
 } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改保养记录的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue b/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue
index 3aa1f4e5f..c7940f347 100644
--- a/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue
+++ b/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue
@@ -31,17 +31,17 @@ function handleRefresh() {
 
 /** 创建保养记录 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看保养记录 */
 function handleDetail(row: MesDvMaintenRecordApi.MaintenRecord) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑保养记录 */
 function handleEdit(row: MesDvMaintenRecordApi.MaintenRecord) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除保养记录 */
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 e2f445119..837f1ef62 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord';
 
 import { computed, ref } from 'vue';
@@ -21,22 +23,20 @@ import { MesDvMaintenRecordStatusEnum } from '#/views/mes/utils/constants';
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
 const userStore = useUserStore();
-const formMode = ref<FormMode>('create');
+const formType = ref<FormType>('create');
 const formData = ref<MesDvMaintenRecordApi.MaintenRecord>();
-const isDetail = computed(() => formMode.value === 'detail');
+const isDetail = computed(() => formType.value === 'detail');
 const canSubmit = computed(
   () =>
-    formMode.value === 'update' && formData.value?.status === MesDvMaintenRecordStatusEnum.PREPARE,
+    formType.value === 'update' && formData.value?.status === MesDvMaintenRecordStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看保养记录';
   }
-  return formMode.value === 'update' ? '修改保养记录' : '新增保养记录';
+  return formType.value === 'update' ? '修改保养记录' : '新增保养记录';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -86,7 +86,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesDvMaintenRecordApi.MaintenRecord;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createMaintenRecord(data);
         formData.value = {
           ...data,
@@ -94,7 +94,7 @@ const [Modal, modalApi] = useVbenModal({
           status: MesDvMaintenRecordStatusEnum.PREPARE,
         };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateMaintenRecord(data);
         formData.value = { ...formData.value, ...data };
@@ -112,10 +112,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       await formApi.setFieldValue('userId', userStore.userInfo?.id);
       return;
diff --git a/apps/web-antd/src/views/mes/dv/repair/data.ts b/apps/web-antd/src/views/mes/dv/repair/data.ts
index 71029e5a1..4bc44e428 100644
--- a/apps/web-antd/src/views/mes/dv/repair/data.ts
+++ b/apps/web-antd/src/views/mes/dv/repair/data.ts
@@ -14,6 +14,9 @@ import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
 import { MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '#/views/mes/utils/constants';
+/** 表单类型 */
+export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
+
 /** 新增/修改维修工单的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/dv/repair/index.vue b/apps/web-antd/src/views/mes/dv/repair/index.vue
index dc91fa735..c66bf2f73 100644
--- a/apps/web-antd/src/views/mes/dv/repair/index.vue
+++ b/apps/web-antd/src/views/mes/dv/repair/index.vue
@@ -27,27 +27,27 @@ function handleRefresh() {
 
 /** 创建维修工单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看维修工单 */
 function handleDetail(row: MesDvRepairApi.Repair) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑维修工单 */
 function handleEdit(row: MesDvRepairApi.Repair) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 完成维修 */
 function handleConfirm(row: MesDvRepairApi.Repair) {
-  formModalApi.setData({ id: row.id, type: 'confirm' }).open();
+  formModalApi.setData({ id: row.id, formType: 'confirm' }).open();
 }
 
 /** 验收维修 */
 function handleFinish(row: MesDvRepairApi.Repair) {
-  formModalApi.setData({ id: row.id, type: 'finish' }).open();
+  formModalApi.setData({ id: row.id, formType: 'finish' }).open();
 }
 
 /** 删除维修工单 */
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 1914e68d2..ded9ae757 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvRepairApi } from '#/api/mes/dv/repair';
 
 import { computed, ref } from 'vue';
@@ -22,15 +24,13 @@ 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<FormMode>('create');
+const formType = ref<FormType>('create');
 const formData = ref<MesDvRepairApi.Repair>();
-const isDetail = computed(() => formMode.value === 'detail');
-const isReadonly = computed(() => ['confirm', 'detail', 'finish'].includes(formMode.value));
+const isDetail = computed(() => formType.value === 'detail');
+const isReadonly = computed(() => ['confirm', 'detail', 'finish'].includes(formType.value));
 const canSubmit = computed(
-  () => formMode.value === 'update' && formData.value?.status === MesDvRepairStatusEnum.PREPARE,
+  () => formType.value === 'update' && formData.value?.status === MesDvRepairStatusEnum.PREPARE,
 );
 const getTitle = computed(
   () =>
@@ -40,7 +40,7 @@ const getTitle = computed(
       confirm: '完成维修',
       finish: '验收维修',
       detail: '查看维修工单',
-    })[formMode.value],
+    })[formType.value],
 );
 
 const [Form, formApi] = useVbenForm({
@@ -132,7 +132,7 @@ async function doFinish(result: number) {
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    if (isDetail.value || formMode.value === 'confirm' || formMode.value === 'finish') {
+    if (isDetail.value || formType.value === 'confirm' || formType.value === 'finish') {
       await modalApi.close();
       return;
     }
@@ -144,11 +144,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesDvRepairApi.Repair;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createRepair(data);
         formData.value = { ...data, id: id as number, status: MesDvRepairStatusEnum.PREPARE };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateRepair(data);
         formData.value = { ...formData.value, ...data };
@@ -166,10 +166,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(isReadonly.value);
-    modalApi.setState({ showConfirmButton: ['create', 'update'].includes(formMode.value) });
+    modalApi.setState({ showConfirmButton: ['create', 'update'].includes(formType.value) });
     if (!data?.id) {
       return;
     }
@@ -198,21 +198,21 @@ const [Modal, modalApi] = useVbenModal({
           <Button type="primary">提交</Button>
         </Popconfirm>
         <Popconfirm
-          v-if="formMode === 'confirm'"
+          v-if="formType === 'confirm'"
           title="确认完成维修？完成后进入待验收。"
           @confirm="handleConfirm"
         >
           <Button type="primary">完成维修</Button>
         </Popconfirm>
         <Popconfirm
-          v-if="formMode === 'finish'"
+          v-if="formType === 'finish'"
           title="确认完成验收？"
           @confirm="handleFinish(MesDvRepairResultEnum.PASS)"
         >
           <Button type="primary">验收通过</Button>
         </Popconfirm>
         <Popconfirm
-          v-if="formMode === 'finish'"
+          v-if="formType === 'finish'"
           title="确认完成验收？"
           @confirm="handleFinish(MesDvRepairResultEnum.FAIL)"
         >
diff --git a/apps/web-antd/src/views/mes/dv/subject/data.ts b/apps/web-antd/src/views/mes/dv/subject/data.ts
index 21d51902b..c89cb9c23 100644
--- a/apps/web-antd/src/views/mes/dv/subject/data.ts
+++ b/apps/web-antd/src/views/mes/dv/subject/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改点检保养项目的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/dv/subject/index.vue b/apps/web-antd/src/views/mes/dv/subject/index.vue
index 6aabbdeea..a52e2d5c3 100644
--- a/apps/web-antd/src/views/mes/dv/subject/index.vue
+++ b/apps/web-antd/src/views/mes/dv/subject/index.vue
@@ -26,17 +26,17 @@ function handleRefresh() {
 
 /** 创建点检保养项目 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看点检保养项目 */
 function handleDetail(row: MesDvSubjectApi.Subject) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑点检保养项目 */
 function handleEdit(row: MesDvSubjectApi.Subject) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除点检保养项目 */
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 6a1fead3a..ebda266c9 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvSubjectApi } from '#/api/mes/dv/subject';
 
 import { computed, ref } from 'vue';
@@ -13,16 +15,14 @@ import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const formType = ref<FormType>('create'); // 表单模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看点检保养项目';
   }
-  return formMode.value === 'update' ? '修改点检保养项目' : '新增点检保养项目';
+  return formType.value === 'update' ? '修改点检保养项目' : '新增点检保养项目';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -71,10 +71,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-antd/src/views/mes/md/client/data.ts b/apps/web-antd/src/views/mes/md/client/data.ts
index 11b04c915..9263b82d9 100644
--- a/apps/web-antd/src/views/mes/md/client/data.ts
+++ b/apps/web-antd/src/views/mes/md/client/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改客户的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/md/client/index.vue b/apps/web-antd/src/views/mes/md/client/index.vue
index d1d2b0b25..16b6da084 100644
--- a/apps/web-antd/src/views/mes/md/client/index.vue
+++ b/apps/web-antd/src/views/mes/md/client/index.vue
@@ -32,17 +32,17 @@ function handleRefresh() {
 
 /** 创建客户 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看客户 */
 function handleDetail(row: MesMdClientApi.Client) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑客户 */
 function handleEdit(row: MesMdClientApi.Client) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除客户 */
diff --git a/apps/web-antd/src/views/mes/md/client/modules/form.vue b/apps/web-antd/src/views/mes/md/client/modules/form.vue
index 4f4d2dda7..49e3a4eff 100644
--- a/apps/web-antd/src/views/mes/md/client/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/client/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdClientApi } from '#/api/mes/md/client';
 
 import { computed, ref } from 'vue';
@@ -15,19 +17,17 @@ import { useFormSchema } from '../data';
 import ClientProductSalesLineList from './product-sales-line-list.vue';
 import ClientProductSalesList from './product-sales-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('productSalesLine'); // 当前子表页签
 const formData = ref<MesMdClientApi.Client>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看客户';
   }
-  return formMode.value === 'update' ? '修改客户' : '新增客户';
+  return formType.value === 'update' ? '修改客户' : '新增客户';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -78,10 +78,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTabsName.value = 'productSalesLine';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -101,7 +101,7 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <Tabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model:active-key="subTabsName"
       class="mx-4 mt-4"
     >
diff --git a/apps/web-antd/src/views/mes/md/client/modules/product-sales-line-list.vue b/apps/web-antd/src/views/mes/md/client/modules/product-sales-line-list.vue
index 849d5d304..42c050752 100644
--- a/apps/web-antd/src/views/mes/md/client/modules/product-sales-line-list.vue
+++ b/apps/web-antd/src/views/mes/md/client/modules/product-sales-line-list.vue
@@ -21,7 +21,7 @@ const [ItemFormModal, itemFormModalApi] = useVbenModal({
 
 /** 查看物料详情 */
 function handleViewItem(row: MesWmProductSalesLineApi.ProductSalesLine) {
-  itemFormModalApi.setData({ id: row.itemId, type: 'detail' }).open();
+  itemFormModalApi.setData({ id: row.itemId, formType: 'detail' }).open();
 }
 
 const [Grid] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/mes/md/item/data.ts b/apps/web-antd/src/views/mes/md/item/data.ts
index ee80d1f3e..175af9b57 100644
--- a/apps/web-antd/src/views/mes/md/item/data.ts
+++ b/apps/web-antd/src/views/mes/md/item/data.ts
@@ -16,6 +16,9 @@ import { MdItemTypeSelect } from '#/views/mes/md/item/type/components';
 import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改物料产品的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/md/item/index.vue b/apps/web-antd/src/views/mes/md/item/index.vue
index da93b46b7..2cbcbb48e 100644
--- a/apps/web-antd/src/views/mes/md/item/index.vue
+++ b/apps/web-antd/src/views/mes/md/item/index.vue
@@ -46,17 +46,17 @@ function handleRefresh() {
 
 /** 创建物料 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看物料 */
 function handleDetail(row: MesMdItemApi.Item) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑物料 */
 function handleEdit(row: MesMdItemApi.Item) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除物料 */
diff --git a/apps/web-antd/src/views/mes/md/item/modules/form.vue b/apps/web-antd/src/views/mes/md/item/modules/form.vue
index 40eeed34b..15ff74a2b 100644
--- a/apps/web-antd/src/views/mes/md/item/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/item/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdItemApi } from '#/api/mes/md/item';
 
 import { computed, ref } from 'vue';
@@ -19,20 +21,18 @@ import ProductBomForm from './product-bom-form.vue';
 import ProductSipForm from './product-sip-form.vue';
 import ProductSopForm from './product-sop-form.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('bom'); // 当前子表页签
 const formData = ref<MesMdItemApi.Item>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看物料/产品';
   }
-  return formMode.value === 'update' ? '修改物料/产品' : '新增物料/产品';
+  return formType.value === 'update' ? '修改物料/产品' : '新增物料/产品';
 });
 const currentItemOrProduct = computed(
   () => formData.value?.itemOrProduct || '',
@@ -82,11 +82,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesMdItemApi.Item;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createItem(data);
         formData.value = { ...data, id };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
         message.success($t('ui.actionMessage.operationSuccess'));
       } else {
         await updateItem(data);
@@ -106,10 +106,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTabsName.value = 'bom';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -129,16 +129,16 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <Tabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model:active-key="subTabsName"
       class="mx-4 mt-4"
     >
       <Tabs.TabPane key="bom" tab="BOM 组成">
-        <ProductBomForm :form-type="formMode" :item-id="formData.id" />
+        <ProductBomForm :form-type="formType" :item-id="formData.id" />
       </Tabs.TabPane>
       <Tabs.TabPane v-if="formData.batchFlag" key="batch" tab="批次属性">
         <ItemBatchConfigForm
-          :form-type="formMode"
+          :form-type="formType"
           :item-id="formData.id"
           :item-or-product="currentItemOrProduct"
         />
@@ -147,10 +147,10 @@ const [Modal, modalApi] = useVbenModal({
         <Empty description="替代品（待实现）" />
       </Tabs.TabPane>
       <Tabs.TabPane key="sip" tab="SIP">
-        <ProductSipForm :form-type="formMode" :item-id="formData.id" />
+        <ProductSipForm :form-type="formType" :item-id="formData.id" />
       </Tabs.TabPane>
       <Tabs.TabPane key="sop" tab="SOP">
-        <ProductSopForm :form-type="formMode" :item-id="formData.id" />
+        <ProductSopForm :form-type="formType" :item-id="formData.id" />
       </Tabs.TabPane>
     </Tabs>
     <template #prepend-footer>
diff --git a/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue b/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue
index ab050e4f0..31975250d 100644
--- a/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue
+++ b/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdItemBatchConfigApi } from '#/api/mes/md/item/batchConfig';
 
 import { computed, ref, watch } from 'vue';
@@ -13,7 +15,7 @@ import { MesItemOrProductEnum } from '#/views/mes/utils/constants';
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     itemId: number;
     itemOrProduct?: string;
   }>(),
diff --git a/apps/web-antd/src/views/mes/md/item/modules/product-bom-form.vue b/apps/web-antd/src/views/mes/md/item/modules/product-bom-form.vue
index 4cd60c3e2..aca60e4e3 100644
--- a/apps/web-antd/src/views/mes/md/item/modules/product-bom-form.vue
+++ b/apps/web-antd/src/views/mes/md/item/modules/product-bom-form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdItemApi } from '#/api/mes/md/item';
 import type { MesMdProductBomApi } from '#/api/mes/md/item/productBom';
@@ -22,7 +24,7 @@ import { useProductBomGridColumns } from '../data';
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     itemId: number;
   }>(),
   {
diff --git a/apps/web-antd/src/views/mes/md/item/modules/product-media-list.vue b/apps/web-antd/src/views/mes/md/item/modules/product-media-list.vue
index 2f1ebb88e..ae48c37bc 100644
--- a/apps/web-antd/src/views/mes/md/item/modules/product-media-list.vue
+++ b/apps/web-antd/src/views/mes/md/item/modules/product-media-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdProductSipApi } from '#/api/mes/md/item/productSip';
 import type { MesMdProductSopApi } from '#/api/mes/md/item/productSop';
 
@@ -36,7 +38,7 @@ type MediaItem = MesMdProductSipApi.ProductSip | MesMdProductSopApi.ProductSop;
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     itemId: number;
     kind: MediaKind;
   }>(),
diff --git a/apps/web-antd/src/views/mes/md/item/modules/product-sip-form.vue b/apps/web-antd/src/views/mes/md/item/modules/product-sip-form.vue
index a37cdcaec..b971f4631 100644
--- a/apps/web-antd/src/views/mes/md/item/modules/product-sip-form.vue
+++ b/apps/web-antd/src/views/mes/md/item/modules/product-sip-form.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import ProductMediaList from './product-media-list.vue';
 
 defineProps<{
-  formType?: string;
+  formType?: FormType;
   itemId: number;
 }>();
 </script>
diff --git a/apps/web-antd/src/views/mes/md/item/modules/product-sop-form.vue b/apps/web-antd/src/views/mes/md/item/modules/product-sop-form.vue
index 93a73a9b3..a9bb4f5b3 100644
--- a/apps/web-antd/src/views/mes/md/item/modules/product-sop-form.vue
+++ b/apps/web-antd/src/views/mes/md/item/modules/product-sop-form.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import ProductMediaList from './product-media-list.vue';
 
 defineProps<{
-  formType?: string;
+  formType?: FormType;
   itemId: number;
 }>();
 </script>
diff --git a/apps/web-antd/src/views/mes/md/vendor/data.ts b/apps/web-antd/src/views/mes/md/vendor/data.ts
index 5f31bcf79..d40db4eac 100644
--- a/apps/web-antd/src/views/mes/md/vendor/data.ts
+++ b/apps/web-antd/src/views/mes/md/vendor/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改供应商的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/md/vendor/index.vue b/apps/web-antd/src/views/mes/md/vendor/index.vue
index e33be1f86..97afba8b7 100644
--- a/apps/web-antd/src/views/mes/md/vendor/index.vue
+++ b/apps/web-antd/src/views/mes/md/vendor/index.vue
@@ -32,17 +32,17 @@ function handleRefresh() {
 
 /** 创建供应商 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看供应商 */
 function handleDetail(row: MesMdVendorApi.Vendor) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑供应商 */
 function handleEdit(row: MesMdVendorApi.Vendor) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除供应商 */
diff --git a/apps/web-antd/src/views/mes/md/vendor/modules/form.vue b/apps/web-antd/src/views/mes/md/vendor/modules/form.vue
index b45af94bb..f12e7c206 100644
--- a/apps/web-antd/src/views/mes/md/vendor/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/vendor/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdVendorApi } from '#/api/mes/md/vendor';
 
 import { computed, ref } from 'vue';
@@ -15,19 +17,17 @@ import { useFormSchema } from '../data';
 import VendorItemReceiptLineList from './item-receipt-line-list.vue';
 import VendorItemReceiptList from './item-receipt-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('itemReceiptLine'); // 当前子表页签
 const formData = ref<MesMdVendorApi.Vendor>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['供应商']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['供应商'])
     : $t('ui.actionTitle.create', ['供应商']);
 });
@@ -80,10 +80,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTabsName.value = 'itemReceiptLine';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -103,7 +103,7 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <Tabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model:active-key="subTabsName"
       class="mx-4 mt-4"
     >
diff --git a/apps/web-antd/src/views/mes/md/vendor/modules/item-receipt-line-list.vue b/apps/web-antd/src/views/mes/md/vendor/modules/item-receipt-line-list.vue
index c1d536884..8c679805d 100644
--- a/apps/web-antd/src/views/mes/md/vendor/modules/item-receipt-line-list.vue
+++ b/apps/web-antd/src/views/mes/md/vendor/modules/item-receipt-line-list.vue
@@ -21,7 +21,7 @@ const [ItemFormModal, itemFormModalApi] = useVbenModal({
 
 /** 查看物料详情 */
 function handleViewItem(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
-  itemFormModalApi.setData({ id: row.itemId, type: 'detail' }).open();
+  itemFormModalApi.setData({ id: row.itemId, formType: 'detail' }).open();
 }
 
 const [Grid] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/mes/md/workstation/data.ts b/apps/web-antd/src/views/mes/md/workstation/data.ts
index 2b4848ff5..d49185821 100644
--- a/apps/web-antd/src/views/mes/md/workstation/data.ts
+++ b/apps/web-antd/src/views/mes/md/workstation/data.ts
@@ -19,6 +19,9 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 import { MdWorkshopSelect } from './components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改工作站的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/md/workstation/index.vue b/apps/web-antd/src/views/mes/md/workstation/index.vue
index 4af64d70d..657342ca7 100644
--- a/apps/web-antd/src/views/mes/md/workstation/index.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/index.vue
@@ -36,17 +36,17 @@ function handleRefresh() {
 
 /** 创建工作站 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看工作站 */
 function handleDetail(row: MesMdWorkstationApi.Workstation) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑工作站 */
 function handleEdit(row: MesMdWorkstationApi.Workstation) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除工作站 */
diff --git a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue
index e1358c8e6..aa3f269bf 100644
--- a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
 
 import { computed, ref } from 'vue';
@@ -22,20 +24,18 @@ import MachineList from './machine-list.vue';
 import ToolList from './tool-list.vue';
 import WorkerList from './worker-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('machine'); // 当前资源页签
 const formData = ref<MesMdWorkstationApi.Workstation>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看工作站';
   }
-  return formMode.value === 'update' ? '修改工作站' : '新增工作站';
+  return formType.value === 'update' ? '修改工作站' : '新增工作站';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -82,11 +82,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesMdWorkstationApi.Workstation;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createWorkstation(data);
         formData.value = { ...data, id };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateWorkstation(data);
         formData.value = { ...formData.value, ...data };
@@ -105,10 +105,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTabsName.value = 'machine';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -128,18 +128,18 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <Tabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model:active-key="subTabsName"
       class="mx-4 mt-4"
     >
       <Tabs.TabPane key="machine" tab="设备资源">
-        <MachineList :form-type="formMode" :workstation-id="formData.id" />
+        <MachineList :form-type="formType" :workstation-id="formData.id" />
       </Tabs.TabPane>
       <Tabs.TabPane key="tool" tab="工装夹具">
-        <ToolList :form-type="formMode" :workstation-id="formData.id" />
+        <ToolList :form-type="formType" :workstation-id="formData.id" />
       </Tabs.TabPane>
       <Tabs.TabPane key="worker" tab="人力资源">
-        <WorkerList :form-type="formMode" :workstation-id="formData.id" />
+        <WorkerList :form-type="formType" :workstation-id="formData.id" />
       </Tabs.TabPane>
     </Tabs>
     <template #prepend-footer>
diff --git a/apps/web-antd/src/views/mes/md/workstation/modules/machine-list.vue b/apps/web-antd/src/views/mes/md/workstation/modules/machine-list.vue
index 2eb7e9fe4..f4edeccb3 100644
--- a/apps/web-antd/src/views/mes/md/workstation/modules/machine-list.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/modules/machine-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkstationMachineApi } from '#/api/mes/md/workstation/machine';
 
@@ -20,7 +22,7 @@ defineOptions({ name: 'MesMdWorkstationMachineList' });
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     workstationId: number;
   }>(),
   {
diff --git a/apps/web-antd/src/views/mes/md/workstation/modules/tool-list.vue b/apps/web-antd/src/views/mes/md/workstation/modules/tool-list.vue
index fc233c03d..5f9d473d9 100644
--- a/apps/web-antd/src/views/mes/md/workstation/modules/tool-list.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/modules/tool-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkstationToolApi } from '#/api/mes/md/workstation/tool';
 
@@ -21,7 +23,7 @@ defineOptions({ name: 'MesMdWorkstationToolList' });
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     workstationId: number;
   }>(),
   {
diff --git a/apps/web-antd/src/views/mes/md/workstation/modules/worker-list.vue b/apps/web-antd/src/views/mes/md/workstation/modules/worker-list.vue
index 6eb4d2a21..5e1e58940 100644
--- a/apps/web-antd/src/views/mes/md/workstation/modules/worker-list.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/modules/worker-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkstationWorkerApi } from '#/api/mes/md/workstation/worker';
 
@@ -21,7 +23,7 @@ defineOptions({ name: 'MesMdWorkstationWorkerList' });
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     workstationId: number;
   }>(),
   {
diff --git a/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts b/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts
index e0e03b258..e7d804266 100644
--- a/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts
+++ b/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts
@@ -14,6 +14,9 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改车间的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/md/workstation/workshop/index.vue b/apps/web-antd/src/views/mes/md/workstation/workshop/index.vue
index 9e12e4af5..6cbd46ee3 100644
--- a/apps/web-antd/src/views/mes/md/workstation/workshop/index.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/workshop/index.vue
@@ -28,17 +28,17 @@ function handleRefresh() {
 
 /** 创建车间 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看车间 */
 function handleDetail(row: MesMdWorkshopApi.Workshop) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑车间 */
 function handleEdit(row: MesMdWorkshopApi.Workshop) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除车间 */
diff --git a/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue b/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue
index f09ab589e..1b708029b 100644
--- a/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop';
 
 import { computed, ref } from 'vue';
@@ -19,19 +21,17 @@ import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const formData = ref<MesMdWorkshopApi.Workshop>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看车间';
   }
-  return formMode.value === 'update' ? '修改车间' : '新增车间';
+  return formType.value === 'update' ? '修改车间' : '新增车间';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -94,10 +94,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/data.ts b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
index 017596872..baafa5d1a 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/data.ts
+++ b/apps/web-antd/src/views/mes/pro/andon/record/data.ts
@@ -17,6 +17,9 @@ import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
 
 import { AndonConfigSelect } from '../config/components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
@@ -132,7 +135,7 @@ export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.Andon
  * - detail：所有字段只读
  */
 export function useFormSchema(
-  formType: string,
+  formType: FormType,
   formApi?: VbenFormApi,
 ): VbenFormSchema[] {
   const isCreate = formType === 'create';
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/index.vue b/apps/web-antd/src/views/mes/pro/andon/record/index.vue
index c3c819160..d6b256fbc 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/index.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/record/index.vue
@@ -36,17 +36,17 @@ function handleRefresh() {
 
 /** 新增记录 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 处置记录 */
 function handleHandle(row: MesProAndonRecordApi.AndonRecord) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 详情 */
 function handleDetail(row: MesProAndonRecordApi.AndonRecord) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 删除 */
diff --git a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
index 295b2489d..1b7272681 100644
--- a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 
 import { computed, ref } from 'vue';
@@ -19,19 +21,17 @@ import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式：新增 / 处置 / 详情
+const formType = ref<FormType>('create'); // 表单模式：新增 / 处置 / 详情
 const formData = ref<MesProAndonRecordApi.AndonRecord>();
 const userStore = useUserStore();
 
-const isUpdate = computed(() => formMode.value === 'update'); // 是否处置模式
+const isUpdate = computed(() => formType.value === 'update'); // 是否处置模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['安灯呼叫']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['安灯呼叫'])
     : $t('ui.actionTitle.create', ['安灯呼叫']);
 });
@@ -50,7 +50,7 @@ const [Form, formApi] = useVbenForm({
 });
 
 /** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+formApi.setState({ schema: useFormSchema(formType.value, formApi) });
 
 /** 处置：保存（保持 ACTIVE 状态） */
 async function handleSave() {
@@ -104,7 +104,7 @@ async function handleFinish() {
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    if (formMode.value === 'detail') {
+    if (formType.value === 'detail') {
       await modalApi.close();
       return;
     }
@@ -132,12 +132,12 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
-    modalApi.setState({ showConfirmButton: formMode.value === 'create' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    modalApi.setState({ showConfirmButton: formType.value === 'create' });
     await formApi.resetForm();
-    if (formMode.value === 'create') {
+    if (formType.value === 'create') {
       // 新增时，发起人默认为当前用户
       await formApi.setValues({ userId: userStore.userInfo?.id });
       return;
diff --git a/apps/web-antd/src/views/mes/pro/feedback/data.ts b/apps/web-antd/src/views/mes/pro/feedback/data.ts
index 4d1af1810..cfd5a5015 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/data.ts
+++ b/apps/web-antd/src/views/mes/pro/feedback/data.ts
@@ -24,6 +24,9 @@ import {
   MesProWorkOrderStatusEnum,
 } from '#/views/mes/utils/constants';
 
+/** 生产报工表单类型 */
+export type FormType = 'approve' | 'create' | 'detail' | 'submit' | 'update';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
@@ -173,7 +176,7 @@ export function useGridColumns(): VxeTableGridOptions<MesProFeedbackApi.Feedback
  * - 质检工序：只填报工数量（视为待检数量）
  */
 export function useFormSchema(
-  formType: string,
+  formType: FormType,
   formApi?: VbenFormApi,
 ): VbenFormSchema[] {
   const isHeaderReadonly = ['approve', 'detail', 'submit'].includes(formType);
diff --git a/apps/web-antd/src/views/mes/pro/feedback/index.vue b/apps/web-antd/src/views/mes/pro/feedback/index.vue
index d2a045908..b3ad35785 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/index.vue
+++ b/apps/web-antd/src/views/mes/pro/feedback/index.vue
@@ -35,27 +35,27 @@ function handleRefresh() {
 
 /** 创建生产报工 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑生产报工 */
 function handleEdit(row: MesProFeedbackApi.Feedback) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
 }
 
 /** 提交生产报工 */
 function handleSubmit(row: MesProFeedbackApi.Feedback) {
-  formModalApi.setData({ id: row.id, type: 'submit' }).open();
+  formModalApi.setData({ formType: 'submit', id: row.id }).open();
 }
 
 /** 审批生产报工 */
 function handleApprove(row: MesProFeedbackApi.Feedback) {
-  formModalApi.setData({ id: row.id, type: 'approve' }).open();
+  formModalApi.setData({ formType: 'approve', id: row.id }).open();
 }
 
 /** 详情生产报工 */
 function handleDetail(row: MesProFeedbackApi.Feedback) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 /** 删除生产报工 */
diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
index 4d770d825..8b8699b04 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
 
 import { computed, ref } from 'vue';
@@ -29,25 +31,21 @@ import { useFormSchema } from '../data';
 import ItemConsumeList from './item-consume-list.vue';
 import ProductProduceList from './product-produce-list.vue';
 
-// TODO @AI：formType？
-type FormMode = 'approve' | 'create' | 'detail' | 'submit' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create');
+const formType = ref<FormType>('create');
 const formData = ref<MesProFeedbackApi.Feedback>();
 const userStore = useUserStore();
 const subTabsName = ref('itemConsume');
 
 const isEditable = computed(() =>
-  ['create', 'submit', 'update'].includes(formMode.value),
+  ['create', 'submit', 'update'].includes(formType.value),
 );
-// TODO @AI：是不是都是 isXXXX 风格？
-const canSubmitDirectly = computed(
+const canSubmit = computed(
   () =>
     isEditable.value &&
     formData.value?.status === MesProFeedbackStatusEnum.PREPARE,
 );
-const canApprove = computed(() => formMode.value === 'approve');
+const canApprove = computed(() => formType.value === 'approve');
 const showSubTabs = computed(
   () =>
     !!formData.value?.id &&
@@ -55,16 +53,16 @@ const showSubTabs = computed(
     formData.value?.status !== MesProFeedbackStatusEnum.APPROVING,
 );
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['生产报工']);
   }
-  if (formMode.value === 'approve') {
+  if (formType.value === 'approve') {
     return '审批生产报工';
   }
-  if (formMode.value === 'submit') {
+  if (formType.value === 'submit') {
     return '提交生产报工';
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['生产报工'])
     : $t('ui.actionTitle.create', ['生产报工']);
 });
@@ -84,7 +82,7 @@ const [Form, formApi] = useVbenForm({
 });
 
 /** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+formApi.setState({ schema: useFormSchema(formType.value, formApi) });
 
 /** 提交前对齐数量：根据 checkFlag 决定 uncheck/合格/不良归零策略 */
 function alignQuantity(data: MesProFeedbackApi.Feedback) {
@@ -112,15 +110,15 @@ async function handleSave() {
   try {
     const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
     alignQuantity(data);
-    if (formMode.value === 'create') {
+    if (formType.value === 'create') {
       const id = await createFeedback(data);
       formData.value = {
         ...data,
         id,
         status: MesProFeedbackStatusEnum.PREPARE,
       };
-      formMode.value = 'update';
-      formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+      formType.value = 'update';
+      formApi.setState({ schema: useFormSchema(formType.value, formApi) });
       await formApi.setFieldValue('id', id);
       message.success($t('common.createSuccess'));
     } else {
@@ -145,7 +143,7 @@ async function handleSubmit() {
     const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
     alignQuantity(data);
     let id = formData.value?.id;
-    if (formMode.value === 'create' || !id) {
+    if (formType.value === 'create' || !id) {
       id = await createFeedback(data);
     } else {
       await updateFeedback(data);
@@ -209,7 +207,7 @@ async function resolveCheckFlag(routeId?: number, processId?: number) {
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    if (formMode.value === 'detail' || formMode.value === 'approve') {
+    if (formType.value === 'detail' || formType.value === 'approve') {
       await modalApi.close();
       return;
     }
@@ -222,16 +220,16 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     // 审批/详情整表禁用，避免审核人误改未提交的字段
     formApi.setDisabled(
-      formMode.value === 'approve' || formMode.value === 'detail',
+      formType.value === 'approve' || formType.value === 'detail',
     );
     modalApi.setState({
       showConfirmButton:
-        formMode.value !== 'detail' && formMode.value !== 'approve',
+        formType.value !== 'detail' && formType.value !== 'approve',
     });
     await formApi.resetForm();
     if (!data?.id) {
@@ -281,7 +279,7 @@ const [Modal, modalApi] = useVbenModal({
     <template #prepend-footer>
       <div class="flex flex-auto items-center justify-end gap-2">
         <Popconfirm
-          v-if="canSubmitDirectly"
+          v-if="canSubmit"
           title="确认提交该报工单？提交后将不能修改。"
           @confirm="handleSubmit"
         >
diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/item-consume-list.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/item-consume-list.vue
index 6ac69a535..0af4f897d 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/modules/item-consume-list.vue
+++ b/apps/web-antd/src/views/mes/pro/feedback/modules/item-consume-list.vue
@@ -26,7 +26,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     proxyConfig: {
       ajax: {
         query: async ({ page }) => {
-          // TODO @AI：换行风格？？？
           if (!props.feedbackId) {
             return { list: [], total: 0 };
           }
@@ -38,9 +37,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
         },
       },
     },
-    // TODO @AI：换行风格；
-    rowConfig: { isHover: true, keyField: 'id' },
-    toolbarConfig: { refresh: false, search: false },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: false,
+      search: false,
+    },
   } as VxeTableGridOptions<MesWmItemConsumeLineApi.ItemConsumeLine>,
 });
 
diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/product-produce-list.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/product-produce-list.vue
index 9b313f0cb..c526f6fbb 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/modules/product-produce-list.vue
+++ b/apps/web-antd/src/views/mes/pro/feedback/modules/product-produce-list.vue
@@ -37,7 +37,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     proxyConfig: {
       ajax: {
         query: async ({ page }) => {
-          // TODO @AI：换行风格？？？
           if (!props.feedbackId) {
             return { list: [], total: 0 };
           }
@@ -49,9 +48,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
         },
       },
     },
-    // TODO @AI：换行风格；
-    rowConfig: { isHover: true, keyField: 'id' },
-    toolbarConfig: { refresh: false, search: false },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: false,
+      search: false,
+    },
   } as VxeTableGridOptions<MesWmProductProduceLineApi.ProductProduceLine>,
 });
 
diff --git a/apps/web-antd/src/views/mes/pro/process/data.ts b/apps/web-antd/src/views/mes/pro/process/data.ts
index ff8089acd..e64f78986 100644
--- a/apps/web-antd/src/views/mes/pro/process/data.ts
+++ b/apps/web-antd/src/views/mes/pro/process/data.ts
@@ -14,6 +14,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改生产工序的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/pro/process/index.vue b/apps/web-antd/src/views/mes/pro/process/index.vue
index dcd291410..8f86eaaa9 100644
--- a/apps/web-antd/src/views/mes/pro/process/index.vue
+++ b/apps/web-antd/src/views/mes/pro/process/index.vue
@@ -30,17 +30,17 @@ function handleRefresh() {
 
 /** 创建生产工序 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑生产工序 */
 function handleEdit(row: MesProProcessApi.Process) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 查看生产工序详情 */
 function handleDetail(row: MesProProcessApi.Process) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 删除生产工序 */
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue b/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
index 3d51d5bb5..3f64fcd52 100644
--- a/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
+++ b/apps/web-antd/src/views/mes/pro/process/modules/content-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
 
@@ -19,11 +21,11 @@ import { useContentGridColumns } from '../data';
 import ContentForm from './content-form.vue';
 
 const props = defineProps<{
-  formMode: 'create' | 'detail' | 'update';
+  formType: FormType;
   processId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const isEditable = ref(props.formType !== 'detail'); // 是否可编辑
 const list = ref<MesProProcessContentApi.ProcessContent[]>([]);
 
 const [ContentFormModal, contentFormModalApi] = useVbenModal({
diff --git a/apps/web-antd/src/views/mes/pro/process/modules/form.vue b/apps/web-antd/src/views/mes/pro/process/modules/form.vue
index 94d96bb51..a3d910c8d 100644
--- a/apps/web-antd/src/views/mes/pro/process/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/process/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesProProcessApi } from '#/api/mes/pro/process';
 
 import { computed, ref } from 'vue';
@@ -18,18 +20,16 @@ import { $t } from '#/locales';
 import { useFormSchema } from '../data';
 import ContentList from './content-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const formData = ref<MesProProcessApi.Process>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.detail', ['生产工序']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['生产工序'])
     : $t('ui.actionTitle.create', ['生产工序']);
 });
@@ -81,10 +81,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type ?? 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -110,7 +110,7 @@ const processId = computed(() => formData.value?.id);
     <template v-if="processId">
       <Divider class="!my-3" orientation="left">操作步骤</Divider>
       <div class="mx-4">
-        <ContentList :form-mode="formMode" :process-id="processId" />
+        <ContentList :form-type="formType" :process-id="processId" />
       </div>
     </template>
   </Modal>
diff --git a/apps/web-antd/src/views/mes/pro/route/data.ts b/apps/web-antd/src/views/mes/pro/route/data.ts
index 4fa8916fd..c73686165 100644
--- a/apps/web-antd/src/views/mes/pro/route/data.ts
+++ b/apps/web-antd/src/views/mes/pro/route/data.ts
@@ -22,6 +22,9 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 import { RouteColorPicker } from './components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 工艺路线表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/pro/route/index.vue b/apps/web-antd/src/views/mes/pro/route/index.vue
index 4f066ffa6..7a35148fa 100644
--- a/apps/web-antd/src/views/mes/pro/route/index.vue
+++ b/apps/web-antd/src/views/mes/pro/route/index.vue
@@ -37,17 +37,17 @@ function handleRefresh() {
 
 /** 创建工艺路线 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑工艺路线（仅停用状态可编辑） */
 function handleEdit(row: MesProRouteApi.Route) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 详情查看 */
 function handleDetail(row: MesProRouteApi.Route) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 切换状态 */
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/form.vue b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
index 2ca0303ae..f381fe8d2 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesProRouteApi } from '#/api/mes/pro/route';
 
 import { computed, ref } from 'vue';
@@ -15,19 +17,17 @@ import { useFormSchema } from '../data';
 import ProcessList from './process-list.vue';
 import ProductList from './product-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTab = ref('process'); // 当前激活的子表 Tab
 const formData = ref<MesProRouteApi.Route>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.detail', ['工艺路线']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['工艺路线'])
     : $t('ui.actionTitle.create', ['工艺路线']);
 });
@@ -61,12 +61,12 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesProRouteApi.Route;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         // 新增成功后切到编辑模式，方便继续维护组成工序、关联产品
         const id = await createRoute(data);
         formData.value = { ...data, id };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateRoute(data);
         formData.value = { ...formData.value, ...data };
@@ -85,10 +85,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTab.value = 'process';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type ?? 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -109,15 +109,15 @@ const [Modal, modalApi] = useVbenModal({
     <Form class="mx-4" />
     <!-- 编辑/详情模式下展示子表 Tab，新增模式下隐藏 -->
     <Tabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model:active-key="subTab"
       class="mx-4 mt-4"
     >
       <TabPane key="process" tab="组成工序">
-        <ProcessList :form-mode="formMode" :route-id="formData.id" />
+        <ProcessList :form-type="formType" :route-id="formData.id" />
       </TabPane>
       <TabPane key="product" tab="关联产品">
-        <ProductList :form-mode="formMode" :route-id="formData.id" />
+        <ProductList :form-type="formType" :route-id="formData.id" />
       </TabPane>
     </Tabs>
   </Modal>
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
index 89479d1e2..192cb5c5b 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/process-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
 
@@ -19,11 +21,11 @@ import { useRouteProcessGridColumns } from '../data';
 import ProcessForm from './process-form.vue';
 
 const props = defineProps<{
-  formMode: 'create' | 'detail' | 'update';
+  formType: FormType;
   routeId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const isEditable = ref(props.formType !== 'detail'); // 是否可编辑
 const list = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 工艺路线工序列表
 
 const [ProcessFormModal, processFormModalApi] = useVbenModal({
diff --git a/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue b/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
index 4279d6f48..ea34d58a3 100644
--- a/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
+++ b/apps/web-antd/src/views/mes/pro/route/modules/product-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
 
@@ -21,11 +23,11 @@ import { useRouteProductGridColumns } from '../data';
 import ProductForm from './product-form.vue';
 
 const props = defineProps<{
-  formMode: 'create' | 'detail' | 'update';
+  formType: FormType;
   routeId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const isEditable = ref(props.formType !== 'detail'); // 是否可编辑
 const list = ref<MesProRouteProductApi.RouteProduct[]>([]); // 工艺路线产品列表
 
 const [ProductFormModal, productFormModalApi] = useVbenModal({
diff --git a/apps/web-antd/src/views/mes/tm/tool/data.ts b/apps/web-antd/src/views/mes/tm/tool/data.ts
index fbff2a1a3..b2e012145 100644
--- a/apps/web-antd/src/views/mes/tm/tool/data.ts
+++ b/apps/web-antd/src/views/mes/tm/tool/data.ts
@@ -20,6 +20,9 @@ import {
 
 import { TmToolTypeSelect } from './type/components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改工具的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/tm/tool/index.vue b/apps/web-antd/src/views/mes/tm/tool/index.vue
index 9225e52d0..c6ed9090b 100644
--- a/apps/web-antd/src/views/mes/tm/tool/index.vue
+++ b/apps/web-antd/src/views/mes/tm/tool/index.vue
@@ -32,17 +32,17 @@ function handleRefresh() {
 
 /** 创建工具 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看工具 */
 function handleDetail(row: MesTmToolApi.Tool) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑工具 */
 function handleEdit(row: MesTmToolApi.Tool) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除工具 */
diff --git a/apps/web-antd/src/views/mes/tm/tool/modules/form.vue b/apps/web-antd/src/views/mes/tm/tool/modules/form.vue
index 0e0a26942..f964457e0 100644
--- a/apps/web-antd/src/views/mes/tm/tool/modules/form.vue
+++ b/apps/web-antd/src/views/mes/tm/tool/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesTmToolApi } from '#/api/mes/tm/tool';
 
 import { computed, ref } from 'vue';
@@ -15,19 +17,17 @@ import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const formData = ref<MesTmToolApi.Tool>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['工具']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['工具'])
     : $t('ui.actionTitle.create', ['工具']);
 });
@@ -92,10 +92,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-antd/src/views/mes/tm/tool/type/data.ts b/apps/web-antd/src/views/mes/tm/tool/type/data.ts
index b3778f427..c9bf4ca5b 100644
--- a/apps/web-antd/src/views/mes/tm/tool/type/data.ts
+++ b/apps/web-antd/src/views/mes/tm/tool/type/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode, MesMaintenTypeEnum } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改工具类型的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/mes/tm/tool/type/index.vue b/apps/web-antd/src/views/mes/tm/tool/type/index.vue
index 4ce0188fc..3518116af 100644
--- a/apps/web-antd/src/views/mes/tm/tool/type/index.vue
+++ b/apps/web-antd/src/views/mes/tm/tool/type/index.vue
@@ -26,17 +26,17 @@ function handleRefresh() {
 
 /** 创建工具类型 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看工具类型 */
 function handleDetail(row: MesTmToolTypeApi.ToolType) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑工具类型 */
 function handleEdit(row: MesTmToolTypeApi.ToolType) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除工具类型 */
diff --git a/apps/web-antd/src/views/mes/tm/tool/type/modules/form.vue b/apps/web-antd/src/views/mes/tm/tool/type/modules/form.vue
index 9a4897340..9b8ce574b 100644
--- a/apps/web-antd/src/views/mes/tm/tool/type/modules/form.vue
+++ b/apps/web-antd/src/views/mes/tm/tool/type/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesTmToolTypeApi } from '#/api/mes/tm/tool/type';
 
 import { computed, ref } from 'vue';
@@ -13,18 +15,16 @@ import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const formData = ref<MesTmToolTypeApi.ToolType>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['工具类型']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['工具类型'])
     : $t('ui.actionTitle.create', ['工具类型']);
 });
@@ -76,10 +76,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-antd/src/views/wms/order/check/data.ts b/apps/web-antd/src/views/wms/order/check/data.ts
index c94267371..0efaec3f9 100644
--- a/apps/web-antd/src/views/wms/order/check/data.ts
+++ b/apps/web-antd/src/views/wms/order/check/data.ts
@@ -31,6 +31,9 @@ import {
   sumQuantity,
 } from '#/views/wms/utils/format';
 
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
 /** 拆分数量/金额区间字段，适配后端 Min/Max 查询参数 */
 function splitNumberRange(minFieldName: string, maxFieldName: string) {
   return (
diff --git a/apps/web-antd/src/views/wms/order/check/index.vue b/apps/web-antd/src/views/wms/order/check/index.vue
index 4e60432ab..f3b428b86 100644
--- a/apps/web-antd/src/views/wms/order/check/index.vue
+++ b/apps/web-antd/src/views/wms/order/check/index.vue
@@ -79,12 +79,12 @@ function handleRefresh() {
 
 /** 创建盘库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑盘库单 */
 function handleEdit(row: WmsCheckOrderApi.CheckOrder) {
-  formModalApi.setData({ id: row.id!, type: 'update' }).open();
+  formModalApi.setData({ id: row.id!, formType: 'update' }).open();
 }
 
 /** 查看盘库单详情 */
diff --git a/apps/web-antd/src/views/wms/order/check/modules/form.vue b/apps/web-antd/src/views/wms/order/check/modules/form.vue
index aec59631b..59e87dac9 100644
--- a/apps/web-antd/src/views/wms/order/check/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/check/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsInventoryApi } from '#/api/wms/inventory';
 import type { WmsItemSkuApi } from '#/api/wms/md/item/sku';
@@ -69,7 +71,7 @@ const emit = defineEmits<{
 }>();
 
 const formData = ref<WmsCheckOrderApi.CheckOrder>({});
-const formMode = ref('create');
+const formType = ref<FormType>('create');
 const originalSubmitData = ref<WmsCheckOrderApi.CheckOrder>();
 const details = ref<DetailRow[]>([]);
 const detailTableRef = ref<VxeTableInstance>();
@@ -79,7 +81,7 @@ const warehouseName = ref<string>();
 let detailSeq = 0; // 明细行可能还没有后端 id，使用本地序号作为 VXE 行操作的稳定标识
 
 const getTitle = computed(() => {
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['盘库单'])
     : $t('ui.actionTitle.create', ['盘库单']);
 });
@@ -513,7 +515,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = await buildSubmitData();
     try {
-      await (formMode.value === 'update'
+      await (formType.value === 'update'
         ? updateCheckOrder(data)
         : createCheckOrder(data));
       // 关闭并提示
@@ -534,11 +536,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
-    const data = modalApi.getData<{
-      id?: number;
-      type?: string;
-    }>();
-    formMode.value = data?.type || (data?.id ? 'update' : 'create');
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     if (data?.id) {
       modalApi.lock();
       try {
diff --git a/apps/web-antd/src/views/wms/order/movement/data.ts b/apps/web-antd/src/views/wms/order/movement/data.ts
index 42a6b9be7..2ae4ac646 100644
--- a/apps/web-antd/src/views/wms/order/movement/data.ts
+++ b/apps/web-antd/src/views/wms/order/movement/data.ts
@@ -24,6 +24,9 @@ import {
   QUANTITY_PRECISION,
 } from '#/views/wms/utils/format';
 
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/wms/order/movement/index.vue b/apps/web-antd/src/views/wms/order/movement/index.vue
index b28ec6ab0..d97571c13 100644
--- a/apps/web-antd/src/views/wms/order/movement/index.vue
+++ b/apps/web-antd/src/views/wms/order/movement/index.vue
@@ -72,12 +72,12 @@ function handleRefresh() {
 
 /** 创建移库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑移库单 */
 function handleEdit(row: WmsMovementOrderApi.MovementOrder) {
-  formModalApi.setData({ id: row.id!, type: 'update' }).open();
+  formModalApi.setData({ id: row.id!, formType: 'update' }).open();
 }
 
 /** 查看移库单详情 */
diff --git a/apps/web-antd/src/views/wms/order/movement/modules/form.vue b/apps/web-antd/src/views/wms/order/movement/modules/form.vue
index 648d6e2c0..f1d2a7d30 100644
--- a/apps/web-antd/src/views/wms/order/movement/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/movement/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsWarehouseApi } from '#/api/wms/md/warehouse';
 import type { WmsMovementOrderApi } from '#/api/wms/order/movement';
@@ -50,7 +52,7 @@ const emit = defineEmits<{
 }>();
 
 const formData = ref<WmsMovementOrderApi.MovementOrder>({});
-const formMode = ref('create');
+const formType = ref<FormType>('create');
 const originalSubmitData = ref<WmsMovementOrderApi.MovementOrder>();
 const details = ref<DetailRow[]>([]);
 const detailTableRef = ref<VxeTableInstance>();
@@ -58,7 +60,7 @@ const inventorySelectRef = ref<InstanceType<typeof WmsInventorySelect>>();
 let detailSeq = 0; // 明细行可能还没有后端 id，使用本地序号作为 VXE 行操作的稳定标识
 
 const getTitle = computed(() => {
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['移库单'])
     : $t('ui.actionTitle.create', ['移库单']);
 });
@@ -353,7 +355,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = await buildSubmitData();
     try {
-      await (formMode.value === 'update'
+      await (formType.value === 'update'
         ? updateMovementOrder(data)
         : createMovementOrder(data));
       // 关闭并提示
@@ -372,11 +374,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
-    const data = modalApi.getData<{
-      id?: number;
-      type?: string;
-    }>();
-    formMode.value = data?.type || (data?.id ? 'update' : 'create');
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     if (data?.id) {
       modalApi.lock();
       try {
diff --git a/apps/web-antd/src/views/wms/order/receipt/data.ts b/apps/web-antd/src/views/wms/order/receipt/data.ts
index ad6cc502f..eebdadb67 100644
--- a/apps/web-antd/src/views/wms/order/receipt/data.ts
+++ b/apps/web-antd/src/views/wms/order/receipt/data.ts
@@ -24,6 +24,9 @@ import {
   QUANTITY_PRECISION,
 } from '#/views/wms/utils/format';
 
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/wms/order/receipt/index.vue b/apps/web-antd/src/views/wms/order/receipt/index.vue
index 160d742a1..2f15504ec 100644
--- a/apps/web-antd/src/views/wms/order/receipt/index.vue
+++ b/apps/web-antd/src/views/wms/order/receipt/index.vue
@@ -72,12 +72,12 @@ function handleRefresh() {
 
 /** 创建入库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑入库单 */
 function handleEdit(row: WmsReceiptOrderApi.ReceiptOrder) {
-  formModalApi.setData({ id: row.id!, type: 'update' }).open();
+  formModalApi.setData({ id: row.id!, formType: 'update' }).open();
 }
 
 /** 查看入库单详情 */
diff --git a/apps/web-antd/src/views/wms/order/receipt/modules/form.vue b/apps/web-antd/src/views/wms/order/receipt/modules/form.vue
index 8d349aacd..2b7acf71c 100644
--- a/apps/web-antd/src/views/wms/order/receipt/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/receipt/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsItemSkuApi } from '#/api/wms/md/item/sku';
 import type { WmsReceiptOrderApi } from '#/api/wms/order/receipt';
@@ -48,7 +50,7 @@ const emit = defineEmits<{
 }>();
 
 const formData = ref<WmsReceiptOrderApi.ReceiptOrder>({});
-const formMode = ref('create');
+const formType = ref<FormType>('create');
 const originalSubmitData = ref<WmsReceiptOrderApi.ReceiptOrder>();
 const details = ref<DetailRow[]>([]);
 const detailTableRef = ref<VxeTableInstance>();
@@ -56,7 +58,7 @@ const skuSelectRef = ref<InstanceType<typeof WmsItemSkuSelect>>();
 let detailSeq = 0; // 明细行可能还没有后端 id，使用本地序号作为 VXE 行操作的稳定标识
 
 const getTitle = computed(() => {
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['入库单'])
     : $t('ui.actionTitle.create', ['入库单']);
 });
@@ -297,7 +299,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = await buildSubmitData();
     try {
-      await (formMode.value === 'update'
+      await (formType.value === 'update'
         ? updateReceiptOrder(data)
         : createReceiptOrder(data));
       // 关闭并提示
@@ -316,11 +318,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
-    const data = modalApi.getData<{
-      id?: number;
-      type?: string;
-    }>();
-    formMode.value = data?.type || (data?.id ? 'update' : 'create');
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     if (data?.id) {
       modalApi.lock();
       try {
diff --git a/apps/web-antd/src/views/wms/order/shipment/data.ts b/apps/web-antd/src/views/wms/order/shipment/data.ts
index eac4d1b10..afcc3c980 100644
--- a/apps/web-antd/src/views/wms/order/shipment/data.ts
+++ b/apps/web-antd/src/views/wms/order/shipment/data.ts
@@ -25,6 +25,9 @@ import {
   QUANTITY_PRECISION,
 } from '#/views/wms/utils/format';
 
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-antd/src/views/wms/order/shipment/index.vue b/apps/web-antd/src/views/wms/order/shipment/index.vue
index 966008a77..56aa5686a 100644
--- a/apps/web-antd/src/views/wms/order/shipment/index.vue
+++ b/apps/web-antd/src/views/wms/order/shipment/index.vue
@@ -72,12 +72,12 @@ function handleRefresh() {
 
 /** 创建出库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑出库单 */
 function handleEdit(row: WmsShipmentOrderApi.ShipmentOrder) {
-  formModalApi.setData({ id: row.id!, type: 'update' }).open();
+  formModalApi.setData({ id: row.id!, formType: 'update' }).open();
 }
 
 /** 查看出库单详情 */
diff --git a/apps/web-antd/src/views/wms/order/shipment/modules/form.vue b/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
index e2e79a413..eb077a1c7 100644
--- a/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
+++ b/apps/web-antd/src/views/wms/order/shipment/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsWarehouseApi } from '#/api/wms/md/warehouse';
 import type { WmsShipmentOrderApi } from '#/api/wms/order/shipment';
@@ -50,7 +52,7 @@ const emit = defineEmits<{
 }>();
 
 const formData = ref<WmsShipmentOrderApi.ShipmentOrder>({});
-const formMode = ref('create');
+const formType = ref<FormType>('create');
 const originalSubmitData = ref<WmsShipmentOrderApi.ShipmentOrder>();
 const details = ref<DetailRow[]>([]);
 const detailTableRef = ref<VxeTableInstance>();
@@ -60,7 +62,7 @@ const initializing = ref(false);
 let detailSeq = 0; // 明细行可能还没有后端 id，使用本地序号作为 VXE 行操作的稳定标识
 
 const getTitle = computed(() => {
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['出库单'])
     : $t('ui.actionTitle.create', ['出库单']);
 });
@@ -338,7 +340,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = await buildSubmitData();
     try {
-      await (formMode.value === 'update'
+      await (formType.value === 'update'
         ? updateShipmentOrder(data)
         : createShipmentOrder(data));
       // 关闭并提示
@@ -359,11 +361,8 @@ const [Modal, modalApi] = useVbenModal({
     }
     initializing.value = true;
     await formApi.resetForm();
-    const data = modalApi.getData<{
-      id?: number;
-      type?: string;
-    }>();
-    formMode.value = data?.type || (data?.id ? 'update' : 'create');
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     if (data?.id) {
       modalApi.lock();
       try {
diff --git a/apps/web-antdv-next/src/views/erp/finance/payment/data.ts b/apps/web-antdv-next/src/views/erp/finance/payment/data.ts
index 9f021945e..cdf3cf9f6 100644
--- a/apps/web-antdv-next/src/views/erp/finance/payment/data.ts
+++ b/apps/web-antdv-next/src/views/erp/finance/payment/data.ts
@@ -10,8 +10,11 @@ import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/finance/payment/index.vue b/apps/web-antdv-next/src/views/erp/finance/payment/index.vue
index 57e7c9079..866fa9011 100644
--- a/apps/web-antdv-next/src/views/erp/finance/payment/index.vue
+++ b/apps/web-antdv-next/src/views/erp/finance/payment/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增付款单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑付款单 */
 function handleEdit(row: ErpFinancePaymentApi.FinancePayment) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除付款单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpFinancePaymentApi.FinancePayment) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/finance/payment/modules/form.vue b/apps/web-antdv-next/src/views/erp/finance/payment/modules/form.vue
index 5e01f7492..9bb8a42f1 100644
--- a/apps/web-antdv-next/src/views/erp/finance/payment/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/finance/payment/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpFinancePaymentApi } from '#/api/erp/finance/payment';
 
 import { computed, ref } from 'vue';
@@ -40,7 +42,7 @@ const formData = ref<
   status: 0,
 });
 
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -145,8 +147,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/finance/receipt/data.ts b/apps/web-antdv-next/src/views/erp/finance/receipt/data.ts
index c0b06eee2..27b8c3139 100644
--- a/apps/web-antdv-next/src/views/erp/finance/receipt/data.ts
+++ b/apps/web-antdv-next/src/views/erp/finance/receipt/data.ts
@@ -10,8 +10,11 @@ import { getCustomerSimpleList } from '#/api/erp/sale/customer';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/finance/receipt/index.vue b/apps/web-antdv-next/src/views/erp/finance/receipt/index.vue
index bf94faaac..7d07f93d5 100644
--- a/apps/web-antdv-next/src/views/erp/finance/receipt/index.vue
+++ b/apps/web-antdv-next/src/views/erp/finance/receipt/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增收款单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑收款单 */
 function handleEdit(row: ErpFinanceReceiptApi.FinanceReceipt) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除收款单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpFinanceReceiptApi.FinanceReceipt) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/form.vue b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/form.vue
index 37ba99d57..16c44e2cc 100644
--- a/apps/web-antdv-next/src/views/erp/finance/receipt/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/finance/receipt/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpFinanceReceiptApi } from '#/api/erp/finance/receipt';
 
 import { computed, ref } from 'vue';
@@ -40,7 +42,7 @@ const formData = ref<
   status: 0,
 });
 
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -159,8 +161,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/purchase/in/data.ts b/apps/web-antdv-next/src/views/erp/purchase/in/data.ts
index fd18193d3..72ec4d10c 100644
--- a/apps/web-antdv-next/src/views/erp/purchase/in/data.ts
+++ b/apps/web-antdv-next/src/views/erp/purchase/in/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/purchase/in/index.vue b/apps/web-antdv-next/src/views/erp/purchase/in/index.vue
index dc94682bb..a28f9cecc 100644
--- a/apps/web-antdv-next/src/views/erp/purchase/in/index.vue
+++ b/apps/web-antdv-next/src/views/erp/purchase/in/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增采购入库 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑采购入库 */
 function handleEdit(row: ErpPurchaseInApi.PurchaseIn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除采购入库 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpPurchaseInApi.PurchaseIn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/purchase/in/modules/form.vue b/apps/web-antdv-next/src/views/erp/purchase/in/modules/form.vue
index 8dcee8650..3fe78dc94 100644
--- a/apps/web-antdv-next/src/views/erp/purchase/in/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/purchase/in/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpPurchaseInApi } from '#/api/erp/purchase/in';
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
@@ -46,7 +48,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -175,8 +177,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/purchase/order/data.ts b/apps/web-antdv-next/src/views/erp/purchase/order/data.ts
index 0d1b268eb..11bd38307 100644
--- a/apps/web-antdv-next/src/views/erp/purchase/order/data.ts
+++ b/apps/web-antdv-next/src/views/erp/purchase/order/data.ts
@@ -12,8 +12,11 @@ import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/purchase/order/index.vue b/apps/web-antdv-next/src/views/erp/purchase/order/index.vue
index 69d43c67b..2d56f4ca4 100644
--- a/apps/web-antdv-next/src/views/erp/purchase/order/index.vue
+++ b/apps/web-antdv-next/src/views/erp/purchase/order/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增采购订单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑采购订单 */
 function handleEdit(row: ErpPurchaseOrderApi.PurchaseOrder) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除采购订单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpPurchaseOrderApi.PurchaseOrder) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/purchase/order/modules/form.vue b/apps/web-antdv-next/src/views/erp/purchase/order/modules/form.vue
index 7ccd16a70..44668c1c5 100644
--- a/apps/web-antdv-next/src/views/erp/purchase/order/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/purchase/order/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
 import { computed, ref } from 'vue';
@@ -21,7 +23,7 @@ import PurchaseOrderItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpPurchaseOrderApi.PurchaseOrder>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof PurchaseOrderItemForm>>();
 
 const getTitle = computed(() => {
@@ -124,8 +126,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/purchase/return/data.ts b/apps/web-antdv-next/src/views/erp/purchase/return/data.ts
index 6f50ab238..2993695d8 100644
--- a/apps/web-antdv-next/src/views/erp/purchase/return/data.ts
+++ b/apps/web-antdv-next/src/views/erp/purchase/return/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/purchase/return/index.vue b/apps/web-antdv-next/src/views/erp/purchase/return/index.vue
index a66da1bd0..1c9bfd138 100644
--- a/apps/web-antdv-next/src/views/erp/purchase/return/index.vue
+++ b/apps/web-antdv-next/src/views/erp/purchase/return/index.vue
@@ -45,17 +45,17 @@ function handleRowCheckboxChange({
 
 /** 新增采购退货 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑采购退货 */
 function handleEdit(row: ErpPurchaseReturnApi.PurchaseReturn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 查看详情 */
 function handleDetail(row: ErpPurchaseReturnApi.PurchaseReturn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 /** 删除采购退货 */
diff --git a/apps/web-antdv-next/src/views/erp/purchase/return/modules/form.vue b/apps/web-antdv-next/src/views/erp/purchase/return/modules/form.vue
index b18d7680b..235a09147 100644
--- a/apps/web-antdv-next/src/views/erp/purchase/return/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/purchase/return/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 import type { ErpPurchaseReturnApi } from '#/api/erp/purchase/return';
 
@@ -46,7 +48,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 /* eslint-disable unicorn/no-nested-ternary */
@@ -175,8 +177,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/sale/order/data.ts b/apps/web-antdv-next/src/views/erp/sale/order/data.ts
index 682f8a5f3..910d7554a 100644
--- a/apps/web-antdv-next/src/views/erp/sale/order/data.ts
+++ b/apps/web-antdv-next/src/views/erp/sale/order/data.ts
@@ -12,8 +12,11 @@ import { getCustomerSimpleList } from '#/api/erp/sale/customer';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/sale/order/index.vue b/apps/web-antdv-next/src/views/erp/sale/order/index.vue
index 8fe5f28c5..3073b1723 100644
--- a/apps/web-antdv-next/src/views/erp/sale/order/index.vue
+++ b/apps/web-antdv-next/src/views/erp/sale/order/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增销售订单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑销售订单 */
 function handleEdit(row: ErpSaleOrderApi.SaleOrder) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除销售订单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpSaleOrderApi.SaleOrder) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/sale/order/modules/form.vue b/apps/web-antdv-next/src/views/erp/sale/order/modules/form.vue
index 0e7f1985e..0d1d5b8f0 100644
--- a/apps/web-antdv-next/src/views/erp/sale/order/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/sale/order/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
 import { computed, ref } from 'vue';
@@ -21,7 +23,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpSaleOrderApi.SaleOrder>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -114,8 +116,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/sale/out/data.ts b/apps/web-antdv-next/src/views/erp/sale/out/data.ts
index ac489fe71..4c8228298 100644
--- a/apps/web-antdv-next/src/views/erp/sale/out/data.ts
+++ b/apps/web-antdv-next/src/views/erp/sale/out/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/sale/out/index.vue b/apps/web-antdv-next/src/views/erp/sale/out/index.vue
index 28afcaba4..e1d16f11e 100644
--- a/apps/web-antdv-next/src/views/erp/sale/out/index.vue
+++ b/apps/web-antdv-next/src/views/erp/sale/out/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增销售出库 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑销售出库 */
 function handleEdit(row: ErpSaleOutApi.SaleOut) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除销售出库 */
@@ -91,7 +91,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpSaleOutApi.SaleOut) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/sale/out/modules/form.vue b/apps/web-antdv-next/src/views/erp/sale/out/modules/form.vue
index 92024d7df..06b75feac 100644
--- a/apps/web-antdv-next/src/views/erp/sale/out/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/sale/out/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { ErpSaleOutApi } from '#/api/erp/sale/out';
 
@@ -42,7 +44,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 /* eslint-disable unicorn/no-nested-ternary */
@@ -170,8 +172,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/sale/return/data.ts b/apps/web-antdv-next/src/views/erp/sale/return/data.ts
index 0301b8b14..d097aef32 100644
--- a/apps/web-antdv-next/src/views/erp/sale/return/data.ts
+++ b/apps/web-antdv-next/src/views/erp/sale/return/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/sale/return/index.vue b/apps/web-antdv-next/src/views/erp/sale/return/index.vue
index 48d42cba7..6a61d7f8e 100644
--- a/apps/web-antdv-next/src/views/erp/sale/return/index.vue
+++ b/apps/web-antdv-next/src/views/erp/sale/return/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增销售退货 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑销售退货 */
 function handleEdit(row: ErpSaleReturnApi.SaleReturn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除销售退货 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpSaleReturnApi.SaleReturn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/sale/return/modules/form.vue b/apps/web-antdv-next/src/views/erp/sale/return/modules/form.vue
index 9dd7f27a6..69aea9d1a 100644
--- a/apps/web-antdv-next/src/views/erp/sale/return/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/sale/return/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { ErpSaleReturnApi } from '#/api/erp/sale/return';
 
@@ -46,7 +48,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -175,8 +177,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/stock/check/data.ts b/apps/web-antdv-next/src/views/erp/stock/check/data.ts
index 5f4c267ac..6d9b52042 100644
--- a/apps/web-antdv-next/src/views/erp/stock/check/data.ts
+++ b/apps/web-antdv-next/src/views/erp/stock/check/data.ts
@@ -9,8 +9,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/stock/check/index.vue b/apps/web-antdv-next/src/views/erp/stock/check/index.vue
index 8154e0e90..586b73cce 100644
--- a/apps/web-antdv-next/src/views/erp/stock/check/index.vue
+++ b/apps/web-antdv-next/src/views/erp/stock/check/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增库存盘点单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑库存盘点单 */
 function handleEdit(row: ErpStockCheckApi.StockCheck) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除库存盘点单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockCheckApi.StockCheck) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/stock/check/modules/form.vue b/apps/web-antdv-next/src/views/erp/stock/check/modules/form.vue
index 482f38ef8..ae9ebed59 100644
--- a/apps/web-antdv-next/src/views/erp/stock/check/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/stock/check/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockCheckApi } from '#/api/erp/stock/check';
 
 import { computed, ref } from 'vue';
@@ -20,7 +22,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockCheckApi.StockCheck>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -93,8 +95,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/stock/in/data.ts b/apps/web-antdv-next/src/views/erp/stock/in/data.ts
index b73cd5824..c0be3bd5e 100644
--- a/apps/web-antdv-next/src/views/erp/stock/in/data.ts
+++ b/apps/web-antdv-next/src/views/erp/stock/in/data.ts
@@ -10,8 +10,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/stock/in/index.vue b/apps/web-antdv-next/src/views/erp/stock/in/index.vue
index e4e36337f..ed799c82c 100644
--- a/apps/web-antdv-next/src/views/erp/stock/in/index.vue
+++ b/apps/web-antdv-next/src/views/erp/stock/in/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增其它入库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑其它入库单 */
 function handleEdit(row: ErpStockInApi.StockIn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除其它入库单 */
@@ -91,7 +91,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockInApi.StockIn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/stock/in/modules/form.vue b/apps/web-antdv-next/src/views/erp/stock/in/modules/form.vue
index c59cfe0a7..d124196ec 100644
--- a/apps/web-antdv-next/src/views/erp/stock/in/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/stock/in/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockInApi } from '#/api/erp/stock/in';
 
 import { computed, ref } from 'vue';
@@ -16,7 +18,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockInApi.StockIn>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -89,8 +91,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/stock/move/data.ts b/apps/web-antdv-next/src/views/erp/stock/move/data.ts
index 8414eaaac..32705daea 100644
--- a/apps/web-antdv-next/src/views/erp/stock/move/data.ts
+++ b/apps/web-antdv-next/src/views/erp/stock/move/data.ts
@@ -9,8 +9,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/stock/move/index.vue b/apps/web-antdv-next/src/views/erp/stock/move/index.vue
index 28e8daee8..d54836752 100644
--- a/apps/web-antdv-next/src/views/erp/stock/move/index.vue
+++ b/apps/web-antdv-next/src/views/erp/stock/move/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增库存调拨单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑库存调拨单 */
 function handleEdit(row: ErpStockMoveApi.StockMove) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除库存调拨单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockMoveApi.StockMove) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/stock/move/modules/form.vue b/apps/web-antdv-next/src/views/erp/stock/move/modules/form.vue
index e2bec1660..9797cb378 100644
--- a/apps/web-antdv-next/src/views/erp/stock/move/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/stock/move/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockMoveApi } from '#/api/erp/stock/move';
 
 import { computed, ref } from 'vue';
@@ -20,7 +22,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockMoveApi.StockMove>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -93,8 +95,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/erp/stock/out/data.ts b/apps/web-antdv-next/src/views/erp/stock/out/data.ts
index cdd893212..0a8ca3d3a 100644
--- a/apps/web-antdv-next/src/views/erp/stock/out/data.ts
+++ b/apps/web-antdv-next/src/views/erp/stock/out/data.ts
@@ -10,8 +10,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-antdv-next/src/views/erp/stock/out/index.vue b/apps/web-antdv-next/src/views/erp/stock/out/index.vue
index 219de7ee4..ddf66ea68 100644
--- a/apps/web-antdv-next/src/views/erp/stock/out/index.vue
+++ b/apps/web-antdv-next/src/views/erp/stock/out/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增其它出库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑其它出库单 */
 function handleEdit(row: ErpStockOutApi.StockOut) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除其它出库单 */
@@ -94,7 +94,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockOutApi.StockOut) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/erp/stock/out/modules/form.vue b/apps/web-antdv-next/src/views/erp/stock/out/modules/form.vue
index 5df5fd4d7..38a1083aa 100644
--- a/apps/web-antdv-next/src/views/erp/stock/out/modules/form.vue
+++ b/apps/web-antdv-next/src/views/erp/stock/out/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockOutApi } from '#/api/erp/stock/out';
 
 import { computed, ref } from 'vue';
@@ -20,7 +22,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockOutApi.StockOut>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -93,8 +95,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-antdv-next/src/views/iot/ota/firmware/index.vue b/apps/web-antdv-next/src/views/iot/ota/firmware/index.vue
index bcb123c05..f39d4ae67 100644
--- a/apps/web-antdv-next/src/views/iot/ota/firmware/index.vue
+++ b/apps/web-antdv-next/src/views/iot/ota/firmware/index.vue
@@ -32,12 +32,12 @@ function handleRefresh() {
 
 /** 创建固件 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData(null).open();
 }
 
 /** 编辑固件 */
 function handleEdit(row: IoTOtaFirmwareApi.Firmware) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData({ id: row.id }).open();
 }
 
 /** 删除固件 */
diff --git a/apps/web-antdv-next/src/views/iot/rule/data/index.vue b/apps/web-antdv-next/src/views/iot/rule/data/index.vue
index 411ab4bed..37aa01355 100644
--- a/apps/web-antdv-next/src/views/iot/rule/data/index.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/data/index.vue
@@ -28,12 +28,12 @@ function handleRefresh() {
 
 /** 创建规则 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData(null).open();
 }
 
 /** 编辑规则 */
 function handleEdit(row: any) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData({ id: row.id }).open();
 }
 
 /** 删除规则 */
diff --git a/apps/web-antdv-next/src/views/iot/rule/data/rule/index.vue b/apps/web-antdv-next/src/views/iot/rule/data/rule/index.vue
index 4cd18d5e1..469edcb37 100644
--- a/apps/web-antdv-next/src/views/iot/rule/data/rule/index.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/data/rule/index.vue
@@ -29,12 +29,12 @@ function handleRefresh() {
 
 /** 创建规则 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData(null).open();
 }
 
 /** 编辑规则 */
 function handleEdit(row: any) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData({ id: row.id }).open();
 }
 
 /** 删除规则 */
diff --git a/apps/web-antdv-next/src/views/iot/rule/data/sink/index.vue b/apps/web-antdv-next/src/views/iot/rule/data/sink/index.vue
index ed7dc53a9..1718312e9 100644
--- a/apps/web-antdv-next/src/views/iot/rule/data/sink/index.vue
+++ b/apps/web-antdv-next/src/views/iot/rule/data/sink/index.vue
@@ -29,12 +29,12 @@ function handleRefresh() {
 
 /** 创建数据目的 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData(null).open();
 }
 
 /** 编辑数据目的 */
 function handleEdit(row: any) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData({ id: row.id }).open();
 }
 
 /** 删除数据目的 */
diff --git a/apps/web-ele/src/views/erp/finance/payment/data.ts b/apps/web-ele/src/views/erp/finance/payment/data.ts
index 116172128..cf591b138 100644
--- a/apps/web-ele/src/views/erp/finance/payment/data.ts
+++ b/apps/web-ele/src/views/erp/finance/payment/data.ts
@@ -10,8 +10,11 @@ import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/finance/payment/index.vue b/apps/web-ele/src/views/erp/finance/payment/index.vue
index 5c6750bf2..a48762888 100644
--- a/apps/web-ele/src/views/erp/finance/payment/index.vue
+++ b/apps/web-ele/src/views/erp/finance/payment/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增付款单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑付款单 */
 function handleEdit(row: ErpFinancePaymentApi.FinancePayment) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除付款单 */
@@ -92,7 +92,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpFinancePaymentApi.FinancePayment) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/finance/payment/modules/form.vue b/apps/web-ele/src/views/erp/finance/payment/modules/form.vue
index fe8796e12..46a0ea20f 100644
--- a/apps/web-ele/src/views/erp/finance/payment/modules/form.vue
+++ b/apps/web-ele/src/views/erp/finance/payment/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpFinancePaymentApi } from '#/api/erp/finance/payment';
 
 import { computed, ref } from 'vue';
@@ -40,7 +42,7 @@ const formData = ref<
   status: 0,
 });
 
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -145,8 +147,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/finance/receipt/data.ts b/apps/web-ele/src/views/erp/finance/receipt/data.ts
index 19e463c38..b7b3186e8 100644
--- a/apps/web-ele/src/views/erp/finance/receipt/data.ts
+++ b/apps/web-ele/src/views/erp/finance/receipt/data.ts
@@ -10,8 +10,11 @@ import { getCustomerSimpleList } from '#/api/erp/sale/customer';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/finance/receipt/index.vue b/apps/web-ele/src/views/erp/finance/receipt/index.vue
index 53a84eecf..501871613 100644
--- a/apps/web-ele/src/views/erp/finance/receipt/index.vue
+++ b/apps/web-ele/src/views/erp/finance/receipt/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增收款单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑收款单 */
 function handleEdit(row: ErpFinanceReceiptApi.FinanceReceipt) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除收款单 */
@@ -92,7 +92,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpFinanceReceiptApi.FinanceReceipt) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/finance/receipt/modules/form.vue b/apps/web-ele/src/views/erp/finance/receipt/modules/form.vue
index 8464cceb4..b024098f4 100644
--- a/apps/web-ele/src/views/erp/finance/receipt/modules/form.vue
+++ b/apps/web-ele/src/views/erp/finance/receipt/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpFinanceReceiptApi } from '#/api/erp/finance/receipt';
 
 import { computed, ref } from 'vue';
@@ -40,7 +42,7 @@ const formData = ref<
   status: 0,
 });
 
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -159,8 +161,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/purchase/in/data.ts b/apps/web-ele/src/views/erp/purchase/in/data.ts
index 4b4233c68..7b9d60dfe 100644
--- a/apps/web-ele/src/views/erp/purchase/in/data.ts
+++ b/apps/web-ele/src/views/erp/purchase/in/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/purchase/in/index.vue b/apps/web-ele/src/views/erp/purchase/in/index.vue
index 2b5c1cbd6..71d0b2c6f 100644
--- a/apps/web-ele/src/views/erp/purchase/in/index.vue
+++ b/apps/web-ele/src/views/erp/purchase/in/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增采购入库 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑采购入库 */
 function handleEdit(row: ErpPurchaseInApi.PurchaseIn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除采购入库 */
@@ -92,7 +92,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpPurchaseInApi.PurchaseIn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/purchase/in/modules/form.vue b/apps/web-ele/src/views/erp/purchase/in/modules/form.vue
index 21cfadfae..ec2f152d9 100644
--- a/apps/web-ele/src/views/erp/purchase/in/modules/form.vue
+++ b/apps/web-ele/src/views/erp/purchase/in/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpPurchaseInApi } from '#/api/erp/purchase/in';
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
@@ -46,7 +48,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -175,8 +177,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/purchase/order/data.ts b/apps/web-ele/src/views/erp/purchase/order/data.ts
index 489af22cc..29115679d 100644
--- a/apps/web-ele/src/views/erp/purchase/order/data.ts
+++ b/apps/web-ele/src/views/erp/purchase/order/data.ts
@@ -12,8 +12,11 @@ import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/purchase/order/index.vue b/apps/web-ele/src/views/erp/purchase/order/index.vue
index 024e3c2a5..55c1927ed 100644
--- a/apps/web-ele/src/views/erp/purchase/order/index.vue
+++ b/apps/web-ele/src/views/erp/purchase/order/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增采购订单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑采购订单 */
 function handleEdit(row: ErpPurchaseOrderApi.PurchaseOrder) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除采购订单 */
@@ -92,7 +92,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpPurchaseOrderApi.PurchaseOrder) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/purchase/order/modules/form.vue b/apps/web-ele/src/views/erp/purchase/order/modules/form.vue
index 03e9129c3..fee5d6d55 100644
--- a/apps/web-ele/src/views/erp/purchase/order/modules/form.vue
+++ b/apps/web-ele/src/views/erp/purchase/order/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 
 import { computed, ref } from 'vue';
@@ -21,7 +23,7 @@ import PurchaseOrderItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpPurchaseOrderApi.PurchaseOrder>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof PurchaseOrderItemForm>>();
 
 const getTitle = computed(() => {
@@ -124,8 +126,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/purchase/return/data.ts b/apps/web-ele/src/views/erp/purchase/return/data.ts
index 6a2686946..822e0fe47 100644
--- a/apps/web-ele/src/views/erp/purchase/return/data.ts
+++ b/apps/web-ele/src/views/erp/purchase/return/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/purchase/return/index.vue b/apps/web-ele/src/views/erp/purchase/return/index.vue
index 91c9cfbfc..4167cad12 100644
--- a/apps/web-ele/src/views/erp/purchase/return/index.vue
+++ b/apps/web-ele/src/views/erp/purchase/return/index.vue
@@ -45,17 +45,17 @@ function handleRowCheckboxChange({
 
 /** 新增采购退货 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑采购退货 */
 function handleEdit(row: ErpPurchaseReturnApi.PurchaseReturn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 查看详情 */
 function handleDetail(row: ErpPurchaseReturnApi.PurchaseReturn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 /** 删除采购退货 */
diff --git a/apps/web-ele/src/views/erp/purchase/return/modules/form.vue b/apps/web-ele/src/views/erp/purchase/return/modules/form.vue
index f496ae03e..e0bc8c2dc 100644
--- a/apps/web-ele/src/views/erp/purchase/return/modules/form.vue
+++ b/apps/web-ele/src/views/erp/purchase/return/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpPurchaseOrderApi } from '#/api/erp/purchase/order';
 import type { ErpPurchaseReturnApi } from '#/api/erp/purchase/return';
 
@@ -46,7 +48,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 /* eslint-disable unicorn/no-nested-ternary */
@@ -175,8 +177,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/sale/order/data.ts b/apps/web-ele/src/views/erp/sale/order/data.ts
index b1537508c..8f4daedbb 100644
--- a/apps/web-ele/src/views/erp/sale/order/data.ts
+++ b/apps/web-ele/src/views/erp/sale/order/data.ts
@@ -12,8 +12,11 @@ import { getCustomerSimpleList } from '#/api/erp/sale/customer';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/sale/order/index.vue b/apps/web-ele/src/views/erp/sale/order/index.vue
index e681b8696..284c3ef85 100644
--- a/apps/web-ele/src/views/erp/sale/order/index.vue
+++ b/apps/web-ele/src/views/erp/sale/order/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增销售订单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑销售订单 */
 function handleEdit(row: ErpSaleOrderApi.SaleOrder) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除销售订单 */
@@ -92,7 +92,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpSaleOrderApi.SaleOrder) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/sale/order/modules/form.vue b/apps/web-ele/src/views/erp/sale/order/modules/form.vue
index 53dd591fe..947001f40 100644
--- a/apps/web-ele/src/views/erp/sale/order/modules/form.vue
+++ b/apps/web-ele/src/views/erp/sale/order/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
 import { computed, ref } from 'vue';
@@ -21,7 +23,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpSaleOrderApi.SaleOrder>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -114,8 +116,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/sale/out/data.ts b/apps/web-ele/src/views/erp/sale/out/data.ts
index 7a444a714..a8979a7af 100644
--- a/apps/web-ele/src/views/erp/sale/out/data.ts
+++ b/apps/web-ele/src/views/erp/sale/out/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/sale/out/index.vue b/apps/web-ele/src/views/erp/sale/out/index.vue
index 528e7f5b3..bfd9da126 100644
--- a/apps/web-ele/src/views/erp/sale/out/index.vue
+++ b/apps/web-ele/src/views/erp/sale/out/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增销售出库 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑销售出库 */
 function handleEdit(row: ErpSaleOutApi.SaleOut) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除销售出库 */
@@ -89,7 +89,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpSaleOutApi.SaleOut) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/sale/out/modules/form.vue b/apps/web-ele/src/views/erp/sale/out/modules/form.vue
index 123f2f38b..5587c806b 100644
--- a/apps/web-ele/src/views/erp/sale/out/modules/form.vue
+++ b/apps/web-ele/src/views/erp/sale/out/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { ErpSaleOutApi } from '#/api/erp/sale/out';
 
@@ -42,7 +44,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 /* eslint-disable unicorn/no-nested-ternary */
@@ -170,8 +172,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/sale/return/data.ts b/apps/web-ele/src/views/erp/sale/return/data.ts
index 9138f35a6..d6cd37886 100644
--- a/apps/web-ele/src/views/erp/sale/return/data.ts
+++ b/apps/web-ele/src/views/erp/sale/return/data.ts
@@ -13,8 +13,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/sale/return/index.vue b/apps/web-ele/src/views/erp/sale/return/index.vue
index 5a76a96b3..10366952a 100644
--- a/apps/web-ele/src/views/erp/sale/return/index.vue
+++ b/apps/web-ele/src/views/erp/sale/return/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增销售退货 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑销售退货 */
 function handleEdit(row: ErpSaleReturnApi.SaleReturn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除销售退货 */
@@ -92,7 +92,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpSaleReturnApi.SaleReturn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/sale/return/modules/form.vue b/apps/web-ele/src/views/erp/sale/return/modules/form.vue
index 35f59a95d..9e8d982a0 100644
--- a/apps/web-ele/src/views/erp/sale/return/modules/form.vue
+++ b/apps/web-ele/src/views/erp/sale/return/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { ErpSaleReturnApi } from '#/api/erp/sale/return';
 
@@ -46,7 +48,7 @@ const formData = ref<
   otherPrice: 0,
   items: [],
 });
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -175,8 +177,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/stock/check/data.ts b/apps/web-ele/src/views/erp/stock/check/data.ts
index c4beb2c5c..0d41c1922 100644
--- a/apps/web-ele/src/views/erp/stock/check/data.ts
+++ b/apps/web-ele/src/views/erp/stock/check/data.ts
@@ -9,8 +9,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/stock/check/index.vue b/apps/web-ele/src/views/erp/stock/check/index.vue
index 144ab7619..a225cf559 100644
--- a/apps/web-ele/src/views/erp/stock/check/index.vue
+++ b/apps/web-ele/src/views/erp/stock/check/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增库存盘点单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑库存盘点单 */
 function handleEdit(row: ErpStockCheckApi.StockCheck) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除库存盘点单 */
@@ -92,7 +92,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockCheckApi.StockCheck) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/stock/check/modules/form.vue b/apps/web-ele/src/views/erp/stock/check/modules/form.vue
index 72e504a73..7d0231404 100644
--- a/apps/web-ele/src/views/erp/stock/check/modules/form.vue
+++ b/apps/web-ele/src/views/erp/stock/check/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockCheckApi } from '#/api/erp/stock/check';
 
 import { computed, ref } from 'vue';
@@ -20,7 +22,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockCheckApi.StockCheck>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -93,8 +95,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/stock/in/data.ts b/apps/web-ele/src/views/erp/stock/in/data.ts
index 9b59ce9cc..1d589000b 100644
--- a/apps/web-ele/src/views/erp/stock/in/data.ts
+++ b/apps/web-ele/src/views/erp/stock/in/data.ts
@@ -10,8 +10,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/stock/in/index.vue b/apps/web-ele/src/views/erp/stock/in/index.vue
index 4f6e1da26..893166155 100644
--- a/apps/web-ele/src/views/erp/stock/in/index.vue
+++ b/apps/web-ele/src/views/erp/stock/in/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增其它入库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑其它入库单 */
 function handleEdit(row: ErpStockInApi.StockIn) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除其它入库单 */
@@ -89,7 +89,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockInApi.StockIn) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/stock/in/modules/form.vue b/apps/web-ele/src/views/erp/stock/in/modules/form.vue
index 8d1e42091..c269ebf94 100644
--- a/apps/web-ele/src/views/erp/stock/in/modules/form.vue
+++ b/apps/web-ele/src/views/erp/stock/in/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockInApi } from '#/api/erp/stock/in';
 
 import { computed, ref } from 'vue';
@@ -16,7 +18,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockInApi.StockIn>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -89,8 +91,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/stock/move/data.ts b/apps/web-ele/src/views/erp/stock/move/data.ts
index 0b4ffea43..556b096ba 100644
--- a/apps/web-ele/src/views/erp/stock/move/data.ts
+++ b/apps/web-ele/src/views/erp/stock/move/data.ts
@@ -9,8 +9,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/stock/move/index.vue b/apps/web-ele/src/views/erp/stock/move/index.vue
index c0a64812b..39638d75e 100644
--- a/apps/web-ele/src/views/erp/stock/move/index.vue
+++ b/apps/web-ele/src/views/erp/stock/move/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增库存调拨单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑库存调拨单 */
 function handleEdit(row: ErpStockMoveApi.StockMove) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除库存调拨单 */
@@ -92,7 +92,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockMoveApi.StockMove) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/stock/move/modules/form.vue b/apps/web-ele/src/views/erp/stock/move/modules/form.vue
index 94c879b99..11194e436 100644
--- a/apps/web-ele/src/views/erp/stock/move/modules/form.vue
+++ b/apps/web-ele/src/views/erp/stock/move/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockMoveApi } from '#/api/erp/stock/move';
 
 import { computed, ref } from 'vue';
@@ -20,7 +22,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockMoveApi.StockMove>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -93,8 +95,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/erp/stock/out/data.ts b/apps/web-ele/src/views/erp/stock/out/data.ts
index eb11d6849..129f76ce3 100644
--- a/apps/web-ele/src/views/erp/stock/out/data.ts
+++ b/apps/web-ele/src/views/erp/stock/out/data.ts
@@ -10,8 +10,11 @@ import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'edit';
+
 /** 表单的配置项 */
-export function useFormSchema(formType: string): VbenFormSchema[] {
+export function useFormSchema(formType: FormType): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
diff --git a/apps/web-ele/src/views/erp/stock/out/index.vue b/apps/web-ele/src/views/erp/stock/out/index.vue
index 96c244e09..5bf9b7865 100644
--- a/apps/web-ele/src/views/erp/stock/out/index.vue
+++ b/apps/web-ele/src/views/erp/stock/out/index.vue
@@ -42,12 +42,12 @@ async function handleExport() {
 
 /** 新增其它出库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑其它出库单 */
 function handleEdit(row: ErpStockOutApi.StockOut) {
-  formModalApi.setData({ type: 'edit', id: row.id }).open();
+  formModalApi.setData({ formType: 'edit', id: row.id }).open();
 }
 
 /** 删除其它出库单 */
@@ -92,7 +92,7 @@ function handleRowCheckboxChange({
 
 /** 查看详情 */
 function handleDetail(row: ErpStockOutApi.StockOut) {
-  formModalApi.setData({ type: 'detail', id: row.id }).open();
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/stock/out/modules/form.vue b/apps/web-ele/src/views/erp/stock/out/modules/form.vue
index 4d84dd331..051cdd2a5 100644
--- a/apps/web-ele/src/views/erp/stock/out/modules/form.vue
+++ b/apps/web-ele/src/views/erp/stock/out/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { ErpStockOutApi } from '#/api/erp/stock/out';
 
 import { computed, ref } from 'vue';
@@ -20,7 +22,7 @@ import ItemForm from './item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpStockOutApi.StockOut>();
-const formType = ref(''); // 表单类型：'create' | 'edit' | 'detail'
+const formType = ref<FormType>('create'); // 表单类型：'create' | 'edit' | 'detail'
 const itemFormRef = ref<InstanceType<typeof ItemForm>>();
 
 const getTitle = computed(() => {
@@ -93,8 +95,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type: string }>();
-    formType.value = data.type;
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(formType.value === 'detail');
     formApi.updateSchema(useFormSchema(formType.value));
     if (!data || !data.id) {
diff --git a/apps/web-ele/src/views/iot/ota/firmware/index.vue b/apps/web-ele/src/views/iot/ota/firmware/index.vue
index 5ecd79e4d..5aec4214c 100644
--- a/apps/web-ele/src/views/iot/ota/firmware/index.vue
+++ b/apps/web-ele/src/views/iot/ota/firmware/index.vue
@@ -34,12 +34,12 @@ function handleRefresh() {
 
 /** 创建固件 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData(null).open();
 }
 
 /** 编辑固件 */
 function handleEdit(row: IoTOtaFirmwareApi.Firmware) {
-  formModalApi.setData({ type: 'update', id: row.id }).open();
+  formModalApi.setData({ id: row.id }).open();
 }
 
 /** 删除固件 */
diff --git a/apps/web-ele/src/views/mes/cal/plan/data.ts b/apps/web-ele/src/views/mes/cal/plan/data.ts
index 5c3867160..66548df50 100644
--- a/apps/web-ele/src/views/mes/cal/plan/data.ts
+++ b/apps/web-ele/src/views/mes/cal/plan/data.ts
@@ -18,6 +18,9 @@ import {
   MesCalShiftTypeEnum,
 } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改排班计划的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/cal/plan/index.vue b/apps/web-ele/src/views/mes/cal/plan/index.vue
index 3400ddd5a..3a517c6ed 100644
--- a/apps/web-ele/src/views/mes/cal/plan/index.vue
+++ b/apps/web-ele/src/views/mes/cal/plan/index.vue
@@ -27,17 +27,17 @@ function handleRefresh() {
 
 /** 创建排班计划 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看排班计划 */
 function handleDetail(row: MesCalPlanApi.Plan) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑排班计划 */
 function handleEdit(row: MesCalPlanApi.Plan) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除排班计划 */
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 bc88a84a8..4300f3edf 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesCalPlanApi } from '#/api/mes/cal/plan';
 
 import { computed, ref } from 'vue';
@@ -17,21 +19,19 @@ import ShiftList from './shift-list.vue';
 import PlanTeamList from './team-list.vue';
 
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('shift'); // 当前资源页签
 const formData = ref<MesCalPlanApi.Plan>();
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const canConfirm = computed(
-  () => formMode.value === 'update' && formData.value?.status === MesCalPlanStatusEnum.PREPARE,
+  () => formType.value === 'update' && formData.value?.status === MesCalPlanStatusEnum.PREPARE,
 ); // 是否可确认计划
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['排班计划']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['排班计划'])
     : $t('ui.actionTitle.create', ['排班计划']);
 });
@@ -87,11 +87,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesCalPlanApi.Plan;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createPlan(data);
         formData.value = { ...data, id: id as number, status: MesCalPlanStatusEnum.PREPARE };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updatePlan(data);
         formData.value = { ...formData.value, ...data };
@@ -110,10 +110,10 @@ 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');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -132,12 +132,12 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
-    <ElTabs v-if="formMode !== 'create' && formData?.id" v-model="subTabsName" class="mx-4 mt-4">
+    <ElTabs v-if="formType !== 'create' && formData?.id" v-model="subTabsName" class="mx-4 mt-4">
       <ElTabPane label="班次" name="shift">
-        <ShiftList :form-type="formMode" :plan-id="formData.id" />
+        <ShiftList :form-type="formType" :plan-id="formData.id" />
       </ElTabPane>
       <ElTabPane label="班组" name="team">
-        <PlanTeamList :form-type="formMode" :plan-id="formData.id" />
+        <PlanTeamList :form-type="formType" :plan-id="formData.id" />
       </ElTabPane>
     </ElTabs>
     <template #prepend-footer>
diff --git a/apps/web-ele/src/views/mes/cal/plan/modules/shift-list.vue b/apps/web-ele/src/views/mes/cal/plan/modules/shift-list.vue
index 3fbf0fdf0..1bab15e3c 100644
--- a/apps/web-ele/src/views/mes/cal/plan/modules/shift-list.vue
+++ b/apps/web-ele/src/views/mes/cal/plan/modules/shift-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesCalPlanShiftApi } from '#/api/mes/cal/plan/shift';
 
@@ -16,7 +18,7 @@ import {
 } from '#/api/mes/cal/plan/shift';
 import { $t } from '#/locales';
 
-const props = withDefaults(defineProps<{ formType?: string; planId: number }>(), {
+const props = withDefaults(defineProps<{ formType?: FormType; planId: number }>(), {
   formType: 'update',
 });
 const isEditable = computed(() => props.formType !== 'detail'); // 是否可编辑
diff --git a/apps/web-ele/src/views/mes/cal/plan/modules/team-list.vue b/apps/web-ele/src/views/mes/cal/plan/modules/team-list.vue
index cb4e21106..c45a8f96b 100644
--- a/apps/web-ele/src/views/mes/cal/plan/modules/team-list.vue
+++ b/apps/web-ele/src/views/mes/cal/plan/modules/team-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesCalPlanTeamApi } from '#/api/mes/cal/plan/team';
 import type { MesCalTeamApi } from '#/api/mes/cal/team';
@@ -14,7 +16,7 @@ import { getTeamMemberListByTeam } from '#/api/mes/cal/team/member';
 import { $t } from '#/locales';
 import { CalTeamSelectDialog } from '#/views/mes/cal/team/components';
 
-const props = withDefaults(defineProps<{ formType?: string; planId: number }>(), {
+const props = withDefaults(defineProps<{ formType?: FormType; planId: number }>(), {
   formType: 'update',
 });
 const isEditable = computed(() => props.formType !== 'detail'); // 是否可编辑
diff --git a/apps/web-ele/src/views/mes/cal/team/data.ts b/apps/web-ele/src/views/mes/cal/team/data.ts
index cf1521481..4d78d82d2 100644
--- a/apps/web-ele/src/views/mes/cal/team/data.ts
+++ b/apps/web-ele/src/views/mes/cal/team/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改班组的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/cal/team/index.vue b/apps/web-ele/src/views/mes/cal/team/index.vue
index 723b68782..359beb691 100644
--- a/apps/web-ele/src/views/mes/cal/team/index.vue
+++ b/apps/web-ele/src/views/mes/cal/team/index.vue
@@ -26,17 +26,17 @@ function handleRefresh() {
 
 /** 创建班组 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看班组 */
 function handleDetail(row: MesCalTeamApi.Team) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑班组 */
 function handleEdit(row: MesCalTeamApi.Team) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除班组 */
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 8217bbae1..17a70a355 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesCalTeamApi } from '#/api/mes/cal/team';
 
 import { computed, ref } from 'vue';
@@ -15,18 +17,16 @@ import { useFormSchema } from '../data';
 import MemberList from './member-list.vue';
 
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('member'); // 当前资源页签
 const formData = ref<MesCalTeamApi.Team>();
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['班组']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['班组'])
     : $t('ui.actionTitle.create', ['班组']);
 });
@@ -62,11 +62,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesCalTeamApi.Team;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createTeam(data);
         formData.value = { ...data, id: id as number };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateTeam(data);
         formData.value = { ...formData.value, ...data };
@@ -85,10 +85,10 @@ 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');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -107,9 +107,9 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
-    <ElTabs v-if="formMode !== 'create' && formData?.id" v-model="subTabsName" class="mx-4 mt-4">
+    <ElTabs v-if="formType !== 'create' && formData?.id" v-model="subTabsName" class="mx-4 mt-4">
       <ElTabPane label="班组成员" name="member">
-        <MemberList :form-type="formMode" :team-id="formData.id" />
+        <MemberList :form-type="formType" :team-id="formData.id" />
       </ElTabPane>
     </ElTabs>
   </Modal>
diff --git a/apps/web-ele/src/views/mes/cal/team/modules/member-list.vue b/apps/web-ele/src/views/mes/cal/team/modules/member-list.vue
index 8dc4f4200..6069d9624 100644
--- a/apps/web-ele/src/views/mes/cal/team/modules/member-list.vue
+++ b/apps/web-ele/src/views/mes/cal/team/modules/member-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesCalTeamMemberApi } from '#/api/mes/cal/team/member';
 
@@ -16,7 +18,7 @@ import {
 import { getSimpleUserList } from '#/api/system/user';
 import { $t } from '#/locales';
 
-const props = withDefaults(defineProps<{ formType?: string; teamId: number }>(), {
+const props = withDefaults(defineProps<{ formType?: FormType; teamId: number }>(), {
   formType: 'update',
 });
 const isEditable = computed(() => ['create', 'update'].includes(props.formType)); // 是否可编辑
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/data.ts b/apps/web-ele/src/views/mes/dv/checkplan/data.ts
index cf5ff2c44..9b34cc8d4 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/data.ts
+++ b/apps/web-ele/src/views/mes/dv/checkplan/data.ts
@@ -18,6 +18,9 @@ import {
   MesDvSubjectTypeEnum,
 } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改点检保养方案的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/index.vue b/apps/web-ele/src/views/mes/dv/checkplan/index.vue
index 493af75d0..84e58e38e 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/index.vue
+++ b/apps/web-ele/src/views/mes/dv/checkplan/index.vue
@@ -34,17 +34,17 @@ function handleRefresh() {
 
 /** 创建点检计划 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看点检计划 */
 function handleDetail(row: MesDvCheckPlanApi.CheckPlan) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑点检计划 */
 function handleEdit(row: MesDvCheckPlanApi.CheckPlan) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除点检计划 */
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 14b3a5b5f..edda2c7b8 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan';
 
 import { computed, ref } from 'vue';
@@ -16,18 +18,16 @@ import { useFormSchema } from '../data';
 import MachineryList from './machinery-list.vue';
 import SubjectList from './subject-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create');
+const formType = ref<FormType>('create');
 const subTabsName = ref('machinery');
 const formData = ref<MesDvCheckPlanApi.CheckPlan>();
-const isDetail = computed(() => formMode.value === 'detail');
+const isDetail = computed(() => formType.value === 'detail');
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看点检保养方案';
   }
-  return formMode.value === 'update' ? '修改点检保养方案' : '新增点检保养方案';
+  return formType.value === 'update' ? '修改点检保养方案' : '新增点检保养方案';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -61,11 +61,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesDvCheckPlanApi.CheckPlan;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createCheckPlan(data);
         formData.value = { ...data, id: id as number, status: MesDvCheckPlanStatusEnum.PREPARE };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateCheckPlan(data);
         formData.value = { ...formData.value, ...data };
@@ -84,10 +84,10 @@ 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');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -105,12 +105,12 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
-    <ElTabs v-if="formMode !== 'create' && formData?.id" v-model="subTabsName" class="mx-4 mt-4">
+    <ElTabs v-if="formType !== 'create' && formData?.id" v-model="subTabsName" class="mx-4 mt-4">
       <ElTabPane label="设备" name="machinery">
-        <MachineryList :form-type="formMode" :plan-id="formData.id" />
+        <MachineryList :form-type="formType" :plan-id="formData.id" />
       </ElTabPane>
       <ElTabPane label="项目" name="subject">
-        <SubjectList :form-type="formMode" :plan-id="formData.id" :plan-type="formData.type" />
+        <SubjectList :form-type="formType" :plan-id="formData.id" :plan-type="formData.type" />
       </ElTabPane>
     </ElTabs>
   </Modal>
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/modules/machinery-list.vue b/apps/web-ele/src/views/mes/dv/checkplan/modules/machinery-list.vue
index 5c91afdd4..4a2106649 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/modules/machinery-list.vue
+++ b/apps/web-ele/src/views/mes/dv/checkplan/modules/machinery-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvCheckPlanMachineryApi } from '#/api/mes/dv/checkplan/machinery';
 
@@ -17,7 +19,7 @@ import { $t } from '#/locales';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
 
 const props = withDefaults(
-  defineProps<{ formType?: string; planId: number; planType?: number }>(),
+  defineProps<{ formType?: FormType; planId: number; planType?: number }>(),
   { formType: 'update', planType: undefined },
 );
 const isEditable = computed(() => props.formType !== 'detail');
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/modules/subject-list.vue b/apps/web-ele/src/views/mes/dv/checkplan/modules/subject-list.vue
index b678ed8d5..5fa45eb99 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/modules/subject-list.vue
+++ b/apps/web-ele/src/views/mes/dv/checkplan/modules/subject-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvCheckPlanSubjectApi } from '#/api/mes/dv/checkplan/subject';
 
@@ -19,7 +21,7 @@ import { $t } from '#/locales';
 import { DvSubjectSelect } from '#/views/mes/dv/subject/components';
 
 const props = withDefaults(
-  defineProps<{ formType?: string; planId: number; planType?: number }>(),
+  defineProps<{ formType?: FormType; planId: number; planType?: number }>(),
   { formType: 'update', planType: undefined },
 );
 const isEditable = computed(() => props.formType !== 'detail');
diff --git a/apps/web-ele/src/views/mes/dv/checkrecord/data.ts b/apps/web-ele/src/views/mes/dv/checkrecord/data.ts
index d75828f64..dc7b48ae5 100644
--- a/apps/web-ele/src/views/mes/dv/checkrecord/data.ts
+++ b/apps/web-ele/src/views/mes/dv/checkrecord/data.ts
@@ -17,6 +17,9 @@ import {
   MesDvSubjectTypeEnum,
 } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改点检记录的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/dv/checkrecord/index.vue b/apps/web-ele/src/views/mes/dv/checkrecord/index.vue
index f29ff2d05..2a71d2a49 100644
--- a/apps/web-ele/src/views/mes/dv/checkrecord/index.vue
+++ b/apps/web-ele/src/views/mes/dv/checkrecord/index.vue
@@ -27,17 +27,17 @@ function handleRefresh() {
 
 /** 创建点检记录 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看点检记录 */
 function handleDetail(row: MesDvCheckRecordApi.CheckRecord) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑点检记录 */
 function handleEdit(row: MesDvCheckRecordApi.CheckRecord) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除点检记录 */
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 cbbc3557a..c355deebc 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord';
 
 import { computed, ref } from 'vue';
@@ -20,20 +22,18 @@ import { MesDvCheckRecordStatusEnum } from '#/views/mes/utils/constants';
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create');
+const formType = ref<FormType>('create');
 const formData = ref<MesDvCheckRecordApi.CheckRecord>();
-const isDetail = computed(() => formMode.value === 'detail');
+const isDetail = computed(() => formType.value === 'detail');
 const canSubmit = computed(
-  () => formMode.value === 'update' && formData.value?.status === MesDvCheckRecordStatusEnum.DRAFT,
+  () => formType.value === 'update' && formData.value?.status === MesDvCheckRecordStatusEnum.DRAFT,
 );
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看点检记录';
   }
-  return formMode.value === 'update' ? '修改点检记录' : '新增点检记录';
+  return formType.value === 'update' ? '修改点检记录' : '新增点检记录';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -83,11 +83,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesDvCheckRecordApi.CheckRecord;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createCheckRecord(data);
         formData.value = { ...data, id: id as number, status: MesDvCheckRecordStatusEnum.DRAFT };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateCheckRecord(data);
         formData.value = { ...formData.value, ...data };
@@ -105,10 +105,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-ele/src/views/mes/dv/machinery/data.ts b/apps/web-ele/src/views/mes/dv/machinery/data.ts
index c11fd5940..735b30eca 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/data.ts
+++ b/apps/web-ele/src/views/mes/dv/machinery/data.ts
@@ -1,5 +1,3 @@
-import type { Ref } from 'vue';
-
 import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
@@ -18,8 +16,11 @@ import { MesAutoCodeRuleCode, MesDvMachineryStatusEnum } from '#/views/mes/utils
 
 import { DvMachineryTypeSelect } from './type/components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改设备的表单 */
-export function useFormSchema(formApi?: VbenFormApi, formMode?: Ref<string>): VbenFormSchema[] {
+export function useFormSchema(formType: FormType, formApi?: VbenFormApi): VbenFormSchema[] {
   return [
     {
       fieldName: 'id',
@@ -123,7 +124,7 @@ export function useFormSchema(formApi?: VbenFormApi, formMode?: Ref<string>): Vb
       },
       dependencies: {
         triggerFields: ['id'],
-        show: () => formMode?.value === 'detail',
+        show: () => formType === 'detail',
       },
     },
     {
@@ -139,7 +140,7 @@ export function useFormSchema(formApi?: VbenFormApi, formMode?: Ref<string>): Vb
       },
       dependencies: {
         triggerFields: ['id'],
-        show: () => formMode?.value === 'detail',
+        show: () => formType === 'detail',
       },
     },
     {
diff --git a/apps/web-ele/src/views/mes/dv/machinery/index.vue b/apps/web-ele/src/views/mes/dv/machinery/index.vue
index 97b0adde5..71c95bb28 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/index.vue
+++ b/apps/web-ele/src/views/mes/dv/machinery/index.vue
@@ -37,17 +37,17 @@ function handleRefresh() {
 
 /** 创建设备 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看设备 */
 function handleDetail(row: MesDvMachineryApi.Machinery) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑设备 */
 function handleEdit(row: MesDvMachineryApi.Machinery) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除设备 */
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 4165ef0bf..524946e24 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvMachineryApi } from '#/api/mes/dv/machinery';
 
 import { computed, ref } from 'vue';
@@ -18,19 +20,17 @@ import CheckRecordList from './check-record-list.vue';
 import MaintenRecordList from './mainten-record-list.vue';
 import RepairList from './repair-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('check'); // 当前资源页签
 const formData = ref<MesDvMachineryApi.Machinery>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看设备';
   }
-  return formMode.value === 'update' ? '修改设备' : '新增设备';
+  return formType.value === 'update' ? '修改设备' : '新增设备';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -48,7 +48,7 @@ const [Form, formApi] = useVbenForm({
 });
 
 /** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formApi, formMode) });
+formApi.setState({ schema: useFormSchema(formType.value, formApi) });
 
 /** 查看设备条码 */
 function handleBarcode() {
@@ -94,10 +94,11 @@ 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');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -116,7 +117,7 @@ const [Modal, modalApi] = useVbenModal({
 <template>
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
-    <ElTabs v-if="formMode !== 'create' && formData?.id" v-model="subTabsName" class="mx-4 mt-4">
+    <ElTabs v-if="formType !== 'create' && formData?.id" v-model="subTabsName" class="mx-4 mt-4">
       <ElTabPane label="点检记录" name="check">
         <CheckRecordList :machinery-id="formData.id" />
       </ElTabPane>
diff --git a/apps/web-ele/src/views/mes/dv/maintenrecord/data.ts b/apps/web-ele/src/views/mes/dv/maintenrecord/data.ts
index e5d6f6116..59bde5664 100644
--- a/apps/web-ele/src/views/mes/dv/maintenrecord/data.ts
+++ b/apps/web-ele/src/views/mes/dv/maintenrecord/data.ts
@@ -17,6 +17,9 @@ import {
   MesDvSubjectTypeEnum,
 } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改保养记录的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/dv/maintenrecord/index.vue b/apps/web-ele/src/views/mes/dv/maintenrecord/index.vue
index b2d7045c9..9ecffa447 100644
--- a/apps/web-ele/src/views/mes/dv/maintenrecord/index.vue
+++ b/apps/web-ele/src/views/mes/dv/maintenrecord/index.vue
@@ -31,17 +31,17 @@ function handleRefresh() {
 
 /** 创建保养记录 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看保养记录 */
 function handleDetail(row: MesDvMaintenRecordApi.MaintenRecord) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑保养记录 */
 function handleEdit(row: MesDvMaintenRecordApi.MaintenRecord) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除保养记录 */
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 2aa64705f..02158e5cd 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord';
 
 import { computed, ref } from 'vue';
@@ -21,22 +23,20 @@ import { MesDvMaintenRecordStatusEnum } from '#/views/mes/utils/constants';
 import { useFormSchema } from '../data';
 import LineList from './line-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
 const userStore = useUserStore();
-const formMode = ref<FormMode>('create');
+const formType = ref<FormType>('create');
 const formData = ref<MesDvMaintenRecordApi.MaintenRecord>();
-const isDetail = computed(() => formMode.value === 'detail');
+const isDetail = computed(() => formType.value === 'detail');
 const canSubmit = computed(
   () =>
-    formMode.value === 'update' && formData.value?.status === MesDvMaintenRecordStatusEnum.PREPARE,
+    formType.value === 'update' && formData.value?.status === MesDvMaintenRecordStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看保养记录';
   }
-  return formMode.value === 'update' ? '修改保养记录' : '新增保养记录';
+  return formType.value === 'update' ? '修改保养记录' : '新增保养记录';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -86,7 +86,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesDvMaintenRecordApi.MaintenRecord;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createMaintenRecord(data);
         formData.value = {
           ...data,
@@ -94,7 +94,7 @@ const [Modal, modalApi] = useVbenModal({
           status: MesDvMaintenRecordStatusEnum.PREPARE,
         };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateMaintenRecord(data);
         formData.value = { ...formData.value, ...data };
@@ -112,10 +112,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       await formApi.setFieldValue('userId', userStore.userInfo?.id);
       return;
diff --git a/apps/web-ele/src/views/mes/dv/repair/data.ts b/apps/web-ele/src/views/mes/dv/repair/data.ts
index 9b027fb42..ce5db65da 100644
--- a/apps/web-ele/src/views/mes/dv/repair/data.ts
+++ b/apps/web-ele/src/views/mes/dv/repair/data.ts
@@ -14,6 +14,9 @@ import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 import { DvMachinerySelect } from '#/views/mes/dv/machinery/components';
 import { MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '#/views/mes/utils/constants';
+/** 表单类型 */
+export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update';
+
 /** 新增/修改维修工单的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/dv/repair/index.vue b/apps/web-ele/src/views/mes/dv/repair/index.vue
index 0b765e81b..d8d4899f6 100644
--- a/apps/web-ele/src/views/mes/dv/repair/index.vue
+++ b/apps/web-ele/src/views/mes/dv/repair/index.vue
@@ -27,27 +27,27 @@ function handleRefresh() {
 
 /** 创建维修工单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看维修工单 */
 function handleDetail(row: MesDvRepairApi.Repair) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑维修工单 */
 function handleEdit(row: MesDvRepairApi.Repair) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 完成维修 */
 function handleConfirm(row: MesDvRepairApi.Repair) {
-  formModalApi.setData({ id: row.id, type: 'confirm' }).open();
+  formModalApi.setData({ id: row.id, formType: 'confirm' }).open();
 }
 
 /** 验收维修 */
 function handleFinish(row: MesDvRepairApi.Repair) {
-  formModalApi.setData({ id: row.id, type: 'finish' }).open();
+  formModalApi.setData({ id: row.id, formType: 'finish' }).open();
 }
 
 /** 删除维修工单 */
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 a50e83cdb..fcff4d0ea 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvRepairApi } from '#/api/mes/dv/repair';
 
 import { computed, ref } from 'vue';
@@ -22,15 +24,13 @@ 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<FormMode>('create');
+const formType = ref<FormType>('create');
 const formData = ref<MesDvRepairApi.Repair>();
-const isDetail = computed(() => formMode.value === 'detail');
-const isReadonly = computed(() => ['confirm', 'detail', 'finish'].includes(formMode.value));
+const isDetail = computed(() => formType.value === 'detail');
+const isReadonly = computed(() => ['confirm', 'detail', 'finish'].includes(formType.value));
 const canSubmit = computed(
-  () => formMode.value === 'update' && formData.value?.status === MesDvRepairStatusEnum.PREPARE,
+  () => formType.value === 'update' && formData.value?.status === MesDvRepairStatusEnum.PREPARE,
 );
 const getTitle = computed(
   () =>
@@ -40,7 +40,7 @@ const getTitle = computed(
       confirm: '完成维修',
       finish: '验收维修',
       detail: '查看维修工单',
-    })[formMode.value],
+    })[formType.value],
 );
 
 const [Form, formApi] = useVbenForm({
@@ -132,7 +132,7 @@ async function doFinish(result: number) {
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    if (isDetail.value || formMode.value === 'confirm' || formMode.value === 'finish') {
+    if (isDetail.value || formType.value === 'confirm' || formType.value === 'finish') {
       await modalApi.close();
       return;
     }
@@ -144,11 +144,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesDvRepairApi.Repair;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createRepair(data);
         formData.value = { ...data, id: id as number, status: MesDvRepairStatusEnum.PREPARE };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateRepair(data);
         formData.value = { ...formData.value, ...data };
@@ -166,10 +166,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     formApi.setDisabled(isReadonly.value);
-    modalApi.setState({ showConfirmButton: ['create', 'update'].includes(formMode.value) });
+    modalApi.setState({ showConfirmButton: ['create', 'update'].includes(formType.value) });
     if (!data?.id) {
       return;
     }
@@ -200,7 +200,7 @@ const [Modal, modalApi] = useVbenModal({
           </template>
         </ElPopconfirm>
         <ElPopconfirm
-          v-if="formMode === 'confirm'"
+          v-if="formType === 'confirm'"
           title="确认完成维修？完成后进入待验收。"
           @confirm="handleConfirm"
         >
@@ -209,7 +209,7 @@ const [Modal, modalApi] = useVbenModal({
           </template>
         </ElPopconfirm>
         <ElPopconfirm
-          v-if="formMode === 'finish'"
+          v-if="formType === 'finish'"
           title="确认完成验收？"
           @confirm="handleFinish(MesDvRepairResultEnum.PASS)"
         >
@@ -218,7 +218,7 @@ const [Modal, modalApi] = useVbenModal({
           </template>
         </ElPopconfirm>
         <ElPopconfirm
-          v-if="formMode === 'finish'"
+          v-if="formType === 'finish'"
           title="确认完成验收？"
           @confirm="handleFinish(MesDvRepairResultEnum.FAIL)"
         >
diff --git a/apps/web-ele/src/views/mes/dv/subject/data.ts b/apps/web-ele/src/views/mes/dv/subject/data.ts
index 087781834..6d28f541d 100644
--- a/apps/web-ele/src/views/mes/dv/subject/data.ts
+++ b/apps/web-ele/src/views/mes/dv/subject/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改点检保养项目的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/dv/subject/index.vue b/apps/web-ele/src/views/mes/dv/subject/index.vue
index 336a80cd1..2714a1765 100644
--- a/apps/web-ele/src/views/mes/dv/subject/index.vue
+++ b/apps/web-ele/src/views/mes/dv/subject/index.vue
@@ -26,17 +26,17 @@ function handleRefresh() {
 
 /** 创建点检保养项目 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看点检保养项目 */
 function handleDetail(row: MesDvSubjectApi.Subject) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑点检保养项目 */
 function handleEdit(row: MesDvSubjectApi.Subject) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除点检保养项目 */
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 5608a0023..abdb412be 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
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesDvSubjectApi } from '#/api/mes/dv/subject';
 
 import { computed, ref } from 'vue';
@@ -13,16 +15,14 @@ import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const formType = ref<FormType>('create'); // 表单模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看点检保养项目';
   }
-  return formMode.value === 'update' ? '修改点检保养项目' : '新增点检保养项目';
+  return formType.value === 'update' ? '修改点检保养项目' : '新增点检保养项目';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -71,10 +71,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-ele/src/views/mes/md/client/data.ts b/apps/web-ele/src/views/mes/md/client/data.ts
index 0a7597229..882c54ce8 100644
--- a/apps/web-ele/src/views/mes/md/client/data.ts
+++ b/apps/web-ele/src/views/mes/md/client/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改客户的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/md/client/index.vue b/apps/web-ele/src/views/mes/md/client/index.vue
index b7250ddb9..9ba792057 100644
--- a/apps/web-ele/src/views/mes/md/client/index.vue
+++ b/apps/web-ele/src/views/mes/md/client/index.vue
@@ -32,17 +32,17 @@ function handleRefresh() {
 
 /** 创建客户 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看客户 */
 function handleDetail(row: MesMdClientApi.Client) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑客户 */
 function handleEdit(row: MesMdClientApi.Client) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除客户 */
diff --git a/apps/web-ele/src/views/mes/md/client/modules/form.vue b/apps/web-ele/src/views/mes/md/client/modules/form.vue
index 5b0fa0f41..3d22f5f4e 100644
--- a/apps/web-ele/src/views/mes/md/client/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/client/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdClientApi } from '#/api/mes/md/client';
 
 import { computed, ref } from 'vue';
@@ -15,19 +17,17 @@ import { useFormSchema } from '../data';
 import ClientProductSalesLineList from './product-sales-line-list.vue';
 import ClientProductSalesList from './product-sales-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('productSalesLine'); // 当前子表页签
 const formData = ref<MesMdClientApi.Client>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看客户';
   }
-  return formMode.value === 'update' ? '修改客户' : '新增客户';
+  return formType.value === 'update' ? '修改客户' : '新增客户';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -78,10 +78,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTabsName.value = 'productSalesLine';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -101,7 +101,7 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <ElTabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model="subTabsName"
       class="mx-4 mt-4"
     >
diff --git a/apps/web-ele/src/views/mes/md/client/modules/product-sales-line-list.vue b/apps/web-ele/src/views/mes/md/client/modules/product-sales-line-list.vue
index 8ddb50d30..ef375649b 100644
--- a/apps/web-ele/src/views/mes/md/client/modules/product-sales-line-list.vue
+++ b/apps/web-ele/src/views/mes/md/client/modules/product-sales-line-list.vue
@@ -21,7 +21,7 @@ const [ItemFormModal, itemFormModalApi] = useVbenModal({
 
 /** 查看物料详情 */
 function handleViewItem(row: MesWmProductSalesLineApi.ProductSalesLine) {
-  itemFormModalApi.setData({ id: row.itemId, type: 'detail' }).open();
+  itemFormModalApi.setData({ id: row.itemId, formType: 'detail' }).open();
 }
 
 const [Grid] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/mes/md/item/data.ts b/apps/web-ele/src/views/mes/md/item/data.ts
index ea7f7991b..1b2dd41af 100644
--- a/apps/web-ele/src/views/mes/md/item/data.ts
+++ b/apps/web-ele/src/views/mes/md/item/data.ts
@@ -16,6 +16,9 @@ import { MdItemTypeSelect } from '#/views/mes/md/item/type/components';
 import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改物料产品的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/md/item/index.vue b/apps/web-ele/src/views/mes/md/item/index.vue
index b30e612a2..f6e290fe8 100644
--- a/apps/web-ele/src/views/mes/md/item/index.vue
+++ b/apps/web-ele/src/views/mes/md/item/index.vue
@@ -52,17 +52,17 @@ function handleRefresh() {
 
 /** 创建物料 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看物料 */
 function handleDetail(row: MesMdItemApi.Item) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑物料 */
 function handleEdit(row: MesMdItemApi.Item) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除物料 */
diff --git a/apps/web-ele/src/views/mes/md/item/modules/form.vue b/apps/web-ele/src/views/mes/md/item/modules/form.vue
index b9681d9e9..913e02eec 100644
--- a/apps/web-ele/src/views/mes/md/item/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/item/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdItemApi } from '#/api/mes/md/item';
 
 import { computed, ref } from 'vue';
@@ -19,20 +21,18 @@ import ProductBomForm from './product-bom-form.vue';
 import ProductSipForm from './product-sip-form.vue';
 import ProductSopForm from './product-sop-form.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('bom'); // 当前子表页签
 const formData = ref<MesMdItemApi.Item>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看物料/产品';
   }
-  return formMode.value === 'update' ? '修改物料/产品' : '新增物料/产品';
+  return formType.value === 'update' ? '修改物料/产品' : '新增物料/产品';
 });
 const currentItemOrProduct = computed(
   () => formData.value?.itemOrProduct || '',
@@ -82,11 +82,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesMdItemApi.Item;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createItem(data);
         formData.value = { ...data, id };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
         ElMessage.success($t('ui.actionMessage.operationSuccess'));
       } else {
         await updateItem(data);
@@ -106,10 +106,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTabsName.value = 'bom';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -129,16 +129,16 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <ElTabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model="subTabsName"
       class="mx-4 mt-4"
     >
       <ElTabPane name="bom" label="BOM 组成">
-        <ProductBomForm :form-type="formMode" :item-id="formData.id" />
+        <ProductBomForm :form-type="formType" :item-id="formData.id" />
       </ElTabPane>
       <ElTabPane v-if="formData.batchFlag" name="batch" label="批次属性">
         <ItemBatchConfigForm
-          :form-type="formMode"
+          :form-type="formType"
           :item-id="formData.id"
           :item-or-product="currentItemOrProduct"
         />
@@ -147,10 +147,10 @@ const [Modal, modalApi] = useVbenModal({
         <ElEmpty description="替代品（待实现）" />
       </ElTabPane>
       <ElTabPane name="sip" label="SIP">
-        <ProductSipForm :form-type="formMode" :item-id="formData.id" />
+        <ProductSipForm :form-type="formType" :item-id="formData.id" />
       </ElTabPane>
       <ElTabPane name="sop" label="SOP">
-        <ProductSopForm :form-type="formMode" :item-id="formData.id" />
+        <ProductSopForm :form-type="formType" :item-id="formData.id" />
       </ElTabPane>
     </ElTabs>
     <template #prepend-footer>
diff --git a/apps/web-ele/src/views/mes/md/item/modules/item-batch-config-form.vue b/apps/web-ele/src/views/mes/md/item/modules/item-batch-config-form.vue
index 1a822a3c6..888492903 100644
--- a/apps/web-ele/src/views/mes/md/item/modules/item-batch-config-form.vue
+++ b/apps/web-ele/src/views/mes/md/item/modules/item-batch-config-form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdItemBatchConfigApi } from '#/api/mes/md/item/batchConfig';
 
 import { computed, ref, watch } from 'vue';
@@ -13,7 +15,7 @@ import { MesItemOrProductEnum } from '#/views/mes/utils/constants';
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     itemId: number;
     itemOrProduct?: string;
   }>(),
diff --git a/apps/web-ele/src/views/mes/md/item/modules/product-bom-form.vue b/apps/web-ele/src/views/mes/md/item/modules/product-bom-form.vue
index f8d75eb64..c62836b5b 100644
--- a/apps/web-ele/src/views/mes/md/item/modules/product-bom-form.vue
+++ b/apps/web-ele/src/views/mes/md/item/modules/product-bom-form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdItemApi } from '#/api/mes/md/item';
 import type { MesMdProductBomApi } from '#/api/mes/md/item/productBom';
@@ -22,7 +24,7 @@ import { useProductBomGridColumns } from '../data';
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     itemId: number;
   }>(),
   {
diff --git a/apps/web-ele/src/views/mes/md/item/modules/product-media-list.vue b/apps/web-ele/src/views/mes/md/item/modules/product-media-list.vue
index 1508ab5eb..e57d48b33 100644
--- a/apps/web-ele/src/views/mes/md/item/modules/product-media-list.vue
+++ b/apps/web-ele/src/views/mes/md/item/modules/product-media-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdProductSipApi } from '#/api/mes/md/item/productSip';
 import type { MesMdProductSopApi } from '#/api/mes/md/item/productSop';
 
@@ -35,7 +37,7 @@ type MediaItem = MesMdProductSipApi.ProductSip | MesMdProductSopApi.ProductSop;
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     itemId: number;
     kind: MediaKind;
   }>(),
diff --git a/apps/web-ele/src/views/mes/md/item/modules/product-sip-form.vue b/apps/web-ele/src/views/mes/md/item/modules/product-sip-form.vue
index a37cdcaec..b971f4631 100644
--- a/apps/web-ele/src/views/mes/md/item/modules/product-sip-form.vue
+++ b/apps/web-ele/src/views/mes/md/item/modules/product-sip-form.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import ProductMediaList from './product-media-list.vue';
 
 defineProps<{
-  formType?: string;
+  formType?: FormType;
   itemId: number;
 }>();
 </script>
diff --git a/apps/web-ele/src/views/mes/md/item/modules/product-sop-form.vue b/apps/web-ele/src/views/mes/md/item/modules/product-sop-form.vue
index 93a73a9b3..a9bb4f5b3 100644
--- a/apps/web-ele/src/views/mes/md/item/modules/product-sop-form.vue
+++ b/apps/web-ele/src/views/mes/md/item/modules/product-sop-form.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import ProductMediaList from './product-media-list.vue';
 
 defineProps<{
-  formType?: string;
+  formType?: FormType;
   itemId: number;
 }>();
 </script>
diff --git a/apps/web-ele/src/views/mes/md/vendor/data.ts b/apps/web-ele/src/views/mes/md/vendor/data.ts
index 205db9cbf..8e9a3aea3 100644
--- a/apps/web-ele/src/views/mes/md/vendor/data.ts
+++ b/apps/web-ele/src/views/mes/md/vendor/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改供应商的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/md/vendor/index.vue b/apps/web-ele/src/views/mes/md/vendor/index.vue
index 53e593583..10c5e4c1a 100644
--- a/apps/web-ele/src/views/mes/md/vendor/index.vue
+++ b/apps/web-ele/src/views/mes/md/vendor/index.vue
@@ -32,17 +32,17 @@ function handleRefresh() {
 
 /** 创建供应商 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看供应商 */
 function handleDetail(row: MesMdVendorApi.Vendor) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑供应商 */
 function handleEdit(row: MesMdVendorApi.Vendor) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除供应商 */
diff --git a/apps/web-ele/src/views/mes/md/vendor/modules/form.vue b/apps/web-ele/src/views/mes/md/vendor/modules/form.vue
index 6d10830f5..433e7f8dc 100644
--- a/apps/web-ele/src/views/mes/md/vendor/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/vendor/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdVendorApi } from '#/api/mes/md/vendor';
 
 import { computed, ref } from 'vue';
@@ -15,19 +17,17 @@ import { useFormSchema } from '../data';
 import VendorItemReceiptLineList from './item-receipt-line-list.vue';
 import VendorItemReceiptList from './item-receipt-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('itemReceiptLine'); // 当前子表页签
 const formData = ref<MesMdVendorApi.Vendor>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['供应商']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['供应商'])
     : $t('ui.actionTitle.create', ['供应商']);
 });
@@ -80,10 +80,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTabsName.value = 'itemReceiptLine';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -103,7 +103,7 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <ElTabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model="subTabsName"
       class="mx-4 mt-4"
     >
diff --git a/apps/web-ele/src/views/mes/md/vendor/modules/item-receipt-line-list.vue b/apps/web-ele/src/views/mes/md/vendor/modules/item-receipt-line-list.vue
index 43b29d30d..1d2e8655c 100644
--- a/apps/web-ele/src/views/mes/md/vendor/modules/item-receipt-line-list.vue
+++ b/apps/web-ele/src/views/mes/md/vendor/modules/item-receipt-line-list.vue
@@ -21,7 +21,7 @@ const [ItemFormModal, itemFormModalApi] = useVbenModal({
 
 /** 查看物料详情 */
 function handleViewItem(row: MesWmItemReceiptLineApi.ItemReceiptLine) {
-  itemFormModalApi.setData({ id: row.itemId, type: 'detail' }).open();
+  itemFormModalApi.setData({ id: row.itemId, formType: 'detail' }).open();
 }
 
 const [Grid] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/mes/md/workstation/data.ts b/apps/web-ele/src/views/mes/md/workstation/data.ts
index 703c88aac..c559d6e17 100644
--- a/apps/web-ele/src/views/mes/md/workstation/data.ts
+++ b/apps/web-ele/src/views/mes/md/workstation/data.ts
@@ -19,6 +19,9 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 import { MdWorkshopSelect } from './components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改工作站的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/md/workstation/index.vue b/apps/web-ele/src/views/mes/md/workstation/index.vue
index 4fcaa838b..2692caea0 100644
--- a/apps/web-ele/src/views/mes/md/workstation/index.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/index.vue
@@ -36,17 +36,17 @@ function handleRefresh() {
 
 /** 创建工作站 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看工作站 */
 function handleDetail(row: MesMdWorkstationApi.Workstation) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑工作站 */
 function handleEdit(row: MesMdWorkstationApi.Workstation) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除工作站 */
diff --git a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
index b8680ca88..b9d2e87ae 100644
--- a/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
 
 import { computed, ref } from 'vue';
@@ -22,20 +24,18 @@ import MachineList from './machine-list.vue';
 import ToolList from './tool-list.vue';
 import WorkerList from './worker-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTabsName = ref('machine'); // 当前资源页签
 const formData = ref<MesMdWorkstationApi.Workstation>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看工作站';
   }
-  return formMode.value === 'update' ? '修改工作站' : '新增工作站';
+  return formType.value === 'update' ? '修改工作站' : '新增工作站';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -82,11 +82,11 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesMdWorkstationApi.Workstation;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         const id = await createWorkstation(data);
         formData.value = { ...data, id };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateWorkstation(data);
         formData.value = { ...formData.value, ...data };
@@ -105,10 +105,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTabsName.value = 'machine';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -128,18 +128,18 @@ const [Modal, modalApi] = useVbenModal({
   <Modal :title="getTitle" class="w-4/5">
     <Form class="mx-4" />
     <ElTabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model="subTabsName"
       class="mx-4 mt-4"
     >
       <ElTabPane name="machine" label="设备资源">
-        <MachineList :form-type="formMode" :workstation-id="formData.id" />
+        <MachineList :form-type="formType" :workstation-id="formData.id" />
       </ElTabPane>
       <ElTabPane name="tool" label="工装夹具">
-        <ToolList :form-type="formMode" :workstation-id="formData.id" />
+        <ToolList :form-type="formType" :workstation-id="formData.id" />
       </ElTabPane>
       <ElTabPane name="worker" label="人力资源">
-        <WorkerList :form-type="formMode" :workstation-id="formData.id" />
+        <WorkerList :form-type="formType" :workstation-id="formData.id" />
       </ElTabPane>
     </ElTabs>
     <template #prepend-footer>
diff --git a/apps/web-ele/src/views/mes/md/workstation/modules/machine-list.vue b/apps/web-ele/src/views/mes/md/workstation/modules/machine-list.vue
index ff221298b..422a61a75 100644
--- a/apps/web-ele/src/views/mes/md/workstation/modules/machine-list.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/modules/machine-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkstationMachineApi } from '#/api/mes/md/workstation/machine';
 
@@ -20,7 +22,7 @@ defineOptions({ name: 'MesMdWorkstationMachineList' });
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     workstationId: number;
   }>(),
   {
diff --git a/apps/web-ele/src/views/mes/md/workstation/modules/tool-list.vue b/apps/web-ele/src/views/mes/md/workstation/modules/tool-list.vue
index b11ebe390..ee67b8bf8 100644
--- a/apps/web-ele/src/views/mes/md/workstation/modules/tool-list.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/modules/tool-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkstationToolApi } from '#/api/mes/md/workstation/tool';
 
@@ -21,7 +23,7 @@ defineOptions({ name: 'MesMdWorkstationToolList' });
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     workstationId: number;
   }>(),
   {
diff --git a/apps/web-ele/src/views/mes/md/workstation/modules/worker-list.vue b/apps/web-ele/src/views/mes/md/workstation/modules/worker-list.vue
index 65bed52d1..c61b8d16f 100644
--- a/apps/web-ele/src/views/mes/md/workstation/modules/worker-list.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/modules/worker-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesMdWorkstationWorkerApi } from '#/api/mes/md/workstation/worker';
 
@@ -21,7 +23,7 @@ defineOptions({ name: 'MesMdWorkstationWorkerList' });
 
 const props = withDefaults(
   defineProps<{
-    formType?: string;
+    formType?: FormType;
     workstationId: number;
   }>(),
   {
diff --git a/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts b/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
index 22fa897cc..be3d6f09f 100644
--- a/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
+++ b/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
@@ -14,6 +14,9 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { getSimpleUserList } from '#/api/system/user';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改车间的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/md/workstation/workshop/index.vue b/apps/web-ele/src/views/mes/md/workstation/workshop/index.vue
index fd9f51c42..d5d2af061 100644
--- a/apps/web-ele/src/views/mes/md/workstation/workshop/index.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/workshop/index.vue
@@ -28,17 +28,17 @@ function handleRefresh() {
 
 /** 创建车间 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看车间 */
 function handleDetail(row: MesMdWorkshopApi.Workshop) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑车间 */
 function handleEdit(row: MesMdWorkshopApi.Workshop) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除车间 */
diff --git a/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue b/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue
index 822009e42..191bbbd94 100644
--- a/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/workshop/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop';
 
 import { computed, ref } from 'vue';
@@ -19,19 +21,17 @@ import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const formData = ref<MesMdWorkshopApi.Workshop>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return '查看车间';
   }
-  return formMode.value === 'update' ? '修改车间' : '新增车间';
+  return formType.value === 'update' ? '修改车间' : '新增车间';
 });
 
 const [Form, formApi] = useVbenForm({
@@ -94,10 +94,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/data.ts b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
index affc820bb..4947ebf27 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/data.ts
+++ b/apps/web-ele/src/views/mes/pro/andon/record/data.ts
@@ -17,6 +17,9 @@ import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants';
 
 import { AndonConfigSelect } from '../config/components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
@@ -132,7 +135,7 @@ export function useGridColumns(): VxeTableGridOptions<MesProAndonRecordApi.Andon
  * - detail：所有字段只读
  */
 export function useFormSchema(
-  formType: string,
+  formType: FormType,
   formApi?: VbenFormApi,
 ): VbenFormSchema[] {
   const isCreate = formType === 'create';
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/index.vue b/apps/web-ele/src/views/mes/pro/andon/record/index.vue
index aaba8a21d..d31901204 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/index.vue
+++ b/apps/web-ele/src/views/mes/pro/andon/record/index.vue
@@ -36,17 +36,17 @@ function handleRefresh() {
 
 /** 新增记录 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 处置记录 */
 function handleHandle(row: MesProAndonRecordApi.AndonRecord) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 详情 */
 function handleDetail(row: MesProAndonRecordApi.AndonRecord) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 删除 */
diff --git a/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
index 518146b5e..83261cd22 100644
--- a/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/andon/record/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
 
 import { computed, ref } from 'vue';
@@ -19,19 +21,17 @@ import { MesProAndonStatusEnum } from '#/views/mes/utils/constants';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式：新增 / 处置 / 详情
+const formType = ref<FormType>('create'); // 表单模式：新增 / 处置 / 详情
 const formData = ref<MesProAndonRecordApi.AndonRecord>();
 const userStore = useUserStore();
 
-const isUpdate = computed(() => formMode.value === 'update'); // 是否处置模式
+const isUpdate = computed(() => formType.value === 'update'); // 是否处置模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['安灯呼叫']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['安灯呼叫'])
     : $t('ui.actionTitle.create', ['安灯呼叫']);
 });
@@ -50,7 +50,7 @@ const [Form, formApi] = useVbenForm({
 });
 
 /** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
-formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
+formApi.setState({ schema: useFormSchema(formType.value, formApi) });
 
 /** 处置：保存（保持 ACTIVE 状态） */
 async function handleSave() {
@@ -104,7 +104,7 @@ async function handleFinish() {
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    if (formMode.value === 'detail') {
+    if (formType.value === 'detail') {
       await modalApi.close();
       return;
     }
@@ -132,12 +132,12 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setState({ schema: useFormSchema(formMode.value, formApi) });
-    modalApi.setState({ showConfirmButton: formMode.value === 'create' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    modalApi.setState({ showConfirmButton: formType.value === 'create' });
     await formApi.resetForm();
-    if (formMode.value === 'create') {
+    if (formType.value === 'create') {
       // 新增时，发起人默认为当前用户
       await formApi.setValues({ userId: userStore.userInfo?.id });
       return;
diff --git a/apps/web-ele/src/views/mes/pro/process/data.ts b/apps/web-ele/src/views/mes/pro/process/data.ts
index 3d21cb071..1fc136c30 100644
--- a/apps/web-ele/src/views/mes/pro/process/data.ts
+++ b/apps/web-ele/src/views/mes/pro/process/data.ts
@@ -14,6 +14,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改生产工序的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/pro/process/index.vue b/apps/web-ele/src/views/mes/pro/process/index.vue
index 26bb42cf6..62d4df2df 100644
--- a/apps/web-ele/src/views/mes/pro/process/index.vue
+++ b/apps/web-ele/src/views/mes/pro/process/index.vue
@@ -30,17 +30,17 @@ function handleRefresh() {
 
 /** 创建生产工序 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑生产工序 */
 function handleEdit(row: MesProProcessApi.Process) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 查看生产工序详情 */
 function handleDetail(row: MesProProcessApi.Process) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 删除生产工序 */
diff --git a/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue b/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue
index 8e1a7b3c6..45d68aa3e 100644
--- a/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue
+++ b/apps/web-ele/src/views/mes/pro/process/modules/content-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProProcessContentApi } from '#/api/mes/pro/process/content';
 
@@ -19,11 +21,11 @@ import { useContentGridColumns } from '../data';
 import ContentForm from './content-form.vue';
 
 const props = defineProps<{
-  formMode: 'create' | 'detail' | 'update';
+  formType: FormType;
   processId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const isEditable = ref(props.formType !== 'detail'); // 是否可编辑
 const list = ref<MesProProcessContentApi.ProcessContent[]>([]);
 
 const [ContentFormModal, contentFormModalApi] = useVbenModal({
diff --git a/apps/web-ele/src/views/mes/pro/process/modules/form.vue b/apps/web-ele/src/views/mes/pro/process/modules/form.vue
index 1011829f4..4afb9aa04 100644
--- a/apps/web-ele/src/views/mes/pro/process/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/process/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesProProcessApi } from '#/api/mes/pro/process';
 
 import { computed, ref } from 'vue';
@@ -18,18 +20,16 @@ import { $t } from '#/locales';
 import { useFormSchema } from '../data';
 import ContentList from './content-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const formData = ref<MesProProcessApi.Process>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.detail', ['生产工序']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['生产工序'])
     : $t('ui.actionTitle.create', ['生产工序']);
 });
@@ -81,10 +81,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type ?? 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -110,7 +110,7 @@ const processId = computed(() => formData.value?.id);
     <template v-if="processId">
       <ElDivider class="!my-3" content-position="left">操作步骤</ElDivider>
       <div class="mx-4">
-        <ContentList :form-mode="formMode" :process-id="processId" />
+        <ContentList :form-type="formType" :process-id="processId" />
       </div>
     </template>
   </Modal>
diff --git a/apps/web-ele/src/views/mes/pro/route/data.ts b/apps/web-ele/src/views/mes/pro/route/data.ts
index cf770344e..5b4a56612 100644
--- a/apps/web-ele/src/views/mes/pro/route/data.ts
+++ b/apps/web-ele/src/views/mes/pro/route/data.ts
@@ -22,6 +22,9 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
 
 import { RouteColorPicker } from './components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 工艺路线表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/pro/route/index.vue b/apps/web-ele/src/views/mes/pro/route/index.vue
index 07482a5a4..51f4e8ff3 100644
--- a/apps/web-ele/src/views/mes/pro/route/index.vue
+++ b/apps/web-ele/src/views/mes/pro/route/index.vue
@@ -43,17 +43,17 @@ function handleRefresh() {
 
 /** 创建工艺路线 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑工艺路线（仅停用状态可编辑） */
 function handleEdit(row: MesProRouteApi.Route) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 详情查看 */
 function handleDetail(row: MesProRouteApi.Route) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 切换状态 */
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/form.vue b/apps/web-ele/src/views/mes/pro/route/modules/form.vue
index c57eabd07..ce15b7657 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesProRouteApi } from '#/api/mes/pro/route';
 
 import { computed, ref } from 'vue';
@@ -15,19 +17,17 @@ import { useFormSchema } from '../data';
 import ProcessList from './process-list.vue';
 import ProductList from './product-list.vue';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const subTab = ref('process'); // 当前激活的子表 Tab
 const formData = ref<MesProRouteApi.Route>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.detail', ['工艺路线']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['工艺路线'])
     : $t('ui.actionTitle.create', ['工艺路线']);
 });
@@ -61,12 +61,12 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as MesProRouteApi.Route;
     try {
-      if (formMode.value === 'create') {
+      if (formType.value === 'create') {
         // 新增成功后切到编辑模式，方便继续维护组成工序、关联产品
         const id = await createRoute(data);
         formData.value = { ...data, id };
         await formApi.setFieldValue('id', id);
-        formMode.value = 'update';
+        formType.value = 'update';
       } else {
         await updateRoute(data);
         formData.value = { ...formData.value, ...data };
@@ -85,10 +85,10 @@ const [Modal, modalApi] = useVbenModal({
     await formApi.resetForm();
     subTab.value = 'process';
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type ?? 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
@@ -109,15 +109,15 @@ const [Modal, modalApi] = useVbenModal({
     <Form class="mx-4" />
     <!-- 编辑/详情模式下展示子表 Tab，新增模式下隐藏 -->
     <ElTabs
-      v-if="formMode !== 'create' && formData?.id"
+      v-if="formType !== 'create' && formData?.id"
       v-model="subTab"
       class="mx-4 mt-4"
     >
       <ElTabPane label="组成工序" name="process">
-        <ProcessList :form-mode="formMode" :route-id="formData.id" />
+        <ProcessList :form-type="formType" :route-id="formData.id" />
       </ElTabPane>
       <ElTabPane label="关联产品" name="product">
-        <ProductList :form-mode="formMode" :route-id="formData.id" />
+        <ProductList :form-type="formType" :route-id="formData.id" />
       </ElTabPane>
     </ElTabs>
   </Modal>
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue b/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue
index f9b08c9b0..ba00f71c2 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/process-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process';
 
@@ -19,11 +21,11 @@ import { useRouteProcessGridColumns } from '../data';
 import ProcessForm from './process-form.vue';
 
 const props = defineProps<{
-  formMode: 'create' | 'detail' | 'update';
+  formType: FormType;
   routeId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const isEditable = ref(props.formType !== 'detail'); // 是否可编辑
 const list = ref<MesProRouteProcessApi.RouteProcess[]>([]); // 工艺路线工序列表
 
 const [ProcessFormModal, processFormModalApi] = useVbenModal({
diff --git a/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue b/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue
index bca6e686e..ad398351a 100644
--- a/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue
+++ b/apps/web-ele/src/views/mes/pro/route/modules/product-list.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProRouteProductApi } from '#/api/mes/pro/route/product';
 
@@ -21,11 +23,11 @@ import { useRouteProductGridColumns } from '../data';
 import ProductForm from './product-form.vue';
 
 const props = defineProps<{
-  formMode: 'create' | 'detail' | 'update';
+  formType: FormType;
   routeId: number;
 }>();
 
-const isEditable = ref(props.formMode !== 'detail'); // 是否可编辑
+const isEditable = ref(props.formType !== 'detail'); // 是否可编辑
 const list = ref<MesProRouteProductApi.RouteProduct[]>([]); // 工艺路线产品列表
 
 const [ProductFormModal, productFormModalApi] = useVbenModal({
diff --git a/apps/web-ele/src/views/mes/tm/tool/data.ts b/apps/web-ele/src/views/mes/tm/tool/data.ts
index 0c0e00050..73d57ad13 100644
--- a/apps/web-ele/src/views/mes/tm/tool/data.ts
+++ b/apps/web-ele/src/views/mes/tm/tool/data.ts
@@ -20,6 +20,9 @@ import {
 
 import { TmToolTypeSelect } from './type/components';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改工具的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/tm/tool/index.vue b/apps/web-ele/src/views/mes/tm/tool/index.vue
index 9031f261f..f35cb0322 100644
--- a/apps/web-ele/src/views/mes/tm/tool/index.vue
+++ b/apps/web-ele/src/views/mes/tm/tool/index.vue
@@ -32,17 +32,17 @@ function handleRefresh() {
 
 /** 创建工具 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看工具 */
 function handleDetail(row: MesTmToolApi.Tool) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑工具 */
 function handleEdit(row: MesTmToolApi.Tool) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除工具 */
diff --git a/apps/web-ele/src/views/mes/tm/tool/modules/form.vue b/apps/web-ele/src/views/mes/tm/tool/modules/form.vue
index bf46e425c..8ab516ab1 100644
--- a/apps/web-ele/src/views/mes/tm/tool/modules/form.vue
+++ b/apps/web-ele/src/views/mes/tm/tool/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesTmToolApi } from '#/api/mes/tm/tool';
 
 import { computed, ref } from 'vue';
@@ -15,19 +17,17 @@ import { BarcodeDetail } from '#/views/mes/wm/barcode/components';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const formData = ref<MesTmToolApi.Tool>();
 const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 条码详情弹窗
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['工具']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['工具'])
     : $t('ui.actionTitle.create', ['工具']);
 });
@@ -92,10 +92,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-ele/src/views/mes/tm/tool/type/data.ts b/apps/web-ele/src/views/mes/tm/tool/type/data.ts
index 527f4a844..ad2e3900a 100644
--- a/apps/web-ele/src/views/mes/tm/tool/type/data.ts
+++ b/apps/web-ele/src/views/mes/tm/tool/type/data.ts
@@ -13,6 +13,9 @@ import { z } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import { MesAutoCodeRuleCode, MesMaintenTypeEnum } from '#/views/mes/utils/constants';
 
+/** 表单类型 */
+export type FormType = 'create' | 'detail' | 'update';
+
 /** 新增/修改工具类型的表单 */
 export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/mes/tm/tool/type/index.vue b/apps/web-ele/src/views/mes/tm/tool/type/index.vue
index 3cc81e9c2..2e652da05 100644
--- a/apps/web-ele/src/views/mes/tm/tool/type/index.vue
+++ b/apps/web-ele/src/views/mes/tm/tool/type/index.vue
@@ -26,17 +26,17 @@ function handleRefresh() {
 
 /** 创建工具类型 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 查看工具类型 */
 function handleDetail(row: MesTmToolTypeApi.ToolType) {
-  formModalApi.setData({ id: row.id, type: 'detail' }).open();
+  formModalApi.setData({ id: row.id, formType: 'detail' }).open();
 }
 
 /** 编辑工具类型 */
 function handleEdit(row: MesTmToolTypeApi.ToolType) {
-  formModalApi.setData({ id: row.id, type: 'update' }).open();
+  formModalApi.setData({ id: row.id, formType: 'update' }).open();
 }
 
 /** 删除工具类型 */
diff --git a/apps/web-ele/src/views/mes/tm/tool/type/modules/form.vue b/apps/web-ele/src/views/mes/tm/tool/type/modules/form.vue
index 4588bf62b..e9a3cc46f 100644
--- a/apps/web-ele/src/views/mes/tm/tool/type/modules/form.vue
+++ b/apps/web-ele/src/views/mes/tm/tool/type/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { MesTmToolTypeApi } from '#/api/mes/tm/tool/type';
 
 import { computed, ref } from 'vue';
@@ -13,18 +15,16 @@ import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
 
-type FormMode = 'create' | 'detail' | 'update';
-
 const emit = defineEmits(['success']);
-const formMode = ref<FormMode>('create'); // 表单模式
+const formType = ref<FormType>('create'); // 表单模式
 const formData = ref<MesTmToolTypeApi.ToolType>();
 
-const isDetail = computed(() => formMode.value === 'detail'); // 是否查看模式
+const isDetail = computed(() => formType.value === 'detail'); // 是否查看模式
 const getTitle = computed(() => {
-  if (formMode.value === 'detail') {
+  if (formType.value === 'detail') {
     return $t('ui.actionTitle.view', ['工具类型']);
   }
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['工具类型'])
     : $t('ui.actionTitle.create', ['工具类型']);
 });
@@ -76,10 +76,10 @@ const [Modal, modalApi] = useVbenModal({
     }
     await formApi.resetForm();
     // 加载数据
-    const data = modalApi.getData<{ id?: number; type?: FormMode }>();
-    formMode.value = data?.type || 'create';
-    formApi.setDisabled(formMode.value === 'detail');
-    modalApi.setState({ showConfirmButton: formMode.value !== 'detail' });
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setDisabled(formType.value === 'detail');
+    modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
     if (!data?.id) {
       return;
     }
diff --git a/apps/web-ele/src/views/wms/order/check/data.ts b/apps/web-ele/src/views/wms/order/check/data.ts
index 5a2a05260..5acde707a 100644
--- a/apps/web-ele/src/views/wms/order/check/data.ts
+++ b/apps/web-ele/src/views/wms/order/check/data.ts
@@ -31,6 +31,9 @@ import {
   sumQuantity,
 } from '#/views/wms/utils/format';
 
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
 /** 拆分数量/金额区间字段，适配后端 Min/Max 查询参数 */
 function splitNumberRange(minFieldName: string, maxFieldName: string) {
   return (
diff --git a/apps/web-ele/src/views/wms/order/check/index.vue b/apps/web-ele/src/views/wms/order/check/index.vue
index d6dda574e..784e8550d 100644
--- a/apps/web-ele/src/views/wms/order/check/index.vue
+++ b/apps/web-ele/src/views/wms/order/check/index.vue
@@ -79,12 +79,12 @@ function handleRefresh() {
 
 /** 创建盘库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑盘库单 */
 function handleEdit(row: WmsCheckOrderApi.CheckOrder) {
-  formModalApi.setData({ id: row.id!, type: 'update' }).open();
+  formModalApi.setData({ id: row.id!, formType: 'update' }).open();
 }
 
 /** 查看盘库单详情 */
diff --git a/apps/web-ele/src/views/wms/order/check/modules/form.vue b/apps/web-ele/src/views/wms/order/check/modules/form.vue
index 4b376c21a..b7dfb9c21 100644
--- a/apps/web-ele/src/views/wms/order/check/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/check/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsInventoryApi } from '#/api/wms/inventory';
 import type { WmsItemSkuApi } from '#/api/wms/md/item/sku';
@@ -69,7 +71,7 @@ const emit = defineEmits<{
 }>();
 
 const formData = ref<WmsCheckOrderApi.CheckOrder>({});
-const formMode = ref('create');
+const formType = ref<FormType>('create');
 const originalSubmitData = ref<WmsCheckOrderApi.CheckOrder>();
 const details = ref<DetailRow[]>([]);
 const detailTableRef = ref<VxeTableInstance>();
@@ -79,7 +81,7 @@ const warehouseName = ref<string>();
 let detailSeq = 0; // 明细行可能还没有后端 id，使用本地序号作为 VXE 行操作的稳定标识
 
 const getTitle = computed(() => {
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['盘库单'])
     : $t('ui.actionTitle.create', ['盘库单']);
 });
@@ -513,7 +515,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = await buildSubmitData();
     try {
-      await (formMode.value === 'update'
+      await (formType.value === 'update'
         ? updateCheckOrder(data)
         : createCheckOrder(data));
       // 关闭并提示
@@ -534,11 +536,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
-    const data = modalApi.getData<{
-      id?: number;
-      type?: string;
-    }>();
-    formMode.value = data?.type || (data?.id ? 'update' : 'create');
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     if (data?.id) {
       modalApi.lock();
       try {
diff --git a/apps/web-ele/src/views/wms/order/movement/data.ts b/apps/web-ele/src/views/wms/order/movement/data.ts
index f72a9017c..41ae919a0 100644
--- a/apps/web-ele/src/views/wms/order/movement/data.ts
+++ b/apps/web-ele/src/views/wms/order/movement/data.ts
@@ -24,6 +24,9 @@ import {
   QUANTITY_PRECISION,
 } from '#/views/wms/utils/format';
 
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/wms/order/movement/index.vue b/apps/web-ele/src/views/wms/order/movement/index.vue
index a3a2f7ce3..ec9eff141 100644
--- a/apps/web-ele/src/views/wms/order/movement/index.vue
+++ b/apps/web-ele/src/views/wms/order/movement/index.vue
@@ -72,12 +72,12 @@ function handleRefresh() {
 
 /** 创建移库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑移库单 */
 function handleEdit(row: WmsMovementOrderApi.MovementOrder) {
-  formModalApi.setData({ id: row.id!, type: 'update' }).open();
+  formModalApi.setData({ id: row.id!, formType: 'update' }).open();
 }
 
 /** 查看移库单详情 */
diff --git a/apps/web-ele/src/views/wms/order/movement/modules/form.vue b/apps/web-ele/src/views/wms/order/movement/modules/form.vue
index 08c5108ae..596e61d7e 100644
--- a/apps/web-ele/src/views/wms/order/movement/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/movement/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsWarehouseApi } from '#/api/wms/md/warehouse';
 import type { WmsMovementOrderApi } from '#/api/wms/order/movement';
@@ -50,7 +52,7 @@ const emit = defineEmits<{
 }>();
 
 const formData = ref<WmsMovementOrderApi.MovementOrder>({});
-const formMode = ref('create');
+const formType = ref<FormType>('create');
 const originalSubmitData = ref<WmsMovementOrderApi.MovementOrder>();
 const details = ref<DetailRow[]>([]);
 const detailTableRef = ref<VxeTableInstance>();
@@ -58,7 +60,7 @@ const inventorySelectRef = ref<InstanceType<typeof WmsInventorySelect>>();
 let detailSeq = 0; // 明细行可能还没有后端 id，使用本地序号作为 VXE 行操作的稳定标识
 
 const getTitle = computed(() => {
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['移库单'])
     : $t('ui.actionTitle.create', ['移库单']);
 });
@@ -353,7 +355,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = await buildSubmitData();
     try {
-      await (formMode.value === 'update'
+      await (formType.value === 'update'
         ? updateMovementOrder(data)
         : createMovementOrder(data));
       // 关闭并提示
@@ -372,11 +374,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
-    const data = modalApi.getData<{
-      id?: number;
-      type?: string;
-    }>();
-    formMode.value = data?.type || (data?.id ? 'update' : 'create');
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     if (data?.id) {
       modalApi.lock();
       try {
diff --git a/apps/web-ele/src/views/wms/order/receipt/data.ts b/apps/web-ele/src/views/wms/order/receipt/data.ts
index ca7b5c841..bfb3e9ed3 100644
--- a/apps/web-ele/src/views/wms/order/receipt/data.ts
+++ b/apps/web-ele/src/views/wms/order/receipt/data.ts
@@ -24,6 +24,9 @@ import {
   QUANTITY_PRECISION,
 } from '#/views/wms/utils/format';
 
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/wms/order/receipt/index.vue b/apps/web-ele/src/views/wms/order/receipt/index.vue
index 166af652d..88ab201cf 100644
--- a/apps/web-ele/src/views/wms/order/receipt/index.vue
+++ b/apps/web-ele/src/views/wms/order/receipt/index.vue
@@ -72,12 +72,12 @@ function handleRefresh() {
 
 /** 创建入库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑入库单 */
 function handleEdit(row: WmsReceiptOrderApi.ReceiptOrder) {
-  formModalApi.setData({ id: row.id!, type: 'update' }).open();
+  formModalApi.setData({ id: row.id!, formType: 'update' }).open();
 }
 
 /** 查看入库单详情 */
diff --git a/apps/web-ele/src/views/wms/order/receipt/modules/form.vue b/apps/web-ele/src/views/wms/order/receipt/modules/form.vue
index 53cd5b6ce..0597d0230 100644
--- a/apps/web-ele/src/views/wms/order/receipt/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/receipt/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsItemSkuApi } from '#/api/wms/md/item/sku';
 import type { WmsReceiptOrderApi } from '#/api/wms/order/receipt';
@@ -48,7 +50,7 @@ const emit = defineEmits<{
 }>();
 
 const formData = ref<WmsReceiptOrderApi.ReceiptOrder>({});
-const formMode = ref('create');
+const formType = ref<FormType>('create');
 const originalSubmitData = ref<WmsReceiptOrderApi.ReceiptOrder>();
 const details = ref<DetailRow[]>([]);
 const detailTableRef = ref<VxeTableInstance>();
@@ -56,7 +58,7 @@ const skuSelectRef = ref<InstanceType<typeof WmsItemSkuSelect>>();
 let detailSeq = 0; // 明细行可能还没有后端 id，使用本地序号作为 VXE 行操作的稳定标识
 
 const getTitle = computed(() => {
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['入库单'])
     : $t('ui.actionTitle.create', ['入库单']);
 });
@@ -297,7 +299,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = await buildSubmitData();
     try {
-      await (formMode.value === 'update'
+      await (formType.value === 'update'
         ? updateReceiptOrder(data)
         : createReceiptOrder(data));
       // 关闭并提示
@@ -316,11 +318,8 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     await formApi.resetForm();
-    const data = modalApi.getData<{
-      id?: number;
-      type?: string;
-    }>();
-    formMode.value = data?.type || (data?.id ? 'update' : 'create');
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     if (data?.id) {
       modalApi.lock();
       try {
diff --git a/apps/web-ele/src/views/wms/order/shipment/data.ts b/apps/web-ele/src/views/wms/order/shipment/data.ts
index 3346afcca..6ab86acde 100644
--- a/apps/web-ele/src/views/wms/order/shipment/data.ts
+++ b/apps/web-ele/src/views/wms/order/shipment/data.ts
@@ -25,6 +25,9 @@ import {
   QUANTITY_PRECISION,
 } from '#/views/wms/utils/format';
 
+/** 表单类型 */
+export type FormType = 'create' | 'update';
+
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
diff --git a/apps/web-ele/src/views/wms/order/shipment/index.vue b/apps/web-ele/src/views/wms/order/shipment/index.vue
index c988c23ad..0d356db3e 100644
--- a/apps/web-ele/src/views/wms/order/shipment/index.vue
+++ b/apps/web-ele/src/views/wms/order/shipment/index.vue
@@ -72,12 +72,12 @@ function handleRefresh() {
 
 /** 创建出库单 */
 function handleCreate() {
-  formModalApi.setData({ type: 'create' }).open();
+  formModalApi.setData({ formType: 'create' }).open();
 }
 
 /** 编辑出库单 */
 function handleEdit(row: WmsShipmentOrderApi.ShipmentOrder) {
-  formModalApi.setData({ id: row.id!, type: 'update' }).open();
+  formModalApi.setData({ id: row.id!, formType: 'update' }).open();
 }
 
 /** 查看出库单详情 */
diff --git a/apps/web-ele/src/views/wms/order/shipment/modules/form.vue b/apps/web-ele/src/views/wms/order/shipment/modules/form.vue
index c35d4a497..12c0e7ef1 100644
--- a/apps/web-ele/src/views/wms/order/shipment/modules/form.vue
+++ b/apps/web-ele/src/views/wms/order/shipment/modules/form.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { FormType } from '../data';
+
 import type { VxeTableInstance } from '#/adapter/vxe-table';
 import type { WmsWarehouseApi } from '#/api/wms/md/warehouse';
 import type { WmsShipmentOrderApi } from '#/api/wms/order/shipment';
@@ -50,7 +52,7 @@ const emit = defineEmits<{
 }>();
 
 const formData = ref<WmsShipmentOrderApi.ShipmentOrder>({});
-const formMode = ref('create');
+const formType = ref<FormType>('create');
 const originalSubmitData = ref<WmsShipmentOrderApi.ShipmentOrder>();
 const details = ref<DetailRow[]>([]);
 const detailTableRef = ref<VxeTableInstance>();
@@ -60,7 +62,7 @@ const initializing = ref(false);
 let detailSeq = 0; // 明细行可能还没有后端 id，使用本地序号作为 VXE 行操作的稳定标识
 
 const getTitle = computed(() => {
-  return formMode.value === 'update'
+  return formType.value === 'update'
     ? $t('ui.actionTitle.edit', ['出库单'])
     : $t('ui.actionTitle.create', ['出库单']);
 });
@@ -338,7 +340,7 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = await buildSubmitData();
     try {
-      await (formMode.value === 'update'
+      await (formType.value === 'update'
         ? updateShipmentOrder(data)
         : createShipmentOrder(data));
       // 关闭并提示
@@ -359,11 +361,8 @@ const [Modal, modalApi] = useVbenModal({
     }
     initializing.value = true;
     await formApi.resetForm();
-    const data = modalApi.getData<{
-      id?: number;
-      type?: string;
-    }>();
-    formMode.value = data?.type || (data?.id ? 'update' : 'create');
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
     if (data?.id) {
       modalApi.lock();
       try {

From 5a1100aed4e7f87f4e78b80e26805cee2aa4fd8a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 26 May 2026 21:18:36 +0800
Subject: [PATCH 13/17] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=E2=80=9C?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=EF=BC=88pro=5Ffeedback?=
 =?UTF-8?q?=EF=BC=89=E2=80=9D=E7=9A=84=20ele=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mes/pro/task/components/index.ts    |   1 +
 .../components/pro-task-select-dialog.vue     | 245 ++++++++
 .../pro/task/components/pro-task-select.vue   | 206 +++---
 apps/web-antd/src/views/mes/pro/task/data.ts  | 112 ++++
 .../web-antd/src/views/mes/utils/constants.ts |   4 +-
 .../web-ele/src/api/mes/pro/feedback/index.ts | 113 ++++
 apps/web-ele/src/api/mes/pro/task/index.ts    |  68 ++
 .../src/api/mes/wm/itemconsume/line/index.ts  |  37 ++
 .../api/mes/wm/productproduce/line/index.ts   |  37 ++
 .../src/views/mes/pro/feedback/data.ts        | 589 ++++++++++++++++++
 .../src/views/mes/pro/feedback/index.vue      | 184 ++++++
 .../views/mes/pro/feedback/modules/form.vue   | 319 ++++++++++
 .../feedback/modules/item-consume-list.vue    |  57 ++
 .../feedback/modules/product-produce-list.vue |  68 ++
 .../views/mes/pro/task/components/index.ts    |   2 +
 .../components/pro-task-select-dialog.vue     | 248 ++++++++
 .../pro/task/components/pro-task-select.vue   | 155 +++++
 apps/web-ele/src/views/mes/pro/task/data.ts   | 112 ++++
 apps/web-ele/src/views/mes/utils/constants.ts |   4 +-
 19 files changed, 2451 insertions(+), 110 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/pro/task/components/pro-task-select-dialog.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/task/data.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/feedback/index.ts
 create mode 100644 apps/web-ele/src/api/mes/pro/task/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/itemconsume/line/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/productproduce/line/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/feedback/data.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/feedback/index.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/feedback/modules/item-consume-list.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/feedback/modules/product-produce-list.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/task/components/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/task/components/pro-task-select-dialog.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/task/data.ts

diff --git a/apps/web-antd/src/views/mes/pro/task/components/index.ts b/apps/web-antd/src/views/mes/pro/task/components/index.ts
index 0642acb68..3847bb912 100644
--- a/apps/web-antd/src/views/mes/pro/task/components/index.ts
+++ b/apps/web-antd/src/views/mes/pro/task/components/index.ts
@@ -1 +1,2 @@
+export { default as ProTaskSelectDialog } from './pro-task-select-dialog.vue';
 export { default as ProTaskSelect } from './pro-task-select.vue';
diff --git a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select-dialog.vue b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select-dialog.vue
new file mode 100644
index 000000000..da32b86d3
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select-dialog.vue
@@ -0,0 +1,245 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { computed, nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
+
+import { Alert, Button, message, Modal } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getTaskPage } from '#/api/mes/pro/task';
+
+import { useTaskSelectGridColumns, useTaskSelectGridFormSchema } from '../data';
+
+const props = withDefaults(
+  defineProps<{
+    statuses?: number[];
+  }>(),
+  {
+    statuses: undefined,
+  },
+);
+const emit = defineEmits<{
+  selected: [rows: MesProTaskApi.Task[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<MesProTaskApi.Task[]>([]); // 已选任务列表
+const preSelectedIds = ref<number[]>([]); // 预选任务编号列表
+const externalWorkOrderId = ref<number>(); // 外部传入的默认工单过滤
+const externalWorkstationId = ref<number>(); // 外部传入的默认工位过滤
+
+const statusTip = computed(() => {
+  if (!props.statuses?.length) {
+    return '';
+  }
+  const labels = props.statuses
+    .map((value) => getDictLabel(DICT_TYPE.MES_PRO_TASK_STATUS, value))
+    .filter(Boolean)
+    .join('、');
+  return `仅展示状态为【${labels}】的任务`;
+});
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesProTaskApi.Task>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesProTaskApi.Task[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: MesProTaskApi.Task) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesProTaskApi.Task) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesProTaskApi.Task }) {
+  if (multiple.value) {
+    await toggleMultipleRow(row);
+    return;
+  }
+  selectedRows.value = [row];
+  await gridApi.grid.setRadioRow(row);
+  handleConfirm();
+}
+
+/** 回显预选任务 */
+async function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesProTaskApi.Task[];
+  for (const row of rows) {
+    if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
+      continue;
+    }
+    if (multiple.value) {
+      await gridApi.grid.setCheckboxRow(row, true);
+    } else {
+      await gridApi.grid.setRadioRow(row);
+      selectedRows.value = [row];
+      return;
+    }
+  }
+  if (multiple.value) {
+    selectedRows.value = getMultipleSelectedRows();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useTaskSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useTaskSelectGridColumns(false),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getTaskPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            statuses: props.statuses,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProTaskApi.Task>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesProTaskApi.Task }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态，保留外部传入的工单/工位默认过滤 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+  if (externalWorkOrderId.value) {
+    await gridApi.formApi.setFieldValue('workOrderId', externalWorkOrderId.value);
+  }
+  if (externalWorkstationId.value) {
+    await gridApi.formApi.setFieldValue(
+      'workstationId',
+      externalWorkstationId.value,
+    );
+  }
+}
+
+/** 打开任务选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: {
+    multiple?: boolean;
+    workOrderId?: number;
+    workstationId?: number;
+  },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  externalWorkOrderId.value = options?.workOrderId;
+  externalWorkstationId.value = options?.workstationId;
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useTaskSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭任务选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择任务 */
+function handleConfirm() {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
+    message.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit('selected', multiple.value ? rows : [rows[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <Modal
+    v-model:open="open"
+    title="生产任务选择"
+    width="80%"
+    :destroy-on-close="true"
+    @ok="handleConfirm"
+    @cancel="closeModal"
+  >
+    <Alert
+      v-if="statusTip"
+      :message="statusTip"
+      type="info"
+      show-icon
+      class="!mb-3"
+    />
+    <Grid table-title="生产任务列表" />
+    <template #footer>
+      <Button @click="closeModal">取消</Button>
+      <Button type="primary" @click="handleConfirm">确定</Button>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
index d8edc8e0a..fc7e8dae7 100644
--- a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
+++ b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
@@ -1,21 +1,16 @@
 <script lang="ts" setup>
 import type { MesProTaskApi } from '#/api/mes/pro/task';
 
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, ref, useAttrs, watch } from 'vue';
 
-import { Select, Tag, Tooltip } from 'ant-design-vue';
+import { IconifyIcon } from '@vben/icons';
 
-import { getTask, getTaskPage } from '#/api/mes/pro/task';
+import { Input, Tooltip } from 'ant-design-vue';
+
+import { getTask } from '#/api/mes/pro/task';
+
+import ProTaskSelectDialog from './pro-task-select-dialog.vue';
 
-// TODO @AI：直接完整迁移！
-/**
- * MES 生产任务选择器（轻量版）
- *
- * 当前用于生产报工等只需要单选任务 ID 的业务页面：
- * - 默认按 `workOrderId` / `workstationId` / `statuses` 过滤拉取首页 100 条任务作为下拉
- * - 编辑回显走 `getTask(id)`
- * - 后续 `mes/pro/task` 完整迁移后，可替换为带弹窗的复杂选择器
- */
 defineOptions({ name: 'ProTaskSelect', inheritAttrs: false });
 
 const props = withDefaults(
@@ -23,7 +18,6 @@ const props = withDefaults(
     allowClear?: boolean;
     disabled?: boolean;
     modelValue?: number;
-    pageSize?: number;
     placeholder?: string;
     statuses?: number[];
     workOrderId?: number;
@@ -33,131 +27,131 @@ const props = withDefaults(
     allowClear: true,
     disabled: false,
     modelValue: undefined,
-    pageSize: 100,
     placeholder: '请选择任务',
     statuses: undefined,
     workOrderId: undefined,
     workstationId: undefined,
   },
 );
-
 const emit = defineEmits<{
   change: [item: MesProTaskApi.Task | undefined];
   'update:modelValue': [value: number | undefined];
 }>();
+const attrs = useAttrs(); // 透传属性
+const dialogRef = ref<InstanceType<typeof ProTaskSelectDialog>>(); // 任务选择弹窗
+const hovering = ref(false); // 是否悬停
+const selectedItem = ref<MesProTaskApi.Task>(); // 选中的任务
 
-const allList = ref<MesProTaskApi.Task[]>([]);
-const selectedItem = ref<MesProTaskApi.Task>();
+const displayLabel = computed(() => selectedItem.value?.code ?? ''); // 选择器展示编号
+const showClear = computed( // 是否显示清空图标
+  () =>
+    props.allowClear &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue !== undefined,
+);
 
-const selectValue = computed({
-  get: () => props.modelValue,
-  set: (value: number | undefined) => {
-    emit('update:modelValue', value);
-  },
-});
-
-/** 前端过滤：按任务编号或名称模糊匹配 */
-function handleFilter(input: string, option: any) {
-  const keyword = input.toLowerCase();
-  const item = option?.item as MesProTaskApi.Task | undefined;
-  return Boolean(
-    item?.code?.toLowerCase().includes(keyword) ||
-      item?.name?.toLowerCase().includes(keyword),
-  );
-}
-
-/** 同步选中任务详情，未在列表内时单独拉取 */
-async function syncSelectedItem(value: number | undefined) {
-  if (value === undefined) {
+/** 根据任务编号回显选择器 */
+async function resolveItemById(id: number | undefined) {
+  if (id === undefined) {
     selectedItem.value = undefined;
     return;
   }
-  const found = allList.value.find((item) => item.id === value);
-  if (found) {
-    selectedItem.value = found;
+  if (selectedItem.value?.id === id) {
     return;
   }
   try {
-    selectedItem.value = await getTask(value);
+    selectedItem.value = await getTask(id);
   } catch (error) {
     console.error('[ProTaskSelect] resolveItemById failed:', error);
   }
 }
 
-/** 除 v-model 外，额外抛出完整任务对象给业务表单使用 */
-function handleChange(value: any) {
-  const nextValue = value === undefined ? undefined : Number(value);
-  syncSelectedItem(nextValue);
-  emit('change', selectedItem.value);
-}
-
-/** 重新拉取候选任务列表 */
-async function loadList() {
-  const data = await getTaskPage({
-    pageNo: 1,
-    pageSize: props.pageSize,
-    statuses: props.statuses,
-    workOrderId: props.workOrderId,
-    workstationId: props.workstationId,
-  });
-  allList.value = data.list ?? [];
-}
-
 watch(
   () => props.modelValue,
   (value) => {
-    syncSelectedItem(value);
+    resolveItemById(value);
   },
+  { immediate: true },
 );
 
-watch(
-  () => [props.workOrderId, props.workstationId],
-  async () => {
-    await loadList();
-    syncSelectedItem(props.modelValue);
-  },
-);
+/** 清空已选任务 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
 
-onMounted(async () => {
-  await loadList();
-  syncSelectedItem(props.modelValue);
-});
+/** 打开任务选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.ant-input-suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds =
+    props.modelValue === undefined ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, {
+    multiple: false,
+    workOrderId: props.workOrderId,
+    workstationId: props.workstationId,
+  });
+}
+
+/** 回填选中的任务 */
+function handleSelected(rows: MesProTaskApi.Task[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
 </script>
 
 <template>
-  <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
-    <template #title>
-      <div v-if="selectedItem" class="leading-6">
-        <div>任务编号：{{ selectedItem.code || '-' }}</div>
-        <div>任务名称：{{ selectedItem.name || '-' }}</div>
-        <div>工序：{{ selectedItem.processName || '-' }}</div>
-        <div>工作站：{{ selectedItem.workstationName || '-' }}</div>
-        <div>物料：{{ selectedItem.itemName || '-' }}</div>
-        <div>规格：{{ selectedItem.itemSpecification || '-' }}</div>
-      </div>
-    </template>
-    <Select
-      v-bind="$attrs"
-      v-model:value="selectValue"
-      :allow-clear="allowClear"
-      :disabled="disabled"
-      :filter-option="handleFilter"
-      :placeholder="placeholder"
-      class="w-full"
-      show-search
-      @change="handleChange"
-    >
-      <Select.Option
-        v-for="item in allList"
-        :key="item.id"
-        :item="item"
-        :value="item.id"
-      >
-        <div class="flex items-center gap-2">
-          <span>{{ item.code }}</span>
-          <Tag v-if="item.itemName" color="default">{{ item.itemName }}</Tag>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <Tooltip :mouse-enter-delay="0.5" :open="selectedItem ? undefined : false">
+      <template #title>
+        <div v-if="selectedItem" class="leading-6">
+          <div>任务编号：{{ selectedItem.code || '-' }}</div>
+          <div>任务名称：{{ selectedItem.name || '-' }}</div>
+          <div>工序：{{ selectedItem.processName || '-' }}</div>
+          <div>工作站：{{ selectedItem.workstationName || '-' }}</div>
+          <div>物料：{{ selectedItem.itemName || '-' }}</div>
+          <div>规格：{{ selectedItem.itemSpecification || '-' }}</div>
         </div>
-      </Select.Option>
-    </Select>
-  </Tooltip>
+      </template>
+      <Input
+        :disabled="disabled"
+        :placeholder="placeholder"
+        :value="displayLabel"
+        readonly
+      >
+        <template #suffix>
+          <IconifyIcon
+            class="size-4"
+            :icon="showClear ? 'lucide:circle-x' : 'lucide:search'"
+          />
+        </template>
+      </Input>
+    </Tooltip>
+  </div>
+  <ProTaskSelectDialog
+    ref="dialogRef"
+    :statuses="statuses"
+    @selected="handleSelected"
+  />
 </template>
diff --git a/apps/web-antd/src/views/mes/pro/task/data.ts b/apps/web-antd/src/views/mes/pro/task/data.ts
new file mode 100644
index 000000000..c29921b81
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/task/data.ts
@@ -0,0 +1,112 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProProcessSelect } from '#/views/mes/pro/process/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+
+/** 任务选择弹窗的搜索表单 */
+export function useTaskSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        allowClear: true,
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'processId',
+      label: '所属工序',
+      component: markRaw(ProProcessSelect),
+      componentProps: {
+        allowClear: true,
+        placeholder: '请选择工序',
+      },
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        allowClear: true,
+        placeholder: '请选择工作站',
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '任务编号',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入任务编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '任务名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入任务名称',
+      },
+    },
+  ];
+}
+
+/** 任务选择弹窗的字段 */
+export function useTaskSelectGridColumns(
+  multiple = false,
+): VxeTableGridOptions<MesProTaskApi.Task>['columns'] {
+  return [
+    { type: multiple ? 'checkbox' : 'radio', width: 50 },
+    { field: 'code', title: '任务编号', width: 180 },
+    { field: 'name', title: '任务名称', minWidth: 140 },
+    { field: 'workstationCode', title: '工作站编码', width: 140 },
+    { field: 'workstationName', title: '工作站名称', width: 140 },
+    { field: 'processName', title: '工序', width: 120 },
+    {
+      field: 'checkFlag',
+      title: '是否质检',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    { field: 'itemCode', title: '物料编码', width: 140 },
+    { field: 'itemName', title: '物料名称', width: 140 },
+    { field: 'itemSpecification', title: '规格型号', width: 120 },
+    { field: 'quantity', title: '排产数量', width: 100 },
+    { field: 'producedQuantity', title: '已生产数量', width: 110 },
+    {
+      field: 'startTime',
+      title: '开始生产时间',
+      width: 170,
+      formatter: 'formatDateTime',
+    },
+    { field: 'duration', title: '生产时长', width: 100 },
+    {
+      field: 'endTime',
+      title: '预计完成时间',
+      width: 170,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'status',
+      title: '任务状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_TASK_STATUS },
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index 2fd061dc6..668cf7240 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -166,10 +166,10 @@ export const MesProTaskStatusEnum = {
 /** MES 生产报工状态枚举 */
 export const MesProFeedbackStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
-  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
   APPROVING: MesOrderStatusConstants.APPROVING,
+  UNCHECK: MesOrderStatusConstants.APPROVED,
   FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELLED: MesOrderStatusConstants.CANCELLED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
 /** MES 流转卡状态枚举 */
diff --git a/apps/web-ele/src/api/mes/pro/feedback/index.ts b/apps/web-ele/src/api/mes/pro/feedback/index.ts
new file mode 100644
index 000000000..21a988ba8
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/feedback/index.ts
@@ -0,0 +1,113 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProFeedbackApi {
+  /** MES 生产报工 */
+  export interface Feedback {
+    id?: number;
+    code?: string; // 报工单编号
+    type?: number; // 报工类型
+    channel?: string; // 报工途径
+    feedbackTime?: number; // 报工时间
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    routeId?: number; // 工艺路线编号
+    routeCode?: string; // 工艺路线编码
+    processId?: number; // 工序编号
+    processCode?: string; // 工序编码
+    processName?: string; // 工序名称
+    checkFlag?: boolean; // 是否需要检验
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 工单编码
+    workOrderName?: string; // 工单名称
+    taskId?: number; // 生产任务编号
+    taskCode?: string; // 任务编码
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    itemSpecification?: string; // 规格型号
+    unitMeasureId?: number; // 单位编号
+    unitMeasureName?: string; // 单位名称
+    expireDate?: number; // 过期日期
+    scheduledQuantity?: number; // 排产数量
+    feedbackQuantity?: number; // 本次报工数量
+    qualifiedQuantity?: number; // 合格品数量
+    unqualifiedQuantity?: number; // 不良品数量
+    uncheckQuantity?: number; // 待检测数量
+    laborScrapQuantity?: number; // 工废数量
+    materialScrapQuantity?: number; // 料废数量
+    otherScrapQuantity?: number; // 其他废品数量
+    feedbackUserId?: number; // 报工用户编号
+    feedbackUserNickname?: string; // 报工人昵称
+    approveUserId?: number; // 审核用户编号
+    approveUserNickname?: string; // 审核人昵称
+    status?: number; // 状态
+    remark?: string; // 备注
+    creator?: string; // 创建人
+    createTime?: number; // 创建时间
+  }
+
+  /** MES 生产报工分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    type?: number;
+    workOrderId?: number;
+    itemId?: number;
+    feedbackUserId?: number;
+    creator?: string;
+    status?: number;
+    feedbackTime?: string[];
+  }
+}
+
+/** 查询生产报工分页 */
+export function getFeedbackPage(params: MesProFeedbackApi.PageParams) {
+  return requestClient.get<PageResult<MesProFeedbackApi.Feedback>>(
+    '/mes/pro/feedback/page',
+    { params },
+  );
+}
+
+/** 查询生产报工详情 */
+export function getFeedback(id: number) {
+  return requestClient.get<MesProFeedbackApi.Feedback>(
+    `/mes/pro/feedback/get?id=${id}`,
+  );
+}
+
+/** 新增生产报工 */
+export function createFeedback(data: MesProFeedbackApi.Feedback) {
+  return requestClient.post<number>('/mes/pro/feedback/create', data);
+}
+
+/** 修改生产报工 */
+export function updateFeedback(data: MesProFeedbackApi.Feedback) {
+  return requestClient.put('/mes/pro/feedback/update', data);
+}
+
+/** 删除生产报工 */
+export function deleteFeedback(id: number) {
+  return requestClient.delete(`/mes/pro/feedback/delete?id=${id}`);
+}
+
+/** 导出生产报工 Excel */
+export function exportFeedback(params: Partial<MesProFeedbackApi.PageParams>) {
+  return requestClient.download('/mes/pro/feedback/export-excel', { params });
+}
+
+/** 提交生产报工 */
+export function submitFeedback(id: number) {
+  return requestClient.put(`/mes/pro/feedback/submit?id=${id}`);
+}
+
+/** 驳回生产报工 */
+export function rejectFeedback(id: number) {
+  return requestClient.put(`/mes/pro/feedback/reject?id=${id}`);
+}
+
+/** 审批生产报工（返回是否已审批完成） */
+export function approveFeedback(id: number) {
+  return requestClient.put<boolean>(`/mes/pro/feedback/approve?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/pro/task/index.ts b/apps/web-ele/src/api/mes/pro/task/index.ts
new file mode 100644
index 000000000..d7bfd2f5e
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/task/index.ts
@@ -0,0 +1,68 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProTaskApi {
+  /** MES 生产任务 */
+  export interface Task {
+    id?: number;
+    code?: string; // 任务编码
+    name?: string; // 任务名称
+    workOrderId?: number; // 生产工单编号
+    workOrderCode?: string; // 工单编码
+    workOrderName?: string; // 工单名称
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    routeId?: number; // 工艺路线编号
+    processId?: number; // 工序编号
+    processName?: string; // 工序名称
+    itemId?: number; // 产品物料编号
+    itemCode?: string; // 产品编码
+    itemName?: string; // 产品名称
+    itemSpecification?: string; // 规格型号
+    unitMeasureId?: number; // 单位编号
+    unitMeasureName?: string; // 单位名称
+    quantity?: number; // 排产数量
+    producedQuantity?: number; // 已生产数量
+    qualifyQuantity?: number; // 合格品数量
+    unqualifyQuantity?: number; // 不良品数量
+    changedQuantity?: number; // 调整数量
+    clientId?: number; // 客户编号
+    clientName?: string; // 客户名称
+    startTime?: number; // 开始生产时间
+    endTime?: number; // 结束生产时间
+    duration?: number; // 生产时长（工作日，1=8小时）
+    requestDate?: number; // 需求日期（从工单查）
+    finishDate?: number; // 完成日期
+    cancelDate?: number; // 取消日期
+    colorCode?: string; // 甘特图显示颜色
+    status?: number; // 任务状态
+    checkFlag?: boolean; // 是否质检（派生自工艺路线工序）
+    remark?: string; // 备注
+  }
+
+  /** MES 生产任务分页查询参数 */
+  export interface PageParams extends PageParam {
+    code?: string;
+    name?: string;
+    workOrderId?: number;
+    workstationId?: number;
+    itemId?: number;
+    statuses?: number[];
+    status?: number;
+  }
+}
+
+/** 查询生产任务分页 */
+export function getTaskPage(params: MesProTaskApi.PageParams) {
+  return requestClient.get<PageResult<MesProTaskApi.Task>>(
+    '/mes/pro/task/page',
+    { params },
+  );
+}
+
+/** 查询生产任务详情 */
+export function getTask(id: number) {
+  return requestClient.get<MesProTaskApi.Task>(`/mes/pro/task/get?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/itemconsume/line/index.ts b/apps/web-ele/src/api/mes/wm/itemconsume/line/index.ts
new file mode 100644
index 000000000..2a353b766
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/itemconsume/line/index.ts
@@ -0,0 +1,37 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmItemConsumeLineApi {
+  /** MES 物料消耗行 */
+  export interface ItemConsumeLine {
+    id?: number;
+    feedbackId?: number; // 报工编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物资编码
+    itemName?: string; // 物资名称
+    specification?: string; // 规格型号
+    unitId?: number; // 单位编号
+    unitName?: string; // 单位
+    quantity?: number; // 消耗数量
+    batchCode?: string; // 批次号
+    locationId?: number; // 库位编号
+    locationName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+
+  /** MES 物料消耗行分页查询参数 */
+  export interface PageParams extends PageParam {
+    feedbackId?: number;
+  }
+}
+
+/** 查询物料消耗行分页 */
+export function getItemConsumeLinePage(
+  params: MesWmItemConsumeLineApi.PageParams,
+) {
+  return requestClient.get<PageResult<MesWmItemConsumeLineApi.ItemConsumeLine>>(
+    '/mes/wm/item-consume-line/page',
+    { params },
+  );
+}
diff --git a/apps/web-ele/src/api/mes/wm/productproduce/line/index.ts b/apps/web-ele/src/api/mes/wm/productproduce/line/index.ts
new file mode 100644
index 000000000..ab3f49f29
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/productproduce/line/index.ts
@@ -0,0 +1,37 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmProductProduceLineApi {
+  /** MES 产品产出行 */
+  export interface ProductProduceLine {
+    id?: number;
+    feedbackId?: number; // 报工编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物资编码
+    itemName?: string; // 物资名称
+    specification?: string; // 规格型号
+    unitMeasureId?: number; // 单位编号
+    unitMeasureName?: string; // 单位
+    quantity?: number; // 产出数量
+    batchCode?: string; // 批次号
+    qualityStatus?: number; // 质量状态
+    locationId?: number; // 库位编号
+    locationName?: string; // 库位名称
+    remark?: string; // 备注
+  }
+
+  /** MES 产品产出行分页查询参数 */
+  export interface PageParams extends PageParam {
+    feedbackId?: number;
+  }
+}
+
+/** 查询产品产出行分页 */
+export function getProductProduceLinePage(
+  params: MesWmProductProduceLineApi.PageParams,
+) {
+  return requestClient.get<
+    PageResult<MesWmProductProduceLineApi.ProductProduceLine>
+  >('/mes/wm/product-produce-line/page', { params });
+}
diff --git a/apps/web-ele/src/views/mes/pro/feedback/data.ts b/apps/web-ele/src/views/mes/pro/feedback/data.ts
new file mode 100644
index 000000000..21a677ff5
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/feedback/data.ts
@@ -0,0 +1,589 @@
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { h, markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { ElButton } from 'element-plus';
+
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+import { MdItemSelect } from '#/views/mes/md/item/components';
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProTaskSelect } from '#/views/mes/pro/task/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+import {
+  MesAutoCodeRuleCode,
+  MesProTaskStatusEnum,
+  MesProWorkOrderStatusEnum,
+} from '#/views/mes/utils/constants';
+
+/** 生产报工表单类型 */
+export type FormType = 'approve' | 'create' | 'detail' | 'submit' | 'update';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'code',
+      label: '报工单号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入报工单号',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '报工类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_FEEDBACK_TYPE, 'number'),
+        placeholder: '请选择报工类型',
+      },
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        clearable: true,
+        placeholder: '请选择工单',
+      },
+    },
+    {
+      fieldName: 'itemId',
+      label: '产品物料',
+      component: markRaw(MdItemSelect),
+      componentProps: {
+        clearable: true,
+        placeholder: '请选择产品物料',
+      },
+    },
+    {
+      fieldName: 'feedbackUserId',
+      label: '报工人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择报工人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'creator',
+      label: '记录人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择记录人',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_FEEDBACK_STATUS, 'number'),
+        placeholder: '请选择状态',
+      },
+    },
+    {
+      fieldName: 'feedbackTime',
+      label: '报工时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProFeedbackApi.Feedback>['columns'] {
+  return [
+    {
+      field: 'code',
+      title: '报工单号',
+      width: 160,
+      slots: { default: 'code' },
+    },
+    {
+      field: 'type',
+      title: '报工类型',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_FEEDBACK_TYPE },
+      },
+    },
+    { field: 'workstationName', title: '工作站', width: 120 },
+    { field: 'processName', title: '工序', width: 100 },
+    { field: 'workOrderCode', title: '生产工单编码', width: 160 },
+    { field: 'itemCode', title: '产品物料编码', width: 120 },
+    { field: 'itemName', title: '产品物料名称', minWidth: 140 },
+    { field: 'itemSpecification', title: '规格型号', width: 120 },
+    { field: 'unitMeasureName', title: '单位', width: 80 },
+    { field: 'feedbackQuantity', title: '报工数量', width: 100 },
+    { field: 'feedbackUserNickname', title: '报工人', width: 100 },
+    {
+      field: 'feedbackTime',
+      title: '报工时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+    { field: 'approveUserNickname', title: '审核人', width: 100 },
+    {
+      field: 'status',
+      title: '状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_FEEDBACK_STATUS },
+      },
+    },
+    {
+      title: '操作',
+      width: 240,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/**
+ * 新增/编辑/提交/审批/详情生产报工的表单
+ *
+ * - create / update：录入报工主体信息和数量
+ * - submit / approve / detail：主体字段只读
+ *
+ * 数量区域根据 `checkFlag` 和 `unqualifiedQuantity` 动态显示：
+ * - 非质检工序：报工数量 = 合格 + 不良；不良 > 0 时再展开工废/料废/其他废品
+ * - 质检工序：只填报工数量（视为待检数量）
+ */
+export function useFormSchema(
+  formType: FormType,
+  formApi?: VbenFormApi,
+): VbenFormSchema[] {
+  const isHeaderReadonly = ['approve', 'detail', 'submit'].includes(formType);
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'checkFlag',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+      defaultValue: true,
+    },
+    {
+      fieldName: 'routeId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'processId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'itemId',
+      component: 'Input',
+      dependencies: { triggerFields: [''], show: () => false },
+    },
+    {
+      fieldName: 'code',
+      label: '报工单号',
+      component: 'Input',
+      componentProps: {
+        disabled: isHeaderReadonly,
+        placeholder: '请输入报工单号',
+      },
+      rules: 'required',
+      suffix: () =>
+        h(
+          ElButton,
+          {
+            disabled: isHeaderReadonly,
+            type: 'default',
+            onClick: async () => {
+              const code = await generateAutoCode(
+                MesAutoCodeRuleCode.PRO_FEEDBACK_CODE,
+              );
+              await formApi?.setFieldValue('code', code);
+            },
+          },
+          { default: () => '生成' },
+        ),
+    },
+    {
+      fieldName: 'type',
+      label: '报工类型',
+      component: 'Select',
+      componentProps: {
+        disabled: isHeaderReadonly,
+        options: getDictOptions(DICT_TYPE.MES_PRO_FEEDBACK_TYPE, 'number'),
+        placeholder: '请选择报工类型',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        disabled: isHeaderReadonly,
+        placeholder: '请选择工单',
+        status: MesProWorkOrderStatusEnum.CONFIRMED,
+        // 工单变更：清空任务及任务带出的产品信息、数量区域控制位
+        onChange: async () => {
+          await formApi?.setValues({
+            checkFlag: true,
+            itemCode: undefined,
+            itemId: undefined,
+            itemName: undefined,
+            itemSpecification: undefined,
+            processId: undefined,
+            routeId: undefined,
+            taskId: undefined,
+            unitMeasureName: undefined,
+            workstationId: undefined,
+          });
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'taskId',
+      label: '生产任务',
+      component: markRaw(ProTaskSelect),
+      dependencies: {
+        triggerFields: ['workOrderId', 'workstationId'],
+        componentProps: (values) => ({
+          disabled: isHeaderReadonly || !values.workOrderId,
+          placeholder: values.workOrderId ? '请选择任务' : '请先选择工单',
+          statuses: [MesProTaskStatusEnum.PREPARE],
+          workOrderId: values.workOrderId,
+          workstationId: values.workstationId,
+        }),
+      },
+      // 任务变更：自动填充关联字段、产品信息、checkFlag
+      componentProps: {
+        onChange: async (task?: MesProTaskApi.Task) => {
+          if (!task) {
+            return;
+          }
+          await formApi?.setValues({
+            itemCode: task.itemCode,
+            itemId: task.itemId,
+            itemName: task.itemName,
+            itemSpecification: task.itemSpecification,
+            processId: task.processId,
+            routeId: task.routeId,
+            unitMeasureName: task.unitMeasureName,
+            workstationId: task.workstationId,
+          });
+          // 工艺路线工序的 checkFlag 决定数量区域展示
+          if (task.routeId && task.processId) {
+            try {
+              const routeProcess = await getRouteProcessByRouteAndProcess(
+                task.routeId,
+                task.processId,
+              );
+              await formApi?.setFieldValue(
+                'checkFlag',
+                routeProcess?.checkFlag ?? false,
+              );
+            } catch {
+              await formApi?.setFieldValue('checkFlag', true);
+            }
+          }
+        },
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        disabled: isHeaderReadonly,
+        placeholder: '请选择工作站',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'itemCode',
+      label: '产品编码',
+      component: 'Input',
+      componentProps: { disabled: true },
+      dependencies: {
+        triggerFields: ['itemCode'],
+        show: (values) => !!values.itemCode,
+      },
+    },
+    {
+      fieldName: 'itemName',
+      label: '产品名称',
+      component: 'Input',
+      componentProps: { disabled: true },
+      dependencies: {
+        triggerFields: ['itemCode'],
+        show: (values) => !!values.itemCode,
+      },
+    },
+    {
+      fieldName: 'unitMeasureName',
+      label: '单位',
+      component: 'Input',
+      componentProps: { disabled: true },
+      dependencies: {
+        triggerFields: ['itemCode'],
+        show: (values) => !!values.itemCode,
+      },
+    },
+    {
+      fieldName: 'itemSpecification',
+      label: '规格',
+      component: 'Input',
+      componentProps: { disabled: true },
+      dependencies: {
+        triggerFields: ['itemCode'],
+        show: (values) => !!values.itemCode,
+      },
+    },
+    {
+      fieldName: 'feedbackQuantity',
+      label: '报工数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 2,
+      },
+      dependencies: {
+        triggerFields: ['checkFlag'],
+        // 非质检工序时，报工数量 = 合格 + 不良，禁用直接编辑
+        componentProps: (values) => ({
+          class: '!w-full',
+          controlsPosition: 'right',
+          disabled: !values.checkFlag,
+          min: 0,
+          placeholder: '请输入报工数量',
+          precision: 2,
+        }),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'qualifiedQuantity',
+      label: '合格品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 2,
+        // 合格/不良变更，自动累计为报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          await formApi?.setFieldValue(
+            'feedbackQuantity',
+            (values?.qualifiedQuantity || 0) +
+              (values?.unqualifiedQuantity || 0),
+          );
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag'],
+        show: (values) => !values.checkFlag,
+      },
+    },
+    {
+      fieldName: 'unqualifiedQuantity',
+      label: '不良品数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 2,
+        // 合格/不良变更，自动累计为报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          await formApi?.setFieldValue(
+            'feedbackQuantity',
+            (values?.qualifiedQuantity || 0) +
+              (values?.unqualifiedQuantity || 0),
+          );
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag'],
+        show: (values) => !values.checkFlag,
+      },
+    },
+    {
+      fieldName: 'laborScrapQuantity',
+      label: '工废数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 2,
+        // 废品分类变更，自动累计为不良品数量及报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          const unqualified =
+            (values?.laborScrapQuantity || 0) +
+            (values?.materialScrapQuantity || 0) +
+            (values?.otherScrapQuantity || 0);
+          await formApi?.setValues({
+            feedbackQuantity:
+              (values?.qualifiedQuantity || 0) + unqualified,
+            unqualifiedQuantity: unqualified,
+          });
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag', 'unqualifiedQuantity'],
+        show: (values) =>
+          !values.checkFlag && (values.unqualifiedQuantity || 0) > 0,
+      },
+    },
+    {
+      fieldName: 'materialScrapQuantity',
+      label: '料废数量',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 2,
+        // 废品分类变更，自动累计为不良品数量及报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          const unqualified =
+            (values?.laborScrapQuantity || 0) +
+            (values?.materialScrapQuantity || 0) +
+            (values?.otherScrapQuantity || 0);
+          await formApi?.setValues({
+            feedbackQuantity:
+              (values?.qualifiedQuantity || 0) + unqualified,
+            unqualifiedQuantity: unqualified,
+          });
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag', 'unqualifiedQuantity'],
+        show: (values) =>
+          !values.checkFlag && (values.unqualifiedQuantity || 0) > 0,
+      },
+    },
+    {
+      fieldName: 'otherScrapQuantity',
+      label: '其他废品',
+      component: 'InputNumber',
+      componentProps: {
+        class: '!w-full',
+        controlsPosition: 'right',
+        min: 0,
+        precision: 2,
+        // 废品分类变更，自动累计为不良品数量及报工数量
+        onChange: async () => {
+          const values = await formApi?.getValues();
+          const unqualified =
+            (values?.laborScrapQuantity || 0) +
+            (values?.materialScrapQuantity || 0) +
+            (values?.otherScrapQuantity || 0);
+          await formApi?.setValues({
+            feedbackQuantity:
+              (values?.qualifiedQuantity || 0) + unqualified,
+            unqualifiedQuantity: unqualified,
+          });
+        },
+      },
+      defaultValue: 0,
+      dependencies: {
+        triggerFields: ['checkFlag', 'unqualifiedQuantity'],
+        show: (values) =>
+          !values.checkFlag && (values.unqualifiedQuantity || 0) > 0,
+      },
+    },
+    {
+      fieldName: 'feedbackUserId',
+      label: '报工人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        disabled: isHeaderReadonly,
+        labelField: 'nickname',
+        placeholder: '请选择报工人',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'feedbackTime',
+      label: '报工时间',
+      component: 'DatePicker',
+      componentProps: {
+        class: '!w-full',
+        disabled: isHeaderReadonly,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        placeholder: '请选择报工时间',
+        type: 'datetime',
+        valueFormat: 'x',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'approveUserId',
+      label: '审核人',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        disabled: isHeaderReadonly,
+        labelField: 'nickname',
+        placeholder: '请选择审核人',
+        valueField: 'id',
+      },
+      rules: 'selectRequired',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+      formItemClass: 'col-span-3',
+      componentProps: {
+        autosize: { maxRows: 3, minRows: 2 },
+        disabled: formType === 'detail',
+        placeholder: '请输入备注',
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/pro/feedback/index.vue b/apps/web-ele/src/views/mes/pro/feedback/index.vue
new file mode 100644
index 000000000..ef65e4629
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/feedback/index.vue
@@ -0,0 +1,184 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
+
+import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ElButton, ElLoading, ElMessage } from 'element-plus';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteFeedback,
+  exportFeedback,
+  getFeedbackPage,
+} from '#/api/mes/pro/feedback';
+import { $t } from '#/locales';
+import { MesProFeedbackStatusEnum } from '#/views/mes/utils/constants';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const userStore = useUserStore();
+const currentUserId = userStore.userInfo?.id; // 当前登录用户 ID，用于审批人权限判断
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 创建生产报工 */
+function handleCreate() {
+  formModalApi.setData({ formType: 'create' }).open();
+}
+
+/** 编辑生产报工 */
+function handleEdit(row: MesProFeedbackApi.Feedback) {
+  formModalApi.setData({ formType: 'update', id: row.id }).open();
+}
+
+/** 提交生产报工 */
+function handleSubmit(row: MesProFeedbackApi.Feedback) {
+  formModalApi.setData({ formType: 'submit', id: row.id }).open();
+}
+
+/** 审批生产报工 */
+function handleApprove(row: MesProFeedbackApi.Feedback) {
+  formModalApi.setData({ formType: 'approve', id: row.id }).open();
+}
+
+/** 详情生产报工 */
+function handleDetail(row: MesProFeedbackApi.Feedback) {
+  formModalApi.setData({ formType: 'detail', id: row.id }).open();
+}
+
+/** 删除生产报工 */
+async function handleDelete(row: MesProFeedbackApi.Feedback) {
+  const hideLoading = ElLoading.service({
+    text: $t('ui.actionMessage.deleting', [row.code]),
+  });
+  try {
+    await deleteFeedback(row.id!);
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.code]));
+    handleRefresh();
+  } finally {
+    hideLoading.close();
+  }
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportFeedback(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '生产报工.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: { schema: useGridFormSchema() },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getFeedbackPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: { isHover: true, keyField: 'id' },
+    toolbarConfig: { refresh: true, search: true },
+  } as VxeTableGridOptions<MesProFeedbackApi.Feedback>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】生产报工"
+        url="https://doc.iocoder.cn/mes/pro/feedback/"
+      />
+    </template>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="生产报工列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.create', ['生产报工']),
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              auth: ['mes:pro-feedback:create'],
+              onClick: handleCreate,
+            },
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-feedback:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #code="{ row }">
+        <ElButton link type="primary" @click="handleDetail(row)">
+          {{ row.code }}
+        </ElButton>
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.edit'),
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-feedback:update'],
+              ifShow: () => row.status === MesProFeedbackStatusEnum.PREPARE,
+              onClick: handleEdit.bind(null, row),
+            },
+            {
+              label: $t('common.submit'),
+              type: 'success',
+              link: true,
+              auth: ['mes:pro-feedback:update'],
+              ifShow: () => row.status === MesProFeedbackStatusEnum.PREPARE,
+              onClick: handleSubmit.bind(null, row),
+            },
+            {
+              label: $t('common.approve'),
+              type: 'primary',
+              link: true,
+              auth: ['mes:pro-feedback:approve'],
+              ifShow: () =>
+                row.status === MesProFeedbackStatusEnum.APPROVING &&
+                row.approveUserId === currentUserId,
+              onClick: handleApprove.bind(null, row),
+            },
+            {
+              label: $t('common.delete'),
+              type: 'danger',
+              link: true,
+              auth: ['mes:pro-feedback:delete'],
+              ifShow: () => row.status === MesProFeedbackStatusEnum.PREPARE,
+              popConfirm: {
+                title: $t('ui.actionMessage.deleteConfirm', [row.code]),
+                confirm: handleDelete.bind(null, row),
+              },
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue b/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
new file mode 100644
index 000000000..da61a777f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
@@ -0,0 +1,319 @@
+<script lang="ts" setup>
+import type { FormType } from '../data';
+
+import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
+
+import {
+  ElButton,
+  ElMessage,
+  ElPopconfirm,
+  ElTabPane,
+  ElTabs,
+} from 'element-plus';
+
+import { useVbenForm } from '#/adapter/form';
+import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import {
+  approveFeedback,
+  createFeedback,
+  getFeedback,
+  rejectFeedback,
+  submitFeedback,
+  updateFeedback,
+} from '#/api/mes/pro/feedback';
+import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { $t } from '#/locales';
+import {
+  MesAutoCodeRuleCode,
+  MesProFeedbackStatusEnum,
+} from '#/views/mes/utils/constants';
+
+import { useFormSchema } from '../data';
+import ItemConsumeList from './item-consume-list.vue';
+import ProductProduceList from './product-produce-list.vue';
+
+const emit = defineEmits(['success']);
+const formType = ref<FormType>('create');
+const formData = ref<MesProFeedbackApi.Feedback>();
+const userStore = useUserStore();
+const subTabsName = ref('itemConsume');
+
+const isEditable = computed(() =>
+  ['create', 'submit', 'update'].includes(formType.value),
+);
+const canSubmit = computed(
+  () =>
+    isEditable.value &&
+    formData.value?.status === MesProFeedbackStatusEnum.PREPARE,
+);
+const canApprove = computed(() => formType.value === 'approve');
+const showSubTabs = computed(
+  () =>
+    !!formData.value?.id &&
+    formData.value?.status !== MesProFeedbackStatusEnum.PREPARE &&
+    formData.value?.status !== MesProFeedbackStatusEnum.APPROVING,
+);
+const getTitle = computed(() => {
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['生产报工']);
+  }
+  if (formType.value === 'approve') {
+    return '审批生产报工';
+  }
+  if (formType.value === 'submit') {
+    return '提交生产报工';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['生产报工'])
+    : $t('ui.actionTitle.create', ['生产报工']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-1',
+    labelWidth: 110,
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-3',
+});
+
+/** 表单 schema 需要 formApi 引用，所以通过 setState 设置 schema */
+formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+
+/** 提交前对齐数量：根据 checkFlag 决定 uncheck/合格/不良归零策略 */
+function alignQuantity(data: MesProFeedbackApi.Feedback) {
+  if (data.checkFlag) {
+    data.uncheckQuantity = data.feedbackQuantity;
+    data.qualifiedQuantity = 0;
+    data.unqualifiedQuantity = 0;
+    data.laborScrapQuantity = 0;
+    data.materialScrapQuantity = 0;
+    data.otherScrapQuantity = 0;
+  } else {
+    data.feedbackQuantity =
+      (data.qualifiedQuantity || 0) + (data.unqualifiedQuantity || 0);
+    data.uncheckQuantity = 0;
+  }
+}
+
+/** 保存：create 后切换为 update 模式 */
+async function handleSave() {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+    alignQuantity(data);
+    if (formType.value === 'create') {
+      const id = await createFeedback(data);
+      formData.value = {
+        ...data,
+        id,
+        status: MesProFeedbackStatusEnum.PREPARE,
+      };
+      formType.value = 'update';
+      formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+      await formApi.setFieldValue('id', id);
+      ElMessage.success($t('common.createSuccess'));
+    } else {
+      await updateFeedback(data);
+      formData.value = { ...formData.value, ...data };
+      ElMessage.success($t('common.updateSuccess'));
+    }
+    emit('success');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 提交：保存最新内容后调用提交接口 */
+async function handleSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+    alignQuantity(data);
+    let id = formData.value?.id;
+    if (formType.value === 'create' || !id) {
+      id = await createFeedback(data);
+    } else {
+      await updateFeedback(data);
+    }
+    await submitFeedback(id!);
+    await modalApi.close();
+    emit('success');
+    ElMessage.success('报工单已提交');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 审批通过 */
+async function handleApprove() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    const finished = await approveFeedback(formData.value.id);
+    await modalApi.close();
+    emit('success');
+    ElMessage.success(
+      finished ? '报工单已审批完成' : '报工成功，请等待质量检验完成！',
+    );
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 审批不通过 */
+async function handleReject() {
+  if (!formData.value?.id) {
+    return;
+  }
+  modalApi.lock();
+  try {
+    await rejectFeedback(formData.value.id);
+    await modalApi.close();
+    emit('success');
+    ElMessage.success('报工单已驳回');
+  } finally {
+    modalApi.unlock();
+  }
+}
+
+/** 加载工序的 checkFlag 用于回显数量区域 */
+async function resolveCheckFlag(routeId?: number, processId?: number) {
+  if (!routeId || !processId) {
+    return true;
+  }
+  try {
+    const routeProcess = await getRouteProcessByRouteAndProcess(
+      routeId,
+      processId,
+    );
+    return routeProcess?.checkFlag ?? false;
+  } catch {
+    return true;
+  }
+}
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    if (formType.value === 'detail' || formType.value === 'approve') {
+      await modalApi.close();
+      return;
+    }
+    await handleSave();
+  },
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      subTabsName.value = 'itemConsume';
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    formType.value = data.formType;
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    // 审批/详情整表禁用，避免审核人误改未提交的字段
+    formApi.setDisabled(
+      formType.value === 'approve' || formType.value === 'detail',
+    );
+    modalApi.setState({
+      showConfirmButton:
+        formType.value !== 'detail' && formType.value !== 'approve',
+    });
+    await formApi.resetForm();
+    if (!data?.id) {
+      // 新增：默认报工人和报工时间，并自动生成报工单号
+      const code = await generateAutoCode(
+        MesAutoCodeRuleCode.PRO_FEEDBACK_CODE,
+      );
+      await formApi.setValues({
+        code,
+        feedbackTime: Date.now(),
+        feedbackUserId: userStore.userInfo?.id,
+      });
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getFeedback(data.id);
+      const checkFlag = await resolveCheckFlag(
+        formData.value.routeId,
+        formData.value.processId,
+      );
+      // 设置到 values
+      await formApi.setValues({ ...formData.value, checkFlag });
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-3/5">
+    <Form class="mx-4" />
+    <ElTabs
+      v-if="showSubTabs"
+      v-model="subTabsName"
+      type="card"
+      class="mx-4 mt-2"
+    >
+      <ElTabPane label="BOM 物资消耗" name="itemConsume">
+        <ItemConsumeList :feedback-id="formData!.id!" />
+      </ElTabPane>
+      <ElTabPane label="产品产出" name="productProduce">
+        <ProductProduceList :feedback-id="formData!.id!" />
+      </ElTabPane>
+    </ElTabs>
+    <template #prepend-footer>
+      <div class="flex flex-auto items-center justify-end gap-2">
+        <ElPopconfirm
+          v-if="canSubmit"
+          title="确认提交该报工单？提交后将不能修改。"
+          @confirm="handleSubmit"
+        >
+          <template #reference>
+            <ElButton type="primary">{{ $t('common.submit') }}</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="canApprove"
+          title="确认审批通过该报工单？"
+          @confirm="handleApprove"
+        >
+          <template #reference>
+            <ElButton type="success">通过</ElButton>
+          </template>
+        </ElPopconfirm>
+        <ElPopconfirm
+          v-if="canApprove"
+          title="确认驳回该报工单？"
+          @confirm="handleReject"
+        >
+          <template #reference>
+            <ElButton type="danger">不通过</ElButton>
+          </template>
+        </ElPopconfirm>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/feedback/modules/item-consume-list.vue b/apps/web-ele/src/views/mes/pro/feedback/modules/item-consume-list.vue
new file mode 100644
index 000000000..5aa78254f
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/feedback/modules/item-consume-list.vue
@@ -0,0 +1,57 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmItemConsumeLineApi } from '#/api/mes/wm/itemconsume/line';
+
+import { watch } from 'vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getItemConsumeLinePage } from '#/api/mes/wm/itemconsume/line';
+
+const props = defineProps<{
+  feedbackId: number;
+}>();
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: [
+      { field: 'itemCode', title: '物资编码', minWidth: 120 },
+      { field: 'itemName', title: '物资名称', minWidth: 140 },
+      { field: 'specification', title: '规格型号', minWidth: 120 },
+      { field: 'quantity', title: '消耗数量', minWidth: 100 },
+      { field: 'unitName', title: '单位', minWidth: 80 },
+      { field: 'batchCode', title: '批次号', minWidth: 120 },
+    ],
+    height: 320,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          return await getItemConsumeLinePage({
+            feedbackId: props.feedbackId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmItemConsumeLineApi.ItemConsumeLine>,
+});
+
+watch(
+  () => props.feedbackId,
+  () => {
+    gridApi.query();
+  },
+);
+</script>
+
+<template>
+  <Grid />
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/feedback/modules/product-produce-list.vue b/apps/web-ele/src/views/mes/pro/feedback/modules/product-produce-list.vue
new file mode 100644
index 000000000..17ac88995
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/feedback/modules/product-produce-list.vue
@@ -0,0 +1,68 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesWmProductProduceLineApi } from '#/api/mes/wm/productproduce/line';
+
+import { watch } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getProductProduceLinePage } from '#/api/mes/wm/productproduce/line';
+
+const props = defineProps<{
+  feedbackId: number;
+}>();
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: [
+      { field: 'itemCode', title: '物资编码', minWidth: 120 },
+      { field: 'itemName', title: '物资名称', minWidth: 140 },
+      { field: 'specification', title: '规格型号', minWidth: 120 },
+      { field: 'quantity', title: '产出数量', minWidth: 100 },
+      { field: 'unitMeasureName', title: '单位', minWidth: 80 },
+      { field: 'batchCode', title: '批次号', minWidth: 120 },
+      {
+        field: 'qualityStatus',
+        title: '质量状态',
+        minWidth: 100,
+        cellRender: {
+          name: 'CellDict',
+          props: { type: DICT_TYPE.MES_WM_QUALITY_STATUS },
+        },
+      },
+    ],
+    height: 320,
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }) => {
+          return await getProductProduceLinePage({
+            feedbackId: props.feedbackId,
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+    },
+  } as VxeTableGridOptions<MesWmProductProduceLineApi.ProductProduceLine>,
+});
+
+watch(
+  () => props.feedbackId,
+  () => {
+    gridApi.query();
+  },
+);
+</script>
+
+<template>
+  <Grid />
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/task/components/index.ts b/apps/web-ele/src/views/mes/pro/task/components/index.ts
new file mode 100644
index 000000000..3847bb912
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/components/index.ts
@@ -0,0 +1,2 @@
+export { default as ProTaskSelectDialog } from './pro-task-select-dialog.vue';
+export { default as ProTaskSelect } from './pro-task-select.vue';
diff --git a/apps/web-ele/src/views/mes/pro/task/components/pro-task-select-dialog.vue b/apps/web-ele/src/views/mes/pro/task/components/pro-task-select-dialog.vue
new file mode 100644
index 000000000..3e43fc9ad
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/components/pro-task-select-dialog.vue
@@ -0,0 +1,248 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { computed, nextTick, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
+
+import { ElAlert, ElButton, ElDialog, ElMessage } from 'element-plus';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getTaskPage } from '#/api/mes/pro/task';
+
+import { useTaskSelectGridColumns, useTaskSelectGridFormSchema } from '../data';
+
+const props = withDefaults(
+  defineProps<{
+    statuses?: number[];
+  }>(),
+  {
+    statuses: undefined,
+  },
+);
+const emit = defineEmits<{
+  selected: [rows: MesProTaskApi.Task[]];
+}>();
+
+const open = ref(false); // 弹窗是否打开
+const multiple = ref(false); // 是否多选；默认按单选选择器使用
+const selectedRows = ref<MesProTaskApi.Task[]>([]); // 已选任务列表
+const preSelectedIds = ref<number[]>([]); // 预选任务编号列表
+const externalWorkOrderId = ref<number>(); // 外部传入的默认工单过滤
+const externalWorkstationId = ref<number>(); // 外部传入的默认工位过滤
+
+const statusTip = computed(() => {
+  if (!props.statuses?.length) {
+    return '';
+  }
+  const labels = props.statuses
+    .map((value) => getDictLabel(DICT_TYPE.MES_PRO_TASK_STATUS, value))
+    .filter(Boolean)
+    .join('、');
+  return `仅展示状态为【${labels}】的任务`;
+});
+
+/** 获取多选记录，包含 VXE reserve 跨页记录 */
+function getMultipleSelectedRows() {
+  const selectedMap = new Map<number, MesProTaskApi.Task>();
+  const records = [
+    ...(gridApi.grid.getCheckboxReserveRecords?.() ?? []),
+    ...(gridApi.grid.getCheckboxRecords?.() ?? []),
+  ] as MesProTaskApi.Task[];
+  records.forEach((row) => {
+    const rowId = row.id;
+    if (rowId !== undefined) {
+      selectedMap.set(rowId, row);
+    }
+  });
+  return [...selectedMap.values()];
+}
+
+/** 处理多选勾选变化 */
+function handleCheckboxSelectChange() {
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理单选切换 */
+function handleRadioChange(row: MesProTaskApi.Task) {
+  selectedRows.value = [row];
+}
+
+/** 多选模式下切换行勾选 */
+async function toggleMultipleRow(row: MesProTaskApi.Task) {
+  const selected = gridApi.grid.isCheckedByCheckboxRow(row);
+  await gridApi.grid.setCheckboxRow(row, !selected);
+  selectedRows.value = getMultipleSelectedRows();
+}
+
+/** 处理行双击：单选直接确认，多选切换勾选 */
+async function handleCellDblclick({ row }: { row: MesProTaskApi.Task }) {
+  if (multiple.value) {
+    await toggleMultipleRow(row);
+    return;
+  }
+  selectedRows.value = [row];
+  await gridApi.grid.setRadioRow(row);
+  handleConfirm();
+}
+
+/** 回显预选任务 */
+async function applyPreSelection() {
+  if (preSelectedIds.value.length === 0) {
+    return;
+  }
+  const rows = gridApi.grid.getData() as MesProTaskApi.Task[];
+  for (const row of rows) {
+    if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
+      continue;
+    }
+    if (multiple.value) {
+      await gridApi.grid.setCheckboxRow(row, true);
+    } else {
+      await gridApi.grid.setRadioRow(row);
+      selectedRows.value = [row];
+      return;
+    }
+  }
+  if (multiple.value) {
+    selectedRows.value = getMultipleSelectedRows();
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useTaskSelectGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useTaskSelectGridColumns(false),
+    height: 520,
+    keepSource: true,
+    checkboxConfig: {
+      highlight: true,
+      range: true,
+      reserve: true,
+    },
+    radioConfig: {
+      highlight: true,
+      trigger: 'row',
+    },
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getTaskPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+            statuses: props.statuses,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProTaskApi.Task>,
+  gridEvents: {
+    cellDblclick: handleCellDblclick,
+    checkboxAll: handleCheckboxSelectChange,
+    checkboxChange: handleCheckboxSelectChange,
+    radioChange: ({ row }: { row: MesProTaskApi.Task }) => {
+      handleRadioChange(row);
+    },
+  },
+});
+
+/** 重置查询和选择状态，保留外部传入的工单/工位默认过滤 */
+async function resetQueryState() {
+  selectedRows.value = [];
+  await gridApi.grid.clearCheckboxRow();
+  await gridApi.grid.clearCheckboxReserve();
+  await gridApi.grid.clearRadioRow();
+  await gridApi.formApi.resetForm();
+  if (externalWorkOrderId.value) {
+    await gridApi.formApi.setFieldValue(
+      'workOrderId',
+      externalWorkOrderId.value,
+    );
+  }
+  if (externalWorkstationId.value) {
+    await gridApi.formApi.setFieldValue(
+      'workstationId',
+      externalWorkstationId.value,
+    );
+  }
+}
+
+/** 打开任务选择弹窗 */
+async function openModal(
+  selectedIds?: number[],
+  options?: {
+    multiple?: boolean;
+    workOrderId?: number;
+    workstationId?: number;
+  },
+) {
+  open.value = true;
+  multiple.value = options?.multiple ?? false;
+  preSelectedIds.value = selectedIds || [];
+  externalWorkOrderId.value = options?.workOrderId;
+  externalWorkstationId.value = options?.workstationId;
+  await nextTick();
+  gridApi.setGridOptions({
+    columns: useTaskSelectGridColumns(multiple.value),
+  });
+  await resetQueryState();
+  await gridApi.query();
+  await nextTick();
+  await applyPreSelection();
+}
+
+/** 关闭任务选择弹窗 */
+function closeModal() {
+  open.value = false;
+}
+
+/** 确认选择任务 */
+function handleConfirm() {
+  const rows = multiple.value ? getMultipleSelectedRows() : selectedRows.value;
+  if (rows.length === 0) {
+    ElMessage.warning(multiple.value ? '请至少选择一条数据' : '请选择一条数据');
+    return;
+  }
+  emit('selected', multiple.value ? rows : [rows[0]!]);
+  open.value = false;
+}
+
+defineExpose({ open: openModal });
+</script>
+
+<template>
+  <ElDialog
+    v-model="open"
+    title="生产任务选择"
+    width="80%"
+    destroy-on-close
+    @close="closeModal"
+  >
+    <ElAlert
+      v-if="statusTip"
+      :title="statusTip"
+      type="info"
+      :closable="false"
+      show-icon
+      class="!mb-3"
+    />
+    <Grid table-title="生产任务列表" />
+    <template #footer>
+      <ElButton @click="closeModal">取消</ElButton>
+      <ElButton type="primary" @click="handleConfirm">确定</ElButton>
+    </template>
+  </ElDialog>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue b/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
new file mode 100644
index 000000000..99af6c290
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
@@ -0,0 +1,155 @@
+<script lang="ts" setup>
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { computed, ref, useAttrs, watch } from 'vue';
+
+import { CircleX, Search } from '@vben/icons';
+
+import { ElInput, ElTooltip } from 'element-plus';
+
+import { getTask } from '#/api/mes/pro/task';
+
+import ProTaskSelectDialog from './pro-task-select-dialog.vue';
+
+defineOptions({ name: 'ProTaskSelect', inheritAttrs: false });
+
+const props = withDefaults(
+  defineProps<{
+    clearable?: boolean;
+    disabled?: boolean;
+    modelValue?: number;
+    placeholder?: string;
+    statuses?: number[];
+    workOrderId?: number;
+    workstationId?: number;
+  }>(),
+  {
+    clearable: true,
+    disabled: false,
+    modelValue: undefined,
+    placeholder: '请选择任务',
+    statuses: undefined,
+    workOrderId: undefined,
+    workstationId: undefined,
+  },
+);
+const emit = defineEmits<{
+  change: [item: MesProTaskApi.Task | undefined];
+  'update:modelValue': [value: number | undefined];
+}>();
+const attrs = useAttrs(); // 透传属性
+const dialogRef = ref<InstanceType<typeof ProTaskSelectDialog>>(); // 任务选择弹窗
+const hovering = ref(false); // 是否悬停
+const selectedItem = ref<MesProTaskApi.Task>(); // 选中的任务
+
+const displayLabel = computed(() => selectedItem.value?.code ?? ''); // 选择器展示编号
+const showClear = computed( // 是否显示清空图标
+  () =>
+    props.clearable &&
+    !props.disabled &&
+    hovering.value &&
+    props.modelValue !== undefined,
+);
+
+/** 根据任务编号回显选择器 */
+async function resolveItemById(id: number | undefined) {
+  if (id === undefined) {
+    selectedItem.value = undefined;
+    return;
+  }
+  if (selectedItem.value?.id === id) {
+    return;
+  }
+  try {
+    selectedItem.value = await getTask(id);
+  } catch (error) {
+    console.error('[ProTaskSelect] resolveItemById failed:', error);
+  }
+}
+
+watch(
+  () => props.modelValue,
+  (value) => {
+    resolveItemById(value);
+  },
+  { immediate: true },
+);
+
+/** 清空已选任务 */
+function clearSelected() {
+  selectedItem.value = undefined;
+  emit('update:modelValue', undefined);
+  emit('change', undefined);
+}
+
+/** 打开任务选择弹窗 */
+function handleClick(event: MouseEvent) {
+  if (props.disabled) {
+    return;
+  }
+  const target = event.target as HTMLElement;
+  if (showClear.value && target.closest('.el-input__suffix')) {
+    event.stopPropagation();
+    clearSelected();
+    return;
+  }
+  const selectedIds =
+    props.modelValue === undefined ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, {
+    multiple: false,
+    workOrderId: props.workOrderId,
+    workstationId: props.workstationId,
+  });
+}
+
+/** 回填选中的任务 */
+function handleSelected(rows: MesProTaskApi.Task[]) {
+  const item = rows[0];
+  if (!item) {
+    return;
+  }
+  selectedItem.value = item;
+  emit('update:modelValue', item.id);
+  emit('change', item);
+}
+</script>
+
+<template>
+  <div
+    v-bind="attrs"
+    class="w-full"
+    :class="disabled ? 'cursor-not-allowed' : 'cursor-pointer'"
+    @click="handleClick"
+    @mouseenter="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <ElTooltip :disabled="!selectedItem" placement="top" :show-after="500">
+      <template #content>
+        <div v-if="selectedItem" class="leading-6">
+          <div>任务编号：{{ selectedItem.code || '-' }}</div>
+          <div>任务名称：{{ selectedItem.name || '-' }}</div>
+          <div>工序：{{ selectedItem.processName || '-' }}</div>
+          <div>工作站：{{ selectedItem.workstationName || '-' }}</div>
+          <div>物料：{{ selectedItem.itemName || '-' }}</div>
+          <div>规格：{{ selectedItem.itemSpecification || '-' }}</div>
+        </div>
+      </template>
+      <ElInput
+        :disabled="disabled"
+        :model-value="displayLabel"
+        :placeholder="placeholder"
+        readonly
+      >
+        <template #suffix>
+          <CircleX v-if="showClear" class="size-4" />
+          <Search v-else class="size-4" />
+        </template>
+      </ElInput>
+    </ElTooltip>
+  </div>
+  <ProTaskSelectDialog
+    ref="dialogRef"
+    :statuses="statuses"
+    @selected="handleSelected"
+  />
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/task/data.ts b/apps/web-ele/src/views/mes/pro/task/data.ts
new file mode 100644
index 000000000..1e1cc70a2
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/task/data.ts
@@ -0,0 +1,112 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProTaskApi } from '#/api/mes/pro/task';
+
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
+import { ProProcessSelect } from '#/views/mes/pro/process/components';
+import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
+
+/** 任务选择弹窗的搜索表单 */
+export function useTaskSelectGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'workOrderId',
+      label: '生产工单',
+      component: markRaw(ProWorkOrderSelect),
+      componentProps: {
+        clearable: true,
+        placeholder: '请选择生产工单',
+      },
+    },
+    {
+      fieldName: 'processId',
+      label: '所属工序',
+      component: markRaw(ProProcessSelect),
+      componentProps: {
+        clearable: true,
+        placeholder: '请选择工序',
+      },
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        clearable: true,
+        placeholder: '请选择工作站',
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '任务编号',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入任务编号',
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '任务名称',
+      component: 'Input',
+      componentProps: {
+        clearable: true,
+        placeholder: '请输入任务名称',
+      },
+    },
+  ];
+}
+
+/** 任务选择弹窗的字段 */
+export function useTaskSelectGridColumns(
+  multiple = false,
+): VxeTableGridOptions<MesProTaskApi.Task>['columns'] {
+  return [
+    { type: multiple ? 'checkbox' : 'radio', width: 50 },
+    { field: 'code', title: '任务编号', width: 180 },
+    { field: 'name', title: '任务名称', minWidth: 140 },
+    { field: 'workstationCode', title: '工作站编码', width: 140 },
+    { field: 'workstationName', title: '工作站名称', width: 140 },
+    { field: 'processName', title: '工序', width: 120 },
+    {
+      field: 'checkFlag',
+      title: '是否质检',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    { field: 'itemCode', title: '物料编码', width: 140 },
+    { field: 'itemName', title: '物料名称', width: 140 },
+    { field: 'itemSpecification', title: '规格型号', width: 120 },
+    { field: 'quantity', title: '排产数量', width: 100 },
+    { field: 'producedQuantity', title: '已生产数量', width: 110 },
+    {
+      field: 'startTime',
+      title: '开始生产时间',
+      width: 170,
+      formatter: 'formatDateTime',
+    },
+    { field: 'duration', title: '生产时长', width: 100 },
+    {
+      field: 'endTime',
+      title: '预计完成时间',
+      width: 170,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'status',
+      title: '任务状态',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_TASK_STATUS },
+      },
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index 2fd061dc6..668cf7240 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -166,10 +166,10 @@ export const MesProTaskStatusEnum = {
 /** MES 生产报工状态枚举 */
 export const MesProFeedbackStatusEnum = {
   PREPARE: MesOrderStatusConstants.DRAFT,
-  CONFIRMED: MesOrderStatusConstants.CONFIRMED,
   APPROVING: MesOrderStatusConstants.APPROVING,
+  UNCHECK: MesOrderStatusConstants.APPROVED,
   FINISHED: MesOrderStatusConstants.FINISHED,
-  CANCELLED: MesOrderStatusConstants.CANCELLED,
+  CANCELED: MesOrderStatusConstants.CANCELLED,
 } as const;
 
 /** MES 流转卡状态枚举 */

From d1e2202e59224745f6ce04df200cf2499af42e01 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 26 May 2026 22:27:27 +0800
Subject: [PATCH 14/17] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E6=8A=A5=E5=B7=A5=20antd/ele=20=E5=B9=B6=E8=A1=A5?=
 =?UTF-8?q?=E9=BD=90=E4=BB=BB=E5=8A=A1=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mes/pro/feedback/modules/form.vue   | 34 +++++++++++++------
 .../pro/task/components/pro-task-select.vue   | 11 +++---
 .../views/mes/pro/feedback/modules/form.vue   | 34 +++++++++++++------
 .../pro/task/components/pro-task-select.vue   | 11 +++---
 4 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
index 8b8699b04..d0c8a84ce 100644
--- a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
+++ b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue
@@ -36,6 +36,7 @@ const formType = ref<FormType>('create');
 const formData = ref<MesProFeedbackApi.Feedback>();
 const userStore = useUserStore();
 const subTabsName = ref('itemConsume');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 submit 时跳过未变更的保存请求
 
 const isEditable = computed(() =>
   ['create', 'submit', 'update'].includes(formType.value),
@@ -100,6 +101,13 @@ function alignQuantity(data: MesProFeedbackApi.Feedback) {
   }
 }
 
+/** 读取并按提交规则对齐后的表单数据，用于快照和保存 */
+async function getAlignedData(): Promise<MesProFeedbackApi.Feedback> {
+  const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+  alignQuantity(data);
+  return data;
+}
+
 /** 保存：create 后切换为 update 模式 */
 async function handleSave() {
   const { valid } = await formApi.validate();
@@ -108,13 +116,12 @@ async function handleSave() {
   }
   modalApi.lock();
   try {
-    const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
-    alignQuantity(data);
+    const data = await getAlignedData();
     if (formType.value === 'create') {
       const id = await createFeedback(data);
+      data.id = id;
       formData.value = {
         ...data,
-        id,
         status: MesProFeedbackStatusEnum.PREPARE,
       };
       formType.value = 'update';
@@ -126,13 +133,15 @@ async function handleSave() {
       formData.value = { ...formData.value, ...data };
       message.success($t('common.updateSuccess'));
     }
+    // 刷新快照（已对齐数量并补 id），后续 submit 用于判断是否需要再保存
+    originalSnapshot.value = JSON.stringify(data);
     emit('success');
   } finally {
     modalApi.unlock();
   }
 }
 
-/** 提交：保存最新内容后调用提交接口 */
+/** 提交：仅当表单较快照有变更时才先保存，再调用提交接口 */
 async function handleSubmit() {
   const { valid } = await formApi.validate();
   if (!valid) {
@@ -140,15 +149,13 @@ async function handleSubmit() {
   }
   modalApi.lock();
   try {
-    const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
-    alignQuantity(data);
-    let id = formData.value?.id;
-    if (formType.value === 'create' || !id) {
-      id = await createFeedback(data);
-    } else {
+    const data = await getAlignedData();
+    // 表单有修改时，先保存
+    if (JSON.stringify(data) !== originalSnapshot.value) {
       await updateFeedback(data);
+      originalSnapshot.value = JSON.stringify(data);
     }
-    await submitFeedback(id!);
+    await submitFeedback(formData.value!.id!);
     await modalApi.close();
     emit('success');
     message.success('报工单已提交');
@@ -217,6 +224,7 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       formData.value = undefined;
       subTabsName.value = 'itemConsume';
+      originalSnapshot.value = '';
       return;
     }
     // 加载数据
@@ -242,6 +250,8 @@ const [Modal, modalApi] = useVbenModal({
         feedbackTime: Date.now(),
         feedbackUserId: userStore.userInfo?.id,
       });
+      // 记录初始快照（含数量对齐结果），submit 时用于跳过无变更的保存请求
+      originalSnapshot.value = JSON.stringify(await getAlignedData());
       return;
     }
     modalApi.lock();
@@ -253,6 +263,8 @@ const [Modal, modalApi] = useVbenModal({
       );
       // 设置到 values
       await formApi.setValues({ ...formData.value, checkFlag });
+      // 记录初始快照（含数量对齐结果），submit 时用于跳过无变更的保存请求
+      originalSnapshot.value = JSON.stringify(await getAlignedData());
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
index fc7e8dae7..60c5e1133 100644
--- a/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
+++ b/apps/web-antd/src/views/mes/pro/task/components/pro-task-select.vue
@@ -43,12 +43,11 @@ const hovering = ref(false); // 是否悬停
 const selectedItem = ref<MesProTaskApi.Task>(); // 选中的任务
 
 const displayLabel = computed(() => selectedItem.value?.code ?? ''); // 选择器展示编号
-const showClear = computed( // 是否显示清空图标
-  () =>
-    props.allowClear &&
-    !props.disabled &&
-    hovering.value &&
-    props.modelValue !== undefined,
+const showClear = computed(() => // 是否显示清空图标
+  props.allowClear &&
+  !props.disabled &&
+  hovering.value &&
+  props.modelValue !== undefined,
 );
 
 /** 根据任务编号回显选择器 */
diff --git a/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue b/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
index da61a777f..91896b74c 100644
--- a/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
+++ b/apps/web-ele/src/views/mes/pro/feedback/modules/form.vue
@@ -42,6 +42,7 @@ const formType = ref<FormType>('create');
 const formData = ref<MesProFeedbackApi.Feedback>();
 const userStore = useUserStore();
 const subTabsName = ref('itemConsume');
+const originalSnapshot = ref(''); // 表单原始数据快照，用于 submit 时跳过未变更的保存请求
 
 const isEditable = computed(() =>
   ['create', 'submit', 'update'].includes(formType.value),
@@ -106,6 +107,13 @@ function alignQuantity(data: MesProFeedbackApi.Feedback) {
   }
 }
 
+/** 读取并按提交规则对齐后的表单数据，用于快照和保存 */
+async function getAlignedData(): Promise<MesProFeedbackApi.Feedback> {
+  const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+  alignQuantity(data);
+  return data;
+}
+
 /** 保存：create 后切换为 update 模式 */
 async function handleSave() {
   const { valid } = await formApi.validate();
@@ -114,13 +122,12 @@ async function handleSave() {
   }
   modalApi.lock();
   try {
-    const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
-    alignQuantity(data);
+    const data = await getAlignedData();
     if (formType.value === 'create') {
       const id = await createFeedback(data);
+      data.id = id;
       formData.value = {
         ...data,
-        id,
         status: MesProFeedbackStatusEnum.PREPARE,
       };
       formType.value = 'update';
@@ -132,13 +139,15 @@ async function handleSave() {
       formData.value = { ...formData.value, ...data };
       ElMessage.success($t('common.updateSuccess'));
     }
+    // 刷新快照（已对齐数量并补 id），后续 submit 用于判断是否需要再保存
+    originalSnapshot.value = JSON.stringify(data);
     emit('success');
   } finally {
     modalApi.unlock();
   }
 }
 
-/** 提交：保存最新内容后调用提交接口 */
+/** 提交：仅当表单较快照有变更时才先保存，再调用提交接口 */
 async function handleSubmit() {
   const { valid } = await formApi.validate();
   if (!valid) {
@@ -146,15 +155,13 @@ async function handleSubmit() {
   }
   modalApi.lock();
   try {
-    const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
-    alignQuantity(data);
-    let id = formData.value?.id;
-    if (formType.value === 'create' || !id) {
-      id = await createFeedback(data);
-    } else {
+    const data = await getAlignedData();
+    // 表单有修改时，先保存
+    if (JSON.stringify(data) !== originalSnapshot.value) {
       await updateFeedback(data);
+      originalSnapshot.value = JSON.stringify(data);
     }
-    await submitFeedback(id!);
+    await submitFeedback(formData.value!.id!);
     await modalApi.close();
     emit('success');
     ElMessage.success('报工单已提交');
@@ -225,6 +232,7 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       formData.value = undefined;
       subTabsName.value = 'itemConsume';
+      originalSnapshot.value = '';
       return;
     }
     // 加载数据
@@ -250,6 +258,8 @@ const [Modal, modalApi] = useVbenModal({
         feedbackTime: Date.now(),
         feedbackUserId: userStore.userInfo?.id,
       });
+      // 记录初始快照（含数量对齐结果），submit 时用于跳过无变更的保存请求
+      originalSnapshot.value = JSON.stringify(await getAlignedData());
       return;
     }
     modalApi.lock();
@@ -261,6 +271,8 @@ const [Modal, modalApi] = useVbenModal({
       );
       // 设置到 values
       await formApi.setValues({ ...formData.value, checkFlag });
+      // 记录初始快照（含数量对齐结果），submit 时用于跳过无变更的保存请求
+      originalSnapshot.value = JSON.stringify(await getAlignedData());
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue b/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
index 99af6c290..41ddaf20a 100644
--- a/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
+++ b/apps/web-ele/src/views/mes/pro/task/components/pro-task-select.vue
@@ -43,12 +43,11 @@ const hovering = ref(false); // 是否悬停
 const selectedItem = ref<MesProTaskApi.Task>(); // 选中的任务
 
 const displayLabel = computed(() => selectedItem.value?.code ?? ''); // 选择器展示编号
-const showClear = computed( // 是否显示清空图标
-  () =>
-    props.clearable &&
-    !props.disabled &&
-    hovering.value &&
-    props.modelValue !== undefined,
+const showClear = computed(() => // 是否显示清空图标
+  props.clearable &&
+  !props.disabled &&
+  hovering.value &&
+  props.modelValue !== undefined,
 );
 
 /** 根据任务编号回显选择器 */

From 2a868b809f0d27cafbddb8509e56bb03b99c14ae Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 27 May 2026 06:37:33 +0800
Subject: [PATCH 15/17] =?UTF-8?q?feat(mes):=20=E6=96=B0=E5=A2=9E=20wm=20?=
 =?UTF-8?q?=E7=AD=89=20api=20=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mes/pro/workrecord/index.ts       | 71 +++++++++++++++++++
 apps/web-antd/src/api/mes/qc/defect/index.ts  | 54 ++++++++++++++
 .../src/api/mes/qc/indicator/index.ts         | 53 ++++++++++++++
 .../web-antd/src/api/mes/qc/template/index.ts | 51 +++++++++++++
 .../api/mes/qc/template/indicator/index.ts    | 57 +++++++++++++++
 .../src/api/mes/qc/template/item/index.ts     | 52 ++++++++++++++
 .../src/api/mes/wm/barcode/config/index.ts    | 49 +++++++++++++
 apps/web-antd/src/api/mes/wm/barcode/index.ts |  9 ++-
 .../src/api/mes/wm/materialstock/index.ts     | 61 ++++++++++++++++
 .../src/api/mes/wm/warehouse/area/index.ts    | 15 ++++
 .../src/api/mes/wm/warehouse/index.ts         | 15 ++++
 .../api/mes/wm/warehouse/location/index.ts    | 32 +++++++++
 .../web-antd/src/views/mes/utils/constants.ts | 21 ++++++
 packages/constants/src/dict-enum.ts           |  4 ++
 14 files changed, 542 insertions(+), 2 deletions(-)
 create mode 100644 apps/web-antd/src/api/mes/pro/workrecord/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/defect/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/indicator/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/template/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/template/indicator/index.ts
 create mode 100644 apps/web-antd/src/api/mes/qc/template/item/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/barcode/config/index.ts
 create mode 100644 apps/web-antd/src/api/mes/wm/materialstock/index.ts

diff --git a/apps/web-antd/src/api/mes/pro/workrecord/index.ts b/apps/web-antd/src/api/mes/pro/workrecord/index.ts
new file mode 100644
index 000000000..08950365c
--- /dev/null
+++ b/apps/web-antd/src/api/mes/pro/workrecord/index.ts
@@ -0,0 +1,71 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProWorkRecordApi {
+  /** MES 工作记录流水 */
+  export interface WorkRecordLog {
+    id?: number; // 编号
+    userId?: number; // 用户编号
+    userNickname?: string; // 用户昵称
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    type?: number; // 1=上工 2=下工
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+
+  /** MES 当前用户工作站绑定状态 */
+  export interface MyWorkRecord {
+    userId?: number; // 用户编号
+    userNickname?: string; // 用户昵称
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    type?: number; // 1=上工 2=下工
+    clockInTime?: Date; // 上工时间
+    clockOutTime?: Date; // 下工时间
+  }
+}
+
+/** 查询工作记录分页 */
+export function getWorkRecordLogPage(params: PageParam) {
+  return requestClient.get<PageResult<MesProWorkRecordApi.WorkRecordLog>>(
+    '/mes/pro/workrecord/log/page',
+    { params },
+  );
+}
+
+/** 查询工作记录详情 */
+export function getWorkRecordLog(id: number) {
+  return requestClient.get<MesProWorkRecordApi.WorkRecordLog>(
+    `/mes/pro/workrecord/log/get?id=${id}`,
+  );
+}
+
+/** 导出工作记录 */
+export function exportWorkRecordLog(params: any) {
+  return requestClient.download('/mes/pro/workrecord/log/export-excel', {
+    params,
+  });
+}
+
+/** 上工（绑定工作站） */
+export function clockInWorkRecord(workstationId: number) {
+  return requestClient.put('/mes/pro/workrecord/clock-in', null, {
+    params: { workstationId },
+  });
+}
+
+/** 下工（解绑工作站） */
+export function clockOutWorkRecord() {
+  return requestClient.put('/mes/pro/workrecord/clock-out');
+}
+
+/** 查询当前用户绑定的工作站 */
+export function getMyWorkRecord() {
+  return requestClient.get<MesProWorkRecordApi.MyWorkRecord>(
+    '/mes/pro/workrecord/get-my',
+  );
+}
diff --git a/apps/web-antd/src/api/mes/qc/defect/index.ts b/apps/web-antd/src/api/mes/qc/defect/index.ts
new file mode 100644
index 000000000..0b46d3581
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/defect/index.ts
@@ -0,0 +1,54 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcDefectApi {
+  /** MES 缺陷类型 */
+  export interface Defect {
+    id?: number; // 编号
+    code?: string; // 缺陷编码
+    name?: string; // 缺陷描述
+    type?: number; // 检测项类型
+    level?: number; // 缺陷等级
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询缺陷类型分页 */
+export function getDefectPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcDefectApi.Defect>>(
+    '/mes/qc/defect/page',
+    { params },
+  );
+}
+
+/** 查询缺陷类型精简列表 */
+export function getDefectSimpleList() {
+  return requestClient.get<MesQcDefectApi.Defect[]>('/mes/qc/defect/simple-list');
+}
+
+/** 查询缺陷类型详情 */
+export function getDefect(id: number) {
+  return requestClient.get<MesQcDefectApi.Defect>(`/mes/qc/defect/get?id=${id}`);
+}
+
+/** 新增缺陷类型 */
+export function createDefect(data: MesQcDefectApi.Defect) {
+  return requestClient.post('/mes/qc/defect/create', data);
+}
+
+/** 修改缺陷类型 */
+export function updateDefect(data: MesQcDefectApi.Defect) {
+  return requestClient.put('/mes/qc/defect/update', data);
+}
+
+/** 删除缺陷类型 */
+export function deleteDefect(id: number) {
+  return requestClient.delete(`/mes/qc/defect/delete?id=${id}`);
+}
+
+/** 导出缺陷类型 */
+export function exportDefect(params: any) {
+  return requestClient.download('/mes/qc/defect/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/qc/indicator/index.ts b/apps/web-antd/src/api/mes/qc/indicator/index.ts
new file mode 100644
index 000000000..163f11d89
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/indicator/index.ts
@@ -0,0 +1,53 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIndicatorApi {
+  /** MES 质检指标 */
+  export interface Indicator {
+    id?: number; // 编号
+    code?: string; // 检测项编码
+    name?: string; // 检测项名称
+    type?: number; // 检测项类型
+    tool?: string; // 检测工具
+    resultType?: number; // 结果值类型
+    resultSpecification?: string; // 结果值属性
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询质检指标分页 */
+export function getIndicatorPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcIndicatorApi.Indicator>>(
+    '/mes/qc/indicator/page',
+    { params },
+  );
+}
+
+/** 查询质检指标详情 */
+export function getIndicator(id: number) {
+  return requestClient.get<MesQcIndicatorApi.Indicator>(
+    `/mes/qc/indicator/get?id=${id}`,
+  );
+}
+
+/** 新增质检指标 */
+export function createIndicator(data: MesQcIndicatorApi.Indicator) {
+  return requestClient.post('/mes/qc/indicator/create', data);
+}
+
+/** 修改质检指标 */
+export function updateIndicator(data: MesQcIndicatorApi.Indicator) {
+  return requestClient.put('/mes/qc/indicator/update', data);
+}
+
+/** 删除质检指标 */
+export function deleteIndicator(id: number) {
+  return requestClient.delete(`/mes/qc/indicator/delete?id=${id}`);
+}
+
+/** 导出质检指标 */
+export function exportIndicator(params: any) {
+  return requestClient.download('/mes/qc/indicator/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/qc/template/index.ts b/apps/web-antd/src/api/mes/qc/template/index.ts
new file mode 100644
index 000000000..768864482
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/template/index.ts
@@ -0,0 +1,51 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcTemplateApi {
+  /** MES 质检方案 */
+  export interface Template {
+    id?: number; // 编号
+    code?: string; // 方案编号
+    name?: string; // 方案名称
+    types?: number[]; // 检测种类
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询质检方案分页 */
+export function getTemplatePage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcTemplateApi.Template>>(
+    '/mes/qc/template/page',
+    { params },
+  );
+}
+
+/** 查询质检方案详情 */
+export function getTemplate(id: number) {
+  return requestClient.get<MesQcTemplateApi.Template>(
+    `/mes/qc/template/get?id=${id}`,
+  );
+}
+
+/** 新增质检方案 */
+export function createTemplate(data: MesQcTemplateApi.Template) {
+  return requestClient.post('/mes/qc/template/create', data);
+}
+
+/** 修改质检方案 */
+export function updateTemplate(data: MesQcTemplateApi.Template) {
+  return requestClient.put('/mes/qc/template/update', data);
+}
+
+/** 删除质检方案 */
+export function deleteTemplate(id: number) {
+  return requestClient.delete(`/mes/qc/template/delete?id=${id}`);
+}
+
+/** 导出质检方案 */
+export function exportTemplate(params: any) {
+  return requestClient.download('/mes/qc/template/export-excel', { params });
+}
diff --git a/apps/web-antd/src/api/mes/qc/template/indicator/index.ts b/apps/web-antd/src/api/mes/qc/template/indicator/index.ts
new file mode 100644
index 000000000..8fa8119e6
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/template/indicator/index.ts
@@ -0,0 +1,57 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcTemplateIndicatorApi {
+  /** MES 质检方案-检测指标项 */
+  export interface TemplateIndicator {
+    id?: number; // 编号
+    templateId?: number; // 质检方案ID
+    indicatorId?: number; // 质检指标ID
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位ID
+    thresholdMax?: number; // 误差上限
+    thresholdMin?: number; // 误差下限
+    docUrl?: string; // 说明图URL
+    remark?: string; // 备注
+    indicatorCode?: string; // 检测项编码（JOIN）
+    indicatorName?: string; // 检测项名称（JOIN）
+    indicatorType?: number; // 检测项类型（JOIN）
+    indicatorTool?: string; // 检测工具（JOIN）
+    unitMeasureName?: string; // 计量单位名称（JOIN）
+  }
+}
+
+/** 查询检测指标项分页 */
+export function getTemplateIndicatorPage(params: PageParam & { templateId?: number }) {
+  return requestClient.get<
+    PageResult<MesQcTemplateIndicatorApi.TemplateIndicator>
+  >('/mes/qc/template/indicator/page', { params });
+}
+
+/** 查询检测指标项详情 */
+export function getTemplateIndicator(id: number) {
+  return requestClient.get<MesQcTemplateIndicatorApi.TemplateIndicator>(
+    `/mes/qc/template/indicator/get?id=${id}`,
+  );
+}
+
+/** 新增检测指标项 */
+export function createTemplateIndicator(
+  data: MesQcTemplateIndicatorApi.TemplateIndicator,
+) {
+  return requestClient.post('/mes/qc/template/indicator/create', data);
+}
+
+/** 修改检测指标项 */
+export function updateTemplateIndicator(
+  data: MesQcTemplateIndicatorApi.TemplateIndicator,
+) {
+  return requestClient.put('/mes/qc/template/indicator/update', data);
+}
+
+/** 删除检测指标项 */
+export function deleteTemplateIndicator(id: number) {
+  return requestClient.delete(`/mes/qc/template/indicator/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/qc/template/item/index.ts b/apps/web-antd/src/api/mes/qc/template/item/index.ts
new file mode 100644
index 000000000..b1d5b1e6b
--- /dev/null
+++ b/apps/web-antd/src/api/mes/qc/template/item/index.ts
@@ -0,0 +1,52 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcTemplateItemApi {
+  /** MES 质检方案-产品关联 */
+  export interface TemplateItem {
+    id?: number; // 编号
+    templateId?: number; // 质检方案ID
+    itemId?: number; // 产品物料ID
+    quantityCheck?: number; // 最低检测数
+    quantityUnqualified?: number; // 最大不合格数
+    criticalRate?: number; // 最大致命缺陷率（%）
+    majorRate?: number; // 最大严重缺陷率（%）
+    minorRate?: number; // 最大轻微缺陷率（%）
+    remark?: string; // 备注
+    itemCode?: string; // 物料编码（JOIN）
+    itemName?: string; // 物料名称（JOIN）
+    specification?: string; // 规格型号（JOIN）
+    unitMeasureName?: string; // 计量单位名称（JOIN）
+  }
+}
+
+/** 查询产品关联分页 */
+export function getTemplateItemPage(params: PageParam & { templateId?: number }) {
+  return requestClient.get<PageResult<MesQcTemplateItemApi.TemplateItem>>(
+    '/mes/qc/template/item/page',
+    { params },
+  );
+}
+
+/** 查询产品关联详情 */
+export function getTemplateItem(id: number) {
+  return requestClient.get<MesQcTemplateItemApi.TemplateItem>(
+    `/mes/qc/template/item/get?id=${id}`,
+  );
+}
+
+/** 新增产品关联 */
+export function createTemplateItem(data: MesQcTemplateItemApi.TemplateItem) {
+  return requestClient.post('/mes/qc/template/item/create', data);
+}
+
+/** 修改产品关联 */
+export function updateTemplateItem(data: MesQcTemplateItemApi.TemplateItem) {
+  return requestClient.put('/mes/qc/template/item/update', data);
+}
+
+/** 删除产品关联 */
+export function deleteTemplateItem(id: number) {
+  return requestClient.delete(`/mes/qc/template/item/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/barcode/config/index.ts b/apps/web-antd/src/api/mes/wm/barcode/config/index.ts
new file mode 100644
index 000000000..862da4fbb
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/barcode/config/index.ts
@@ -0,0 +1,49 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmBarcodeConfigApi {
+  /** MES 条码配置 */
+  export interface BarcodeConfig {
+    id?: number; // 编号
+    format?: number; // 条码格式
+    bizType?: number; // 业务类型
+    contentFormat?: string; // 内容格式模板
+    contentExample?: string; // 内容样例
+    autoGenerateFlag?: boolean; // 是否自动生成
+    defaultTemplate?: string; // 默认打印模板
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询条码配置分页 */
+export function getBarcodeConfigPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmBarcodeConfigApi.BarcodeConfig>>(
+    '/mes/wm/barcode-config/page',
+    { params },
+  );
+}
+
+/** 查询条码配置详情 */
+export function getBarcodeConfig(id: number) {
+  return requestClient.get<MesWmBarcodeConfigApi.BarcodeConfig>(
+    `/mes/wm/barcode-config/get?id=${id}`,
+  );
+}
+
+/** 新增条码配置 */
+export function createBarcodeConfig(data: MesWmBarcodeConfigApi.BarcodeConfig) {
+  return requestClient.post('/mes/wm/barcode-config/create', data);
+}
+
+/** 修改条码配置 */
+export function updateBarcodeConfig(data: MesWmBarcodeConfigApi.BarcodeConfig) {
+  return requestClient.put('/mes/wm/barcode-config/update', data);
+}
+
+/** 删除条码配置 */
+export function deleteBarcodeConfig(id: number) {
+  return requestClient.delete(`/mes/wm/barcode-config/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/barcode/index.ts b/apps/web-antd/src/api/mes/wm/barcode/index.ts
index 6cbf8a51e..7e8154141 100644
--- a/apps/web-antd/src/api/mes/wm/barcode/index.ts
+++ b/apps/web-antd/src/api/mes/wm/barcode/index.ts
@@ -38,7 +38,7 @@ export function getBarcode(id: number) {
 export function getBarcodeByBusiness(bizType: number, bizId: number) {
   return requestClient.get<MesWmBarcodeApi.Barcode>(
     '/mes/wm/barcode/get-by-business',
-    { params: { bizType, bizId } },
+    { params: { bizId, bizType } },
   );
 }
 
@@ -57,9 +57,14 @@ export function deleteBarcode(id: number) {
   return requestClient.delete(`/mes/wm/barcode/delete?id=${id}`);
 }
 
+/** 导出条码 */
+export function exportBarcode(params: any) {
+  return requestClient.download('/mes/wm/barcode/export-excel', { params });
+}
+
 /** 生成条码内容 */
 export function generateBarcodeContent(bizType: number, bizCode: string) {
   return requestClient.get<string>('/mes/wm/barcode/generate-content', {
-    params: { bizType, bizCode },
+    params: { bizCode, bizType },
   });
 }
diff --git a/apps/web-antd/src/api/mes/wm/materialstock/index.ts b/apps/web-antd/src/api/mes/wm/materialstock/index.ts
new file mode 100644
index 000000000..49aab9620
--- /dev/null
+++ b/apps/web-antd/src/api/mes/wm/materialstock/index.ts
@@ -0,0 +1,61 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMaterialStockApi {
+  /** MES 库存台账 */
+  export interface MaterialStock {
+    id?: number; // 编号
+    itemTypeId?: number; // 物料分类编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseCode?: string; // 仓库编码
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    vendorId?: number; // 供应商编号
+    vendorName?: string; // 供应商名称
+    quantity?: number; // 在库数量
+    receiptTime?: string; // 入库日期
+    frozen?: boolean; // 是否冻结
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询库存台账分页 */
+export function getMaterialStockPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmMaterialStockApi.MaterialStock>>(
+    '/mes/wm/material-stock/page',
+    { params },
+  );
+}
+
+/** 查询库存台账详情 */
+export function getMaterialStock(id: number) {
+  return requestClient.get<MesWmMaterialStockApi.MaterialStock>(
+    `/mes/wm/material-stock/get?id=${id}`,
+  );
+}
+
+/** 更新库存冻结状态 */
+export function updateMaterialStockFrozen(data: {
+  frozen: boolean;
+  id: number;
+}) {
+  return requestClient.put('/mes/wm/material-stock/update-frozen', data);
+}
+
+/** 导出库存台账 */
+export function exportMaterialStock(params: any) {
+  return requestClient.download('/mes/wm/material-stock/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-antd/src/api/mes/wm/warehouse/area/index.ts b/apps/web-antd/src/api/mes/wm/warehouse/area/index.ts
index cf5844ade..ca67789d8 100644
--- a/apps/web-antd/src/api/mes/wm/warehouse/area/index.ts
+++ b/apps/web-antd/src/api/mes/wm/warehouse/area/index.ts
@@ -48,3 +48,18 @@ export function getWarehouseArea(id: number) {
     `/mes/wm/warehouse-area/get?id=${id}`,
   );
 }
+
+/** 新增库位 */
+export function createWarehouseArea(data: MesWmWarehouseAreaApi.WarehouseArea) {
+  return requestClient.post('/mes/wm/warehouse-area/create', data);
+}
+
+/** 修改库位 */
+export function updateWarehouseArea(data: MesWmWarehouseAreaApi.WarehouseArea) {
+  return requestClient.put('/mes/wm/warehouse-area/update', data);
+}
+
+/** 删除库位 */
+export function deleteWarehouseArea(id: number) {
+  return requestClient.delete(`/mes/wm/warehouse-area/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/warehouse/index.ts b/apps/web-antd/src/api/mes/wm/warehouse/index.ts
index f68604790..661b62ee4 100644
--- a/apps/web-antd/src/api/mes/wm/warehouse/index.ts
+++ b/apps/web-antd/src/api/mes/wm/warehouse/index.ts
@@ -38,3 +38,18 @@ export function getWarehouse(id: number) {
     `/mes/wm/warehouse/get?id=${id}`,
   );
 }
+
+/** 新增仓库 */
+export function createWarehouse(data: MesWmWarehouseApi.Warehouse) {
+  return requestClient.post('/mes/wm/warehouse/create', data);
+}
+
+/** 修改仓库 */
+export function updateWarehouse(data: MesWmWarehouseApi.Warehouse) {
+  return requestClient.put('/mes/wm/warehouse/update', data);
+}
+
+/** 删除仓库 */
+export function deleteWarehouse(id: number) {
+  return requestClient.delete(`/mes/wm/warehouse/delete?id=${id}`);
+}
diff --git a/apps/web-antd/src/api/mes/wm/warehouse/location/index.ts b/apps/web-antd/src/api/mes/wm/warehouse/location/index.ts
index e33fb180e..4211f73c8 100644
--- a/apps/web-antd/src/api/mes/wm/warehouse/location/index.ts
+++ b/apps/web-antd/src/api/mes/wm/warehouse/location/index.ts
@@ -38,3 +38,35 @@ export function getWarehouseLocation(id: number) {
     `/mes/wm/warehouse-location/get?id=${id}`,
   );
 }
+
+/** 新增库区 */
+export function createWarehouseLocation(
+  data: MesWmWarehouseLocationApi.WarehouseLocation,
+) {
+  return requestClient.post('/mes/wm/warehouse-location/create', data);
+}
+
+/** 修改库区 */
+export function updateWarehouseLocation(
+  data: MesWmWarehouseLocationApi.WarehouseLocation,
+) {
+  return requestClient.put('/mes/wm/warehouse-location/update', data);
+}
+
+/** 删除库区 */
+export function deleteWarehouseLocation(id: number) {
+  return requestClient.delete(`/mes/wm/warehouse-location/delete?id=${id}`);
+}
+
+/** 批量设置库区下所有库位的混放规则 */
+export function updateAreaByLocationId(
+  locationId: number,
+  allowItemMixing?: boolean,
+  allowBatchMixing?: boolean,
+) {
+  return requestClient.put(
+    '/mes/wm/warehouse-location/update-by-location-id',
+    null,
+    { params: { allowBatchMixing, allowItemMixing, locationId } },
+  );
+}
diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts
index 668cf7240..15993c32a 100644
--- a/apps/web-antd/src/views/mes/utils/constants.ts
+++ b/apps/web-antd/src/views/mes/utils/constants.ts
@@ -139,8 +139,14 @@ export const MesAutoCodeRuleCode = {
   PRO_ROUTE_CODE: 'PRO_ROUTE_CODE',
   PRO_TASK_CODE: 'PRO_TASK_CODE',
   PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE',
+  QC_DEFECT_CODE: 'QC_DEFECT_CODE',
+  QC_INDICATOR_CODE: 'QC_INDICATOR_CODE',
+  QC_TEMPLATE_CODE: 'QC_TEMPLATE_CODE',
   TM_TOOL_TYPE_CODE: 'TM_TOOL_TYPE_CODE',
   TM_TOOL_CODE: 'TM_TOOL_CODE',
+  WM_AREA_CODE: 'WM_AREA_CODE',
+  WM_LOCATION_CODE: 'WM_LOCATION_CODE',
+  WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE',
 } as const;
 
 /** MES 生产工单状态枚举 */
@@ -194,6 +200,21 @@ export const MesProAndonLevelEnum = {
   LEVEL3: 3,
 } as const;
 
+/** MES 上下工状态类型枚举 */
+export const MesProWorkRecordTypeEnum = {
+  CLOCK_IN: 1,
+  CLOCK_OUT: 2,
+} as const;
+
+/** MES 质检结果值类型枚举 */
+export const MesQcResultValueType = {
+  FLOAT: 1,
+  INTEGER: 2,
+  TEXT: 3,
+  DICT: 4,
+  FILE: 5,
+} as const;
+
 /** MES 编码规则分段类型枚举 */
 export const MesAutoCodePartTypeEnum = {
   INPUT: 1,
diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts
index 9ef6e2310..19cba23c0 100644
--- a/packages/constants/src/dict-enum.ts
+++ b/packages/constants/src/dict-enum.ts
@@ -213,6 +213,10 @@ const MES_DICT = {
   MES_PRO_WORK_RECORD_TYPE: 'mes_pro_work_record_type', // MES 上下工状态类型
   MES_TIME_UNIT_TYPE: 'mes_time_unit_type', // MES 时间单位
   MES_ORDER_STATUS: 'mes_order_status', // MES 单据状态
+  MES_INDICATOR_TYPE: 'mes_indicator_type', // MES 检测项类型
+  MES_QC_RESULT_TYPE: 'mes_qc_result_type', // MES 质检结果值类型
+  MES_QC_TYPE: 'mes_qc_type', // MES 质检方案类型
+  MES_DEFECT_LEVEL: 'mes_defect_level', // MES 缺陷等级
   MES_WM_BARCODE_BIZ_TYPE: 'mes_wm_barcode_biz_type', // MES 条码业务类型
   MES_WM_BARCODE_FORMAT: 'mes_wm_barcode_format', // MES 条码格式
   MES_WM_PRODUCT_SALES_STATUS: 'mes_wm_product_sales_status', // MES 销售出库单状态

From 59cc3bbd611c3362edf69a09410640777409912e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 28 May 2026 01:08:05 +0800
Subject: [PATCH 16/17] =?UTF-8?q?feat(mes):=20=E6=96=B0=E5=A2=9E=20md=20wo?=
 =?UTF-8?q?rkstation=20=E7=9A=84=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/mes/md/item/index.vue |   4 +-
 .../components/md-workstation-select.vue      |   8 +-
 .../src/views/mes/pro/route/index.vue         |  23 ++--
 .../components/work-record-status-bar.vue     | 111 ++++++++++++++++
 .../src/views/mes/pro/workrecord/data.ts      | 107 ++++++++++++++++
 .../src/views/mes/pro/workrecord/index.vue    |  87 +++++++++++++
 .../src/api/mes/pro/workrecord/index.ts       |  71 +++++++++++
 apps/web-ele/src/api/mes/qc/defect/index.ts   |  54 ++++++++
 .../web-ele/src/api/mes/qc/indicator/index.ts |  53 ++++++++
 apps/web-ele/src/api/mes/qc/template/index.ts |  51 ++++++++
 .../api/mes/qc/template/indicator/index.ts    |  57 +++++++++
 .../src/api/mes/qc/template/item/index.ts     |  52 ++++++++
 .../src/api/mes/wm/barcode/config/index.ts    |  49 ++++++++
 apps/web-ele/src/api/mes/wm/barcode/index.ts  |   9 +-
 .../src/api/mes/wm/materialstock/index.ts     |  61 +++++++++
 .../src/api/mes/wm/warehouse/area/index.ts    |  15 +++
 .../web-ele/src/api/mes/wm/warehouse/index.ts |  15 +++
 .../api/mes/wm/warehouse/location/index.ts    |  32 +++++
 .../components/md-workstation-select.vue      |   8 +-
 .../components/work-record-status-bar.vue     | 119 ++++++++++++++++++
 .../src/views/mes/pro/workrecord/data.ts      | 107 ++++++++++++++++
 .../src/views/mes/pro/workrecord/index.vue    |  87 +++++++++++++
 apps/web-ele/src/views/mes/utils/constants.ts |  21 ++++
 23 files changed, 1174 insertions(+), 27 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
 create mode 100644 apps/web-antd/src/views/mes/pro/workrecord/data.ts
 create mode 100644 apps/web-antd/src/views/mes/pro/workrecord/index.vue
 create mode 100644 apps/web-ele/src/api/mes/pro/workrecord/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/defect/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/indicator/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/template/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/template/indicator/index.ts
 create mode 100644 apps/web-ele/src/api/mes/qc/template/item/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/barcode/config/index.ts
 create mode 100644 apps/web-ele/src/api/mes/wm/materialstock/index.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
 create mode 100644 apps/web-ele/src/views/mes/pro/workrecord/data.ts
 create mode 100644 apps/web-ele/src/views/mes/pro/workrecord/index.vue

diff --git a/apps/web-antd/src/views/mes/md/item/index.vue b/apps/web-antd/src/views/mes/md/item/index.vue
index 2cbcbb48e..98132ab9e 100644
--- a/apps/web-antd/src/views/mes/md/item/index.vue
+++ b/apps/web-antd/src/views/mes/md/item/index.vue
@@ -5,12 +5,12 @@ import type { MesMdItemTypeApi } from '#/api/mes/md/item/type';
 
 import { ref } from 'vue';
 
-import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictLabel } from '@vben/hooks';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
-import { Button, Card, message, Modal } from 'ant-design-vue';
+import { Button, Card, message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
diff --git a/apps/web-antd/src/views/mes/md/workstation/components/md-workstation-select.vue b/apps/web-antd/src/views/mes/md/workstation/components/md-workstation-select.vue
index 3743ef25a..10d8dfd4f 100644
--- a/apps/web-antd/src/views/mes/md/workstation/components/md-workstation-select.vue
+++ b/apps/web-antd/src/views/mes/md/workstation/components/md-workstation-select.vue
@@ -50,7 +50,7 @@ const showClear = computed(
 
 /** 根据工作站编号回显选择器 */
 async function resolveItemById(id: number | undefined) {
-  if (id === null) {
+  if (id == null) {
     selectedItem.value = undefined;
     return;
   }
@@ -58,7 +58,7 @@ async function resolveItemById(id: number | undefined) {
     return;
   }
   try {
-    selectedItem.value = await getWorkstation(id as number);
+    selectedItem.value = await getWorkstation(id);
   } catch (error) {
     console.error('[MdWorkstationSelect] resolveItemById failed:', error);
   }
@@ -90,8 +90,8 @@ function handleClick(event: MouseEvent) {
     clearSelected();
     return;
   }
-  const selectedIds = props.modelValue === null ? [] : [props.modelValue];
-  dialogRef.value?.open(selectedIds as number[], { multiple: false });
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
 }
 
 /** 回填选中的工作站 */
diff --git a/apps/web-antd/src/views/mes/pro/route/index.vue b/apps/web-antd/src/views/mes/pro/route/index.vue
index 7a35148fa..9a2f8d80c 100644
--- a/apps/web-antd/src/views/mes/pro/route/index.vue
+++ b/apps/web-antd/src/views/mes/pro/route/index.vue
@@ -3,12 +3,12 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProRouteApi } from '#/api/mes/pro/route';
 
 import { useAccess } from '@vben/access';
-import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictLabel } from '@vben/hooks';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
-import { Button, message, Modal, Tooltip } from 'ant-design-vue';
+import { Button, message, Tooltip } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -55,19 +55,12 @@ async function handleStatusChange(
   newStatus: number,
   row: MesProRouteApi.Route,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    Modal.confirm({
-      content: `确认要将"${row.name}"工艺路线切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-      async onOk() {
-        await updateRouteStatus(row.id!, newStatus);
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      },
-      onCancel() {
-        reject(new Error('取消操作'));
-      },
-    });
-  });
+  await confirm(
+    `确认要将"${row.name}"工艺路线切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
+  );
+  await updateRouteStatus(row.id!, newStatus);
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 /** 删除（仅停用状态可删除） */
diff --git a/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue b/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
new file mode 100644
index 000000000..25c367826
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
@@ -0,0 +1,111 @@
+<script lang="ts" setup>
+import type { MesProWorkRecordApi } from '#/api/mes/pro/workrecord';
+
+import { computed, onMounted, ref } from 'vue';
+
+import { confirm } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+import { formatDateTime } from '@vben/utils';
+
+import { Button, message, Modal, Tag } from 'ant-design-vue';
+
+import {
+  clockInWorkRecord,
+  clockOutWorkRecord,
+  getMyWorkRecord,
+} from '#/api/mes/pro/workrecord';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { MesProWorkRecordTypeEnum } from '#/views/mes/utils/constants';
+
+const emit = defineEmits<{
+  (e: 'change'): void;
+}>();
+
+const myWorkstation = ref<MesProWorkRecordApi.MyWorkRecord | null>(null); // 当前用户绑定的工作站状态
+const clockInModalVisible = ref(false); // 上工弹窗是否可见
+const selectedWorkstationId = ref<number>(); // 当前选中的工作站编号
+
+const isClockIn = computed(() => // 是否处于上工状态
+  myWorkstation.value?.type === MesProWorkRecordTypeEnum.CLOCK_IN,
+);
+
+/** 加载当前用户工作站 */
+async function loadMyWorkstation() {
+  myWorkstation.value = await getMyWorkRecord();
+}
+
+/** 打开上工弹窗 */
+function handleOpenClockIn() {
+  selectedWorkstationId.value = undefined;
+  clockInModalVisible.value = true;
+}
+
+/** 上工 */
+async function handleClockIn() {
+  if (!selectedWorkstationId.value) {
+    return;
+  }
+  await clockInWorkRecord(selectedWorkstationId.value);
+  message.success('上工成功');
+  clockInModalVisible.value = false;
+  selectedWorkstationId.value = undefined;
+  await loadMyWorkstation();
+  emit('change');
+}
+
+/** 下工 */
+async function handleClockOut() {
+  await confirm('确认下工当前工作站？');
+  await clockOutWorkRecord();
+  message.success('下工成功');
+  await loadMyWorkstation();
+  emit('change');
+}
+
+onMounted(loadMyWorkstation);
+</script>
+
+<template>
+  <div
+    class="bg-card mb-3 flex items-center justify-between rounded border p-3"
+  >
+    <div class="flex flex-wrap items-center gap-3">
+      <span class="text-sm font-semibold">我的工作站</span>
+      <template v-if="isClockIn">
+        <Tag color="success">
+          <IconifyIcon class="mr-1 inline-block size-4" icon="lucide:check" />
+          {{ myWorkstation!.workstationCode }} -
+          {{ myWorkstation!.workstationName }}
+        </Tag>
+        <span class="text-muted-foreground text-xs">
+          上工时间：{{ formatDateTime(myWorkstation!.clockInTime as Date) }}
+        </span>
+      </template>
+      <Tag v-else>当前未上工</Tag>
+    </div>
+    <div>
+      <Button v-if="!isClockIn" type="primary" @click="handleOpenClockIn">
+        <IconifyIcon class="mr-1 inline-block size-4" icon="lucide:play" />
+        上工
+      </Button>
+      <Button v-else danger @click="handleClockOut">
+        <IconifyIcon class="mr-1 inline-block size-4" icon="lucide:pause" />
+        下工
+      </Button>
+    </div>
+
+    <Modal
+      v-model:open="clockInModalVisible"
+      :ok-button-props="{ disabled: !selectedWorkstationId }"
+      title="选择工作站"
+      width="420px"
+      @ok="handleClockIn"
+    >
+      <MdWorkstationSelect
+        v-model="selectedWorkstationId"
+        class="w-full"
+        placeholder="请选择工作站"
+      />
+    </Modal>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/mes/pro/workrecord/data.ts b/apps/web-antd/src/views/mes/pro/workrecord/data.ts
new file mode 100644
index 000000000..291d7e156
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workrecord/data.ts
@@ -0,0 +1,107 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkRecordApi } from '#/api/mes/pro/workrecord';
+import type { SystemUserApi } from '#/api/system/user';
+
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+
+/** 关联数据 */
+let userList: SystemUserApi.User[] = [];
+getSimpleUserList().then((data) => (userList = data));
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'userId',
+      label: '用户',
+      component: 'ApiSelect',
+      componentProps: {
+        allowClear: true,
+        api: getSimpleUserList,
+        labelField: 'nickname',
+        placeholder: '请选择用户',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工作站',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '操作类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_RECORD_TYPE, 'number'),
+        placeholder: '请选择操作类型',
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '操作时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProWorkRecordApi.WorkRecordLog>['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+      width: 80,
+    },
+    {
+      field: 'userId',
+      title: '用户',
+      width: 140,
+      formatter: ({ row }) =>
+        row.userNickname ||
+        userList.find((user) => user.id === row.userId)?.nickname ||
+        '',
+    },
+    {
+      field: 'workstationCode',
+      title: '工作站编码',
+      width: 140,
+    },
+    {
+      field: 'workstationName',
+      title: '工作站名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '操作类型',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_RECORD_TYPE },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mes/pro/workrecord/index.vue b/apps/web-antd/src/views/mes/pro/workrecord/index.vue
new file mode 100644
index 000000000..3c9483954
--- /dev/null
+++ b/apps/web-antd/src/views/mes/pro/workrecord/index.vue
@@ -0,0 +1,87 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkRecordApi } from '#/api/mes/pro/workrecord';
+
+import { DocAlert, Page } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  exportWorkRecordLog,
+  getWorkRecordLogPage,
+} from '#/api/mes/pro/workrecord';
+import { $t } from '#/locales';
+
+import WorkRecordStatusBar from './components/work-record-status-bar.vue';
+import { useGridColumns, useGridFormSchema } from './data';
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportWorkRecordLog(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '工作记录.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWorkRecordLogPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProWorkRecordApi.WorkRecordLog>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】工作记录"
+        url="https://doc.iocoder.cn/mes/pro/work-record/"
+      />
+    </template>
+
+    <WorkRecordStatusBar @change="handleRefresh" />
+
+    <Grid table-title="工作记录列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-workrecord:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/api/mes/pro/workrecord/index.ts b/apps/web-ele/src/api/mes/pro/workrecord/index.ts
new file mode 100644
index 000000000..08950365c
--- /dev/null
+++ b/apps/web-ele/src/api/mes/pro/workrecord/index.ts
@@ -0,0 +1,71 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesProWorkRecordApi {
+  /** MES 工作记录流水 */
+  export interface WorkRecordLog {
+    id?: number; // 编号
+    userId?: number; // 用户编号
+    userNickname?: string; // 用户昵称
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    type?: number; // 1=上工 2=下工
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+
+  /** MES 当前用户工作站绑定状态 */
+  export interface MyWorkRecord {
+    userId?: number; // 用户编号
+    userNickname?: string; // 用户昵称
+    workstationId?: number; // 工作站编号
+    workstationCode?: string; // 工作站编码
+    workstationName?: string; // 工作站名称
+    type?: number; // 1=上工 2=下工
+    clockInTime?: Date; // 上工时间
+    clockOutTime?: Date; // 下工时间
+  }
+}
+
+/** 查询工作记录分页 */
+export function getWorkRecordLogPage(params: PageParam) {
+  return requestClient.get<PageResult<MesProWorkRecordApi.WorkRecordLog>>(
+    '/mes/pro/workrecord/log/page',
+    { params },
+  );
+}
+
+/** 查询工作记录详情 */
+export function getWorkRecordLog(id: number) {
+  return requestClient.get<MesProWorkRecordApi.WorkRecordLog>(
+    `/mes/pro/workrecord/log/get?id=${id}`,
+  );
+}
+
+/** 导出工作记录 */
+export function exportWorkRecordLog(params: any) {
+  return requestClient.download('/mes/pro/workrecord/log/export-excel', {
+    params,
+  });
+}
+
+/** 上工（绑定工作站） */
+export function clockInWorkRecord(workstationId: number) {
+  return requestClient.put('/mes/pro/workrecord/clock-in', null, {
+    params: { workstationId },
+  });
+}
+
+/** 下工（解绑工作站） */
+export function clockOutWorkRecord() {
+  return requestClient.put('/mes/pro/workrecord/clock-out');
+}
+
+/** 查询当前用户绑定的工作站 */
+export function getMyWorkRecord() {
+  return requestClient.get<MesProWorkRecordApi.MyWorkRecord>(
+    '/mes/pro/workrecord/get-my',
+  );
+}
diff --git a/apps/web-ele/src/api/mes/qc/defect/index.ts b/apps/web-ele/src/api/mes/qc/defect/index.ts
new file mode 100644
index 000000000..0b46d3581
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/defect/index.ts
@@ -0,0 +1,54 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcDefectApi {
+  /** MES 缺陷类型 */
+  export interface Defect {
+    id?: number; // 编号
+    code?: string; // 缺陷编码
+    name?: string; // 缺陷描述
+    type?: number; // 检测项类型
+    level?: number; // 缺陷等级
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询缺陷类型分页 */
+export function getDefectPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcDefectApi.Defect>>(
+    '/mes/qc/defect/page',
+    { params },
+  );
+}
+
+/** 查询缺陷类型精简列表 */
+export function getDefectSimpleList() {
+  return requestClient.get<MesQcDefectApi.Defect[]>('/mes/qc/defect/simple-list');
+}
+
+/** 查询缺陷类型详情 */
+export function getDefect(id: number) {
+  return requestClient.get<MesQcDefectApi.Defect>(`/mes/qc/defect/get?id=${id}`);
+}
+
+/** 新增缺陷类型 */
+export function createDefect(data: MesQcDefectApi.Defect) {
+  return requestClient.post('/mes/qc/defect/create', data);
+}
+
+/** 修改缺陷类型 */
+export function updateDefect(data: MesQcDefectApi.Defect) {
+  return requestClient.put('/mes/qc/defect/update', data);
+}
+
+/** 删除缺陷类型 */
+export function deleteDefect(id: number) {
+  return requestClient.delete(`/mes/qc/defect/delete?id=${id}`);
+}
+
+/** 导出缺陷类型 */
+export function exportDefect(params: any) {
+  return requestClient.download('/mes/qc/defect/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/qc/indicator/index.ts b/apps/web-ele/src/api/mes/qc/indicator/index.ts
new file mode 100644
index 000000000..163f11d89
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/indicator/index.ts
@@ -0,0 +1,53 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcIndicatorApi {
+  /** MES 质检指标 */
+  export interface Indicator {
+    id?: number; // 编号
+    code?: string; // 检测项编码
+    name?: string; // 检测项名称
+    type?: number; // 检测项类型
+    tool?: string; // 检测工具
+    resultType?: number; // 结果值类型
+    resultSpecification?: string; // 结果值属性
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询质检指标分页 */
+export function getIndicatorPage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcIndicatorApi.Indicator>>(
+    '/mes/qc/indicator/page',
+    { params },
+  );
+}
+
+/** 查询质检指标详情 */
+export function getIndicator(id: number) {
+  return requestClient.get<MesQcIndicatorApi.Indicator>(
+    `/mes/qc/indicator/get?id=${id}`,
+  );
+}
+
+/** 新增质检指标 */
+export function createIndicator(data: MesQcIndicatorApi.Indicator) {
+  return requestClient.post('/mes/qc/indicator/create', data);
+}
+
+/** 修改质检指标 */
+export function updateIndicator(data: MesQcIndicatorApi.Indicator) {
+  return requestClient.put('/mes/qc/indicator/update', data);
+}
+
+/** 删除质检指标 */
+export function deleteIndicator(id: number) {
+  return requestClient.delete(`/mes/qc/indicator/delete?id=${id}`);
+}
+
+/** 导出质检指标 */
+export function exportIndicator(params: any) {
+  return requestClient.download('/mes/qc/indicator/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/qc/template/index.ts b/apps/web-ele/src/api/mes/qc/template/index.ts
new file mode 100644
index 000000000..768864482
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/template/index.ts
@@ -0,0 +1,51 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcTemplateApi {
+  /** MES 质检方案 */
+  export interface Template {
+    id?: number; // 编号
+    code?: string; // 方案编号
+    name?: string; // 方案名称
+    types?: number[]; // 检测种类
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询质检方案分页 */
+export function getTemplatePage(params: PageParam) {
+  return requestClient.get<PageResult<MesQcTemplateApi.Template>>(
+    '/mes/qc/template/page',
+    { params },
+  );
+}
+
+/** 查询质检方案详情 */
+export function getTemplate(id: number) {
+  return requestClient.get<MesQcTemplateApi.Template>(
+    `/mes/qc/template/get?id=${id}`,
+  );
+}
+
+/** 新增质检方案 */
+export function createTemplate(data: MesQcTemplateApi.Template) {
+  return requestClient.post('/mes/qc/template/create', data);
+}
+
+/** 修改质检方案 */
+export function updateTemplate(data: MesQcTemplateApi.Template) {
+  return requestClient.put('/mes/qc/template/update', data);
+}
+
+/** 删除质检方案 */
+export function deleteTemplate(id: number) {
+  return requestClient.delete(`/mes/qc/template/delete?id=${id}`);
+}
+
+/** 导出质检方案 */
+export function exportTemplate(params: any) {
+  return requestClient.download('/mes/qc/template/export-excel', { params });
+}
diff --git a/apps/web-ele/src/api/mes/qc/template/indicator/index.ts b/apps/web-ele/src/api/mes/qc/template/indicator/index.ts
new file mode 100644
index 000000000..8fa8119e6
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/template/indicator/index.ts
@@ -0,0 +1,57 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcTemplateIndicatorApi {
+  /** MES 质检方案-检测指标项 */
+  export interface TemplateIndicator {
+    id?: number; // 编号
+    templateId?: number; // 质检方案ID
+    indicatorId?: number; // 质检指标ID
+    checkMethod?: string; // 检测方法
+    standardValue?: number; // 标准值
+    unitMeasureId?: number; // 计量单位ID
+    thresholdMax?: number; // 误差上限
+    thresholdMin?: number; // 误差下限
+    docUrl?: string; // 说明图URL
+    remark?: string; // 备注
+    indicatorCode?: string; // 检测项编码（JOIN）
+    indicatorName?: string; // 检测项名称（JOIN）
+    indicatorType?: number; // 检测项类型（JOIN）
+    indicatorTool?: string; // 检测工具（JOIN）
+    unitMeasureName?: string; // 计量单位名称（JOIN）
+  }
+}
+
+/** 查询检测指标项分页 */
+export function getTemplateIndicatorPage(params: PageParam & { templateId?: number }) {
+  return requestClient.get<
+    PageResult<MesQcTemplateIndicatorApi.TemplateIndicator>
+  >('/mes/qc/template/indicator/page', { params });
+}
+
+/** 查询检测指标项详情 */
+export function getTemplateIndicator(id: number) {
+  return requestClient.get<MesQcTemplateIndicatorApi.TemplateIndicator>(
+    `/mes/qc/template/indicator/get?id=${id}`,
+  );
+}
+
+/** 新增检测指标项 */
+export function createTemplateIndicator(
+  data: MesQcTemplateIndicatorApi.TemplateIndicator,
+) {
+  return requestClient.post('/mes/qc/template/indicator/create', data);
+}
+
+/** 修改检测指标项 */
+export function updateTemplateIndicator(
+  data: MesQcTemplateIndicatorApi.TemplateIndicator,
+) {
+  return requestClient.put('/mes/qc/template/indicator/update', data);
+}
+
+/** 删除检测指标项 */
+export function deleteTemplateIndicator(id: number) {
+  return requestClient.delete(`/mes/qc/template/indicator/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/qc/template/item/index.ts b/apps/web-ele/src/api/mes/qc/template/item/index.ts
new file mode 100644
index 000000000..b1d5b1e6b
--- /dev/null
+++ b/apps/web-ele/src/api/mes/qc/template/item/index.ts
@@ -0,0 +1,52 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesQcTemplateItemApi {
+  /** MES 质检方案-产品关联 */
+  export interface TemplateItem {
+    id?: number; // 编号
+    templateId?: number; // 质检方案ID
+    itemId?: number; // 产品物料ID
+    quantityCheck?: number; // 最低检测数
+    quantityUnqualified?: number; // 最大不合格数
+    criticalRate?: number; // 最大致命缺陷率（%）
+    majorRate?: number; // 最大严重缺陷率（%）
+    minorRate?: number; // 最大轻微缺陷率（%）
+    remark?: string; // 备注
+    itemCode?: string; // 物料编码（JOIN）
+    itemName?: string; // 物料名称（JOIN）
+    specification?: string; // 规格型号（JOIN）
+    unitMeasureName?: string; // 计量单位名称（JOIN）
+  }
+}
+
+/** 查询产品关联分页 */
+export function getTemplateItemPage(params: PageParam & { templateId?: number }) {
+  return requestClient.get<PageResult<MesQcTemplateItemApi.TemplateItem>>(
+    '/mes/qc/template/item/page',
+    { params },
+  );
+}
+
+/** 查询产品关联详情 */
+export function getTemplateItem(id: number) {
+  return requestClient.get<MesQcTemplateItemApi.TemplateItem>(
+    `/mes/qc/template/item/get?id=${id}`,
+  );
+}
+
+/** 新增产品关联 */
+export function createTemplateItem(data: MesQcTemplateItemApi.TemplateItem) {
+  return requestClient.post('/mes/qc/template/item/create', data);
+}
+
+/** 修改产品关联 */
+export function updateTemplateItem(data: MesQcTemplateItemApi.TemplateItem) {
+  return requestClient.put('/mes/qc/template/item/update', data);
+}
+
+/** 删除产品关联 */
+export function deleteTemplateItem(id: number) {
+  return requestClient.delete(`/mes/qc/template/item/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/barcode/config/index.ts b/apps/web-ele/src/api/mes/wm/barcode/config/index.ts
new file mode 100644
index 000000000..862da4fbb
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/barcode/config/index.ts
@@ -0,0 +1,49 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmBarcodeConfigApi {
+  /** MES 条码配置 */
+  export interface BarcodeConfig {
+    id?: number; // 编号
+    format?: number; // 条码格式
+    bizType?: number; // 业务类型
+    contentFormat?: string; // 内容格式模板
+    contentExample?: string; // 内容样例
+    autoGenerateFlag?: boolean; // 是否自动生成
+    defaultTemplate?: string; // 默认打印模板
+    status?: number; // 状态
+    remark?: string; // 备注
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询条码配置分页 */
+export function getBarcodeConfigPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmBarcodeConfigApi.BarcodeConfig>>(
+    '/mes/wm/barcode-config/page',
+    { params },
+  );
+}
+
+/** 查询条码配置详情 */
+export function getBarcodeConfig(id: number) {
+  return requestClient.get<MesWmBarcodeConfigApi.BarcodeConfig>(
+    `/mes/wm/barcode-config/get?id=${id}`,
+  );
+}
+
+/** 新增条码配置 */
+export function createBarcodeConfig(data: MesWmBarcodeConfigApi.BarcodeConfig) {
+  return requestClient.post('/mes/wm/barcode-config/create', data);
+}
+
+/** 修改条码配置 */
+export function updateBarcodeConfig(data: MesWmBarcodeConfigApi.BarcodeConfig) {
+  return requestClient.put('/mes/wm/barcode-config/update', data);
+}
+
+/** 删除条码配置 */
+export function deleteBarcodeConfig(id: number) {
+  return requestClient.delete(`/mes/wm/barcode-config/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/barcode/index.ts b/apps/web-ele/src/api/mes/wm/barcode/index.ts
index 6cbf8a51e..7e8154141 100644
--- a/apps/web-ele/src/api/mes/wm/barcode/index.ts
+++ b/apps/web-ele/src/api/mes/wm/barcode/index.ts
@@ -38,7 +38,7 @@ export function getBarcode(id: number) {
 export function getBarcodeByBusiness(bizType: number, bizId: number) {
   return requestClient.get<MesWmBarcodeApi.Barcode>(
     '/mes/wm/barcode/get-by-business',
-    { params: { bizType, bizId } },
+    { params: { bizId, bizType } },
   );
 }
 
@@ -57,9 +57,14 @@ export function deleteBarcode(id: number) {
   return requestClient.delete(`/mes/wm/barcode/delete?id=${id}`);
 }
 
+/** 导出条码 */
+export function exportBarcode(params: any) {
+  return requestClient.download('/mes/wm/barcode/export-excel', { params });
+}
+
 /** 生成条码内容 */
 export function generateBarcodeContent(bizType: number, bizCode: string) {
   return requestClient.get<string>('/mes/wm/barcode/generate-content', {
-    params: { bizType, bizCode },
+    params: { bizCode, bizType },
   });
 }
diff --git a/apps/web-ele/src/api/mes/wm/materialstock/index.ts b/apps/web-ele/src/api/mes/wm/materialstock/index.ts
new file mode 100644
index 000000000..49aab9620
--- /dev/null
+++ b/apps/web-ele/src/api/mes/wm/materialstock/index.ts
@@ -0,0 +1,61 @@
+import type { PageParam, PageResult } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace MesWmMaterialStockApi {
+  /** MES 库存台账 */
+  export interface MaterialStock {
+    id?: number; // 编号
+    itemTypeId?: number; // 物料分类编号
+    itemId?: number; // 物料编号
+    itemCode?: string; // 物料编码
+    itemName?: string; // 物料名称
+    specification?: string; // 规格型号
+    unitMeasureName?: string; // 计量单位名称
+    batchId?: number; // 批次编号
+    batchCode?: string; // 批次号
+    warehouseId?: number; // 仓库编号
+    warehouseCode?: string; // 仓库编码
+    warehouseName?: string; // 仓库名称
+    locationId?: number; // 库区编号
+    locationName?: string; // 库区名称
+    areaId?: number; // 库位编号
+    areaName?: string; // 库位名称
+    vendorId?: number; // 供应商编号
+    vendorName?: string; // 供应商名称
+    quantity?: number; // 在库数量
+    receiptTime?: string; // 入库日期
+    frozen?: boolean; // 是否冻结
+    createTime?: Date; // 创建时间
+  }
+}
+
+/** 查询库存台账分页 */
+export function getMaterialStockPage(params: PageParam) {
+  return requestClient.get<PageResult<MesWmMaterialStockApi.MaterialStock>>(
+    '/mes/wm/material-stock/page',
+    { params },
+  );
+}
+
+/** 查询库存台账详情 */
+export function getMaterialStock(id: number) {
+  return requestClient.get<MesWmMaterialStockApi.MaterialStock>(
+    `/mes/wm/material-stock/get?id=${id}`,
+  );
+}
+
+/** 更新库存冻结状态 */
+export function updateMaterialStockFrozen(data: {
+  frozen: boolean;
+  id: number;
+}) {
+  return requestClient.put('/mes/wm/material-stock/update-frozen', data);
+}
+
+/** 导出库存台账 */
+export function exportMaterialStock(params: any) {
+  return requestClient.download('/mes/wm/material-stock/export-excel', {
+    params,
+  });
+}
diff --git a/apps/web-ele/src/api/mes/wm/warehouse/area/index.ts b/apps/web-ele/src/api/mes/wm/warehouse/area/index.ts
index cf5844ade..ca67789d8 100644
--- a/apps/web-ele/src/api/mes/wm/warehouse/area/index.ts
+++ b/apps/web-ele/src/api/mes/wm/warehouse/area/index.ts
@@ -48,3 +48,18 @@ export function getWarehouseArea(id: number) {
     `/mes/wm/warehouse-area/get?id=${id}`,
   );
 }
+
+/** 新增库位 */
+export function createWarehouseArea(data: MesWmWarehouseAreaApi.WarehouseArea) {
+  return requestClient.post('/mes/wm/warehouse-area/create', data);
+}
+
+/** 修改库位 */
+export function updateWarehouseArea(data: MesWmWarehouseAreaApi.WarehouseArea) {
+  return requestClient.put('/mes/wm/warehouse-area/update', data);
+}
+
+/** 删除库位 */
+export function deleteWarehouseArea(id: number) {
+  return requestClient.delete(`/mes/wm/warehouse-area/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/warehouse/index.ts b/apps/web-ele/src/api/mes/wm/warehouse/index.ts
index f68604790..661b62ee4 100644
--- a/apps/web-ele/src/api/mes/wm/warehouse/index.ts
+++ b/apps/web-ele/src/api/mes/wm/warehouse/index.ts
@@ -38,3 +38,18 @@ export function getWarehouse(id: number) {
     `/mes/wm/warehouse/get?id=${id}`,
   );
 }
+
+/** 新增仓库 */
+export function createWarehouse(data: MesWmWarehouseApi.Warehouse) {
+  return requestClient.post('/mes/wm/warehouse/create', data);
+}
+
+/** 修改仓库 */
+export function updateWarehouse(data: MesWmWarehouseApi.Warehouse) {
+  return requestClient.put('/mes/wm/warehouse/update', data);
+}
+
+/** 删除仓库 */
+export function deleteWarehouse(id: number) {
+  return requestClient.delete(`/mes/wm/warehouse/delete?id=${id}`);
+}
diff --git a/apps/web-ele/src/api/mes/wm/warehouse/location/index.ts b/apps/web-ele/src/api/mes/wm/warehouse/location/index.ts
index e33fb180e..4211f73c8 100644
--- a/apps/web-ele/src/api/mes/wm/warehouse/location/index.ts
+++ b/apps/web-ele/src/api/mes/wm/warehouse/location/index.ts
@@ -38,3 +38,35 @@ export function getWarehouseLocation(id: number) {
     `/mes/wm/warehouse-location/get?id=${id}`,
   );
 }
+
+/** 新增库区 */
+export function createWarehouseLocation(
+  data: MesWmWarehouseLocationApi.WarehouseLocation,
+) {
+  return requestClient.post('/mes/wm/warehouse-location/create', data);
+}
+
+/** 修改库区 */
+export function updateWarehouseLocation(
+  data: MesWmWarehouseLocationApi.WarehouseLocation,
+) {
+  return requestClient.put('/mes/wm/warehouse-location/update', data);
+}
+
+/** 删除库区 */
+export function deleteWarehouseLocation(id: number) {
+  return requestClient.delete(`/mes/wm/warehouse-location/delete?id=${id}`);
+}
+
+/** 批量设置库区下所有库位的混放规则 */
+export function updateAreaByLocationId(
+  locationId: number,
+  allowItemMixing?: boolean,
+  allowBatchMixing?: boolean,
+) {
+  return requestClient.put(
+    '/mes/wm/warehouse-location/update-by-location-id',
+    null,
+    { params: { allowBatchMixing, allowItemMixing, locationId } },
+  );
+}
diff --git a/apps/web-ele/src/views/mes/md/workstation/components/md-workstation-select.vue b/apps/web-ele/src/views/mes/md/workstation/components/md-workstation-select.vue
index 92e3944e3..6129baf5a 100644
--- a/apps/web-ele/src/views/mes/md/workstation/components/md-workstation-select.vue
+++ b/apps/web-ele/src/views/mes/md/workstation/components/md-workstation-select.vue
@@ -50,7 +50,7 @@ const showClear = computed(
 
 /** 根据工作站编号回显选择器 */
 async function resolveItemById(id: number | undefined) {
-  if (id === null) {
+  if (id == null) {
     selectedItem.value = undefined;
     return;
   }
@@ -58,7 +58,7 @@ async function resolveItemById(id: number | undefined) {
     return;
   }
   try {
-    selectedItem.value = await getWorkstation(id as number);
+    selectedItem.value = await getWorkstation(id);
   } catch (error) {
     console.error('[MdWorkstationSelect] resolveItemById failed:', error);
   }
@@ -90,8 +90,8 @@ function handleClick(event: MouseEvent) {
     clearSelected();
     return;
   }
-  const selectedIds = props.modelValue === null ? [] : [props.modelValue];
-  dialogRef.value?.open(selectedIds as number[], { multiple: false });
+  const selectedIds = props.modelValue == null ? [] : [props.modelValue];
+  dialogRef.value?.open(selectedIds, { multiple: false });
 }
 
 /** 回填选中的工作站 */
diff --git a/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue b/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
new file mode 100644
index 000000000..499dc51d7
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
@@ -0,0 +1,119 @@
+<script lang="ts" setup>
+import type { MesProWorkRecordApi } from '#/api/mes/pro/workrecord';
+
+import { computed, onMounted, ref } from 'vue';
+
+import { confirm } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+import { formatDateTime } from '@vben/utils';
+
+import { ElButton, ElDialog, ElMessage, ElTag } from 'element-plus';
+
+import {
+  clockInWorkRecord,
+  clockOutWorkRecord,
+  getMyWorkRecord,
+} from '#/api/mes/pro/workrecord';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+import { MesProWorkRecordTypeEnum } from '#/views/mes/utils/constants';
+
+const emit = defineEmits<{
+  (e: 'change'): void;
+}>();
+
+const myWorkstation = ref<MesProWorkRecordApi.MyWorkRecord | null>(null); // 当前用户绑定的工作站状态
+const clockInDialogVisible = ref(false); // 上工弹窗是否可见
+const selectedWorkstationId = ref<number>(); // 当前选中的工作站编号
+
+const isClockIn = computed(() => // 是否处于上工状态
+  myWorkstation.value?.type === MesProWorkRecordTypeEnum.CLOCK_IN,
+);
+
+/** 加载当前用户工作站 */
+async function loadMyWorkstation() {
+  myWorkstation.value = await getMyWorkRecord();
+}
+
+/** 打开上工弹窗 */
+function handleOpenClockIn() {
+  selectedWorkstationId.value = undefined;
+  clockInDialogVisible.value = true;
+}
+
+/** 上工 */
+async function handleClockIn() {
+  if (!selectedWorkstationId.value) {
+    return;
+  }
+  await clockInWorkRecord(selectedWorkstationId.value);
+  ElMessage.success('上工成功');
+  clockInDialogVisible.value = false;
+  selectedWorkstationId.value = undefined;
+  await loadMyWorkstation();
+  emit('change');
+}
+
+/** 下工 */
+async function handleClockOut() {
+  await confirm('确认下工当前工作站？');
+  await clockOutWorkRecord();
+  ElMessage.success('下工成功');
+  await loadMyWorkstation();
+  emit('change');
+}
+
+onMounted(loadMyWorkstation);
+</script>
+
+<template>
+  <div
+    class="bg-card mb-3 flex items-center justify-between rounded border p-3"
+  >
+    <div class="flex flex-wrap items-center gap-3">
+      <span class="text-sm font-semibold">我的工作站</span>
+      <template v-if="isClockIn">
+        <ElTag type="success">
+          <IconifyIcon class="mr-1 inline-block size-4" icon="lucide:check" />
+          {{ myWorkstation!.workstationCode }} -
+          {{ myWorkstation!.workstationName }}
+        </ElTag>
+        <span class="text-muted-foreground text-xs">
+          上工时间：{{ formatDateTime(myWorkstation!.clockInTime as Date) }}
+        </span>
+      </template>
+      <ElTag v-else type="info">当前未上工</ElTag>
+    </div>
+    <div>
+      <ElButton v-if="!isClockIn" type="primary" @click="handleOpenClockIn">
+        <IconifyIcon class="mr-1 inline-block size-4" icon="lucide:play" />
+        上工
+      </ElButton>
+      <ElButton v-else type="danger" @click="handleClockOut">
+        <IconifyIcon class="mr-1 inline-block size-4" icon="lucide:pause" />
+        下工
+      </ElButton>
+    </div>
+
+    <ElDialog
+      v-model="clockInDialogVisible"
+      title="选择工作站"
+      width="420px"
+    >
+      <MdWorkstationSelect
+        v-model="selectedWorkstationId"
+        class="w-full"
+        placeholder="请选择工作站"
+      />
+      <template #footer>
+        <ElButton @click="clockInDialogVisible = false">取消</ElButton>
+        <ElButton
+          :disabled="!selectedWorkstationId"
+          type="primary"
+          @click="handleClockIn"
+        >
+          确认上工
+        </ElButton>
+      </template>
+    </ElDialog>
+  </div>
+</template>
diff --git a/apps/web-ele/src/views/mes/pro/workrecord/data.ts b/apps/web-ele/src/views/mes/pro/workrecord/data.ts
new file mode 100644
index 000000000..dea5783d5
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workrecord/data.ts
@@ -0,0 +1,107 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkRecordApi } from '#/api/mes/pro/workrecord';
+import type { SystemUserApi } from '#/api/system/user';
+
+import { markRaw } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+import MdWorkstationSelect from '#/views/mes/md/workstation/components/md-workstation-select.vue';
+
+/** 关联数据 */
+let userList: SystemUserApi.User[] = [];
+getSimpleUserList().then((data) => (userList = data));
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'userId',
+      label: '用户',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleUserList,
+        clearable: true,
+        labelField: 'nickname',
+        placeholder: '请选择用户',
+        valueField: 'id',
+      },
+    },
+    {
+      fieldName: 'workstationId',
+      label: '工作站',
+      component: markRaw(MdWorkstationSelect),
+      componentProps: {
+        placeholder: '请选择工作站',
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '操作类型',
+      component: 'Select',
+      componentProps: {
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.MES_PRO_WORK_RECORD_TYPE, 'number'),
+        placeholder: '请选择操作类型',
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '操作时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions<MesProWorkRecordApi.WorkRecordLog>['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+      width: 80,
+    },
+    {
+      field: 'userId',
+      title: '用户',
+      width: 140,
+      formatter: ({ row }) =>
+        row.userNickname ||
+        userList.find((user) => user.id === row.userId)?.nickname ||
+        '',
+    },
+    {
+      field: 'workstationCode',
+      title: '工作站编码',
+      width: 140,
+    },
+    {
+      field: 'workstationName',
+      title: '工作站名称',
+      minWidth: 160,
+    },
+    {
+      field: 'type',
+      title: '操作类型',
+      width: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.MES_PRO_WORK_RECORD_TYPE },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mes/pro/workrecord/index.vue b/apps/web-ele/src/views/mes/pro/workrecord/index.vue
new file mode 100644
index 000000000..3c9483954
--- /dev/null
+++ b/apps/web-ele/src/views/mes/pro/workrecord/index.vue
@@ -0,0 +1,87 @@
+<script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MesProWorkRecordApi } from '#/api/mes/pro/workrecord';
+
+import { DocAlert, Page } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  exportWorkRecordLog,
+  getWorkRecordLogPage,
+} from '#/api/mes/pro/workrecord';
+import { $t } from '#/locales';
+
+import WorkRecordStatusBar from './components/work-record-status-bar.vue';
+import { useGridColumns, useGridFormSchema } from './data';
+
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
+
+/** 导出表格 */
+async function handleExport() {
+  const data = await exportWorkRecordLog(await gridApi.formApi.getValues());
+  downloadFileFromBlobPart({ fileName: '工作记录.xls', source: data });
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getWorkRecordLogPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<MesProWorkRecordApi.WorkRecordLog>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <template #doc>
+      <DocAlert
+        title="【生产】工作记录"
+        url="https://doc.iocoder.cn/mes/pro/work-record/"
+      />
+    </template>
+
+    <WorkRecordStatusBar @change="handleRefresh" />
+
+    <Grid table-title="工作记录列表">
+      <template #toolbar-tools>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['mes:pro-workrecord:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts
index 668cf7240..15993c32a 100644
--- a/apps/web-ele/src/views/mes/utils/constants.ts
+++ b/apps/web-ele/src/views/mes/utils/constants.ts
@@ -139,8 +139,14 @@ export const MesAutoCodeRuleCode = {
   PRO_ROUTE_CODE: 'PRO_ROUTE_CODE',
   PRO_TASK_CODE: 'PRO_TASK_CODE',
   PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE',
+  QC_DEFECT_CODE: 'QC_DEFECT_CODE',
+  QC_INDICATOR_CODE: 'QC_INDICATOR_CODE',
+  QC_TEMPLATE_CODE: 'QC_TEMPLATE_CODE',
   TM_TOOL_TYPE_CODE: 'TM_TOOL_TYPE_CODE',
   TM_TOOL_CODE: 'TM_TOOL_CODE',
+  WM_AREA_CODE: 'WM_AREA_CODE',
+  WM_LOCATION_CODE: 'WM_LOCATION_CODE',
+  WM_WAREHOUSE_CODE: 'WM_WAREHOUSE_CODE',
 } as const;
 
 /** MES 生产工单状态枚举 */
@@ -194,6 +200,21 @@ export const MesProAndonLevelEnum = {
   LEVEL3: 3,
 } as const;
 
+/** MES 上下工状态类型枚举 */
+export const MesProWorkRecordTypeEnum = {
+  CLOCK_IN: 1,
+  CLOCK_OUT: 2,
+} as const;
+
+/** MES 质检结果值类型枚举 */
+export const MesQcResultValueType = {
+  FLOAT: 1,
+  INTEGER: 2,
+  TEXT: 3,
+  DICT: 4,
+  FILE: 5,
+} as const;
+
 /** MES 编码规则分段类型枚举 */
 export const MesAutoCodePartTypeEnum = {
   INPUT: 1,

From e9cb162aea5872e6d829c137ffc34309049e41cc Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 28 May 2026 10:53:24 +0800
Subject: [PATCH 17/17] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=BC=B9=E7=AA=97=E8=B0=83=E7=94=A8=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=BC=80=E5=8F=91=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/ai/image/manager/index.vue      |  29 +++--
 .../src/views/ai/knowledge/document/index.vue |  29 +++--
 .../src/views/ai/knowledge/segment/index.vue  |  25 ++--
 .../src/views/ai/music/manager/index.vue      |  29 +++--
 .../crm/business/components/detail-list.vue   |  36 +++---
 .../src/views/crm/clue/detail/index.vue       |  25 ++--
 .../crm/contact/components/detail-list.vue    |  36 +++---
 .../src/views/crm/customer/detail/index.vue   | 108 ++++++++----------
 .../src/views/crm/permission/modules/list.vue |  38 +++---
 .../src/views/erp/finance/account/index.vue   |  29 +++--
 .../src/views/erp/stock/warehouse/index.vue   |  29 +++--
 .../src/views/mall/product/comment/index.vue  |  31 +++--
 .../src/views/mall/product/spu/index.vue      |  33 +++---
 .../mall/promotion/coupon/template/index.vue  |  25 ++--
 .../mall/promotion/seckill/config/index.vue   |  29 +++--
 .../views/mall/trade/brokerage/user/index.vue |  33 +++---
 .../src/views/mes/dv/checkplan/index.vue      |  10 +-
 apps/web-antd/src/views/mes/md/item/index.vue |  23 ++--
 .../src/views/mes/pro/route/index.vue         |  10 +-
 .../components/work-record-status-bar.vue     |   6 +-
 apps/web-antd/src/views/pay/app/index.vue     |  31 +++--
 apps/web-antd/src/views/system/user/index.vue |  25 ++--
 .../src/views/crm/clue/detail/index.vue       |  25 ++--
 .../src/views/crm/customer/detail/index.vue   | 108 ++++++++----------
 .../src/views/mall/product/spu/index.vue      |  33 +++---
 .../src/views/ai/image/manager/index.vue      |  29 +++--
 .../src/views/ai/knowledge/document/index.vue |  29 +++--
 .../src/views/ai/knowledge/segment/index.vue  |  25 ++--
 .../src/views/ai/music/manager/index.vue      |  29 +++--
 .../crm/business/components/detail-list.vue   |  36 +++---
 .../src/views/crm/clue/detail/index.vue       |  25 ++--
 .../crm/contact/components/detail-list.vue    |  36 +++---
 .../src/views/crm/customer/detail/index.vue   | 108 ++++++++----------
 .../src/views/crm/permission/modules/list.vue |  38 +++---
 .../src/views/erp/finance/account/index.vue   |  29 +++--
 .../src/views/erp/stock/warehouse/index.vue   |  29 +++--
 .../src/views/mall/product/comment/index.vue  |  31 +++--
 .../src/views/mall/product/spu/index.vue      |  33 +++---
 .../mall/promotion/coupon/template/index.vue  |  25 ++--
 .../mall/promotion/seckill/config/index.vue   |  29 +++--
 .../views/mall/trade/brokerage/user/index.vue |  33 +++---
 .../src/views/mes/dv/checkplan/index.vue      |  10 +-
 apps/web-ele/src/views/mes/md/item/index.vue  |  35 ++----
 .../web-ele/src/views/mes/pro/route/index.vue |  20 +---
 .../components/work-record-status-bar.vue     |   6 +-
 apps/web-ele/src/views/pay/app/index.vue      |  31 +++--
 apps/web-ele/src/views/system/user/index.vue  |  25 ++--
 47 files changed, 689 insertions(+), 837 deletions(-)

diff --git a/apps/web-antd/src/views/ai/image/manager/index.vue b/apps/web-antd/src/views/ai/image/manager/index.vue
index 62087c743..04d048e80 100644
--- a/apps/web-antd/src/views/ai/image/manager/index.vue
+++ b/apps/web-antd/src/views/ai/image/manager/index.vue
@@ -38,24 +38,21 @@ async function handleUpdatePublicStatusChange(
   row: AiImageApi.Image,
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确认要将该图片切换为【${text}】吗？`,
-    })
-      .then(async () => {
-        // 更新图片状态
-        await updateImage({
-          id: row.id,
-          publicStatus: newStatus,
-        });
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新图片状态
+  await updateImage({
+    id: row.id,
+    publicStatus: newStatus,
   });
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/ai/knowledge/document/index.vue b/apps/web-antd/src/views/ai/knowledge/document/index.vue
index e1dd551fa..5d21febd3 100644
--- a/apps/web-antd/src/views/ai/knowledge/document/index.vue
+++ b/apps/web-antd/src/views/ai/knowledge/document/index.vue
@@ -76,24 +76,21 @@ async function handleStatusChange(
   newStatus: number,
   row: AiKnowledgeDocumentApi.KnowledgeDocument,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.name}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新文档状态
-        await updateKnowledgeDocumentStatus({
-          id: row.id,
-          status: newStatus,
-        });
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新文档状态
+  await updateKnowledgeDocumentStatus({
+    id: row.id,
+    status: newStatus,
   });
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/ai/knowledge/segment/index.vue b/apps/web-antd/src/views/ai/knowledge/segment/index.vue
index 363e6b1ad..2f9955e64 100644
--- a/apps/web-antd/src/views/ai/knowledge/segment/index.vue
+++ b/apps/web-antd/src/views/ai/knowledge/segment/index.vue
@@ -64,21 +64,18 @@ async function handleStatusChange(
   newStatus: number,
   row: AiKnowledgeSegmentApi.KnowledgeSegment,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将片段 ${row.id} 的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新片段状态
-        await updateKnowledgeSegmentStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新片段状态
+  await updateKnowledgeSegmentStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/ai/music/manager/index.vue b/apps/web-antd/src/views/ai/music/manager/index.vue
index bfd4d4502..6d03547cd 100644
--- a/apps/web-antd/src/views/ai/music/manager/index.vue
+++ b/apps/web-antd/src/views/ai/music/manager/index.vue
@@ -38,24 +38,21 @@ async function handleUpdatePublicStatusChange(
   row: AiMusicApi.Music,
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确认要将该音乐切换为【${text}】吗？`,
-    })
-      .then(async () => {
-        // 更新音乐状态
-        await updateMusic({
-          id: row.id,
-          publicStatus: newStatus,
-        });
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新音乐状态
+  await updateMusic({
+    id: row.id,
+    publicStatus: newStatus,
   });
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/crm/business/components/detail-list.vue b/apps/web-antd/src/views/crm/business/components/detail-list.vue
index 712b55e82..87f36d459 100644
--- a/apps/web-antd/src/views/crm/business/components/detail-list.vue
+++ b/apps/web-antd/src/views/crm/business/components/detail-list.vue
@@ -74,28 +74,24 @@ async function handleDeleteContactBusinessList() {
     message.error('请先选择商机后操作！');
     return;
   }
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    })
-      .then(async () => {
-        const res = await deleteContactBusinessList({
-          contactId: props.bizId,
-          businessIds: checkedRows.value.map((item) => item.id),
-        });
-        if (res) {
-          // 提示并返回成功
-          message.success($t('ui.actionMessage.operationSuccess'));
-          handleRefresh();
-          resolve(true);
-        } else {
-          reject(new Error($t('ui.actionMessage.operationFailed')));
-        }
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  const res = await deleteContactBusinessList({
+    contactId: props.bizId,
+    businessIds: checkedRows.value.map((item) => item.id),
   });
+  if (!res) {
+    throw new Error($t('ui.actionMessage.operationFailed'));
+  }
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 /** 查看商机详情 */
diff --git a/apps/web-antd/src/views/crm/clue/detail/index.vue b/apps/web-antd/src/views/crm/clue/detail/index.vue
index 02c356400..98117c0e4 100644
--- a/apps/web-antd/src/views/crm/clue/detail/index.vue
+++ b/apps/web-antd/src/views/crm/clue/detail/index.vue
@@ -83,21 +83,18 @@ function handleTransfer() {
 
 /** 转化为客户 */
 async function handleTransform(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: '确定将该线索转化为客户吗？',
-    })
-      .then(async () => {
-        // 转化为客户
-        await transformClue(clueId.value);
-        // 提示并返回成功
-        message.success('转化客户成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 转化为客户
+  await transformClue(clueId.value);
+  // 提示并返回成功
+  message.success('转化客户成功');
+  return true;
 }
 
 /** 加载数据 */
diff --git a/apps/web-antd/src/views/crm/contact/components/detail-list.vue b/apps/web-antd/src/views/crm/contact/components/detail-list.vue
index 832f80473..7e408cf3a 100644
--- a/apps/web-antd/src/views/crm/contact/components/detail-list.vue
+++ b/apps/web-antd/src/views/crm/contact/components/detail-list.vue
@@ -71,28 +71,24 @@ async function handleDeleteContactBusinessList() {
     message.error('请先选择联系人后操作！');
     return;
   }
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    })
-      .then(async () => {
-        const res = await deleteBusinessContactList({
-          businessId: props.bizId,
-          contactIds: checkedRows.value.map((item) => item.id),
-        });
-        if (res) {
-          // 提示并返回成功
-          message.success($t('ui.actionMessage.operationSuccess'));
-          handleRefresh();
-          resolve(true);
-        } else {
-          reject(new Error($t('ui.actionMessage.operationFailed')));
-        }
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  const res = await deleteBusinessContactList({
+    businessId: props.bizId,
+    contactIds: checkedRows.value.map((item) => item.id),
   });
+  if (!res) {
+    throw new Error($t('ui.actionMessage.operationFailed'));
+  }
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 /** 创建商机联系人关联 */
diff --git a/apps/web-antd/src/views/crm/customer/detail/index.vue b/apps/web-antd/src/views/crm/customer/detail/index.vue
index 925d1a5ac..8faf13e93 100644
--- a/apps/web-antd/src/views/crm/customer/detail/index.vue
+++ b/apps/web-antd/src/views/crm/customer/detail/index.vue
@@ -100,41 +100,35 @@ function handleTransfer() {
 }
 
 /** 锁定客户 */
-function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+async function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
+  try {
+    await confirm({
       content: `确定锁定客户【${customer.value.name}】吗？`,
-    })
-      .then(async () => {
-        // 锁定客户
-        await lockCustomer(customerId.value, lockStatus);
-        // 提示并返回成功
-        message.success(lockStatus ? '锁定客户成功' : '解锁客户成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 锁定客户
+  await lockCustomer(customerId.value, lockStatus);
+  // 提示并返回成功
+  message.success(lockStatus ? '锁定客户成功' : '解锁客户成功');
+  return true;
 }
 
 /** 领取客户 */
-function handleReceive(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+async function handleReceive(): Promise<boolean | undefined> {
+  try {
+    await confirm({
       content: `确定领取客户【${customer.value.name}】吗？`,
-    })
-      .then(async () => {
-        // 领取客户
-        await receiveCustomer([customerId.value]);
-        // 提示并返回成功
-        message.success('领取客户成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 领取客户
+  await receiveCustomer([customerId.value]);
+  // 提示并返回成功
+  message.success('领取客户成功');
+  return true;
 }
 
 /** 分配客户 */
@@ -143,42 +137,36 @@ function handleDistributeForm() {
 }
 
 /** 客户放入公海 */
-function handlePutPool(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+async function handlePutPool(): Promise<boolean | undefined> {
+  try {
+    await confirm({
       content: `确定将客户【${customer.value.name}】放入公海吗？`,
-    })
-      .then(async () => {
-        // 放入公海
-        await putCustomerPool(customerId.value);
-        // 提示并返回成功
-        message.success('放入公海成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 放入公海
+  await putCustomerPool(customerId.value);
+  // 提示并返回成功
+  message.success('放入公海成功');
+  return true;
 }
 
 /** 更新成交状态操作 */
 async function handleUpdateDealStatus(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const dealStatus = !customer.value.dealStatus;
-    confirm({
+  const dealStatus = !customer.value.dealStatus;
+  try {
+    await confirm({
       content: `确定更新成交状态为【${dealStatus ? '已成交' : '未成交'}】吗？`,
-    })
-      .then(async () => {
-        // 更新成交状态
-        await updateCustomerDealStatus(customerId.value, dealStatus);
-        // 提示并返回成功
-        message.success('更新成交状态成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新成交状态
+  await updateCustomerDealStatus(customerId.value, dealStatus);
+  // 提示并返回成功
+  message.success('更新成交状态成功');
+  return true;
 }
 
 /** 加载数据 */
diff --git a/apps/web-antd/src/views/crm/permission/modules/list.vue b/apps/web-antd/src/views/crm/permission/modules/list.vue
index 13f0fb723..2a2789ff9 100644
--- a/apps/web-antd/src/views/crm/permission/modules/list.vue
+++ b/apps/web-antd/src/views/crm/permission/modules/list.vue
@@ -94,32 +94,28 @@ function handleEdit() {
 }
 
 /** 删除团队成员 */
-function handleDelete() {
+async function handleDelete() {
   if (checkedRows.value.length === 0) {
     message.error('请先选择团队成员后操作！');
     return;
   }
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${checkedRows.value.map((item) => item.nickname).join(',')}移出团队吗？`,
-    })
-      .then(async () => {
-        const res = await deletePermissionBatch(
-          checkedRows.value.map((item) => item.id!),
-        );
-        if (res) {
-          // 提示并返回成功
-          message.success($t('ui.actionMessage.operationSuccess'));
-          handleRefresh();
-          resolve(true);
-        } else {
-          reject(new Error('移出失败'));
-        }
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  const res = await deletePermissionBatch(
+    checkedRows.value.map((item) => item.id!),
+  );
+  if (!res) {
+    throw new Error('移出失败');
+  }
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 /** 退出团队 */
diff --git a/apps/web-antd/src/views/erp/finance/account/index.vue b/apps/web-antd/src/views/erp/finance/account/index.vue
index 4ceb7abba..2a91dbe9a 100644
--- a/apps/web-antd/src/views/erp/finance/account/index.vue
+++ b/apps/web-antd/src/views/erp/finance/account/index.vue
@@ -65,23 +65,20 @@ async function handleDefaultStatusChange(
   newStatus: boolean,
   row: ErpAccountApi.Account,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus ? '设置' : '取消';
-    confirm({
+  const text = newStatus ? '设置' : '取消';
+  try {
+    await confirm({
       content: `确认要${text}"${row.name}"默认吗?`,
-    })
-      .then(async () => {
-        // 更新默认状态
-        await updateAccountDefaultStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success(`${text}默认成功`);
-        handleRefresh();
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新默认状态
+  await updateAccountDefaultStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success(`${text}默认成功`);
+  handleRefresh();
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/erp/stock/warehouse/index.vue b/apps/web-antd/src/views/erp/stock/warehouse/index.vue
index e567fd2ec..560918fb5 100644
--- a/apps/web-antd/src/views/erp/stock/warehouse/index.vue
+++ b/apps/web-antd/src/views/erp/stock/warehouse/index.vue
@@ -63,23 +63,20 @@ async function handleDefaultStatusChange(
   newStatus: boolean,
   row: ErpWarehouseApi.Warehouse,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus ? '设置' : '取消';
-    confirm({
+  const text = newStatus ? '设置' : '取消';
+  try {
+    await confirm({
       content: `确认要${text}"${row.name}"默认吗?`,
-    })
-      .then(async () => {
-        // 更新默认状态
-        await updateWarehouseDefaultStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success(`${text}默认成功`);
-        handleRefresh();
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新默认状态
+  await updateWarehouseDefaultStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success(`${text}默认成功`);
+  handleRefresh();
+  return true;
 }
 
 const [FormModal, formModalApi] = useVbenModal({
diff --git a/apps/web-antd/src/views/mall/product/comment/index.vue b/apps/web-antd/src/views/mall/product/comment/index.vue
index 8a5071615..e10ae6326 100644
--- a/apps/web-antd/src/views/mall/product/comment/index.vue
+++ b/apps/web-antd/src/views/mall/product/comment/index.vue
@@ -63,25 +63,22 @@ async function handleStatusChange(
   newStatus: boolean,
   row: MallCommentApi.Comment,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus ? '展示' : '隐藏';
-    confirm({
+  const text = newStatus ? '展示' : '隐藏';
+  try {
+    await confirm({
       content: `确认要${text}该评论吗？`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateCommentVisible({
-          id: row.id!,
-          visible: newStatus,
-        });
-        // 提示并返回成功
-        message.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateCommentVisible({
+    id: row.id!,
+    visible: newStatus,
   });
+  // 提示并返回成功
+  message.success(`${text}成功`);
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/mall/product/spu/index.vue b/apps/web-antd/src/views/mall/product/spu/index.vue
index dbeefd6d7..205bc8174 100644
--- a/apps/web-antd/src/views/mall/product/spu/index.vue
+++ b/apps/web-antd/src/views/mall/product/spu/index.vue
@@ -107,26 +107,23 @@ async function handleStatusChange(
   newStatus: number,
   row: MallSpuApi.Spu,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    // 二次确认
-    const text = newStatus ? '上架' : '下架';
-    confirm({
+  // 二次确认
+  const text = newStatus ? '上架' : '下架';
+  try {
+    await confirm({
       content: `确认要${text + row.name}吗?`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateStatus({
-          id: row.id!,
-          status: newStatus,
-        });
-        // 提示并返回成功
-        message.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateStatus({
+    id: row.id!,
+    status: newStatus,
   });
+  // 提示并返回成功
+  message.success(`${text}成功`);
+  return true;
 }
 
 /** 添加到仓库 / 回收站的状态 */
diff --git a/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue b/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue
index 050a4fb6b..b6a01d3c7 100644
--- a/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/coupon/template/index.vue
@@ -60,21 +60,18 @@ async function handleStatusChange(
   newStatus: number,
   row: MallCouponTemplateApi.CouponTemplate,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.name}的状态切换为【${newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用'}】吗？`,
-    })
-      .then(async () => {
-        // 更新优惠券模板状态
-        await updateCouponTemplateStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新优惠券模板状态
+  await updateCouponTemplateStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/mall/promotion/seckill/config/index.vue b/apps/web-antd/src/views/mall/promotion/seckill/config/index.vue
index 932e0235f..61dbd8319 100644
--- a/apps/web-antd/src/views/mall/promotion/seckill/config/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/seckill/config/index.vue
@@ -59,23 +59,20 @@ async function handleStatusChange(
   newStatus: number,
   row: MallSeckillConfigApi.SeckillConfig,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    // 二次确认
-    const text = row.status === 0 ? '启用' : '停用';
-    confirm({
+  // 二次确认
+  const text = row.status === 0 ? '启用' : '停用';
+  try {
+    await confirm({
       content: `确认要${text + row.name}吗?`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateSeckillConfigStatus(row.id, newStatus);
-        // 提示并返回成功
-        message.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateSeckillConfigStatus(row.id, newStatus);
+  // 提示并返回成功
+  message.success(`${text}成功`);
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
index eb263d892..26682725d 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
@@ -87,26 +87,23 @@ async function handleBrokerageEnabledChange(
   newEnabled: boolean,
   row: MallBrokerageUserApi.BrokerageUser,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newEnabled ? '开通' : '关闭';
-    confirm({
+  const text = newEnabled ? '开通' : '关闭';
+  try {
+    await confirm({
       content: `你要将${row.nickname}的推广资格切换为【${text}】吗？`,
-    })
-      .then(async () => {
-        // 更新推广资格
-        await updateBrokerageEnabled({
-          id: row.id!,
-          enabled: newEnabled,
-        });
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        handleRefresh();
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新推广资格
+  await updateBrokerageEnabled({
+    id: row.id!,
+    enabled: newEnabled,
   });
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/mes/dv/checkplan/index.vue b/apps/web-antd/src/views/mes/dv/checkplan/index.vue
index e3fd69f70..f20a5d5ac 100644
--- a/apps/web-antd/src/views/mes/dv/checkplan/index.vue
+++ b/apps/web-antd/src/views/mes/dv/checkplan/index.vue
@@ -113,13 +113,19 @@ function getTableActions(row: MesDvCheckPlanApi.CheckPlan): ActionItem[] {
           label: '启用',
           type: 'link',
           auth: ['mes:dv-check-plan:update'],
-          onClick: handleEnable.bind(null, row),
+          popConfirm: {
+            title: `确认启用"${row.name}"点检保养方案？启用后将不可修改或删除。`,
+            confirm: handleEnable.bind(null, row),
+          },
         }
       : {
           label: '停用',
           type: 'link',
           auth: ['mes:dv-check-plan:update'],
-          onClick: handleDisable.bind(null, row),
+          popConfirm: {
+            title: `确认停用"${row.name}"点检保养方案？`,
+            confirm: handleDisable.bind(null, row),
+          },
         },
   );
   return actions;
diff --git a/apps/web-antd/src/views/mes/md/item/index.vue b/apps/web-antd/src/views/mes/md/item/index.vue
index 98132ab9e..cc3756a9c 100644
--- a/apps/web-antd/src/views/mes/md/item/index.vue
+++ b/apps/web-antd/src/views/mes/md/item/index.vue
@@ -96,19 +96,16 @@ async function handleStatusChange(
   newStatus: number,
   row: MesMdItemApi.Item,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    Modal.confirm({
-      content: `确认要将“${row.name}”物料切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-      async onOk() {
-        await updateItemStatus(row.id!, newStatus);
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      },
-      onCancel() {
-        reject(new Error('取消操作'));
-      },
-    });
-  });
+  try {
+    await confirm(
+      `确认要将"${row.name}"物料切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
+    );
+  } catch {
+    return false;
+  }
+  await updateItemStatus(row.id!, newStatus);
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antd/src/views/mes/pro/route/index.vue b/apps/web-antd/src/views/mes/pro/route/index.vue
index 9a2f8d80c..c19854837 100644
--- a/apps/web-antd/src/views/mes/pro/route/index.vue
+++ b/apps/web-antd/src/views/mes/pro/route/index.vue
@@ -55,9 +55,13 @@ async function handleStatusChange(
   newStatus: number,
   row: MesProRouteApi.Route,
 ): Promise<boolean | undefined> {
-  await confirm(
-    `确认要将"${row.name}"工艺路线切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-  );
+  try {
+    await confirm(
+      `确认要将"${row.name}"工艺路线切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
+    );
+  } catch {
+    return false;
+  }
   await updateRouteStatus(row.id!, newStatus);
   message.success($t('ui.actionMessage.operationSuccess'));
   return true;
diff --git a/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue b/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
index 25c367826..52cd0ce2f 100644
--- a/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
+++ b/apps/web-antd/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
@@ -55,7 +55,11 @@ async function handleClockIn() {
 
 /** 下工 */
 async function handleClockOut() {
-  await confirm('确认下工当前工作站？');
+  try {
+    await confirm('确认下工当前工作站？');
+  } catch {
+    return;
+  }
   await clockOutWorkRecord();
   message.success('下工成功');
   await loadMyWorkstation();
diff --git a/apps/web-antd/src/views/pay/app/index.vue b/apps/web-antd/src/views/pay/app/index.vue
index 671aa1aa1..92fbc6f64 100644
--- a/apps/web-antd/src/views/pay/app/index.vue
+++ b/apps/web-antd/src/views/pay/app/index.vue
@@ -65,25 +65,22 @@ async function handleStatusChange(
   newStatus: number,
   row: PayAppApi.App,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用';
-    confirm({
+  const text = newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用';
+  try {
+    await confirm({
       content: `确认要${text + row.name}应用吗?`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateAppStatus({
-          id: row.id!,
-          status: newStatus,
-        });
-        // 提示并返回成功
-        message.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateAppStatus({
+    id: row.id!,
+    status: newStatus,
   });
+  // 提示并返回成功
+  message.success(`${text}成功`);
+  return true;
 }
 
 /** 生成渠道配置按钮 */
diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue
index 5d1267a8f..0da0f2d0d 100644
--- a/apps/web-antd/src/views/system/user/index.vue
+++ b/apps/web-antd/src/views/system/user/index.vue
@@ -138,21 +138,18 @@ async function handleStatusChange(
   newStatus: number,
   row: SystemUserApi.User,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.username}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新用户状态
-        await updateUserStatus(row.id!, newStatus);
-        // 提示并返回成功
-        message.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新用户状态
+  await updateUserStatus(row.id!, newStatus);
+  // 提示并返回成功
+  message.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-antdv-next/src/views/crm/clue/detail/index.vue b/apps/web-antdv-next/src/views/crm/clue/detail/index.vue
index a0e430e20..18a762864 100644
--- a/apps/web-antdv-next/src/views/crm/clue/detail/index.vue
+++ b/apps/web-antdv-next/src/views/crm/clue/detail/index.vue
@@ -83,21 +83,18 @@ function handleTransfer() {
 
 /** 转化为客户 */
 async function handleTransform(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: '确定将该线索转化为客户吗？',
-    })
-      .then(async () => {
-        // 转化为客户
-        await transformClue(clueId.value);
-        // 提示并返回成功
-        message.success('转化客户成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 转化为客户
+  await transformClue(clueId.value);
+  // 提示并返回成功
+  message.success('转化客户成功');
+  return true;
 }
 
 /** 加载数据 */
diff --git a/apps/web-antdv-next/src/views/crm/customer/detail/index.vue b/apps/web-antdv-next/src/views/crm/customer/detail/index.vue
index 6678e382e..c7ffc4a10 100644
--- a/apps/web-antdv-next/src/views/crm/customer/detail/index.vue
+++ b/apps/web-antdv-next/src/views/crm/customer/detail/index.vue
@@ -100,41 +100,35 @@ function handleTransfer() {
 }
 
 /** 锁定客户 */
-function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+async function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
+  try {
+    await confirm({
       content: `确定锁定客户【${customer.value.name}】吗？`,
-    })
-      .then(async () => {
-        // 锁定客户
-        await lockCustomer(customerId.value, lockStatus);
-        // 提示并返回成功
-        message.success(lockStatus ? '锁定客户成功' : '解锁客户成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 锁定客户
+  await lockCustomer(customerId.value, lockStatus);
+  // 提示并返回成功
+  message.success(lockStatus ? '锁定客户成功' : '解锁客户成功');
+  return true;
 }
 
 /** 领取客户 */
-function handleReceive(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+async function handleReceive(): Promise<boolean | undefined> {
+  try {
+    await confirm({
       content: `确定领取客户【${customer.value.name}】吗？`,
-    })
-      .then(async () => {
-        // 领取客户
-        await receiveCustomer([customerId.value]);
-        // 提示并返回成功
-        message.success('领取客户成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 领取客户
+  await receiveCustomer([customerId.value]);
+  // 提示并返回成功
+  message.success('领取客户成功');
+  return true;
 }
 
 /** 分配客户 */
@@ -143,42 +137,36 @@ function handleDistributeForm() {
 }
 
 /** 客户放入公海 */
-function handlePutPool(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+async function handlePutPool(): Promise<boolean | undefined> {
+  try {
+    await confirm({
       content: `确定将客户【${customer.value.name}】放入公海吗？`,
-    })
-      .then(async () => {
-        // 放入公海
-        await putCustomerPool(customerId.value);
-        // 提示并返回成功
-        message.success('放入公海成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 放入公海
+  await putCustomerPool(customerId.value);
+  // 提示并返回成功
+  message.success('放入公海成功');
+  return true;
 }
 
 /** 更新成交状态操作 */
 async function handleUpdateDealStatus(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const dealStatus = !customer.value.dealStatus;
-    confirm({
+  const dealStatus = !customer.value.dealStatus;
+  try {
+    await confirm({
       content: `确定更新成交状态为【${dealStatus ? '已成交' : '未成交'}】吗？`,
-    })
-      .then(async () => {
-        // 更新成交状态
-        await updateCustomerDealStatus(customerId.value, dealStatus);
-        // 提示并返回成功
-        message.success('更新成交状态成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新成交状态
+  await updateCustomerDealStatus(customerId.value, dealStatus);
+  // 提示并返回成功
+  message.success('更新成交状态成功');
+  return true;
 }
 
 /** 加载数据 */
diff --git a/apps/web-antdv-next/src/views/mall/product/spu/index.vue b/apps/web-antdv-next/src/views/mall/product/spu/index.vue
index 0cb69a42f..40e9dd1da 100644
--- a/apps/web-antdv-next/src/views/mall/product/spu/index.vue
+++ b/apps/web-antdv-next/src/views/mall/product/spu/index.vue
@@ -107,26 +107,23 @@ async function handleStatusChange(
   newStatus: number,
   row: MallSpuApi.Spu,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    // 二次确认
-    const text = newStatus ? '上架' : '下架';
-    confirm({
+  // 二次确认
+  const text = newStatus ? '上架' : '下架';
+  try {
+    await confirm({
       content: `确认要${text + row.name}吗?`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateStatus({
-          id: row.id!,
-          status: newStatus,
-        });
-        // 提示并返回成功
-        message.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateStatus({
+    id: row.id!,
+    status: newStatus,
   });
+  // 提示并返回成功
+  message.success(`${text}成功`);
+  return true;
 }
 
 /** 添加到仓库 / 回收站的状态 */
diff --git a/apps/web-ele/src/views/ai/image/manager/index.vue b/apps/web-ele/src/views/ai/image/manager/index.vue
index 72830e7a9..6544bc146 100644
--- a/apps/web-ele/src/views/ai/image/manager/index.vue
+++ b/apps/web-ele/src/views/ai/image/manager/index.vue
@@ -37,24 +37,21 @@ async function handleUpdatePublicStatusChange(
   row: AiImageApi.Image,
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确认要将该图片切换为【${text}】吗？`,
-    })
-      .then(async () => {
-        // 更新图片状态
-        await updateImage({
-          id: row.id,
-          publicStatus: newStatus,
-        });
-        // 提示并返回成功
-        ElMessage.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新图片状态
+  await updateImage({
+    id: row.id,
+    publicStatus: newStatus,
   });
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/ai/knowledge/document/index.vue b/apps/web-ele/src/views/ai/knowledge/document/index.vue
index df0fc7142..2e8ca97c4 100644
--- a/apps/web-ele/src/views/ai/knowledge/document/index.vue
+++ b/apps/web-ele/src/views/ai/knowledge/document/index.vue
@@ -75,24 +75,21 @@ async function handleStatusChange(
   newStatus: number,
   row: AiKnowledgeDocumentApi.KnowledgeDocument,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.name}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新文档状态
-        await updateKnowledgeDocumentStatus({
-          id: row.id,
-          status: newStatus,
-        });
-        // 提示并返回成功
-        ElMessage.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新文档状态
+  await updateKnowledgeDocumentStatus({
+    id: row.id,
+    status: newStatus,
   });
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/ai/knowledge/segment/index.vue b/apps/web-ele/src/views/ai/knowledge/segment/index.vue
index 980a904e4..b74f75542 100644
--- a/apps/web-ele/src/views/ai/knowledge/segment/index.vue
+++ b/apps/web-ele/src/views/ai/knowledge/segment/index.vue
@@ -63,21 +63,18 @@ async function handleStatusChange(
   newStatus: number,
   row: AiKnowledgeSegmentApi.KnowledgeSegment,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将片段 ${row.id} 的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新片段状态
-        await updateKnowledgeSegmentStatus(row.id!, newStatus);
-        // 提示并返回成功
-        ElMessage.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新片段状态
+  await updateKnowledgeSegmentStatus(row.id!, newStatus);
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/ai/music/manager/index.vue b/apps/web-ele/src/views/ai/music/manager/index.vue
index d0e04cb57..d4d966d40 100644
--- a/apps/web-ele/src/views/ai/music/manager/index.vue
+++ b/apps/web-ele/src/views/ai/music/manager/index.vue
@@ -37,24 +37,21 @@ async function handleUpdatePublicStatusChange(
   row: AiMusicApi.Music,
 ): Promise<boolean | undefined> {
   const text = newStatus ? '公开' : '私有';
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确认要将该音乐切换为【${text}】吗？`,
-    })
-      .then(async () => {
-        // 更新音乐状态
-        await updateMusic({
-          id: row.id,
-          publicStatus: newStatus,
-        });
-        // 提示并返回成功
-        ElMessage.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新音乐状态
+  await updateMusic({
+    id: row.id,
+    publicStatus: newStatus,
   });
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/crm/business/components/detail-list.vue b/apps/web-ele/src/views/crm/business/components/detail-list.vue
index e57ac8f0c..c89172b11 100644
--- a/apps/web-ele/src/views/crm/business/components/detail-list.vue
+++ b/apps/web-ele/src/views/crm/business/components/detail-list.vue
@@ -74,28 +74,24 @@ async function handleDeleteContactBusinessList() {
     ElMessage.error('请先选择商机后操作！');
     return;
   }
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    })
-      .then(async () => {
-        const res = await deleteContactBusinessList({
-          contactId: props.bizId,
-          businessIds: checkedRows.value.map((item) => item.id),
-        });
-        if (res) {
-          // 提示并返回成功
-          ElMessage.success($t('ui.actionMessage.operationSuccess'));
-          handleRefresh();
-          resolve(true);
-        } else {
-          reject(new Error($t('ui.actionMessage.operationFailed')));
-        }
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  const res = await deleteContactBusinessList({
+    contactId: props.bizId,
+    businessIds: checkedRows.value.map((item) => item.id),
   });
+  if (!res) {
+    throw new Error($t('ui.actionMessage.operationFailed'));
+  }
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 /** 查看商机详情 */
diff --git a/apps/web-ele/src/views/crm/clue/detail/index.vue b/apps/web-ele/src/views/crm/clue/detail/index.vue
index e7e6f8d22..0d95f5edb 100644
--- a/apps/web-ele/src/views/crm/clue/detail/index.vue
+++ b/apps/web-ele/src/views/crm/clue/detail/index.vue
@@ -84,21 +84,18 @@ function handleTransfer() {
 
 /** 转化为客户 */
 async function handleTransform(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: '确定将该线索转化为客户吗？',
-    })
-      .then(async () => {
-        // 转化为客户
-        await transformClue(clueId.value);
-        // 提示并返回成功
-        ElMessage.success('转化客户成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 转化为客户
+  await transformClue(clueId.value);
+  // 提示并返回成功
+  ElMessage.success('转化客户成功');
+  return true;
 }
 
 /** 加载数据 */
diff --git a/apps/web-ele/src/views/crm/contact/components/detail-list.vue b/apps/web-ele/src/views/crm/contact/components/detail-list.vue
index b49e768ac..71f65066d 100644
--- a/apps/web-ele/src/views/crm/contact/components/detail-list.vue
+++ b/apps/web-ele/src/views/crm/contact/components/detail-list.vue
@@ -71,28 +71,24 @@ async function handleDeleteContactBusinessList() {
     ElMessage.error('请先选择联系人后操作！');
     return;
   }
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `确定要将${checkedRows.value.map((item) => item.name).join(',')}解除关联吗？`,
-    })
-      .then(async () => {
-        const res = await deleteBusinessContactList({
-          businessId: props.bizId,
-          contactIds: checkedRows.value.map((item) => item.id),
-        });
-        if (res) {
-          // 提示并返回成功
-          ElMessage.success($t('ui.actionMessage.operationSuccess'));
-          handleRefresh();
-          resolve(true);
-        } else {
-          reject(new Error($t('ui.actionMessage.operationFailed')));
-        }
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  const res = await deleteBusinessContactList({
+    businessId: props.bizId,
+    contactIds: checkedRows.value.map((item) => item.id),
   });
+  if (!res) {
+    throw new Error($t('ui.actionMessage.operationFailed'));
+  }
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 /** 创建商机联系人关联 */
diff --git a/apps/web-ele/src/views/crm/customer/detail/index.vue b/apps/web-ele/src/views/crm/customer/detail/index.vue
index 77c0e1b9c..594a7c9a0 100644
--- a/apps/web-ele/src/views/crm/customer/detail/index.vue
+++ b/apps/web-ele/src/views/crm/customer/detail/index.vue
@@ -101,41 +101,35 @@ function handleTransfer() {
 }
 
 /** 锁定客户 */
-function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+async function handleLock(lockStatus: boolean): Promise<boolean | undefined> {
+  try {
+    await confirm({
       content: `确定锁定客户【${customer.value.name}】吗？`,
-    })
-      .then(async () => {
-        // 锁定客户
-        await lockCustomer(customerId.value, lockStatus);
-        // 提示并返回成功
-        ElMessage.success(lockStatus ? '锁定客户成功' : '解锁客户成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 锁定客户
+  await lockCustomer(customerId.value, lockStatus);
+  // 提示并返回成功
+  ElMessage.success(lockStatus ? '锁定客户成功' : '解锁客户成功');
+  return true;
 }
 
 /** 领取客户 */
-function handleReceive(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+async function handleReceive(): Promise<boolean | undefined> {
+  try {
+    await confirm({
       content: `确定领取客户【${customer.value.name}】吗？`,
-    })
-      .then(async () => {
-        // 领取客户
-        await receiveCustomer([customerId.value]);
-        // 提示并返回成功
-        ElMessage.success('领取客户成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 领取客户
+  await receiveCustomer([customerId.value]);
+  // 提示并返回成功
+  ElMessage.success('领取客户成功');
+  return true;
 }
 
 /** 分配客户 */
@@ -144,42 +138,36 @@ function handleDistributeForm() {
 }
 
 /** 客户放入公海 */
-function handlePutPool(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+async function handlePutPool(): Promise<boolean | undefined> {
+  try {
+    await confirm({
       content: `确定将客户【${customer.value.name}】放入公海吗？`,
-    })
-      .then(async () => {
-        // 放入公海
-        await putCustomerPool(customerId.value);
-        // 提示并返回成功
-        ElMessage.success('放入公海成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 放入公海
+  await putCustomerPool(customerId.value);
+  // 提示并返回成功
+  ElMessage.success('放入公海成功');
+  return true;
 }
 
 /** 更新成交状态操作 */
 async function handleUpdateDealStatus(): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const dealStatus = !customer.value.dealStatus;
-    confirm({
+  const dealStatus = !customer.value.dealStatus;
+  try {
+    await confirm({
       content: `确定更新成交状态为【${dealStatus ? '已成交' : '未成交'}】吗？`,
-    })
-      .then(async () => {
-        // 更新成交状态
-        await updateCustomerDealStatus(customerId.value, dealStatus);
-        // 提示并返回成功
-        ElMessage.success('更新成交状态成功');
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新成交状态
+  await updateCustomerDealStatus(customerId.value, dealStatus);
+  // 提示并返回成功
+  ElMessage.success('更新成交状态成功');
+  return true;
 }
 
 /** 加载数据 */
diff --git a/apps/web-ele/src/views/crm/permission/modules/list.vue b/apps/web-ele/src/views/crm/permission/modules/list.vue
index 957f0dd8b..21eec5726 100644
--- a/apps/web-ele/src/views/crm/permission/modules/list.vue
+++ b/apps/web-ele/src/views/crm/permission/modules/list.vue
@@ -94,32 +94,28 @@ function handleEdit() {
 }
 
 /** 删除团队成员 */
-function handleDelete() {
+async function handleDelete() {
   if (checkedRows.value.length === 0) {
     ElMessage.error('请先选择团队成员后操作！');
     return;
   }
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${checkedRows.value.map((item) => item.nickname).join(',')}移出团队吗？`,
-    })
-      .then(async () => {
-        const res = await deletePermissionBatch(
-          checkedRows.value.map((item) => item.id!),
-        );
-        if (res) {
-          // 提示并返回成功
-          ElMessage.success($t('ui.actionMessage.operationSuccess'));
-          handleRefresh();
-          resolve(true);
-        } else {
-          reject(new Error('移出失败'));
-        }
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  const res = await deletePermissionBatch(
+    checkedRows.value.map((item) => item.id!),
+  );
+  if (!res) {
+    throw new Error('移出失败');
+  }
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 /** 退出团队 */
diff --git a/apps/web-ele/src/views/erp/finance/account/index.vue b/apps/web-ele/src/views/erp/finance/account/index.vue
index 1f5493980..47c1e45a2 100644
--- a/apps/web-ele/src/views/erp/finance/account/index.vue
+++ b/apps/web-ele/src/views/erp/finance/account/index.vue
@@ -64,23 +64,20 @@ async function handleDefaultStatusChange(
   newStatus: boolean,
   row: ErpAccountApi.Account,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus ? '设置' : '取消';
-    confirm({
+  const text = newStatus ? '设置' : '取消';
+  try {
+    await confirm({
       content: `确认要${text}"${row.name}"默认吗?`,
-    })
-      .then(async () => {
-        // 更新默认状态
-        await updateAccountDefaultStatus(row.id!, newStatus);
-        // 提示并返回成功
-        ElMessage.success(`${text}默认成功`);
-        handleRefresh();
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新默认状态
+  await updateAccountDefaultStatus(row.id!, newStatus);
+  // 提示并返回成功
+  ElMessage.success(`${text}默认成功`);
+  handleRefresh();
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/erp/stock/warehouse/index.vue b/apps/web-ele/src/views/erp/stock/warehouse/index.vue
index 48669e1f8..5373fc1f2 100644
--- a/apps/web-ele/src/views/erp/stock/warehouse/index.vue
+++ b/apps/web-ele/src/views/erp/stock/warehouse/index.vue
@@ -62,23 +62,20 @@ async function handleDefaultStatusChange(
   newStatus: boolean,
   row: ErpWarehouseApi.Warehouse,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus ? '设置' : '取消';
-    confirm({
+  const text = newStatus ? '设置' : '取消';
+  try {
+    await confirm({
       content: `确认要${text}"${row.name}"默认吗?`,
-    })
-      .then(async () => {
-        // 更新默认状态
-        await updateWarehouseDefaultStatus(row.id!, newStatus);
-        // 提示并返回成功
-        ElMessage.success(`${text}默认成功`);
-        handleRefresh();
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新默认状态
+  await updateWarehouseDefaultStatus(row.id!, newStatus);
+  // 提示并返回成功
+  ElMessage.success(`${text}默认成功`);
+  handleRefresh();
+  return true;
 }
 
 const [FormModal, formModalApi] = useVbenModal({
diff --git a/apps/web-ele/src/views/mall/product/comment/index.vue b/apps/web-ele/src/views/mall/product/comment/index.vue
index 3c39a767c..ea8baced0 100644
--- a/apps/web-ele/src/views/mall/product/comment/index.vue
+++ b/apps/web-ele/src/views/mall/product/comment/index.vue
@@ -62,25 +62,22 @@ async function handleStatusChange(
   newStatus: boolean,
   row: MallCommentApi.Comment,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus ? '展示' : '隐藏';
-    confirm({
+  const text = newStatus ? '展示' : '隐藏';
+  try {
+    await confirm({
       content: `确认要${text}该评论吗？`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateCommentVisible({
-          id: row.id!,
-          visible: newStatus,
-        });
-        // 提示并返回成功
-        ElMessage.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateCommentVisible({
+    id: row.id!,
+    visible: newStatus,
   });
+  // 提示并返回成功
+  ElMessage.success(`${text}成功`);
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/mall/product/spu/index.vue b/apps/web-ele/src/views/mall/product/spu/index.vue
index f206c5f92..9d436759c 100644
--- a/apps/web-ele/src/views/mall/product/spu/index.vue
+++ b/apps/web-ele/src/views/mall/product/spu/index.vue
@@ -106,26 +106,23 @@ async function handleStatusChange(
   newStatus: number,
   row: MallSpuApi.Spu,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    // 二次确认
-    const text = newStatus ? '上架' : '下架';
-    confirm({
+  // 二次确认
+  const text = newStatus ? '上架' : '下架';
+  try {
+    await confirm({
       content: `确认要${text + row.name}吗?`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateStatus({
-          id: row.id!,
-          status: newStatus,
-        });
-        // 提示并返回成功
-        ElMessage.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateStatus({
+    id: row.id!,
+    status: newStatus,
   });
+  // 提示并返回成功
+  ElMessage.success(`${text}成功`);
+  return true;
 }
 
 /** 添加到仓库 / 回收站的状态 */
diff --git a/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue b/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue
index cbe999341..dcda02261 100644
--- a/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/coupon/template/index.vue
@@ -59,21 +59,18 @@ async function handleStatusChange(
   newStatus: number,
   row: MallCouponTemplateApi.CouponTemplate,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.name}的状态切换为【${newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用'}】吗？`,
-    })
-      .then(async () => {
-        // 更新优惠券模板状态
-        await updateCouponTemplateStatus(row.id!, newStatus);
-        // 提示并返回成功
-        ElMessage.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新优惠券模板状态
+  await updateCouponTemplateStatus(row.id!, newStatus);
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue b/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue
index 073c763c2..068bf5209 100644
--- a/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/seckill/config/index.vue
@@ -56,23 +56,20 @@ async function handleStatusChange(
   newStatus: number,
   row: MallSeckillConfigApi.SeckillConfig,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    // 二次确认
-    const text = row.status === 0 ? '启用' : '停用';
-    confirm({
+  // 二次确认
+  const text = row.status === 0 ? '启用' : '停用';
+  try {
+    await confirm({
       content: `确认要${text + row.name}吗?`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateSeckillConfigStatus(row.id, newStatus);
-        // 提示并返回成功
-        ElMessage.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateSeckillConfigStatus(row.id, newStatus);
+  // 提示并返回成功
+  ElMessage.success(`${text}成功`);
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue
index 5b7d958dc..a8ad43da0 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue
@@ -86,26 +86,23 @@ async function handleBrokerageEnabledChange(
   newEnabled: boolean,
   row: MallBrokerageUserApi.BrokerageUser,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newEnabled ? '开通' : '关闭';
-    confirm({
+  const text = newEnabled ? '开通' : '关闭';
+  try {
+    await confirm({
       content: `你要将${row.nickname}的推广资格切换为【${text}】吗？`,
-    })
-      .then(async () => {
-        // 更新推广资格
-        await updateBrokerageEnabled({
-          id: row.id!,
-          enabled: newEnabled,
-        });
-        // 提示并返回成功
-        ElMessage.success($t('ui.actionMessage.operationSuccess'));
-        handleRefresh();
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新推广资格
+  await updateBrokerageEnabled({
+    id: row.id!,
+    enabled: newEnabled,
   });
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  handleRefresh();
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/index.vue b/apps/web-ele/src/views/mes/dv/checkplan/index.vue
index 84e58e38e..4b0713f73 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/index.vue
+++ b/apps/web-ele/src/views/mes/dv/checkplan/index.vue
@@ -112,14 +112,20 @@ function getTableActions(row: MesDvCheckPlanApi.CheckPlan): ActionItem[] {
           type: 'warning',
           link: true,
           auth: ['mes:dv-check-plan:update'],
-          onClick: handleEnable.bind(null, row),
+          popConfirm: {
+            title: `确认启用"${row.name}"点检保养方案？启用后将不可修改或删除。`,
+            confirm: handleEnable.bind(null, row),
+          },
         }
       : {
           label: '停用',
           type: 'warning',
           link: true,
           auth: ['mes:dv-check-plan:update'],
-          onClick: handleDisable.bind(null, row),
+          popConfirm: {
+            title: `确认停用"${row.name}"点检保养方案？`,
+            confirm: handleDisable.bind(null, row),
+          },
         },
   );
   return actions;
diff --git a/apps/web-ele/src/views/mes/md/item/index.vue b/apps/web-ele/src/views/mes/md/item/index.vue
index f6e290fe8..51f876e12 100644
--- a/apps/web-ele/src/views/mes/md/item/index.vue
+++ b/apps/web-ele/src/views/mes/md/item/index.vue
@@ -5,18 +5,12 @@ import type { MesMdItemTypeApi } from '#/api/mes/md/item/type';
 
 import { ref } from 'vue';
 
-import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictLabel } from '@vben/hooks';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
-import {
-  ElButton,
-  ElCard,
-  ElLoading,
-  ElMessage,
-  ElMessageBox,
-} from 'element-plus';
+import { ElButton, ElCard, ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -101,21 +95,16 @@ async function handleStatusChange(
   newStatus: number,
   row: MesMdItemApi.Item,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    ElMessageBox.confirm(
-      `确认要将“${row.name}”物料切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-      '提示',
-      { type: 'warning' },
-    )
-      .then(async () => {
-        await updateItemStatus(row.id!, newStatus);
-        ElMessage.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+  try {
+    await confirm(
+      `确认要将"${row.name}"物料切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
+    );
+  } catch {
+    return false;
+  }
+  await updateItemStatus(row.id!, newStatus);
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/apps/web-ele/src/views/mes/pro/route/index.vue b/apps/web-ele/src/views/mes/pro/route/index.vue
index 51f4e8ff3..ae7e8962a 100644
--- a/apps/web-ele/src/views/mes/pro/route/index.vue
+++ b/apps/web-ele/src/views/mes/pro/route/index.vue
@@ -3,18 +3,12 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesProRouteApi } from '#/api/mes/pro/route';
 
 import { useAccess } from '@vben/access';
-import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictLabel } from '@vben/hooks';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
-import {
-  ElButton,
-  ElLoading,
-  ElMessage,
-  ElMessageBox,
-  ElTooltip,
-} from 'element-plus';
+import { ElButton, ElLoading, ElMessage, ElTooltip } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -62,17 +56,15 @@ async function handleStatusChange(
   row: MesProRouteApi.Route,
 ): Promise<boolean | undefined> {
   try {
-    await ElMessageBox.confirm(
+    await confirm(
       `确认要将"${row.name}"工艺路线切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-      '提示',
-      { type: 'warning' },
     );
-    await updateRouteStatus(row.id!, newStatus);
-    ElMessage.success($t('ui.actionMessage.operationSuccess'));
-    return true;
   } catch {
     return false;
   }
+  await updateRouteStatus(row.id!, newStatus);
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 /** 删除（仅停用状态可删除） */
diff --git a/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue b/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
index 499dc51d7..53bceb42d 100644
--- a/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
+++ b/apps/web-ele/src/views/mes/pro/workrecord/components/work-record-status-bar.vue
@@ -55,7 +55,11 @@ async function handleClockIn() {
 
 /** 下工 */
 async function handleClockOut() {
-  await confirm('确认下工当前工作站？');
+  try {
+    await confirm('确认下工当前工作站？');
+  } catch {
+    return;
+  }
   await clockOutWorkRecord();
   ElMessage.success('下工成功');
   await loadMyWorkstation();
diff --git a/apps/web-ele/src/views/pay/app/index.vue b/apps/web-ele/src/views/pay/app/index.vue
index 57920fe12..c538e16bd 100644
--- a/apps/web-ele/src/views/pay/app/index.vue
+++ b/apps/web-ele/src/views/pay/app/index.vue
@@ -64,25 +64,22 @@ async function handleStatusChange(
   newStatus: number,
   row: PayAppApi.App,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    const text = newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用';
-    confirm({
+  const text = newStatus === CommonStatusEnum.ENABLE ? '启用' : '停用';
+  try {
+    await confirm({
       content: `确认要${text + row.name}应用吗?`,
-    })
-      .then(async () => {
-        // 更新状态
-        await updateAppStatus({
-          id: row.id!,
-          status: newStatus,
-        });
-        // 提示并返回成功
-        ElMessage.success(`${text}成功`);
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
+    });
+  } catch {
+    return false;
+  }
+  // 更新状态
+  await updateAppStatus({
+    id: row.id!,
+    status: newStatus,
   });
+  // 提示并返回成功
+  ElMessage.success(`${text}成功`);
+  return true;
 }
 
 /** 生成渠道配置按钮 */
diff --git a/apps/web-ele/src/views/system/user/index.vue b/apps/web-ele/src/views/system/user/index.vue
index e56a89878..2c0ebcbb6 100644
--- a/apps/web-ele/src/views/system/user/index.vue
+++ b/apps/web-ele/src/views/system/user/index.vue
@@ -136,21 +136,18 @@ async function handleStatusChange(
   newStatus: number,
   row: SystemUserApi.User,
 ): Promise<boolean | undefined> {
-  return new Promise((resolve, reject) => {
-    confirm({
+  try {
+    await confirm({
       content: `你要将${row.username}的状态切换为【${getDictLabel(DICT_TYPE.COMMON_STATUS, newStatus)}】吗？`,
-    })
-      .then(async () => {
-        // 更新用户状态
-        await updateUserStatus(row.id!, newStatus);
-        // 提示并返回成功
-        ElMessage.success($t('ui.actionMessage.operationSuccess'));
-        resolve(true);
-      })
-      .catch(() => {
-        reject(new Error('取消操作'));
-      });
-  });
+    });
+  } catch {
+    return false;
+  }
+  // 更新用户状态
+  await updateUserStatus(row.id!, newStatus);
+  // 提示并返回成功
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
+  return true;
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({