diff --git a/src/api/dms/dmsBillsLubeInstance/types.ts b/src/api/dms/dmsBillsLubeInstance/types.ts
index 8edf270..d7a441d 100644
--- a/src/api/dms/dmsBillsLubeInstance/types.ts
+++ b/src/api/dms/dmsBillsLubeInstance/types.ts
@@ -68,6 +68,12 @@ export interface DmsBillsLubeInstanceVO {
    * 润滑工单编号
    */
   planLubeCode: string;
+
+  /**
+   * 流程定义ID
+   */
+  wfDefinitionId: string | number;
+
 }
 
 export interface DmsBillsLubeInstanceForm extends BaseEntity {
@@ -150,6 +156,10 @@ export interface DmsBillsLubeInstanceForm extends BaseEntity {
 
   createTime?: string;
 
+  /**
+   * 流程定义ID
+   */
+  wfDefinitionId?: string | number;
 
 }
 
@@ -228,6 +238,12 @@ export interface DmsBillsLubeInstanceQuery extends PageQuery {
   createBy?: string;
 
   createTime?: string;
+
+  /**
+   * 流程定义ID
+   */
+  wfDefinitionId?: string | number;
+
 }
 
 
diff --git a/src/api/mes/baseProcessInfo/types.ts b/src/api/mes/baseProcessInfo/types.ts
index 31f7586..f9c6635 100644
--- a/src/api/mes/baseProcessInfo/types.ts
+++ b/src/api/mes/baseProcessInfo/types.ts
@@ -1,14 +1,11 @@
+import { BaseProcessResourceVO } from "../baseProcessResource/types";
+
 export interface BaseProcessInfoVO {
   /**
    * 主键标识
    */
   processId: string | number;
 
-  /**
-   * 租户编号
-   */
-  tenantId: string | number;
-
   /**
    * 工序编号
    */
@@ -25,7 +22,7 @@ export interface BaseProcessInfoVO {
   processType: string;
 
   /**
-   * 工序顺序
+   * 工序顺序（弃用）
    */
   processQueue: number;
 
@@ -34,6 +31,71 @@ export interface BaseProcessInfoVO {
    */
   productionTime: number;
 
+  /**
+   * 车间ID
+   */
+  workshopId: string | number;
+
+  /**
+   * 委外标识（1自制 2委外）
+   */
+  outsourcingFlag: string;
+
+  /**
+   * 工序生产类型（1投料 2加工 3装配）
+   */
+  processProductionType: string;
+
+  /**
+   * 默认产出率（%），公式：合格数/投入数
+   */
+  defaultYieldRate: number;
+
+  /**
+   * 损耗率（%），公式：废品/不可修复不良品占比
+   */
+  lossRate: number;
+
+  /**
+   * 返修率（%），公式：返修品/投入数
+   */
+  reworkRate: number;
+
+  /**
+   * 领料方式（1领料单 2申请领料 3生产叫料）
+   */
+  materialMethod: string;
+
+  /**
+   * 委外提前期（秒）
+   */
+  leadTime: number;
+
+  /**
+   * 准备时间（秒）
+   */
+  setupTime: number;
+
+  /**
+   * 加工时间（秒）
+   */
+  processingTime: number;
+
+  /**
+   * 拆卸时间（秒）
+   */
+  disassemblyTime: number;
+
+  /**
+   * 理论生产节拍（秒/件）
+   */
+  theoreticalCycleTime: number;
+
+  /**
+   * 质检方式（1免检 2自检 3质量检验）
+   */
+  inspectionMethod: string;
+
   /**
    * 激活标识(1是 0否)
    */
@@ -98,7 +160,7 @@ export interface BaseProcessInfoForm extends BaseEntity {
   processType?: string;
 
   /**
-   * 工序顺序
+   * 工序顺序（弃用）
    */
   processQueue?: number;
 
@@ -107,6 +169,71 @@ export interface BaseProcessInfoForm extends BaseEntity {
    */
   productionTime?: number;
 
+  /**
+   * 车间ID
+   */
+  workshopId?: string | number;
+
+  /**
+   * 委外标识（1自制 2委外）
+   */
+  outsourcingFlag?: string;
+
+  /**
+   * 工序生产类型（1投料 2加工 3装配）
+   */
+  processProductionType?: string;
+
+  /**
+   * 默认产出率（%），公式：合格数/投入数
+   */
+  defaultYieldRate?: number;
+
+  /**
+   * 损耗率（%），公式：废品/不可修复不良品占比
+   */
+  lossRate?: number;
+
+  /**
+   * 返修率（%），公式：返修品/投入数
+   */
+  reworkRate?: number;
+
+  /**
+   * 领料方式（1领料单 2申请领料 3生产叫料）
+   */
+  materialMethod?: string;
+
+  /**
+   * 委外提前期（秒）
+   */
+  leadTime?: number;
+
+  /**
+   * 准备时间（秒）
+   */
+  setupTime?: number;
+
+  /**
+   * 加工时间（秒）
+   */
+  processingTime?: number;
+
+  /**
+   * 拆卸时间（秒）
+   */
+  disassemblyTime?: number;
+
+  /**
+   * 理论生产节拍（秒/件）
+   */
+  theoreticalCycleTime?: number;
+
+  /**
+   * 质检方式（1免检 2自检 3质量检验）
+   */
+  inspectionMethod?: string;
+
   /**
    * 激活标识(1是 0否)
    */
@@ -126,6 +253,7 @@ export interface BaseProcessInfoForm extends BaseEntity {
   prodBaseProcessUserVoList?: ProdBaseProcessUser[];
   prodBaseProcessProdlineBoList?: ProdBaseProcessProdLine[];
   prodBaseProcessUserBoList?: ProdBaseProcessUser[];
+  prodBaseProcessResourceList?: BaseProcessResourceVO[];
 }
 
 export interface BaseProcessInfoQuery extends PageQuery {
@@ -151,7 +279,7 @@ export interface BaseProcessInfoQuery extends PageQuery {
   processType?: string;
 
   /**
-   * 工序顺序
+   * 工序顺序（弃用）
    */
   processQueue?: number;
 
@@ -160,15 +288,80 @@ export interface BaseProcessInfoQuery extends PageQuery {
    */
   productionTime?: number;
 
+  /**
+   * 车间ID
+   */
+  workshopId?: string | number;
+
+  /**
+   * 委外标识（1自制 2委外）
+   */
+  outsourcingFlag?: string;
+
+  /**
+   * 工序生产类型（1投料 2加工 3装配）
+   */
+  processProductionType?: string;
+
+  /**
+   * 默认产出率（%），公式：合格数/投入数
+   */
+  defaultYieldRate?: number;
+
+  /**
+   * 损耗率（%），公式：废品/不可修复不良品占比
+   */
+  lossRate?: number;
+
+  /**
+   * 返修率（%），公式：返修品/投入数
+   */
+  reworkRate?: number;
+
+  /**
+   * 领料方式（1领料单 2申请领料 3生产叫料）
+   */
+  materialMethod?: string;
+
+  /**
+   * 委外提前期（秒）
+   */
+  leadTime?: number;
+
+  /**
+   * 准备时间（秒）
+   */
+  setupTime?: number;
+
+  /**
+   * 加工时间（秒）
+   */
+  processingTime?: number;
+
+  /**
+   * 拆卸时间（秒）
+   */
+  disassemblyTime?: number;
+
+  /**
+   * 理论生产节拍（秒/件）
+   */
+  theoreticalCycleTime?: number;
+
+  /**
+   * 质检方式（1免检 2自检 3质量检验）
+   */
+  inspectionMethod?: string;
+
   /**
    * 激活标识(1是 0否)
    */
   activeFlag?: string;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 
   prodBaseProcessProdlineV0List?: ProdBaseProcessProdLine[];
   prodBaseProcessUserV0List?: ProdBaseProcessUser[];
@@ -205,8 +398,6 @@ export interface ProdBaseProcessProdLine {
 }
 
 
-
-
 export interface ProdBaseProcessUser {
   /**
    * 工序ID
diff --git a/src/api/mes/baseProcessResource/types.ts b/src/api/mes/baseProcessResource/types.ts
new file mode 100644
index 0000000..e627a89
--- /dev/null
+++ b/src/api/mes/baseProcessResource/types.ts
@@ -0,0 +1,134 @@
+export interface BaseProcessResourceVO {
+  /**
+   * 主键标识
+   */
+  processResourceId: string | number;
+
+  /**
+   * 工序ID
+   */
+  processId: string | number;
+
+  /**
+   * 指派类型（1人员 2班组 3机台 4工位）
+   */
+  assignmentType: string;
+
+  /**
+   * 载具工装类型
+   */
+  toolingTypeCode: string;
+
+  /**
+   * 必选标识（0可选 1必选）
+   */
+  requiredFlag: string;
+
+  /**
+   * 选择模式（0单选 1多选）
+   */
+  selectionMode: string;
+
+  /**
+   * 是否需要校验（0否 1是）
+   */
+  requiresValidation: string | number;
+
+  /**
+   * 是否需要准备任务（0否 1是）
+   */
+  requiresPreparation: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface BaseProcessResourceForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  processResourceId?: string | number;
+
+  /**
+   * 指派类型（1人员 2班组 3机台 4工位）
+   */
+  assignmentType?: string;
+
+  /**
+   * 载具工装类型
+   */
+  toolingTypeCode?: string;
+
+  /**
+   * 必选标识（0可选 1必选）
+   */
+  requiredFlag?: string;
+
+  /**
+   * 选择模式（0单选 1多选）
+   */
+  selectionMode?: string;
+
+  /**
+   * 是否需要校验（0否 1是）
+   */
+  requiresValidation?: string | number;
+
+  /**
+   * 是否需要准备任务（0否 1是）
+   */
+  requiresPreparation?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface BaseProcessResourceQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  processResourceId?: string | number;
+
+  /**
+   * 指派类型（1人员 2班组 3机台 4工位）
+   */
+  assignmentType?: string;
+
+  /**
+   * 载具工装类型
+   */
+  toolingTypeCode?: string;
+
+  /**
+   * 必选标识（0可选 1必选）
+   */
+  requiredFlag?: string;
+
+  /**
+   * 选择模式（0单选 1多选）
+   */
+  selectionMode?: string;
+
+  /**
+   * 是否需要校验（0否 1是）
+   */
+  requiresValidation?: string | number;
+
+  /**
+   * 是否需要准备任务（0否 1是）
+   */
+  requiresPreparation?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/mes/baseRoute/types.ts b/src/api/mes/baseRoute/types.ts
index 0fb39cd..d89841d 100644
--- a/src/api/mes/baseRoute/types.ts
+++ b/src/api/mes/baseRoute/types.ts
@@ -18,6 +18,28 @@ export interface ProdBaseRouteProcess {
   index?: number;
 }
 
+// 定义工艺路线关联物料的接口
+export interface ProdBaseRouteMaterial {
+  /** 物料ID */
+  materialId: string | number;
+  /** 物料名称 */
+  materialName?: string;
+  /** 激活标识（0否 1是） */
+  activeFlag: string;
+  /** 备注 */
+  remark?: string;
+  /** 创建人 */
+  createBy?: number;
+  /** 创建时间 */
+  createTime?: string;
+  /** 更新人 */
+  updateBy?: number;
+  /** 更新时间 */
+  updateTime?: string;
+  /** 序号（前端使用） */
+  index?: number;
+}
+
 export interface BaseRouteVO {
   /**
    * 工艺路线ID
@@ -40,7 +62,7 @@ export interface BaseRouteVO {
   routeDesc: string;
 
   /**
-   * 激活标识(1是 0否)
+   * 状态（1待审核 2审核通过 3审核不通过 4发布 5作废）
    */
   activeFlag: string;
 
@@ -81,6 +103,55 @@ export interface BaseRouteVO {
 
   routeProcessVoList?: ProdBaseRouteProcess[];
 
+  /**
+   * 工艺路线关联物料列表
+   */
+  prodBaseRouteMaterialList?: ProdBaseRouteMaterial[];
+
+  /**
+   * 工艺路线版本
+   */
+  routeVersion: string;
+
+  /**
+   * 生产类型（1正式 2试制 3返修）
+   */
+  productionType: string;
+
+  /**
+   * 路线类型（1生产 2装配）
+   */
+  routeType: string;
+
+  /**
+   * 审核原因
+   */
+  auditReason: string;
+
+  /**
+   * 审核人
+   */
+  approveBy: number;
+
+  /**
+   * 审核时间
+   */
+  approveTime: string;
+
+  /**
+   * 是否需要首件检验（0否 1是）
+   */
+  needFirstInspect: string;
+
+  /**
+   * 是否打印流转卡（0继承 1是 2否）
+   */
+  printFlowCard: string;
+
+  /**
+   * 批次量（0=不拆分）
+   */
+  batchSize: number;
 }
 
 export interface BaseRouteForm extends BaseEntity {
@@ -100,7 +171,7 @@ export interface BaseRouteForm extends BaseEntity {
   routeDesc?: string;
 
   /**
-   * 激活标识(1是 0否)
+   * 状态（1待审核 2审核通过 3审核不通过 4发布 5作废）
    */
   activeFlag?: string;
 
@@ -115,10 +186,59 @@ export interface BaseRouteForm extends BaseEntity {
   routeProcessBoList?: ProdBaseRouteProcess[];
 
   routeProcessVoList?: ProdBaseRouteProcess[];
+
+  /**
+   * 工艺路线关联物料列表
+   */
+  prodBaseRouteMaterialList?: ProdBaseRouteMaterial[];
+
+  /**
+   * 工艺路线版本
+   */
+  routeVersion?: string;
+
+  /**
+   * 生产类型（1正式 2试制 3返修）
+   */
+  productionType?: string;
+
+  /**
+   * 路线类型（1生产 2装配）
+   */
+  routeType?: string;
+
+  /**
+   * 审核原因
+   */
+  auditReason?: string;
+
+  /**
+   * 审核人
+   */
+  approveBy?: number;
+
+  /**
+   * 审核时间
+   */
+  approveTime?: string;
+
+  /**
+   * 是否需要首件检验（0否 1是）
+   */
+  needFirstInspect?: string;
+
+  /**
+   * 是否打印流转卡（0继承 1是 2否）
+   */
+  printFlowCard?: string;
+
+  /**
+   * 批次量（0=不拆分）
+   */
+  batchSize?: number;
 }
 
 export interface BaseRouteQuery extends PageQuery {
-
   /**
    * 工艺路线ID
    */
@@ -135,10 +255,55 @@ export interface BaseRouteQuery extends PageQuery {
   routeDesc?: string;
 
   /**
-   * 激活标识(1是 0否)
+   * 状态（1待审核 2审核通过 3审核不通过 4发布 5作废）
    */
   activeFlag?: string;
 
+  /**
+   * 工艺路线版本
+   */
+  routeVersion?: string;
+
+  /**
+   * 生产类型（1正式 2试制 3返修）
+   */
+  productionType?: string;
+
+  /**
+   * 路线类型（1生产 2装配）
+   */
+  routeType?: string;
+
+  /**
+   * 审核原因
+   */
+  auditReason?: string;
+
+  /**
+   * 审核人
+   */
+  approveBy?: number;
+
+  /**
+   * 审核时间
+   */
+  approveTime?: string;
+
+  /**
+   * 是否需要首件检验（0否 1是）
+   */
+  needFirstInspect?: string;
+
+  /**
+   * 是否打印流转卡（0继承 1是 2否）
+   */
+  printFlowCard?: string;
+
+  /**
+   * 批次量（0=不拆分）
+   */
+  batchSize?: number;
+
   /**
    * 日期范围参数
    */
diff --git a/src/api/mes/baseRouteMaterial/types.ts b/src/api/mes/baseRouteMaterial/types.ts
new file mode 100644
index 0000000..67bb318
--- /dev/null
+++ b/src/api/mes/baseRouteMaterial/types.ts
@@ -0,0 +1,86 @@
+export interface BaseRouteMaterialVO {
+  /**
+   * 关联物料ID
+   */
+  routeMaterialId: string | number;
+
+  /**
+   * 工艺路线ID
+   */
+  routeId: string | number;
+
+  /**
+   * 物料ID
+   */
+  materialId: string | number;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface BaseRouteMaterialForm extends BaseEntity {
+  /**
+   * 关联物料ID
+   */
+  routeMaterialId?: string | number;
+
+  /**
+   * 工艺路线ID
+   */
+  routeId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface BaseRouteMaterialQuery extends PageQuery {
+
+  /**
+   * 关联物料ID
+   */
+  routeMaterialId?: string | number;
+
+  /**
+   * 工艺路线ID
+   */
+  routeId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/router/index.ts b/src/router/index.ts
index de4867a..104b265 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -346,7 +346,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     permissions: ['dms:dmsBillsLubeInstance:add'],
     children: [
       {
-        path: 'index/:lubeInstanceId',
+        path: 'index',
         component: () => import('@/views/dms/dmsBillsLubeInstanceActivity/index.vue'),
         name: 'dmsBillsLubeInstanceActivity',
         meta: { title: '润滑工单明细', activeMenu: '/dms/dmsBillsLubeInstance', icon: '' }
@@ -424,7 +424,38 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         meta: { title: '保养工单申请', activeMenu: '/dms/maint/maintEdit', noCache: true }
       }
     ]
-  }
+  },
+
+  // {
+  //   path: '/dms/dmsMaintInstanceActivity',
+  //   component: Layout,
+  //   hidden: true,
+  //   permissions: ['dms:dmsBillsMaintInstance:add'],
+  //   children: [
+  //     {
+  //       path: 'index/:maintInstanceId',
+  //       component: () => import('@/views/dms/dmsMaintInstanceActivity/index.vue'),
+  //       name: 'dmsMaintInstanceActivity',
+  //       meta: { title: '保养工单明细', activeMenu: '/dms/dmsMaintInstanceActivity', icon: '' }
+  //     }
+  //   ]
+  // },
+  //
+  // {
+  //   path: '/dms/dmsBillsInspectInstanceActivity',
+  //   component: Layout,
+  //   hidden: true,
+  //   permissions: ['dms:dmsBillsInspectInstanceActivity:add'],
+  //   children: [
+  //     {
+  //       path: 'index/:inspctInstanceId',
+  //       component: () => import('@/views/dms/dmsBillsInspectInstanceActivity/index.vue'),
+  //       name: 'dmsBillsInspectInstanceActivity',
+  //       meta: { title: '点巡检工单明细', activeMenu: '/dms/dmsBillsInspectInstanceActivity', icon: '' }
+  //     }
+  //   ]
+  // },
+
 
 ];
 
diff --git a/src/views/dms/dmsBillsLubeInstance/index.vue b/src/views/dms/dmsBillsLubeInstance/index.vue
index 8884c47..53d1e9e 100644
--- a/src/views/dms/dmsBillsLubeInstance/index.vue
+++ b/src/views/dms/dmsBillsLubeInstance/index.vue
@@ -139,21 +139,36 @@
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[12].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
+
+                <!-- 启动工单按钮 -->
+    <el-tooltip content="启动工单" placement="top"v-if="!scope.row.wfDefinitionId" >
+      <el-button link type="success" icon="View" @click="handleStartWorkflow(scope.row)">
+      </el-button>
+    </el-tooltip>
+
 <!--            <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsLubeInstance:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBillsLubeInstance:remove']"></el-button>
             </el-tooltip>-->
-            <el-tooltip content="详情" placement="top">
+            <!-- <el-tooltip content="详情" placement="top">
               <el-button link type="primary" icon="View" @click="handleShowDetail(scope.row)" v-hasPermi="['dms:dmsBillsLubeInstance:edit']"></el-button>
-            </el-tooltip>
+            </el-tooltip> -->
+
           </template>
         </el-table-column>
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
+
+    <!-- 工作流处理组件 -->
+    <submitVerify
+      ref="submitVerifyRef"
+      :task-variables="taskVariables"
+      @submit-callback="submitCallback" />
+
     <!-- 添加或修改润滑工单对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="dmsBillsLubeInstanceFormRef" :model="form" :rules="rules" label-width="160px">
@@ -251,6 +266,8 @@
 import { listDmsBillsLubeInstance, getDmsBillsLubeInstance, delDmsBillsLubeInstance, addDmsBillsLubeInstance, updateDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
 import { DmsBillsLubeInstanceVO, DmsBillsLubeInstanceQuery, DmsBillsLubeInstanceForm } from '@/api/dms/dmsBillsLubeInstance/types';
 import { useRouter } from 'vue-router';
+import { startWorkFlow } from '@/api/workflow/task'
+import SubmitVerify from '@/components/Process/submitVerify.vue'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { active_flag, lube_level, lube_status } = toRefs<any>(proxy?.useDict('active_flag', 'lube_level', 'lube_status'));
@@ -430,11 +447,92 @@ const handleExport = () => {
   }, `dmsBillsLubeInstance_${new Date().getTime()}.xlsx`)
 }
 
+/** 详情按钮 */
 const router = useRouter();
 const handleShowDetail = (row: DmsBillsLubeInstanceVO) => {
   router.push('/dms/dmsBillsLubeInstanceActivity/index/' + row.lubeInstanceId)
 }
 
+// 启动工单工作流
+const handleStartWorkflow = async (row: DmsBillsLubeInstanceVO) => {
+  try {
+    const confirmResult = await proxy?.$modal.confirm(
+      `确认启动润滑工单"${row.billsLubeCode}"的工作流？`
+    );
+
+    if (confirmResult) {
+      buttonLoading.value = true;
+
+      // 启动工作流
+      const workflowData = {
+        businessId: row.lubeInstanceId,
+        flowCode: 'Lube01',
+        variables: {
+          lubeInstanceId: row.lubeInstanceId,
+          billsLubeCode: row.billsLubeCode,
+          lubeLevel: row.lubeLevel
+        }
+      };
+
+      const workflowRes = await startWorkFlow(workflowData);
+
+      // 更新工单的工作流定义ID
+      await updateDmsBillsLubeInstance({
+        ...row,
+        wfDefinitionId: workflowRes.data.taskId,
+        status: 'waiting'
+      });
+
+      // 准备第一个节点的任务变量
+      taskVariables.value = {
+        entity: {
+          lubeInstanceId: row.lubeInstanceId,
+          lubeLevel: row.lubeLevel,
+          lubeGroup: row.lubeGroup,
+          lubeSupervisor: row.lubeSupervisor,
+          processStepOrder: 1
+        }
+      };
+
+      proxy?.$modal.msgSuccess('工单工作流启动成功');
+
+      // 立即打开审批组件处理第一个节点（工单创建）
+      if (submitVerifyRef.value && workflowRes.data.taskId) {
+        submitVerifyRef.value.openDialog(workflowRes.data.taskId);
+      }
+    }
+  } catch (error) {
+    console.error('启动工作流失败:', error);
+    proxy?.$modal.msgError('启动工作流失败');
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+
+// 查看工单进度
+const handleWorkflowProgress = (row: DmsBillsLubeInstanceVO) => {
+  // 跳转到审批记录查看页面
+  router.push({
+    path: '/workflow/process/record',
+    query: { businessId: row.lubeInstanceId }
+  });
+};
+
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+const taskVariables = ref<any>({});
+
+// 提交回调 - 处理工作流节点完成后的逻辑
+const submitCallback = async () => {
+  try {
+    // 工作流节点处理完成，刷新列表
+    await getList();
+    proxy?.$modal.msgSuccess('工单创建节点处理完成，工作流已流转到下一步');
+  } catch (error) {
+    console.error('刷新列表失败:', error);
+    proxy?.$modal.msgError('刷新列表失败');
+  }
+};
+
 onMounted(() => {
   getList();
 });
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
index 760111e..97989af 100644
--- a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
@@ -1,796 +1,369 @@
 <template>
   <div class="p-2">
-    <!-- 工单信息区域 -->
-    <h4 class="form-header h4">工单信息</h4>
+    <!-- 操作按钮区域 -->
+    <el-card shadow="never">
+      <div style="display: flex; justify-content: space-between">
+        <div>
+          <el-button 
+            v-if="approvalButtonShow" 
+            :loading="buttonLoading" 
+            type="primary" 
+            @click="approvalVerifyOpen">
+            {{ currentStepName }}
+          </el-button>
+          <el-button 
+            v-if="workOrder?.wfDefinitionId" 
+            type="primary" 
+            @click="handleApprovalRecord">
+            流程进度
+          </el-button>
+        </div>
+        <div>
+          <el-button @click="goBack()">返回</el-button>
+        </div>
+      </div>
+    </el-card>
+
+    <!-- 工单基本信息区域 -->
     <el-card shadow="never" class="mb-[10px]">
+      <h4 class="form-header">工单基本信息</h4>
       <el-form label-width="120px">
         <el-row>
-          <el-col :span="8" :offset="2">
+          <el-col :span="8">
             <el-form-item label="工单编号">
-              <el-input v-model="billsInfo.billsLubeCode" disabled />
+              <el-input v-model="workOrder.billsLubeCode" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="8" :offset="2">
+          <el-col :span="8">
             <el-form-item label="工单状态">
-              <el-input v-model="billsStatusCheck" disabled />
+              <el-input v-model="workOrderStatusText" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="8" :offset="2">
+          <el-col :span="8">
             <el-form-item label="申请人">
-              <el-input v-model="billsInfo.createBy" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" :offset="2">
-            <el-form-item label="申请时间">
-              <el-input v-model="billsInfo.createTime" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="16" :offset="2">
-            <el-form-item label="备注">
-              <el-input v-model="billsInfo.remark" disabled />
+              <el-input v-model="workOrder.createBy" disabled />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </el-card>
 
-    <!-- 流程步骤展示区域 -->
-    <el-card shadow="never" class="mb-[10px]">
-      <el-form ref="stepFormRef" :model="form" label-width="100px">
-        <!-- 第一步 -->
-        <h4 class="form-header h4" v-if="dmsBillsLubeInstanceActivityList.length > 0">已处理节点：步骤1（要求参数）</h4>
-        <el-row v-if="dmsBillsLubeInstanceActivityList.length > 0">
+    <!-- 当前步骤处理区域 -->
+    <el-card shadow="never">
+      <h4 class="form-header">{{ currentStepTitle }}</h4>
+      <el-form 
+        ref="processFormRef" 
+        v-loading="loading" 
+        :disabled="routeParams.type === 'view'" 
+        :model="form" 
+        :rules="rules" 
+        label-width="120px">
+        
+        <el-row>
           <el-col :span="8">
             <el-form-item label="润滑级别" prop="lubeLevel">
-              <el-select v-model="form.lubeLevel" placeholder="润滑级别" disabled>
-                <el-option v-for="dict in lube_level" :key="dict.value" :label="dict.label" :value="dict.value"> </el-option>
+              <el-select v-model="form.lubeLevel" placeholder="请选择润滑级别">
+                <el-option 
+                  v-for="dict in lube_level" 
+                  :key="dict.value" 
+                  :label="dict.label" 
+                  :value="dict.value">
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="润滑组别" prop="lubeGroup">
-              <el-input v-model="form.lubeGroup" placeholder="请输入润滑组别" disabled />
+              <el-input v-model="form.lubeGroup" placeholder="请输入润滑组别" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="润滑负责人" prop="lubeSupervisor">
-              <el-input v-model="form.lubeSupervisor" placeholder="请输入润滑负责人" disabled />
+              <el-input v-model="form.lubeSupervisor" placeholder="请输入润滑负责人" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <!-- 中间步骤 (已处理的后续节点) -->
-        <template v-for="activity in dmsBillsLubeInstanceActivityList" :key="activity.instanceActivityId">
-          <div v-if="activity.processStepOrder && activity.processStepOrder > 1">
-            <h4 class="form-header h4">{{ `已处理节点：步骤${activity.processStepOrder}（${activity.processStepOrder === 2 ? '实际参数' : '工单完成'}）` }}</h4>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="润滑级别">
-                  <el-select v-model="activity.lubeLevel" placeholder="润滑级别" disabled>
-                    <el-option v-for="dict in lube_level" :key="dict.value" :label="dict.label" :value="dict.value"> </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑组别">
-                  <el-input v-model="activity.lubeGroup" disabled placeholder="润滑组别"> </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑负责人">
-                  <el-input v-model="activity.lubeSupervisor" disabled placeholder="润滑负责人"> </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="处理意见">
-                  <el-input v-model="activity.processHandleResolution" disabled placeholder="处理意见"> </el-input>
+          
+          <!-- 处理意见：除第一步外都需要 -->
+          <el-col :span="24" v-if="needProcessResolution">
+            <el-form-item label="处理意见" prop="processHandleResolution">
+              <el-input 
+                v-model="form.processHandleResolution" 
+                type="textarea" 
+                :rows="3" 
+                placeholder="请输入处理意见" />
                 </el-form-item>
               </el-col>
             </el-row>
-          </div>
-        </template>
-
-        <!-- 当前步骤表单 (用于提交新节点) -->
-        <div v-if="isUpdate">
-          <h4 class="form-header h4">
-            {{
-              isCreatingWorkflow && dmsBillsLubeInstanceActivityList.length === 0
-                ? `创建工单：步骤1（要求参数）`
-                : `当前处理节点：步骤${nextStepOrder}${nextStepOrder === 2 ? '（实际参数）' : nextStepOrder === 3 ? '（工单完成）' : ''}`
-            }}
-          </h4>
-          <el-form ref="nextStepFormRef" :model="nextStepForm" :rules="nextStepFormRules" label-width="100px">
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="润滑级别" prop="lubeLevel">
-                  <el-select v-model="nextStepForm.lubeLevel" placeholder="润滑级别" :disabled="nextStepOrder === 3">
-                    <el-option v-for="dict in lube_level" :key="dict.value" :label="dict.label" :value="dict.value"> </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑组别" prop="lubeGroup">
-                  <el-input v-model="nextStepForm.lubeGroup" placeholder="润滑组别" :disabled="nextStepOrder === 3"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                  <el-input v-model="nextStepForm.lubeSupervisor" placeholder="润滑负责人" :disabled="nextStepOrder === 3"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24" v-if="!(isCreatingWorkflow && dmsBillsLubeInstanceActivityList.length === 0)">
-                <el-form-item label="处理意见" prop="processHandleResolution">
-                  <el-input v-model="nextStepForm.processHandleResolution" placeholder="处理意见"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24" class="text-center mt-4">
-                <el-button
-                  type="primary"
-                  @click="submitForm"
-                  :loading="buttonLoading"
-                  :disabled="buttonLoading || (!currentTaskId && !isCreatingWorkflow)"
-                >
-                  {{ buttonText }}
-                </el-button>
-                <el-button
-                  v-if="billsInfo && billsInfo.lubeInstanceId !== null && billsInfo.status !== 'draft'"
-                  type="primary"
-                  @click="handleApprovalRecord"
-                >
-                  流程进度
-                </el-button>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
       </el-form>
     </el-card>
 
-    <!-- 润滑计划详情区域 -->
-    <el-card shadow="never">
-      <h4 class="form-header h4 text-center">润滑计划详细信息</h4>
-      <el-table v-loading="loading" :data="planLubeDetail">
-        <el-table-column label="设备名称" align="center" prop="machineName" />
-        <el-table-column label="润滑部位" align="center" prop="lubeStationName" />
-        <el-table-column label="润滑标准" align="center" prop="lubeStandardCode" />
-        <el-table-column label="操作描述" align="center" prop="operationDescription" />
-      </el-table>
-    </el-card>
-
-    <!-- 提交组件 -->
-    <submitVerify ref="submitVerifyRef" :task-variables="taskVariables as any" @submit-callback="submitCallback" @cancel-callback="cancelCallback" />
-    <!-- 审批记录 -->
+    <!-- 审批组件 -->
+    <submitVerify 
+      ref="submitVerifyRef" 
+      :task-variables="taskVariables" 
+      @submit-callback="submitCallback" />
+    
+    <!-- 审批记录组件 -->
     <approvalRecord ref="approvalRecordRef" />
   </div>
 </template>
-
-<script setup name="DmsBillsLubeInstanceActivity" lang="ts">
-import { ref, reactive, toRefs, getCurrentInstance, onMounted, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import type { FormInstance, FormRules } from 'element-plus'; // 引入 FormInstance 和 FormRules 类型
-import {
-  listDmsBillsLubeInstanceActivity,
-  addDmsBillsLubeInstanceActivity,
-  updateDmsBillsLubeInstanceActivity
-} from '@/api/dms/dmsBillsLubeInstanceActivity';
-import {
-  DmsBillsLubeInstanceActivityVO,
-  DmsBillsLubeInstanceActivityForm
-} from '@/api/dms/dmsBillsLubeInstanceActivity/types';
+<script setup name="LubeWorkOrderProcess" lang="ts">
+// 导入相关模块
 import { getDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
-import { getDmsPlanLubeDetailList} from '@/api/dms/dmsPlanLubeDetail';
-import {DmsPlanLubeDetailVO} from "@/api/dms/dmsPlanLubeDetail/types";
-// 引入工作流相关组件和API
-import { startWorkFlow, pageByTaskWait } from '@/api/workflow/task';
-import { pageByCurrent } from '@/api/workflow/instance';
+import { addDmsBillsLubeInstanceActivity } from '@/api/dms/dmsBillsLubeInstanceActivity';
+import { pageByTaskWait } from '@/api/workflow/task';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
-import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
-import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
-import { TaskQuery, FlowTaskVO } from '@/api/workflow/task/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { lube_level, process_handle_status } = toRefs<any>(proxy?.useDict('lube_level', 'process_handle_status'));
+const { lube_level } = toRefs<any>(proxy?.useDict('lube_level'));
 const route = useRoute();
 
-// 表单实例
-const stepFormRef = ref<FormInstance>(); // 主表单 ref
-const nextStepFormRef = ref<FormInstance>(); // 下一步表单 ref
+// 基础数据
+const loading = ref(true);
+const buttonLoading = ref(false);
+const routeParams = ref<Record<string, any>>({});
+const workOrder = ref<any>({});
+const workOrderStatusText = ref('');
 
-// 工作流相关
+// 表单相关
+const processFormRef = ref<ElFormInstance>();
 const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
 const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+// 当前任务信息
+const currentTask = ref<any>(null);
+const currentStepOrder = ref(1);
 const taskVariables = ref<any>({});
-const submitFormData = ref<StartProcessBo>({
-  businessId: '',
-  flowCode: 'Lube01',
-  variables: {}
-});
 
-// 基础数据定义
-const loading = ref(true);
-const dmsBillsLubeInstanceActivityList = ref<DmsBillsLubeInstanceActivityVO[]>([]);
-const billsInfo = ref<any>({}); // 工单主体信息
-const planLubeDetail = ref<DmsPlanLubeDetailVO[]>([]);
-const billsStatusCheck = ref(''); // 工单状态显示文本
-const isUpdate = ref(true); // 控制是否显示提交表单区域
-const planLubeId = ref(''); // 润滑计划ID，从工单信息中获取
-const lubeInstanceId = route.params.lubeInstanceId as string; // 类型断言
-const buttonLoading = ref(false);
-
-// 新增状态
-const currentTaskId = ref<string | number | null>(null);
-const isCreatingWorkflow = ref(false); // true 表示在走创建流程的第一步（startWorkFlow）
-const buttonText = ref('创建工单并提交');
-
-// 暂存业务数据，等待工作流提交成功后再保存
-const pendingActivityData = ref<DmsBillsLubeInstanceActivityForm | null>(null);
-
-// 计算下一步序号
-const nextStepOrder = computed(() => {
-  return dmsBillsLubeInstanceActivityList.value.length + 1;
-});
-
-// 表单数据 (用于展示第一个已处理节点的信息)
-const form = reactive<Partial<DmsBillsLubeInstanceActivityForm>>({
+// 表单数据
+const initFormData = {
+  lubeInstanceId: undefined,
+  lubeLevel: undefined,
   lubeGroup: undefined,
   lubeSupervisor: undefined,
-  lubeLevel: undefined,
-  remark: undefined,
-});
-
-// 下一步表单 (用于提交新的节点)
-const nextStepForm = reactive<DmsBillsLubeInstanceActivityForm>({
-  instanceActivityId: undefined,
-  lubeInstanceId: lubeInstanceId,
-  lubeGroup: undefined,
-  lubeSupervisor: undefined,
-  lubeLevel: undefined,
   processHandleResolution: undefined,
-  processHandleStatus: undefined,
-  processStepOrder: undefined,
-  startTime: undefined,
-  endTime: undefined,
-  handleUserId: undefined,
-  handleBy: undefined,
-  handleTime: undefined,
-  transferUserId: undefined,
-  attr1: undefined,
-  remark: undefined,
+  processStepOrder: undefined
+};
+
+const form = reactive({ ...initFormData });
+
+// 表单验证规则
+const rules = reactive({
+  lubeLevel: [{ required: true, message: '润滑级别不能为空', trigger: 'change' }],
+  lubeGroup: [{ required: true, message: '润滑组别不能为空', trigger: 'blur' }],
+  lubeSupervisor: [{ required: true, message: '润滑负责人不能为空', trigger: 'blur' }],
+  processHandleResolution: [{ required: false, message: '处理意见不能为空', trigger: 'blur' }]
 });
 
-// 下一步表单校验规则
-const nextStepFormRules = reactive<FormRules>({
-  lubeLevel: [{ required: true, message: "润滑级别不能为空", trigger: "change" }],
-  lubeGroup: [{ required: true, message: "润滑组别不能为空", trigger: "blur" }],
-  lubeSupervisor: [{ required: true, message: "润滑负责人不能为空", trigger: "blur" }],
-  // 处理意见的校验会由 updateButtonAndFormState 动态设置
-  processHandleResolution: [{ required: false, message: "处理意见不能为空", trigger: "blur" }],
+// 计算属性
+const needProcessResolution = computed(() => currentStepOrder.value > 1);
+
+const currentStepName = computed(() => {
+  const stepNames = {
+    1: '工单创建',
+    2: '工单处理', 
+    3: '工单完成'
+  };
+  return stepNames[currentStepOrder.value] || '处理工单';
 });
 
-// 查询参数
-const queryParams = reactive({
-  pageNum: 1,
-  pageSize: 150,
-  lubeInstanceId: lubeInstanceId,
+const currentStepTitle = computed(() => {
+  const stepTitles = {
+    1: '步骤1：工单创建（要求参数）',
+    2: '步骤2：工单处理（实际参数）',
+    3: '步骤3：工单完成确认'
+  };
+  return stepTitles[currentStepOrder.value] || '工单处理';
 });
 
-// 初始化数据
+const approvalButtonShow = computed(() => {
+  return routeParams.value.type === 'approval' && currentTask.value;
+});
+
+// 初始化
 onMounted(async () => {
-  // 判断当前页面是查看还是编辑
-  if(route.name === 'childDmsBillsLubeInstanceActivity') {
-    isUpdate.value = true;
-  } else if(route.name === 'selectChildDmsBillsLubeInstanceActivity') {
-    isUpdate.value = false;
-  }
-
-  if (isUpdate.value) { // 仅在编辑模式下加载数据和设置状态
-    await loadData();
-  } else {
-    // 查看模式也需要加载工单信息和已处理节点
-    await dmsBillsLubeInstance();
-    await getList();
+  routeParams.value = route.query;
+  loading.value = true;
+  
+  try {
+    // 获取工单信息
+    await loadWorkOrderInfo();
+    
+    // 获取当前任务信息
+    if (routeParams.value.type === 'approval') {
+      await loadCurrentTask();
+    }
+    
+    // 初始化表单数据
+    initializeFormData();
+    
+  } catch (error) {
+    console.error('初始化失败:', error);
+    proxy?.$modal.msgError('加载数据失败');
+  } finally {
     loading.value = false;
   }
 });
 
-async function loadData() {
-  loading.value = true;
-  try {
-    // 先清除表单验证状态，避免在数据加载过程中触发不必要的表单验证错误
-    if (nextStepFormRef.value) {
-      nextStepFormRef.value.clearValidate();
-    }
-
-    await dmsBillsLubeInstance();
-    await getList(); // 获取已处理节点会影响 nextStepOrder 和 nextStepForm 的初始化
-
-    if (dmsBillsLubeInstanceActivityList.value.length === 0) {
-      currentTaskId.value = null;
-      isCreatingWorkflow.value = true;
-    } else {
-      isCreatingWorkflow.value = false;
-      currentTaskId.value = null; // 重置当前任务ID，准备从流程引擎获取
-      const completedSteps = dmsBillsLubeInstanceActivityList.value.length;
-
-      // 如果流程业务步骤少于3步（工单创建、工单处理、工单完成），则尝试获取当前活动任务
-      if (completedSteps < 3) {
-        proxy?.$modal.loading("正在获取最新流程任务...");
-        let expectedNodeName = '';
-        if (completedSteps === 1) expectedNodeName = '工单处理';
-        else if (completedSteps === 2) expectedNodeName = '工单完成';
-
-        console.log(`[loadData] Attempting to find current task. Completed steps: ${completedSteps}, Expected next node: '${expectedNodeName}' for businessId: ${lubeInstanceId}`);
-
-        try {
-          let tasks: FlowTaskVO[] = [];
-          // 尝试使用期望的节点名称进行精确查找
-          if (expectedNodeName) {
-            const taskRes = await pageByTaskWait({
-              pageNum: 1,
-              pageSize: 10, // 通常特定业务ID和节点名称的任务不会很多
-              flowCode: 'Lube01', // 从 submitFormData 获取或确认此编码正确
-              nodeName: expectedNodeName
-            });
-            if (taskRes.rows) {
-              tasks = taskRes.rows.filter(task => task.businessId === lubeInstanceId);
-              if (tasks.length > 0) {
-                 console.log(`[loadData] Found ${tasks.length} task(s) using specific nodeName '${expectedNodeName}' and businessId '${lubeInstanceId}'.`);
-              } else {
-                 console.log(`[loadData] No tasks found using specific nodeName '${expectedNodeName}' for businessId '${lubeInstanceId}'. Will try broader search.`);
-              }
-            }
-          }
-
-          let foundTask: FlowTaskVO | undefined = tasks.length > 0 ? tasks[0] : undefined; // 如果有多个，暂时取第一个
-          if (tasks.length > 1) {
-            console.warn(`[loadData] Multiple tasks (${tasks.length}) found with specific nodeName '${expectedNodeName}' and businessId '${lubeInstanceId}'. Using the first one found: ${foundTask?.id}.`);
-          }
-
-          // 如果未通过特定节点名称找到，则尝试仅通过flowCode查找，然后匹配businessId
-          if (!foundTask) {
-            console.log(`[loadData] Task not found with specific nodeName. Fetching all waiting tasks for flowCode 'Lube01' to filter by businessId '${lubeInstanceId}'.`);
-            const taskResAll = await pageByTaskWait({
-              pageNum: 1,
-              pageSize: 50, // 获取更多任务以便筛选
-              flowCode: 'Lube01'
-            });
-
-            if (taskResAll.rows && taskResAll.rows.length > 0) {
-              const businessTasks = taskResAll.rows.filter(task => task.businessId === lubeInstanceId);
-              if (businessTasks.length === 1) {
-                foundTask = businessTasks[0];
-                console.log(`[loadData] Found single task by businessId from all waiting tasks: ${foundTask.id}, Node: ${foundTask.nodeName}`);
-              } else if (businessTasks.length > 1) {
-                console.warn(`[loadData] Multiple tasks (${businessTasks.length}) found for businessId '${lubeInstanceId}' from all waiting tasks. Attempting to match with expectedNodeName '${expectedNodeName}'.`);
-                if (expectedNodeName) {
-                  foundTask = businessTasks.find(task => task.nodeName === expectedNodeName);
-                }
-                if (foundTask) {
-                  console.log(`[loadData] Matched task by expectedNodeName from multiple: ${foundTask.id}`);
-                } else {
-                  // Fallback: 如果仍有多个或无法通过expectedNodeName匹配，则取第一个（或记录更严重的警告）
-                  foundTask = businessTasks[0]; 
-                  console.warn(`[loadData] Could not specifically match by nodeName among multiple tasks for businessId '${lubeInstanceId}'. Using the first one found: ${foundTask?.id}, Node: ${foundTask?.nodeName}. Review workflow design if this is not correct.`);
-                }
-              } else {
-                 console.log(`[loadData] No tasks found for businessId '${lubeInstanceId}' even after broader search by flowCode 'Lube01'.`);
-              }
-            }
-          }
-
-          if (foundTask) {
-            currentTaskId.value = foundTask.id;
-            console.log(`[loadData] Successfully set currentTaskId via pageByTaskWait to: ${currentTaskId.value} (Node: ${foundTask.nodeName}, BusinessID: ${foundTask.businessId})`);
-          } else {
-            console.warn(`[loadData] No suitable waiting task found for businessId ${lubeInstanceId} with flowCode Lube01. Button may show '暂无操作'.`);
-          }
-        } catch (error) {
-          console.error("[loadData] Error fetching current task via pageByTaskWait:", error);
-          proxy?.$modal.msgError("获取最新流程任务失败");
-        } finally {
-          proxy?.$modal.closeLoading();
-        }
-      } else {
-        console.log("[loadData] All expected business steps completed (>=3) or initial creation. No active task to fetch from workflow via pageByTaskWait for middle steps.");
-      }
-    }
-
-    updateButtonAndFormState();
-
-    // 数据加载后再次清除表单验证状态，确保UI渲染正确
-    setTimeout(() => {
-      if (nextStepFormRef.value) {
-        nextStepFormRef.value.clearValidate();
-      }
-    }, 100);
-  } catch (error) {
-    console.error("Failed to load initial data", error);
-    proxy?.$modal.msgError("加载数据失败");
-    // 出错时，尝试恢复到一个相对安全的状态
-    currentTaskId.value = null;
-    isCreatingWorkflow.value = dmsBillsLubeInstanceActivityList.value.length === 0;
-    updateButtonAndFormState();
-  } finally {
-    loading.value = false;
-  }
-}
-
-function updateButtonAndFormState() {
-  const activitiesCount = dmsBillsLubeInstanceActivityList.value.length;
+// 加载工单信息
+const loadWorkOrderInfo = async () => {
+  // 从query参数获取businessId
+  const businessId = routeParams.value.id;
   
-  // 第一步：创建工单（工单创建）
-  if (activitiesCount === 0 && isCreatingWorkflow.value) {
-    buttonText.value = '创建工单并提交';
-    nextStepFormRules.processHandleResolution = [{ required: false, message: "处理意见不能为空", trigger: "blur" }];
-    // 清理 nextStepForm
-    Object.assign(nextStepForm, {
-        instanceActivityId: undefined, // 重置ID
-        lubeInstanceId: lubeInstanceId, // 确保lubeInstanceId正确
-        lubeGroup: undefined,
-        lubeSupervisor: undefined,
-        lubeLevel: undefined,
-        processHandleResolution: undefined,
-        processHandleStatus: undefined,
-        processStepOrder: undefined,
-        startTime: undefined,
-        endTime: undefined,
-        handleUserId: undefined,
-        handleBy: undefined,
-        handleTime: undefined,
-        transferUserId: undefined,
-        attr1: undefined,
-        remark: undefined,
-    });
-  } 
-  // 有待办任务ID，且非创建模式
-  else if (currentTaskId.value && !isCreatingWorkflow.value) { 
-    const currentStepBasedOnActivities = activitiesCount + 1; // 下一步是第几步
+  if (!businessId) {
+    proxy?.$modal.msgError('缺少工单ID参数');
+    return;
+  }
+  
+  const res = await getDmsBillsLubeInstance(businessId);
+  workOrder.value = res.data;
+  
+  // 设置状态显示文本
+  workOrderStatusText.value = getStatusText(workOrder.value.status);
+};
 
-    if (currentStepBasedOnActivities === 2) {
-      // 第二步：工单处理
-      buttonText.value = '工单处理';
-      nextStepFormRules.processHandleResolution = [{ required: true, message: "处理意见不能为空", trigger: "blur" }];
-    } else if (currentStepBasedOnActivities === 3) {
-      // 第三步：工单完成
-      buttonText.value = '工单完成';
-      nextStepFormRules.processHandleResolution = [{ required: true, message: "处理意见不能为空", trigger: "blur" }];
-    } else {
-      buttonText.value = '提交处理';
-      nextStepFormRules.processHandleResolution = [{ required: true, message: "处理意见不能为空", trigger: "blur" }];
+// 加载当前任务信息
+const loadCurrentTask = async () => {
+  // 从query参数获取businessId和taskId
+  const businessId = routeParams.value.id;
+  const taskId = routeParams.value.taskId;
+  
+  // 通过taskId或businessId获取当前任务
+  const taskRes = await pageByTaskWait({
+    pageNum: 1,
+    pageSize: 10,
+    flowCode: 'Lube01'
+  });
+  
+  const tasks = taskRes.rows.filter(task => 
+    task.businessId === businessId || task.id === taskId
+  );
+  
+  if (tasks.length > 0) {
+    currentTask.value = tasks[0];
+    
+    // 根据节点名称确定当前步骤
+    const nodeName = currentTask.value.nodeName;
+    if (nodeName === '工单创建') {
+      currentStepOrder.value = 1;
+    } else if (nodeName === '工单处理') {
+      currentStepOrder.value = 2;
+    } else if (nodeName === '工单完成') {
+      currentStepOrder.value = 3;
     }
     
-    if (activitiesCount > 0) {
-      if (currentStepBasedOnActivities === 3) {
-        // 第三步应复制第一步的数据
-        const firstActivity = dmsBillsLubeInstanceActivityList.value[0];
-        Object.assign(nextStepForm, {
-          instanceActivityId: undefined, // 新节点ID为空
-          lubeInstanceId: lubeInstanceId,
-          lubeGroup: firstActivity.lubeGroup, // 复制第一步的数据
-          lubeSupervisor: firstActivity.lubeSupervisor, // 复制第一步的数据
-          lubeLevel: firstActivity.lubeLevel, // 复制第一步的数据
-          processHandleResolution: '', // 清空处理意见
-          remark: '', // 清空备注
-          processHandleStatus: undefined,
-          processStepOrder: undefined,
-        });
-      } else {
-        // 其他步骤使用最后一个节点的数据
-        const lastActivity = dmsBillsLubeInstanceActivityList.value[activitiesCount - 1];
-        Object.assign(nextStepForm, {
-          instanceActivityId: undefined, // 新节点ID为空
-          lubeInstanceId: lubeInstanceId,
-          lubeGroup: lastActivity.lubeGroup,
-          lubeSupervisor: lastActivity.lubeSupervisor,
-          lubeLevel: lastActivity.lubeLevel,
-          processHandleResolution: '', // 清空处理意见
-          remark: '', // 清空备注
-          processHandleStatus: undefined,
-          processStepOrder: undefined,
-        });
-      }
-    } else { // 有 currentTaskId 但没有历史活动，这通常不应该发生，但为了健壮性处理
-        Object.assign(nextStepForm, {
-            instanceActivityId: undefined,
-            lubeInstanceId: lubeInstanceId,
-            processHandleResolution: '',
-            remark: '',
-        });
-    }
-  } else { // 没有待办任务（可能已结束、非处理人打开、或查看模式）或状态不明确
-    buttonText.value = '暂无操作';
-    if (isUpdate.value) { // 如果是编辑模式但无操作，则禁用提交相关的校验
-        nextStepFormRules.processHandleResolution = [{ required: false }];
+    // 动态设置处理意见校验规则
+    if (needProcessResolution.value) {
+      rules.processHandleResolution = [
+        { required: true, message: '处理意见不能为空', trigger: 'blur' }
+      ];
     }
   }
-}
-
-// 获取工单实例数据
-const dmsBillsLubeInstance = async () => {
-    const _lubeInstanceId = lubeInstanceId;
-    const res = await getDmsBillsLubeInstance(_lubeInstanceId);
-    billsInfo.value = res.data;
-
-      // 确保 planLubeId 是字符串类型
-      const lubeIdFromServer = res.data.planLubeId;
-      planLubeId.value = typeof lubeIdFromServer === 'number' ? String(lubeIdFromServer) : lubeIdFromServer;
-
-      // 设置工单状态显示文本
-      if (lube_level.value && billsInfo.value.lubeStatus !== undefined) {
-        const statusItem = lube_level.value.find((item: any) => String(item.value) === String(billsInfo.value.lubeStatus));
-        billsStatusCheck.value = statusItem ? statusItem.label : '未知状态';
-      } else {
-        billsStatusCheck.value = '未知状态';
-      }
-
-      // 获取润滑计划详情
-      if (planLubeId.value) {
-        getPlanLubeDetailData();
-      }
 };
 
-// 获取润滑计划详情
-const getPlanLubeDetailData = async () => {
-  if (!planLubeId.value) return;
-  loading.value = true;
-    const res = await getDmsPlanLubeDetailList({planLubeId: planLubeId.value});
-    planLubeDetail.value = res.data;
-};
-
-// 获取工单实例节点数据
-const getList = async () => {
-  loading.value = true;
-  try {
-    const res = await listDmsBillsLubeInstanceActivity(queryParams);
-    dmsBillsLubeInstanceActivityList.value = res.rows;
-
-    // 填充第一步数据 (用于表单展示)
-    if (res.rows && res.rows.length > 0) {
-      Object.assign(form, {
-        lubeGroup: res.rows[0].lubeGroup,
-        lubeSupervisor: res.rows[0].lubeSupervisor,
-        lubeLevel: res.rows[0].lubeLevel,
-        remark: res.rows[0].remark
-      });
-
-      // 根据步骤数初始化下一步表单数据
-      if (nextStepOrder.value === 2) {
-        // 第二步，复制第一步的润滑组别和润滑负责人
-        Object.assign(nextStepForm, {
-          lubeGroup: res.rows[0].lubeGroup,
-          lubeSupervisor: res.rows[0].lubeSupervisor,
-          lubeLevel: res.rows[0].lubeLevel,
-          processHandleResolution: null, // 第二步需要填写处理意见
-          remark: ''
-        });
-      } else if (nextStepOrder.value === 3) {
-        // 第三步，复制第一步的润滑组别和润滑负责人
-        const firstActivity = res.rows[0];
-        Object.assign(nextStepForm, {
-          lubeGroup: firstActivity.lubeGroup, // 复制第一步数据
-          lubeSupervisor: firstActivity.lubeSupervisor, // 复制第一步数据
-          lubeLevel: firstActivity.lubeLevel, // 复制第一步数据
-          processHandleResolution: null, // 清空处理意见
-          remark: ''
-        });
-      } else if (nextStepOrder.value > 3) {
-        // 第四步及以后，使用最后一个节点的数据（正常不会有这种情况）
-        const lastActivity = res.rows[res.rows.length - 1];
-        Object.assign(nextStepForm, {
-          lubeGroup: lastActivity.lubeGroup,
-          lubeSupervisor: lastActivity.lubeSupervisor,
-          lubeLevel: lastActivity.lubeLevel,
-          processHandleResolution: null, // 清空处理意见
-          remark: ''
-        });
-      }
-    } else {
-      // 如果没有已处理节点，则 nextStepForm 全新初始化
-      Object.assign(nextStepForm, {
-        lubeGroup: undefined,
-        lubeSupervisor: undefined,
-        lubeLevel: undefined,
-        processHandleResolution: null,
-        remark: ''
-      });
-    }
-
-    // 更新表单校验规则
-    nextStepFormRules.processHandleResolution = [{
-      required: nextStepOrder.value > 1,
-      message: "处理意见不能为空",
-      trigger: "blur"
-    }];
-
-  } catch (error) {
-    console.error('获取工单实例节点数据失败', error);
-    proxy?.$modal.msgError("获取工单实例节点数据失败");
-  } finally {
-    loading.value = false;
+// 初始化表单数据
+const initializeFormData = () => {
+  // 基础信息从工单获取
+  form.lubeInstanceId = workOrder.value.lubeInstanceId;
+  form.processStepOrder = currentStepOrder.value;
+  
+  if (currentStepOrder.value === 1) {
+    // 第一步：工单创建，表单为空等待用户填写
+    form.lubeLevel = workOrder.value.lubeLevel;
+    form.lubeGroup = workOrder.value.lubeGroup;
+    form.lubeSupervisor = workOrder.value.lubeSupervisor;
+  } else {
+    // 第二步、第三步：从工单基础信息预填充
+    form.lubeLevel = workOrder.value.lubeLevel;
+    form.lubeGroup = workOrder.value.lubeGroup;
+    form.lubeSupervisor = workOrder.value.lubeSupervisor;
   }
 };
 
-// 提交表单
-const submitForm = async () => {
-  if (!nextStepFormRef.value) return;
+// 审批处理
+const approvalVerifyOpen = async () => {
+  if (!processFormRef.value) return;
   
   try {
-    // 清空之前的错误状态
-    buttonLoading.value = false;
-    pendingActivityData.value = null;
-    
-    // 触发一次校验更新，确保最新的rules生效
-    nextStepFormRef.value.clearValidate();
-    
-    const valid = await nextStepFormRef.value.validate().catch(errors => {
-      console.error("表单验证错误:", errors);
-      return false;
-    });
-    
+    const valid = await processFormRef.value.validate();
     if (valid) {
-      buttonLoading.value = true;
+      // 准备任务变量
+      taskVariables.value = {
+        entity: {
+          lubeInstanceId: form.lubeInstanceId,
+          lubeLevel: form.lubeLevel,
+          lubeGroup: form.lubeGroup,
+          lubeSupervisor: form.lubeSupervisor,
+          processHandleResolution: form.processHandleResolution || '',
+          processStepOrder: form.processStepOrder
+        }
+      };
       
-      try {
-        nextStepForm.processStepOrder = dmsBillsLubeInstanceActivityList.value.length + 1;
-        nextStepForm.lubeInstanceId = lubeInstanceId;
-
-        // 确保处理意见有值，避免数据库NOT NULL约束异常
-        if (nextStepForm.processHandleResolution === undefined || nextStepForm.processHandleResolution === null) {
-          nextStepForm.processHandleResolution = '';
-        }
-
-        // 复制一份表单数据用于后续保存
-        pendingActivityData.value = JSON.parse(JSON.stringify(nextStepForm));
-
-        // 将当前表单的数据放入流程变量 - 仅传递简单必要字段而不是整个对象
-        taskVariables.value = { 
-          entity: {
-            lubeInstanceId: pendingActivityData.value.lubeInstanceId,
-            lubeGroup: pendingActivityData.value.lubeGroup,
-            lubeSupervisor: pendingActivityData.value.lubeSupervisor,
-            lubeLevel: pendingActivityData.value.lubeLevel,
-            processHandleResolution: pendingActivityData.value.processHandleResolution,
-            processStepOrder: pendingActivityData.value.processStepOrder
-          }
-        };
-
-        if (isCreatingWorkflow.value && dmsBillsLubeInstanceActivityList.value.length === 0) {
-          // 步骤一: 创建工单，启动工作流
-          submitFormData.value.businessId = lubeInstanceId;
-          submitFormData.value.variables = taskVariables.value;
-
-          console.log("[submitForm] 开始启动工作流, businessId:", lubeInstanceId);
-          const workflowRes = await startWorkFlow(submitFormData.value);
-          
-          if (!workflowRes || !workflowRes.data || !workflowRes.data.taskId) {
-            buttonLoading.value = false;
-            throw new Error("工作流启动失败，未能获取有效的任务ID");
-          }
-          
-          console.log("[submitForm] 工作流启动成功, taskId:", workflowRes.data.taskId);
-          
-          if (submitVerifyRef.value) {
-            buttonLoading.value = false; // openDialog 前重置loading
-            submitVerifyRef.value.openDialog(String(workflowRes.data.taskId));
-          } else {
-            buttonLoading.value = false;
-            throw new Error("提交流程组件不可用");
-          }
-        } else if (currentTaskId.value && !isCreatingWorkflow.value) {
-          // 第二步或第三步：处理工作流节点
-          console.log("[submitForm] 处理工作流节点, taskId:", currentTaskId.value);
-          
-          if (submitVerifyRef.value) {
-            buttonLoading.value = false;
-            submitVerifyRef.value.openDialog(String(currentTaskId.value));
-          } else {
-            buttonLoading.value = false;
-            throw new Error("提交流程组件不可用");
-          }
-        } else {
-          buttonLoading.value = false;
-          throw new Error("未知的提交流程状态或没有待办任务ID");
-        }
-      } catch (error: any) {
-        buttonLoading.value = false;
-        pendingActivityData.value = null; // 出错时清空待处理数据
-        console.error('[submitForm] 提交失败:', error);
-        proxy?.$modal.msgError(error.message || "提交失败，请检查数据或联系管理员");
-      }
-    } else {
-      buttonLoading.value = false;
-      proxy?.$modal.msgError("表单校验失败，请检查输入项");
+      // 直接使用传入的taskId进行审批
+      submitVerifyRef.value?.openDialog(routeParams.value.taskId);
     }
   } catch (error) {
-    buttonLoading.value = false;
-    console.error('[submitForm] 意外错误:', error);
-    proxy?.$modal.msgError("表单提交过程中发生错误");
+    proxy?.$modal.msgError('表单验证失败，请检查输入项');
+  }
+};
+
+// 提交回调
+const submitCallback = async () => {
+  try {
+    // 格式化当前时间为 YYYY-MM-DD HH:mm:ss
+    const getCurrentDateTime = () => {
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = (now.getMonth() + 1).toString().padStart(2, '0');
+      const day = now.getDate().toString().padStart(2, '0');
+      const hours = now.getHours().toString().padStart(2, '0');
+      const minutes = now.getMinutes().toString().padStart(2, '0');
+      const seconds = now.getSeconds().toString().padStart(2, '0');
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    };
+    
+    // 保存工单实例活动记录
+    await addDmsBillsLubeInstanceActivity({
+      lubeInstanceId: form.lubeInstanceId,
+      lubeLevel: form.lubeLevel,
+      lubeGroup: form.lubeGroup,
+      lubeSupervisor: form.lubeSupervisor,
+      processHandleResolution: form.processHandleResolution || '',
+      processStepOrder: form.processStepOrder,
+      handleTime: getCurrentDateTime()
+    });
+    
+    proxy?.$modal.msgSuccess(`${currentStepName.value}完成`);
+    
+    // 关闭页面返回
+    goBack();
+  } catch (error) {
+    console.error('保存业务数据失败:', error);
+    proxy?.$modal.msgError('保存业务数据失败');
   }
 };
 
 // 审批记录
 const handleApprovalRecord = () => {
-  approvalRecordRef.value.init(lubeInstanceId);
+  approvalRecordRef.value?.init(routeParams.value.id);
 };
 
-// 提交回调
-const submitCallback = async (/* success?: boolean, nextTaskId?: string | number | null */) => {
-  // success 和 nextTaskId 参数在此被注释掉或忽略，
-  // 因为 submitVerify.vue 组件的 submitCallback 事件没有传递这些参数，
-  // 导致它们在父组件中始终是 undefined。
-  console.log('[submitCallback] Invoked.');
-
-  try {
-    if (pendingActivityData.value) {
-      // 当 submitCallback 被调用，我们假定 submitVerify.vue 中的工作流步骤已被尝试。
-      // 现在，我们尝试保存业务数据。
-      const activityRes = await addDmsBillsLubeInstanceActivity(pendingActivityData.value);
-      console.log("[submitCallback] Business data saved successfully:", activityRes.data);
-
-      // 根据已暂存的待处理活动数据的步骤顺序来判断当前完成的是哪个步骤
-      const stepOrderOfSavedData = pendingActivityData.value.processStepOrder;
-
-      if (stepOrderOfSavedData === 1) {
-        proxy?.$modal.msgSuccess("工单创建数据已保存，流程已流转。");
-      } else if (stepOrderOfSavedData === 2) {
-        proxy?.$modal.msgSuccess("工单处理数据已保存，流程已流转。");
-      } else if (stepOrderOfSavedData === 3) {
-        proxy?.$modal.msgSuccess("工单完成数据已保存，工作流已结束。");
-        // 流程结束后，currentTaskId 应该在 loadData 后变为 null
-      } else {
-        // 这是一个通用回退，理论上不应发生，因为步骤是明确的1, 2, 或 3
-        proxy?.$modal.msgSuccess("业务数据已保存，操作已继续。");
-      }
-      // 注意：实际的下一个任务ID (currentTaskId) 将由后续的 loadData() 调用来确定和更新。
-    } else {
-      // 如果 pendingActivityData.value 为 null，
-      // 这可能意味着 submitForm 未能正确设置它，或者是一个取消操作。
-      // submitVerify.vue 的内部 "操作成功" 消息可能已经显示。
-      // 此处我们不应再显示一个全局的错误，除非我们能确定这是一个未预期的状态。
-      console.warn("[submitCallback] pendingActivityData was null upon callback. This might be normal if a cancel operation occurred or submitForm failed before calling workflow.");
-    }
-  } catch (error) {
-    console.error('[submitCallback] Error saving business data:', error);
-    // 这是一个严重问题：工作流可能已推进，但业务数据未能保存。
-    proxy?.$modal.msgError("关键错误：业务数据保存失败！工作流可能已推进，请紧急核查数据一致性。");
-  } finally {
-    // 重置加载和工作流创建状态
-    buttonLoading.value = false;
-    // 一旦提交尝试发生（无论成功与否），就不再是"正在创建工作流"的初始状态了。
-    // isCreatingWorkflow 的状态将在 loadData 完成后，根据实际的活动列表长度被重新评估。
-    // isCreatingWorkflow.value = false; // 暂时注释掉，让loadData来决定
-    
-    pendingActivityData.value = null; // 清空暂存的业务数据
-
-    // 重新加载数据以反映工作流的最新状态和更新UI
-    if (isUpdate.value) {
-      try {
-        console.log("[submitCallback] Reloading data to reflect current workflow state...");
-        await loadData(); // loadData 会更新 currentTaskId, dmsBillsLubeInstanceActivityList, 和按钮状态等。
-        console.log("[submitCallback] Data reloaded. Current Task ID is now:", currentTaskId.value);
-      } catch (loadError) {
-        console.error('[submitCallback] Failed to reload data post-submission attempt:', loadError);
-        proxy?.$modal.msgError("数据刷新失败，请手动刷新页面以查看最新状态。");
-      }
-    }
-  }
+// 返回
+const goBack = () => {
+  proxy?.$tab.closePage(proxy?.$route);
+  proxy?.$router.go(-1);
 };
 
-// 取消回调
-const cancelCallback = () => {
-  console.log('[cancelCallback] 用户取消了操作');
-  pendingActivityData.value = null; // 清空待保存数据
-  buttonLoading.value = false;
+// 工具函数
+const getStatusText = (status: string) => {
+  const statusMap = {
+    'draft': '草稿',
+    'waiting': '待处理',
+    'processing': '处理中',
+    'completed': '已完成',
+    'cancel': '已取消'
+  };
+  return statusMap[status] || '未知状态';
 };
-</script>
-
-<style scoped>
-.form-header {
-  font-size: 15px;
-  color: #409eff;
-  border-bottom: 1px solid #ddd;
-  margin: 8px 0 15px;
-  padding-bottom: 10px;
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/src/views/mes/baseProcessInfo/index.vue b/src/views/mes/baseProcessInfo/index.vue
index 98bc257..6903fd3 100644
--- a/src/views/mes/baseProcessInfo/index.vue
+++ b/src/views/mes/baseProcessInfo/index.vue
@@ -1,270 +1,539 @@
 <template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="工序名称" prop="processName">
-              <el-input v-model="queryParams.processName" placeholder="请输入工序名称" clearable @keyup.enter="handleQuery" />
+  <div class='p-2'>
+    <transition :enter-active-class='proxy?.animate.searchAnimate.enter'
+                :leave-active-class='proxy?.animate.searchAnimate.leave'>
+      <div v-show='showSearch' class='mb-[10px]'>
+        <el-card shadow='hover'>
+          <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
+            <el-form-item label='工序名称' prop='processName'>
+              <el-input v-model='queryParams.processName' placeholder='请输入工序名称' clearable
+                        @keyup.enter='handleQuery' />
             </el-form-item>
-            <el-form-item label="工序类别" prop="processType">
-              <el-select v-model="queryParams.processType" placeholder="请选择工序类别" clearable >
-                <el-option v-for="dict in process_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            <el-form-item label='工序类别' prop='processType'>
+              <el-select v-model='queryParams.processType' placeholder='请选择工序类别' clearable>
+                <el-option v-for='dict in process_type' :key='dict.value' :label='dict.label' :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <!--            <el-form-item label="车间名称" prop="workshopId">-->
+            <!--              <el-input v-model="queryParams.workshopId" placeholder="请输入车间名称" clearable @keyup.enter="handleQuery" />-->
+            <!--            </el-form-item>-->
+            <el-form-item label='委外标识' prop='outsourcingFlag'>
+              <el-select v-model='queryParams.outsourcingFlag' placeholder='请选择委外标识' clearable>
+                <el-option v-for='dict in mes_outsourcing_flag' :key='dict.value' :label='dict.label'
+                           :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item label='领料方式' prop='materialMethod'>
+              <el-select v-model='queryParams.materialMethod' placeholder='请选择领料方式' clearable>
+                <el-option v-for='dict in mes_material_method' :key='dict.value' :label='dict.label'
+                           :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item label='质检方式' prop='inspectionMethod'>
+              <el-select v-model='queryParams.inspectionMethod' placeholder='请选择质检方式' clearable>
+                <el-option v-for='dict in mes_inspection_method' :key='dict.value' :label='dict.label'
+                           :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item label='工序生产类型' prop='processProductionType' label-width='100'>
+              <el-select v-model='queryParams.processProductionType' placeholder='请选择工序生产类型' clearable>
+                <el-option v-for='dict in mes_process_production_type' :key='dict.value' :label='dict.label'
+                           :value='dict.value' />
               </el-select>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
+              <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
       </div>
     </transition>
 
-    <el-card shadow="never">
+    <el-card shadow='never'>
       <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:baseProcessInfo:add']">新增</el-button>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['mes:baseProcessInfo:add']">
+              新增
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseProcessInfo:edit']">修改</el-button>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['mes:baseProcessInfo:edit']">修改
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseProcessInfo:remove']">删除</el-button>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['mes:baseProcessInfo:remove']">删除
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseProcessInfo:export']">导出</el-button>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['mes:baseProcessInfo:export']">导出
+            </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                         @queryTable='getList'></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="baseProcessInfoList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键标识" align="center" prop="processId" v-if="columns[0].visible"/>
-        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>
-        <el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[2].visible"/>
-        <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[3].visible"/>
-        <el-table-column label="工序类别" align="center" prop="processType" v-if="columns[4].visible">
-          <template #default="scope">
-            <dict-tag :options="process_type" :value="scope.row.processType"/>
+      <el-table v-loading='loading' :data='baseProcessInfoList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='主键标识' align='center' prop='processId' v-if='columns[0].visible' />
+        <el-table-column label='租户编号' align='center' prop='tenantId' v-if='columns[1].visible' />
+        <el-table-column label='工序编号' align='center' prop='processCode' v-if='columns[2].visible' />
+        <el-table-column label='工序名称' align='center' prop='processName' v-if='columns[3].visible' />
+        <el-table-column label='工序类别' align='center' prop='processType' v-if='columns[4].visible'>
+          <template #default='scope'>
+            <dict-tag :options='process_type' :value='scope.row.processType' />
           </template>
         </el-table-column>
-        <el-table-column label="工序顺序" align="center" prop="processQueue" v-if="columns[5].visible"/>
-        <el-table-column label="单位生产时间" align="center" prop="productionTime" v-if="columns[6].visible">
-          <template v-slot="scope">
+        <el-table-column label='工序顺序' align='center' prop='processQueue' v-if='columns[5].visible' />
+        <el-table-column label='单位生产时间' align='center' prop='productionTime' v-if='columns[6].visible' width='110'>
+          <template v-slot='scope'>
             <span>{{ formatDayHourMinutes(scope.row.productionTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[7].visible">
-          <template #default="scope">
-            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+        <el-table-column label='车间名称' align='center' prop='workshopName' v-if='columns[7].visible' width='120'/>
+        <el-table-column label='委外标识' align='center' prop='outsourcingFlag' v-if='columns[8].visible'>
+          <template #default='scope'>
+            <dict-tag :options='mes_outsourcing_flag' :value='scope.row.outsourcingFlag' />
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>
-        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[9].visible"/>
-        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[10].visible"/>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible">
-          <template #default="scope">
+        <el-table-column label='工序生产类型' align='center' prop='processProductionType' v-if='columns[9].visible' width='110'>
+          <template #default='scope'>
+            <dict-tag :options='mes_process_production_type' :value='scope.row.processProductionType' />
+          </template>
+        </el-table-column>
+        <el-table-column label='默认产出率' align='center' prop='defaultYieldRate' v-if='columns[10].visible' width='100'/>
+        <el-table-column label='损耗率' align='center' prop='lossRate' v-if='columns[11].visible' />
+        <el-table-column label='返修率' align='center' prop='reworkRate' v-if='columns[12].visible' />
+        <el-table-column label='领料方式' align='center' prop='materialMethod' v-if='columns[13].visible'>
+          <template #default='scope'>
+            <dict-tag :options='mes_material_method' :value='scope.row.materialMethod' />
+          </template>
+        </el-table-column>
+        <el-table-column label='委外提前期' align='center' prop='leadTime' v-if='columns[14].visible' width='100'/>
+        <el-table-column label='准备时间' align='center' prop='setupTime' v-if='columns[15].visible' />
+        <el-table-column label='加工时间' align='center' prop='processingTime' v-if='columns[16].visible' />
+        <el-table-column label='拆卸时间' align='center' prop='disassemblyTime' v-if='columns[17].visible' />
+        <el-table-column label='理论生产节拍' align='center' prop='theoreticalCycleTime' v-if='columns[18].visible' width='110'/>
+        <el-table-column label='质检方式' align='center' prop='inspectionMethod' v-if='columns[19].visible'>
+          <template #default='scope'>
+            <dict-tag :options='mes_inspection_method' :value='scope.row.inspectionMethod' />
+          </template>
+        </el-table-column>
+        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[20].visible'>
+          <template #default='scope'>
+            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
+          </template>
+        </el-table-column>
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[21].visible' />
+        <el-table-column label='创建部门' align='center' prop='createDept' v-if='columns[22].visible' />
+        <el-table-column label='创建人' align='center' prop='createBy' v-if='columns[23].visible' />
+        <el-table-column label='创建时间' align='center' prop='createTime' width='180' v-if='columns[24].visible'>
+          <template #default='scope'>
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[12].visible"/>
-        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[13].visible">
-          <template #default="scope">
+        <el-table-column label='更新人' align='center' prop='updateBy' v-if='columns[25].visible' />
+        <el-table-column label='更新时间' align='center' prop='updateTime' width='180' v-if='columns[26].visible'>
+          <template #default='scope'>
             <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="12">
-            <el-button
-              size="small"
-              type="text"
-              icon="circle-plus"
-              @click="handleProdLineUpdate(scope.row)"
-            >关联产线
-            </el-button>
+        <el-table-column label='操作' align='center' class-name='small-padding fixed-width' fixed='right' width='150'>
+          <template #default='scope'>
+            <el-row :gutter='10' class='mb8'>
+              <el-col :span='12'>
+                <el-button
+                  size='small'
+                  type='text'
+                  icon='circle-plus'
+                  @click='handleProdLineUpdate(scope.row)'
+                >关联产线
+                </el-button>
               </el-col>
-              <el-col :span="12">
-            <el-button
-              size="small"
-              type="text"
-              icon="check"
-              v-if="scope.row.processType !== '3'"
-              @click="handleUserUpdate(scope.row)"
-            >关联人员
-            </el-button>
+              <el-col :span='12'>
+                <el-button
+                  size='small'
+                  type='text'
+                  icon='check'
+                  v-if="scope.row.processType !== '3'"
+                  @click='handleUserUpdate(scope.row)'
+                >关联人员
+                </el-button>
               </el-col>
             </el-row>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
+                  v-model:limit='queryParams.pageSize' @pagination='getList' />
     </el-card>
     <!-- 添加或修改工序信息对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="baseProcessInfoFormRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="工序编号" prop="processCode">
-          <el-input v-model="form.processCode" placeholder="请输入工序编号" />
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='900px' append-to-body>
+      <el-form ref='baseProcessInfoFormRef' :model='form' :rules='rules' label-width='130px' class="two-column-form">
+        <div class="form-column">
+          <el-form-item label='工序编号' prop='processCode'>
+            <el-input v-model='form.processCode' placeholder='请输入工序编号' />
+          </el-form-item>
+          <el-form-item label='工序名称' prop='processName'>
+            <el-input v-model='form.processName' placeholder='请输入工序名称' />
+          </el-form-item>
+          <el-form-item label='工序类别' prop='processType'>
+            <el-select v-model='form.processType' placeholder='请选择工序类别'>
+              <el-option
+                v-for='dict in process_type'
+                :key='dict.value'
+                :label='dict.label'
+                :value='dict.value'
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label='工序顺序' prop='processQueue'>
+            <el-input v-model='form.processQueue' placeholder='请输入工序顺序' />
+          </el-form-item>
+          <el-form-item label='单位生产时间' prop='productionTime'>
+            <el-input-number v-model='form.productionTimeDays' placeholder='请输入天数' :min='0' :max='10000'
+                           :controls='false' :style="{ width: '50px' }" />
+            <span>&nbsp;天&nbsp;</span>
+            <el-input-number v-model='form.productionTimeHours' placeholder='请输入小时' :min='0' :max='23'
+                           :controls='false' :style="{ width: '50px' }" />
+            <span>&nbsp;小时&nbsp;</span>
+            <el-input-number v-model='form.productionTimeMinutes' placeholder='请输入分钟' :min='0' :max='59'
+                           :controls='false' :style="{ width: '50px' }" />
+            <span>&nbsp;分钟&nbsp;</span>
+          </el-form-item>
+          <el-form-item label='车间名称' prop='workshopId'>
+            <el-select v-model="form.workshopId" placeholder="请选择车间名称">
+              <el-option
+                v-for="item in workshopInfoList"
+                :key="item.workshopId"
+                :label="item.workshopName"
+                :value="item.workshopId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label='委外标识' prop='outsourcingFlag'>
+            <el-radio-group v-model='form.outsourcingFlag'>
+              <el-radio
+                v-for='dict in mes_outsourcing_flag'
+                :key='dict.value'
+                :value='dict.value'
+              >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label='工序生产类型' prop='processProductionType'>
+            <el-radio-group v-model='form.processProductionType'>
+              <el-radio
+                v-for='dict in mes_process_production_type'
+                :key='dict.value'
+                :value='dict.value'
+              >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label='领料方式' prop='materialMethod'>
+            <el-radio-group v-model='form.materialMethod'>
+              <el-radio
+                v-for='dict in mes_material_method'
+                :key='dict.value'
+                :value='dict.value'
+              >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </div>
+        <div class="form-column">
+          <el-form-item label='默认产出率（%）' prop='defaultYieldRate'>
+            <el-input-number v-model='form.defaultYieldRate' placeholder='请输入默认产出率' :style="{ width: '180px' }" />
+          </el-form-item>
+          <el-form-item label='损耗率（%）' prop='lossRate'>
+            <el-input-number v-model='form.lossRate' placeholder='请输入损耗率' :style="{ width: '180px' }" />
+          </el-form-item>
+          <el-form-item label='返修率（%）' prop='reworkRate'>
+            <el-input-number v-model='form.reworkRate' placeholder='请输入返修率' :style="{ width: '180px' }" />
+          </el-form-item>
+          <el-form-item label='委外提前期（秒）' prop='leadTime'>
+            <el-input-number v-model='form.leadTime' placeholder='请输入委外提前期' :style="{ width: '180px' }" />
+          </el-form-item>
+          <el-form-item label='准备时间（秒）' prop='setupTime'>
+            <el-input-number v-model='form.setupTime' placeholder='请输入准备时间' :style="{ width: '180px' }" />
+          </el-form-item>
+          <el-form-item label='加工时间（秒）' prop='processingTime'>
+            <el-input-number v-model='form.processingTime' placeholder='请输入加工时间' :style="{ width: '180px' }" />
+          </el-form-item>
+          <el-form-item label='拆卸时间（秒）' prop='disassemblyTime'>
+            <el-input-number v-model='form.disassemblyTime' placeholder='请输入拆卸时间' :style="{ width: '180px' }" />
+          </el-form-item>
+          <el-form-item label='理论生产节拍（秒/件）' prop='theoreticalCycleTime'>
+            <el-input-number v-model='form.theoreticalCycleTime' placeholder='请输入理论生产节拍' :style="{ width: '180px' }" />
+          </el-form-item>
+          <el-form-item label='质检方式' prop='inspectionMethod'>
+            <el-radio-group v-model='form.inspectionMethod'>
+              <el-radio
+                v-for='dict in mes_inspection_method'
+                :key='dict.value'
+                :value='dict.value'
+              >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label='激活标识' prop='activeFlag'>
+            <el-radio-group v-model='form.activeFlag'>
+              <el-radio
+                v-for='dict in active_flag'
+                :key='dict.value'
+                :value='dict.value'
+              >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label='备注' prop='remark'>
+            <el-input v-model='form.remark' placeholder='请输入备注' />
+          </el-form-item>
+        </div>
+      </el-form>
+
+      <!-- 工序资源表格 -->
+      <div class="mt-4">
+        <div class="mb-2">
+          <el-button type="primary" icon="Plus" @click="handleAddResource">新增工序资源</el-button>
+        </div>
+        <el-table :data="processResourceList" v-loading="resourceLoading">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="指派类型" align="center" prop="assignmentType">
+            <template #default="scope">
+              <dict-tag :options="mes_assignment_type" :value="scope.row.assignmentType"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="载具工装类型" align="center" prop="toolingTypeCode">
+            <template #default="scope">
+              <dict-tag :options="tooling_type_code" :value="scope.row.toolingTypeCode"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="必选标识" align="center" prop="requiredFlag">
+            <template #default="scope">
+              <dict-tag :options="mes_required_flag" :value="scope.row.requiredFlag"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="选择模式" align="center" prop="selectionMode">
+            <template #default="scope">
+              <dict-tag :options="mes_selection_mode" :value="scope.row.selectionMode"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="是否需要校验" align="center" prop="requiresValidation">
+            <template #default="scope">
+              <dict-tag :options="mes_requires_validation" :value="scope.row.requiresValidation"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="是否需要准备任务" align="center" prop="requiresPreparation">
+            <template #default="scope">
+              <dict-tag :options="mes_requires_preparation" :value="scope.row.requiresPreparation"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-tooltip content="修改" placement="top">
+                <el-button link type="primary" icon="Edit" @click="handleUpdateResource(scope.row)"></el-button>
+              </el-tooltip>
+              <el-tooltip content="删除" placement="top">
+                <el-button link type="primary" icon="Delete" @click="handleDeleteResource(scope.row)"></el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 关联产线对话框 -->
+    <el-dialog :title='dialog.title' v-model='prodLineOpen' width='700px' append-to-body>
+      <el-form ref='baseProcessInfoFormRef' :model='form' label-width='100px'>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='12'>
+            <el-form-item label='工序编号' prop='processCode'>
+              <el-input v-model='form.processCode' placeholder='请输入工序编号' disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span='12'>
+            <el-form-item label='工序名称' prop='processName'>
+              <el-input v-model='form.processName' placeholder='请输入工序名称' disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position='center'>工序关联产线信息</el-divider>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAddProdLine'>添加产线</el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' icon='Delete' @click='handleDeleteProdLine'>删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data='prodBaseProcessProdlineBoList' :row-class-name='rowProdBaseProcessProdlineIndex'
+                  @selection-change='handleProdLineSelectionChange'>
+          <el-table-column type='selection' width='50' align='center' />
+          <el-table-column label='序号' align='center' prop='index' />
+          <el-table-column label='关联产线' align='center' prop='prodLineId'>
+            <template #default='scope'>
+              <el-select v-model='scope.row.prodLineId' placeholder='请选择关联产线' clearable>
+                <el-option
+                  v-for='item in prodLineList'
+                  :key='item.prodLineId'
+                  :label='item.prodLineName'
+                  :value='item.prodLineId'
+                  :disabled='prodBaseProcessProdlineBoList.some(i =>i.prodLineId === item.prodLineId)'
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button type='primary' @click='submitProdLineForm'>确 定</el-button>
+          <el-button @click='cancelProdLine'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 关联人员对话框 -->
+    <el-dialog :title='dialog.title' v-model='userOpen' width='700px' append-to-body>
+      <el-form ref='baseProcessInfoFormRef' :model='form' label-width='100px'>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='12'>
+            <el-form-item label='工序编号' prop='processCode'>
+              <el-input v-model='form.processCode' placeholder='请输入工序编号' disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span='12'>
+            <el-form-item label='工序名称' prop='processName'>
+              <el-input v-model='form.processName' placeholder='请输入工序名称' disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position='center'>工序关联人员信息</el-divider>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAddUser'>添加人员</el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' icon='Delete' @click='handleDeleteUser'>删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data='prodBaseProcessUserBoList' :row-class-name='rowProdBaseProcessUserIndex'
+                  @selection-change='handleUserSelectionChange'>
+          <el-table-column type='selection' width='50' align='center' />
+          <el-table-column label='序号' align='center' prop='index' />
+          <el-table-column label='name' align='center' prop='userName' v-if='false' />
+          <el-table-column label='关联人员' align='center' prop='userId'>
+            <template #default='scope'>
+              <el-select v-model='scope.row.userId' filterable placeholder='请选择关联人员' clearable
+                         @change='handleSelectUser(scope.row)'>
+                <el-option
+                  v-for='item in userList'
+                  :key='item.userId'
+                  :label='item.userName'
+                  :value='item.userId'
+                  :disabled='prodBaseProcessUserBoList.some(i =>i.userId === item.userId)'
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button type='primary' @click='submitUserForm'>确 定</el-button>
+          <el-button @click='cancelUser'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 工序资源对话框 -->
+    <el-dialog :title="resourceDialog.title" v-model="resourceDialog.visible" width="600px" append-to-body>
+      <el-form ref="resourceFormRef" :model="resourceForm" :rules="resourceRules" label-width="140px">
+        <el-form-item label="指派类型" prop="assignmentType">
+          <el-radio-group v-model="resourceForm.assignmentType">
+            <el-radio
+              v-for="dict in mes_assignment_type"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
-        <el-form-item label="工序名称" prop="processName">
-          <el-input v-model="form.processName" placeholder="请输入工序名称" />
-        </el-form-item>
-        <el-form-item label="工序类别" prop="processType">
-          <el-select v-model="form.processType" placeholder="请选择工序类别">
+        <el-form-item label="载具工装类型" prop="toolingTypeCode">
+          <el-select v-model="resourceForm.toolingTypeCode" placeholder="请选择载具工装类型">
             <el-option
-                v-for="dict in process_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+              v-for="dict in tooling_type_code"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工序顺序" prop="processQueue">
-          <el-input v-model="form.processQueue" placeholder="请输入工序顺序" />
-        </el-form-item>
-        <el-form-item label="单位生产时间" prop="productionTime">
-          <el-input-number v-model="form.productionTimeDays" placeholder="请输入天数" :min="0" :max="10000"
-                           :controls="false" :style="{ width: '50px' }"/>
-          <span>&nbsp;天&nbsp;</span>
-          <el-input-number v-model="form.productionTimeHours" placeholder="请输入小时" :min="0" :max="23"
-                           :controls="false" :style="{ width: '50px' }"/>
-          <span>&nbsp;小时&nbsp;</span>
-          <el-input-number v-model="form.productionTimeMinutes" placeholder="请输入分钟" :min="0" :max="59"
-                           :controls="false" :style="{ width: '50px' }"/>
-          <span>&nbsp;分钟&nbsp;</span>
-        </el-form-item>
-        <el-form-item label="激活标识" prop="activeFlag">
-          <el-radio-group v-model="form.activeFlag">
+        <el-form-item label="必选标识" prop="requiredFlag">
+          <el-radio-group v-model="resourceForm.requiredFlag">
             <el-radio
-              v-for="dict in active_flag"
+              v-for="dict in mes_required_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="选择模式" prop="selectionMode">
+          <el-radio-group v-model="resourceForm.selectionMode">
+            <el-radio
+              v-for="dict in mes_selection_mode"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否需要校验" prop="requiresValidation">
+          <el-radio-group v-model="resourceForm.requiresValidation">
+            <el-radio
+              v-for="dict in mes_requires_validation"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否需要准备任务" prop="requiresPreparation">
+          <el-radio-group v-model="resourceForm.requiresPreparation">
+            <el-radio
+              v-for="dict in mes_requires_preparation"
               :key="dict.value"
               :value="dict.value"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="resourceForm.remark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 关联产线对话框 -->
-    <el-dialog :title="dialog.title" v-model="prodLineOpen" width="700px" append-to-body>
-      <el-form ref="baseProcessInfoFormRef" :model="form" label-width="100px">
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="工序编号" prop="processCode">
-              <el-input v-model="form.processCode" placeholder="请输入工序编号" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="工序名称" prop="processName">
-              <el-input v-model="form.processName" placeholder="请输入工序名称" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-divider content-position="center">工序关联产线信息</el-divider>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAddProdLine">添加产线</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="Delete" @click="handleDeleteProdLine">删除</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="prodBaseProcessProdlineBoList" :row-class-name="rowProdBaseProcessProdlineIndex"
-                  @selection-change="handleProdLineSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" />
-          <el-table-column label="关联产线" align="center" prop="prodLineId">
-            <template #default="scope">
-              <el-select v-model="scope.row.prodLineId" placeholder="请选择关联产线" clearable>
-                <el-option
-                  v-for="item in prodLineList"
-                  :key="item.prodLineId"
-                  :label="item.prodLineName"
-                  :value="item.prodLineId"
-                  :disabled="prodBaseProcessProdlineBoList.some(i =>i.prodLineId === item.prodLineId)"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitProdLineForm">确 定</el-button>
-          <el-button @click="cancelProdLine">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 关联人员对话框 -->
-    <el-dialog :title="dialog.title" v-model="userOpen" width="700px" append-to-body>
-      <el-form ref="baseProcessInfoFormRef" :model="form" label-width="100px">
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="12">
-            <el-form-item label="工序编号" prop="processCode">
-              <el-input v-model="form.processCode" placeholder="请输入工序编号" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="工序名称" prop="processName">
-              <el-input v-model="form.processName" placeholder="请输入工序名称" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-divider content-position="center">工序关联人员信息</el-divider>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAddUser">添加人员</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="Delete" @click="handleDeleteUser">删除</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="prodBaseProcessUserBoList" :row-class-name="rowProdBaseProcessUserIndex"
-                  @selection-change="handleUserSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" />
-          <el-table-column label="name" align="center" prop="userName" v-if="false"/>
-          <el-table-column label="关联人员" align="center" prop="userId">
-            <template #default="scope">
-              <el-select v-model="scope.row.userId" filterable placeholder="请选择关联人员" clearable @change="handleSelectUser(scope.row)">
-                <el-option
-                  v-for="item in userList"
-                  :key="item.userId"
-                  :label="item.userName"
-                  :value="item.userId"
-                :disabled="prodBaseProcessUserBoList.some(i =>i.userId === item.userId)"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitUserForm">确 定</el-button>
-          <el-button @click="cancelUser">取 消</el-button>
+          <el-button :loading="resourceButtonLoading" type="primary" @click="submitResourceForm">确 定</el-button>
+          <el-button @click="cancelResource">取 消</el-button>
         </div>
       </template>
     </el-dialog>
   </div>
 </template>
 
-<script setup name="BaseProcessInfo" lang="ts">
+<script setup name='BaseProcessInfo' lang='ts'>
 import {
   listBaseProcessInfo,
   getBaseProcessInfo,
@@ -275,11 +544,46 @@ import {
 } from '@/api/mes/baseProcessInfo';
 import { getProdLineList } from '@/api/mes/baseProdLineInfo';
 import { getUserList } from '@/api/system/user';
-import { BaseProcessInfoVO, BaseProcessInfoQuery, BaseProcessInfoForm, ProdBaseProcessProdLine, ProdBaseProcessUser } from '@/api/mes/baseProcessInfo/types';
-import {error} from "echarts/types/src/util/log";
+import { getWorkshopList } from '@/api/mes/baseWorkshopInfo';
+import {
+  BaseProcessInfoVO,
+  BaseProcessInfoQuery,
+  BaseProcessInfoForm
+} from '@/api/mes/baseProcessInfo/types';
+import {
+  BaseProcessResourceVO,
+  BaseProcessResourceQuery,
+  BaseProcessResourceForm
+} from '@/api/mes/baseProcessResource/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { active_flag, process_type } = toRefs<any>(proxy?.useDict('active_flag', 'process_type'));
+const {
+  active_flag,
+  process_type,
+  mes_outsourcing_flag,
+  mes_process_production_type,
+  mes_material_method,
+  mes_inspection_method,
+  mes_assignment_type,
+  mes_requires_validation,
+  mes_selection_mode,
+  tooling_type_code,
+  mes_required_flag,
+  mes_requires_preparation
+} = toRefs<any>(proxy?.useDict(
+  'active_flag',
+  'process_type',
+  'mes_outsourcing_flag',
+  'mes_process_production_type',
+  'mes_material_method',
+  'mes_inspection_method',
+  'mes_assignment_type',
+  'mes_requires_validation',
+  'mes_selection_mode',
+  'tooling_type_code',
+  'mes_required_flag',
+  'mes_requires_preparation'
+));
 
 const baseProcessInfoList = ref<BaseProcessInfoVO[]>([]);
 const buttonLoading = ref(false);
@@ -300,7 +604,13 @@ const chekedUserList = ref<any[]>([]);
 const prodBaseProcessProdlineBoList = ref<any[]>([]);
 const prodBaseProcessUserBoList = ref<any[]>([]);
 
+let workshopInfoList = ref([]);
 
+/** 查询车间下拉树结构 */
+const getWorkshopListSelect = async () => {
+  let res = await getWorkshopList(null);
+  workshopInfoList.value = res.data;
+};
 
 
 const queryFormRef = ref<ElFormInstance>();
@@ -313,20 +623,33 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `主键标识`, visible: false },
-        { key: 1, label: `租户编号`, visible: false },
-        { key: 2, label: `工序编号`, visible: true },
-        { key: 3, label: `工序名称`, visible: true },
-        { key: 4, label: `工序类别`, visible: true },
-        { key: 5, label: `工序顺序`, visible: true },
-        { key: 6, label: `单位生产时间`, visible: true },
-        { key: 7, label: `激活标识`, visible: true },
-        { key: 8, label: `备注`, visible: false },
-        { key: 9, label: `创建部门`, visible: false },
-        { key: 10, label: `创建人`, visible: false },
-        { key: 11, label: `创建时间`, visible: true },
-        { key: 12, label: `更新人`, visible: false },
-        { key: 13, label: `更新时间`, visible: false },
+  { key: 0, label: `主键标识`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `工序编号`, visible: true },
+  { key: 3, label: `工序名称`, visible: true },
+  { key: 4, label: `工序类别`, visible: true },
+  { key: 5, label: `工序顺序`, visible: true },
+  { key: 6, label: `单位生产时间`, visible: true },
+  { key: 7, label: `车间名称`, visible: true },
+  { key: 8, label: `委外标识`, visible: true },
+  { key: 9, label: `工序生产类型`, visible: true },
+  { key: 10, label: `默认产出率`, visible: true },
+  { key: 11, label: `损耗率`, visible: true },
+  { key: 12, label: `返修率`, visible: true },
+  { key: 13, label: `领料方式`, visible: true },
+  { key: 14, label: `委外提前期`, visible: true },
+  { key: 15, label: `准备时间`, visible: true },
+  { key: 16, label: `加工时间`, visible: true },
+  { key: 17, label: `拆卸时间`, visible: true },
+  { key: 18, label: `理论生产节拍`, visible: true },
+  { key: 19, label: `质检方式`, visible: true },
+  { key: 20, label: `激活标识`, visible: true },
+  { key: 21, label: `备注`, visible: false },
+  { key: 22, label: `创建部门`, visible: false },
+  { key: 23, label: `创建人`, visible: false },
+  { key: 24, label: `创建时间`, visible: false },
+  { key: 25, label: `更新人`, visible: false },
+  { key: 26, label: `更新时间`, visible: false }
 ]);
 
 const initFormData: BaseProcessInfoForm = {
@@ -336,19 +659,29 @@ const initFormData: BaseProcessInfoForm = {
   processType: undefined,
   processQueue: undefined,
   productionTime: undefined,
+  workshopId: undefined,
+  outsourcingFlag: undefined,
+  processProductionType: undefined,
+  defaultYieldRate: undefined,
+  lossRate: undefined,
+  reworkRate: undefined,
+  materialMethod: undefined,
+  leadTime: undefined,
+  setupTime: undefined,
+  processingTime: undefined,
+  disassemblyTime: undefined,
+  theoreticalCycleTime: undefined,
+  inspectionMethod: undefined,
   activeFlag: '1',
   remark: undefined,
   productionTimeDays: 0,
   productionTimeHours: 0,
   productionTimeMinutes: 0,
-/*  prodBaseProcessProdlineVoList: [],
-  prodBaseProcessUserVoList: [],*/
   prodBaseProcessProdlineBoList: [],
   prodBaseProcessUserBoList: []
-
-}
+};
 const data = reactive<PageData<BaseProcessInfoForm, BaseProcessInfoQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -358,23 +691,35 @@ const data = reactive<PageData<BaseProcessInfoForm, BaseProcessInfoQuery>>({
     processType: undefined,
     processQueue: undefined,
     productionTime: undefined,
+    workshopId: undefined,
+    outsourcingFlag: undefined,
+    processProductionType: undefined,
+    defaultYieldRate: undefined,
+    lossRate: undefined,
+    reworkRate: undefined,
+    materialMethod: undefined,
+    leadTime: undefined,
+    setupTime: undefined,
+    processingTime: undefined,
+    disassemblyTime: undefined,
+    theoreticalCycleTime: undefined,
+    inspectionMethod: undefined,
     activeFlag: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
     processCode: [
-      { required: true, message: "工序编号不能为空", trigger: "blur" }
+      { required: true, message: '工序编号不能为空', trigger: 'blur' }
     ],
     processName: [
-      { required: true, message: "工序名称不能为空", trigger: "blur" }
+      { required: true, message: '工序名称不能为空', trigger: 'blur' }
     ],
     processType: [
-      { required: true, message: "工序类别不能为空", trigger: "change" }
+      { required: true, message: '工序类别不能为空', trigger: 'change' }
     ],
     activeFlag: [
-      { required: true, message: "激活标识", trigger: "change" }
-    ],
+      { required: true, message: '激活标识', trigger: 'change' }
+    ]
   }
 });
 
@@ -386,7 +731,7 @@ const convertToSeconds = () => {
   const hoursInSeconds = form.value.productionTimeHours * 60 * 60;
   const minutesInSeconds = form.value.productionTimeMinutes * 60;
   form.value.productionTime = daysInSeconds + hoursInSeconds + minutesInSeconds;
-}
+};
 
 /** 秒转换为天小时分钟 */
 const convertToTime = () => {
@@ -398,7 +743,7 @@ const convertToTime = () => {
   form.value.productionTimeDays = days;
   form.value.productionTimeHours = hours;
   form.value.productionTimeMinutes = minutes;
-}
+};
 
 /** 查询工序信息列表 */
 const getList = async () => {
@@ -407,66 +752,74 @@ const getList = async () => {
   baseProcessInfoList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 const cancelUser = () => {
   reset();
   userOpen.value = false;
   prodBaseProcessUserBoList.value = [];
-}
+};
 const cancelProdLine = () => {
   reset();
   prodLineOpen.value = false;
   prodBaseProcessProdlineBoList.value = [];
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   baseProcessInfoFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: BaseProcessInfoVO[]) => {
   ids.value = selection.map(item => item.processId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加工序信息";
-}
+  dialog.title = '添加工序信息';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: BaseProcessInfoVO) => {
   reset();
-  const _processId = row?.processId || ids.value[0]
+  const _processId = row?.processId || ids.value[0];
   const res = await getBaseProcessInfo(_processId);
-  Object.assign(form.value, res.data);
+  // 处理返回数据
+  const { prodBaseProcessResourceList, ...sourceData } = res.data as any;
+  Object.assign(form.value, sourceData);
+  // 设置资源列表
+  if (prodBaseProcessResourceList && Array.isArray(prodBaseProcessResourceList)) {
+    processResourceList.value = prodBaseProcessResourceList;
+  } else {
+    processResourceList.value = [];
+  }
   convertToTime();
   dialog.visible = true;
-  dialog.title = "修改工序信息";
-}
+  dialog.title = '修改工序信息';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -474,12 +827,18 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       convertToSeconds();
+      // 将资源列表添加到表单数据中
+      const submitData: BaseProcessInfoForm = {
+        ...form.value,
+        prodBaseProcessResourceList: processResourceList.value
+      };
+
       if (form.value.processId) {
-        await updateBaseProcessInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await updateBaseProcessInfo(submitData).finally(() => buttonLoading.value = false);
       } else {
-        await addBaseProcessInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await addBaseProcessInfo(submitData).finally(() => buttonLoading.value = false);
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       chekedProdLineList.value = [];
       form.value.prodBaseProcessProdlineBoList = [];
@@ -487,14 +846,14 @@ const submitForm = () => {
       await getList();
     }
   });
-}
+};
 const submitUserForm = () => {
   baseProcessInfoFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
       form.value.prodBaseProcessUserBoList = prodBaseProcessUserBoList.value;
-      await updateBaseProcessInfoUser(form.value).finally(() =>  buttonLoading.value = false);
-      proxy?.$modal.msgSuccess("操作成功");
+      await updateBaseProcessInfoUser(form.value).finally(() => buttonLoading.value = false);
+      proxy?.$modal.msgSuccess('操作成功');
       userOpen.value = false;
       chekedUserList.value = [];
       form.value.prodBaseProcessUserBoList = [];
@@ -502,51 +861,51 @@ const submitUserForm = () => {
       await getList();
     }
   });
-}
+};
 const submitProdLineForm = () => {
 
-    baseProcessInfoFormRef.value?.validate(async (valid: boolean) => {
-      if (valid) {
-        buttonLoading.value = true;
+  baseProcessInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
 
-        form.value.prodBaseProcessProdlineBoList = prodBaseProcessProdlineBoList.value;
+      form.value.prodBaseProcessProdlineBoList = prodBaseProcessProdlineBoList.value;
 
-        convertToSeconds();
-        if (form.value.processId) {
-          await updateBaseProcessInfo(form.value).finally(() =>  buttonLoading.value = false);
-        }
-        proxy?.$modal.msgSuccess("操作成功");
-        prodLineOpen.value = false;
-        chekedProdLineList.value = [];
-        form.value.prodBaseProcessProdlineBoList = [];
-        prodBaseProcessProdlineBoList.value = [];
-        await getList();
+      convertToSeconds();
+      if (form.value.processId) {
+        await updateBaseProcessInfo(form.value).finally(() => buttonLoading.value = false);
       }
-    });
+      proxy?.$modal.msgSuccess('操作成功');
+      prodLineOpen.value = false;
+      chekedProdLineList.value = [];
+      form.value.prodBaseProcessProdlineBoList = [];
+      prodBaseProcessProdlineBoList.value = [];
+      await getList();
+    }
+  });
 
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: BaseProcessInfoVO) => {
   const _processIds = row?.processId || ids.value;
   await proxy?.$modal.confirm('是否确认删除工序信息编号为"' + _processIds + '"的数据项？').finally(() => loading.value = false);
   await delBaseProcessInfo(_processIds);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download('mes/baseProcessInfo/export', {
     ...queryParams.value
-  }, `baseProcessInfo_${new Date().getTime()}.xlsx`)
-}
+  }, `baseProcessInfo_${new Date().getTime()}.xlsx`);
+};
 
 //打开关联产线对话框
 const handleProdLineUpdate = async (row?: BaseProcessInfoVO) => {
 
   reset();
-  const _processId = row?.processId || ids.value[0]
+  const _processId = row?.processId || ids.value[0];
 
   const res = await getBaseProcessInfo(_processId);
 
@@ -557,18 +916,18 @@ const handleProdLineUpdate = async (row?: BaseProcessInfoVO) => {
     index: index + 1 // 初始化 index
   }));
 
-  dialog.title = "关联产线";
-}
+  dialog.title = '关联产线';
+};
 const getLineList = async () => {
   const res = await getProdLineList(null);//下拉框可选择
   prodLineList.value = res.data;
-}
+};
 
 //打开关联人员对话框
 const handleUserUpdate = async (row?: BaseProcessInfoVO) => {
 
   reset();
-  const _processId = row?.processId || ids.value[0]
+  const _processId = row?.processId || ids.value[0];
 
   const res = await getBaseProcessInfo(_processId);
   form.value = res.data;
@@ -578,13 +937,12 @@ const handleUserUpdate = async (row?: BaseProcessInfoVO) => {
     index: index + 1 // 初始化 index
   }));
 
-  dialog.title = "关联用户";
-}
+  dialog.title = '关联用户';
+};
 const getUsersList = async () => {
   const res = await getUserList(null);//下拉框可选择
   userList.value = res.data;
-}
-
+};
 
 
 // 添加关联产线
@@ -592,15 +950,15 @@ const handleAddProdLine = () => {
   return prodBaseProcessProdlineBoList.value.push({
     prodLineId: null,
     processId: form.value.processId, // 确保 processId 被正确赋值
-    index: prodBaseProcessProdlineBoList.value.length + 1,
+    index: prodBaseProcessProdlineBoList.value.length + 1
   });
 
-}
+};
 
 // 删除关联产线
 const handleDeleteProdLine = () => {
   if (chekedProdLineList.value.length === 0) {
-    proxy?.$modal.msgError("请先选择要删除的工序关联产线数据");
+    proxy?.$modal.msgError('请先选择要删除的工序关联产线数据');
   } else {
     prodBaseProcessProdlineBoList.value = prodBaseProcessProdlineBoList.value
       .filter(item => !chekedProdLineList.value.includes(item.prodLineId))
@@ -609,11 +967,11 @@ const handleDeleteProdLine = () => {
         index: index + 1 // 更新 index
       }));
   }
-}
+};
 // 选中关联产线
 const handleProdLineSelectionChange = (selection) => {
   chekedProdLineList.value = selection.map(item => item.prodLineId);
-}
+};
 
 // 添加关联人员
 const handleAddUser = () => {
@@ -621,14 +979,14 @@ const handleAddUser = () => {
     userId: null,
     processId: form.value.processId, // 确保 processId 被正确赋值
     index: prodBaseProcessUserBoList.value.length + 1,
-    userName: null,
+    userName: null
   });
-}
+};
 
 // 删除关联人员
 const handleDeleteUser = () => {
   if (chekedUserList.value.length === 0) {
-    proxy?.$modal.msgError("请先选择要删除的工序关联人员数据");
+    proxy?.$modal.msgError('请先选择要删除的工序关联人员数据');
   } else {
     prodBaseProcessUserBoList.value = prodBaseProcessUserBoList.value
       .filter(item => !chekedUserList.value.includes(item.userId))
@@ -637,11 +995,11 @@ const handleDeleteUser = () => {
         index: index + 1 // 更新 index
       }));
   }
-}
+};
 
 const handleUserSelectionChange = (selection) => {
   chekedUserList.value = selection.map(item => item.userId);
-}
+};
 
 
 // 选中关联人员
@@ -668,8 +1026,7 @@ const handleSelectUser = (row) => {
   } else {
     row.userName = null;
   }
-}
-
+};
 
 
 const rowProdBaseProcessProdlineIndex = ({ row, rowIndex }: { row: any; rowIndex: number }): string => {
@@ -678,18 +1035,165 @@ const rowProdBaseProcessProdlineIndex = ({ row, rowIndex }: { row: any; rowIndex
     return 'custom-class';
   }
   return '';
-}
+};
 const rowProdBaseProcessUserIndex = ({ row, rowIndex }: { row: any; rowIndex: number }): string => {
   // 根据行数据和行索引返回一个类名字符串
   if (row.someCondition) {
     return 'custom-class';
   }
   return '';
-}
+};
+
+// 工序资源相关
+const processResourceList = ref<BaseProcessResourceVO[]>([]);
+const resourceLoading = ref(false);
+const resourceButtonLoading = ref(false);
+const resourceFormRef = ref<ElFormInstance>();
+
+const resourceDialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initResourceFormData: BaseProcessResourceForm = {
+  processResourceId: undefined,
+  assignmentType: undefined,
+  toolingTypeCode: undefined,
+  requiredFlag: undefined,
+  selectionMode: undefined,
+  requiresValidation: undefined,
+  requiresPreparation: undefined,
+  remark: undefined
+};
+
+const resourceData = reactive<PageData<BaseProcessResourceForm, BaseProcessResourceQuery>>({
+  form: {...initResourceFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    processResourceId: undefined,
+    assignmentType: undefined,
+    toolingTypeCode: undefined,
+    requiredFlag: undefined,
+    selectionMode: undefined,
+    requiresValidation: undefined,
+    requiresPreparation: undefined,
+    params: {}
+  },
+  rules: {
+    assignmentType: [
+      { required: true, message: "指派类型不能为空", trigger: "change" }
+    ],
+    requiredFlag: [
+      { required: true, message: "必选标识不能为空", trigger: "change" }
+    ],
+    selectionMode: [
+      { required: true, message: "选择模式不能为空", trigger: "change" }
+    ],
+    requiresValidation: [
+      { required: true, message: "是否需要校验不能为空", trigger: "change" }
+    ],
+    requiresPreparation: [
+      { required: true, message: "是否需要准备任务不能为空", trigger: "change" }
+    ]
+  }
+});
+
+const { queryParams: resourceQueryParams, form: resourceForm, rules: resourceRules } = toRefs(resourceData);
+
+/** 新增资源按钮操作 */
+const handleAddResource = () => {
+  resourceForm.value = {...initResourceFormData};
+  resourceDialog.visible = true;
+  resourceDialog.title = "添加工序资源";
+};
+
+/** 修改资源按钮操作 */
+const handleUpdateResource = async (row: BaseProcessResourceVO) => {
+  resourceForm.value = {...initResourceFormData};
+  Object.assign(resourceForm.value, row);
+  resourceDialog.visible = true;
+  resourceDialog.title = "修改工序资源";
+};
+
+/** 删除资源按钮操作 */
+const handleDeleteResource = async (row: BaseProcessResourceVO) => {
+  await proxy?.$modal.confirm('是否确认删除该工序资源？');
+  const index = processResourceList.value.findIndex(item => item.processResourceId === row.processResourceId);
+  if (index > -1) {
+    processResourceList.value.splice(index, 1);
+  }
+  proxy?.$modal.msgSuccess("删除成功");
+};
+
+/** 提交资源表单 */
+const submitResourceForm = () => {
+  resourceFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      const resourceData: BaseProcessResourceVO = {
+        processResourceId: resourceForm.value.processResourceId,
+        processId: form.value.processId,
+        assignmentType: resourceForm.value.assignmentType,
+        toolingTypeCode: resourceForm.value.toolingTypeCode,
+        requiredFlag: resourceForm.value.requiredFlag,
+        selectionMode: resourceForm.value.selectionMode,
+        requiresValidation: resourceForm.value.requiresValidation,
+        requiresPreparation: resourceForm.value.requiresPreparation,
+        remark: resourceForm.value.remark
+      };
+
+      if (resourceForm.value.processResourceId) {
+        // 修改资源
+        const index = processResourceList.value.findIndex(item => item.processResourceId === resourceForm.value.processResourceId);
+        if (index > -1) {
+          processResourceList.value[index] = resourceData;
+        }
+      } else {
+        // 新增资源
+        processResourceList.value.push(resourceData);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      resourceDialog.visible = false;
+    }
+  });
+};
+
+/** 取消资源表单 */
+const cancelResource = () => {
+  resourceForm.value = {...initResourceFormData};
+  resourceDialog.visible = false;
+};
 
 onMounted(() => {
   getUsersList();
   getLineList();
+  getWorkshopListSelect();// 初始化车间数据
   getList();
 });
 </script>
+
+<style scoped>
+.two-column-form {
+  display: flex;
+  gap: 20px;
+}
+
+.form-column {
+  flex: 1;
+  min-width: 0;
+}
+
+:deep(.el-form-item) {
+  margin-bottom: 18px;
+}
+
+:deep(.el-form-item__content) {
+  flex-wrap: nowrap;
+}
+
+:deep(.el-radio-group) {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+</style>
diff --git a/src/views/mes/baseRoute/index.vue b/src/views/mes/baseRoute/index.vue
index 40075fa..d54420d 100644
--- a/src/views/mes/baseRoute/index.vue
+++ b/src/views/mes/baseRoute/index.vue
@@ -8,6 +8,16 @@
             <el-form-item label='工艺路线名称' prop='routeName'>
               <el-input v-model='queryParams.routeName' placeholder='请输入工艺路线名称' clearable @keyup.enter='handleQuery' />
             </el-form-item>
+            <el-form-item label='状态' prop='activeFlag'>
+              <el-select v-model='queryParams.activeFlag' placeholder='请选择状态' clearable>
+                <el-option v-for='dict in mes_route_active_flag' :key='dict.value' :label='dict.label' :value='dict.value'/>
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label='首件检验' prop='needFirstInspect'>-->
+<!--              <el-select v-model='queryParams.needFirstInspect' placeholder='请选择首件检验' clearable>-->
+<!--                <el-option v-for='dict in mes_need_first_inspect' :key='dict.value' :label='dict.label' :value='dict.value'/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <el-form-item>
               <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
               <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
@@ -48,11 +58,40 @@
         <el-table-column type='selection' width='55' align='center' />
         <el-table-column label='工艺路线ID' align='center' prop='routeId' v-if='columns[0].visible' />
         <el-table-column label='租户编号' align='center' prop='tenantId' v-if='columns[1].visible' />
-        <el-table-column label='工艺路线名称' align='center' prop='routeName' v-if='columns[2].visible' />
-        <el-table-column label='工艺路线说明' align='center' prop='routeDesc' v-if='columns[3].visible' />
-        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[4].visible'>
+        <el-table-column label='工艺路线名称' align='center' prop='routeName' v-if='columns[2].visible' width='110'/>
+        <el-table-column label='工艺路线说明' align='center' prop='routeDesc' v-if='columns[3].visible' width='110'/>
+        <el-table-column label='工艺路线版本' align='center' prop='routeVersion' v-if='columns[11].visible' width='110'/>
+        <el-table-column label='生产类型' align='center' prop='productionType' v-if='columns[12].visible'>
           <template #default='scope'>
-            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
+            <dict-tag :options='mes_process_production_type' :value='scope.row.productionType'/>
+          </template>
+        </el-table-column>
+        <el-table-column label='路线类型' align='center' prop='routeType' v-if='columns[13].visible'>
+          <template #default='scope'>
+            <dict-tag :options='mes_route_type' :value='scope.row.routeType'/>
+          </template>
+        </el-table-column>
+        <el-table-column label='审核原因' align='center' prop='auditReason' v-if='columns[14].visible'/>
+        <el-table-column label='审核人' align='center' prop='approveBy' v-if='columns[15].visible'/>
+        <el-table-column label='审核时间' align='center' prop='approveTime' width='180' v-if='columns[16].visible'>
+          <template #default='scope'>
+            <span>{{ parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label='首件检验' align='center' prop='needFirstInspect' v-if='columns[17].visible'>
+          <template #default='scope'>
+            <dict-tag :options='mes_need_first_inspect' :value='scope.row.needFirstInspect'/>
+          </template>
+        </el-table-column>
+        <el-table-column label='打印流转卡' align='center' prop='printFlowCard' v-if='columns[18].visible' width='100'>
+          <template #default='scope'>
+            <dict-tag :options='mes_print_flow_card' :value='scope.row.printFlowCard'/>
+          </template>
+        </el-table-column>
+        <el-table-column label='批次量' align='center' prop='batchSize' v-if='columns[19].visible'/>
+        <el-table-column label='状态' align='center' prop='activeFlag' v-if='columns[4].visible'>
+          <template #default='scope'>
+            <dict-tag :options='mes_route_active_flag' :value='scope.row.activeFlag' />
           </template>
         </el-table-column>
         <el-table-column label='备注' align='center' prop='remark' v-if='columns[5].visible' />
@@ -89,6 +128,14 @@
             >工艺步骤
             </el-button>
 
+            <el-button
+              size="small"
+              type="text"
+              icon="el-icon-edit"
+              @click="routeMaterialUpdate(scope.row)"
+              v-hasPermi="['mes:baseRoute:edit']"
+            >关联物料
+            </el-button>
 
           </template>
         </el-table-column>
@@ -106,16 +153,74 @@
         <el-form-item label='工艺路线说明' prop='routeDesc'>
           <el-input v-model='form.routeDesc' placeholder='请输入工艺路线说明' />
         </el-form-item>
-        <el-form-item label='激活标识' prop='activeFlag'>
-          <el-radio-group v-model='form.activeFlag'>
+        <el-form-item label='工艺路线版本' prop='routeVersion'>
+          <el-input v-model='form.routeVersion' placeholder='请输入工艺路线版本' />
+        </el-form-item>
+        <el-form-item label='生产类型' prop='productionType'>
+          <el-select v-model='form.productionType' placeholder='请选择生产类型'>
+            <el-option
+              v-for='dict in mes_process_production_type'
+              :key='dict.value'
+              :label='dict.label'
+              :value='dict.value'
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label='路线类型' prop='routeType'>
+          <el-select v-model='form.routeType' placeholder='请选择路线类型'>
+            <el-option
+              v-for='dict in mes_route_type'
+              :key='dict.value'
+              :label='dict.label'
+              :value='dict.value'
+            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label='审核原因' prop='auditReason'>-->
+<!--          <el-input v-model='form.auditReason' placeholder='请输入审核原因' />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label='审核人' prop='approveBy'>-->
+<!--          <el-input v-model='form.approveBy' placeholder='请输入审核人' />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label='审核时间' prop='approveTime'>-->
+<!--          <el-date-picker clearable-->
+<!--            v-model='form.approveTime'-->
+<!--            type='datetime'-->
+<!--            value-format='YYYY-MM-DD HH:mm:ss'-->
+<!--            placeholder='请选择审核时间'>-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item label='首件检验' prop='needFirstInspect'>
+          <el-radio-group v-model='form.needFirstInspect'>
             <el-radio
-              v-for='dict in active_flag'
+              v-for='dict in mes_need_first_inspect'
               :key='dict.value'
               :value='dict.value'
-            >{{ dict.label }}
-            </el-radio>
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label='打印流转卡' prop='printFlowCard'>
+          <el-radio-group v-model='form.printFlowCard'>
+            <el-radio
+              v-for='dict in mes_print_flow_card'
+              :key='dict.value'
+              :value='dict.value'
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='批次量' prop='batchSize'>
+          <el-input-number v-model='form.batchSize' placeholder='请输入批次量' />
+        </el-form-item>
+<!--        <el-form-item label='状态' prop='activeFlag'>-->
+<!--          <el-radio-group v-model='form.activeFlag'>-->
+<!--            <el-radio-->
+<!--              v-for='dict in mes_route_active_flag'-->
+<!--              :key='dict.value'-->
+<!--              :value='dict.value'-->
+<!--            >{{ dict.label }}-->
+<!--            </el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
         <el-form-item label='备注' prop='remark'>
           <el-input v-model='form.remark' placeholder='请输入备注' />
         </el-form-item>
@@ -185,18 +290,83 @@
   </template>
 </el-dialog>
 
+<!--维护工艺路线关联物料对话框-->
+    <el-dialog :title='dialog.title' v-model='materialOpen' width='700px' append-to-body>
+      <el-form ref='baseRouteFormRef' :model='form' :rules='rules' label-width='110px'>
+        <el-form-item label='工艺路线名称' prop='routeName'>
+          <el-input v-model='form.routeName' placeholder='请输入工艺路线名称' disabled />
+        </el-form-item>
+        <el-divider content-position='center'>工艺路线关联物料信息</el-divider>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' icon='Plus' size='small' @click='handleAddRouteMaterial'>添加物料</el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' icon='Delete' size='small' @click='handleDeleteRouteMaterial'>删除</el-button>
+          </el-col>
+        </el-row>
+        <el-table
+          :data="prodBaseRouteMaterialList"
+          :row-class-name="rowRouteMaterialIndex"
+          @selection-change="handleRouteMaterialSelectionChange"
+          ref="mesBaseRouteMaterial"
+        >
+          <el-table-column type='selection' width='50' align='center' />
+          <el-table-column label='序号' align='center' prop='index' v-if='false' />
+          <el-table-column label='关联物料' prop='materialId' align='center'>
+            <template #default='scope'>
+              <el-input
+                v-model='scope.row.materialName'
+                placeholder='请选择物料'
+                readonly
+                @click='openMaterialDialog(scope.$index)'
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label='激活标识' prop='activeFlag' align='center' width='150'>
+            <template #default='scope'>
+              <el-radio-group v-model='scope.row.activeFlag'>
+                <el-radio
+                  v-for='dict in active_flag'
+                  :key='dict.value'
+                  :value='dict.value'
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <template #footer>
+        <div class='dialog-footer'>
+          <el-button type='primary' @click='submitForm' v-show='submitShow'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 物料选择弹窗 -->
+    <el-dialog title='选择物料信息' v-model='materialDialogOpen' width='1200px' append-to-body>
+      <MaterialSelect ref='materialSelectRef' v-if='materialDialogOpen'></MaterialSelect>
+      <template #footer>
+        <el-button type='primary' @click='handleMaterialSelection'>确 定</el-button>
+        <el-button @click='materialDialogOpen = false'>取 消</el-button>
+      </template>
+    </el-dialog>
+
   </div>
 </template>
 
 <script setup name='BaseRoute' lang='ts'>
 import { listBaseRoute, getBaseRoute, delBaseRoute, addBaseRoute, updateBaseRoute } from '@/api/mes/baseRoute';
-import { BaseRouteVO, BaseRouteQuery, BaseRouteForm, ProdBaseRouteProcess } from '@/api/mes/baseRoute/types';
+import { BaseRouteVO, BaseRouteQuery, BaseRouteForm, ProdBaseRouteProcess, ProdBaseRouteMaterial } from '@/api/mes/baseRoute/types';
 import {getProcessInfoList} from "@/api/mes/baseProcessInfo";
+import { getMaterialList } from '@/api/wms/linkage';
+import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
 /*import type { ProdBaseRouteProcess } from '@/api/mes/baseRoute/types';*/
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+const { mes_route_active_flag, mes_process_production_type, mes_need_first_inspect, mes_route_type, mes_print_flow_card, active_flag } = toRefs<any>(proxy?.useDict('mes_route_active_flag', 'mes_process_production_type', 'mes_need_first_inspect', 'mes_route_type', 'mes_print_flow_card', 'active_flag'));
 
 const baseRouteList = ref<BaseRouteVO[]>([]);
 const buttonLoading = ref(false);
@@ -220,6 +390,12 @@ const routeProcessBoList = ref<any[]>([]);
 const checkedProdBaseRouteProcess = ref<any[]>([]);
 const processList = ref<any[]>([]);
 
+// 关联物料相关
+const materialOpen = ref(false);
+const prodBaseRouteMaterialList = ref<ProdBaseRouteMaterial[]>([]);
+const checkedRouteMaterial = ref<ProdBaseRouteMaterial[]>([]);
+const materialList = ref<any[]>([]);
+
 //控制维护工艺路线步骤对话框的显示与隐藏，默认为false隐藏
 const ifOpen = ref(false); // 使用 ref 定义响应式变量
 
@@ -234,13 +410,22 @@ const columns = ref<FieldOption[]>([
   { key: 1, label: `租户编号`, visible: false },
   { key: 2, label: `工艺路线名称`, visible: true },
   { key: 3, label: `工艺路线说明`, visible: true },
-  { key: 4, label: `激活标识`, visible: true },
+  { key: 4, label: `状态`, visible: true },
   { key: 5, label: `备注`, visible: true },
   { key: 6, label: `创建部门`, visible: false },
   { key: 7, label: `创建人`, visible: false },
-  { key: 8, label: `创建时间`, visible: true },
+  { key: 8, label: `创建时间`, visible: false },
   { key: 9, label: `更新人`, visible: false },
-  { key: 10, label: `更新时间`, visible: false }
+  { key: 10, label: `更新时间`, visible: false },
+  { key: 11, label: `工艺路线版本`, visible: true },
+  { key: 12, label: `生产类型`, visible: true },
+  { key: 13, label: `路线类型`, visible: true },
+  { key: 14, label: `审核原因`, visible: false },
+  { key: 15, label: `审核人`, visible: false },
+  { key: 16, label: `审核时间`, visible: false },
+  { key: 17, label: `首件检验`, visible: true },
+  { key: 18, label: `打印流转卡`, visible: true },
+  { key: 19, label: `批次量`, visible: true }
 ]);
 
 const initFormData: BaseRouteForm = {
@@ -249,7 +434,19 @@ const initFormData: BaseRouteForm = {
   routeDesc: undefined,
   activeFlag: '1',
   remark: undefined,
-  routeProcessBoList: []//工艺步骤
+  routeVersion: undefined,
+  productionType: '1',
+  routeType: '1',
+  auditReason: undefined,
+  approveBy: undefined,
+  approveTime: undefined,
+  needFirstInspect: '0',
+  printFlowCard: '0',
+  batchSize: 0,
+  routeProcessBoList: [],//工艺步骤
+  // prodBaseRouteMaterialList 不在BaseRouteForm类型定义中，但后端需要，TS忽略类型检查
+  // @ts-ignore
+  prodBaseRouteMaterialList: []
 };
 const data = reactive<PageData<BaseRouteForm, BaseRouteQuery>>({
   form: { ...initFormData },
@@ -260,14 +457,20 @@ const data = reactive<PageData<BaseRouteForm, BaseRouteQuery>>({
     routeName: undefined,
     routeDesc: undefined,
     activeFlag: undefined,
+    routeVersion: undefined,
+    productionType: undefined,
+    routeType: undefined,
+    auditReason: undefined,
+    approveBy: undefined,
+    approveTime: undefined,
+    needFirstInspect: undefined,
+    printFlowCard: undefined,
+    batchSize: undefined,
     params: {}
   },
   rules: {
     routeName: [
       { required: true, message: '工艺路线名称不能为空', trigger: 'blur' }
-    ],
-    activeFlag: [
-      { required: true, message: '激活标识不能为空', trigger: 'change' }
     ]
   }
 });
@@ -287,7 +490,7 @@ const getList = async () => {
 const cancel = () => {
   reset();
   dialog.visible = false;
-
+  materialOpen.value = false;
   ifOpen.value = false;
 };
 
@@ -338,11 +541,16 @@ const handleUpdate = async (row?: BaseRouteVO) => {
 const submitForm = () => {
   baseRouteFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
+      // 校验物料是否已选择
+      const hasEmptyMaterial = prodBaseRouteMaterialList.value.some(item => !item.materialId || item.materialId === '');
+      if (hasEmptyMaterial) {
+        proxy?.$modal.msgError('请选择所有关联物料');
+        return;
+      }
+
       buttonLoading.value = true;
-
-      // 确保 form 包含最新的 routeProcessBoList 数据
       form.value.routeProcessBoList = routeProcessBoList.value;
-
+      form.value.prodBaseRouteMaterialList = prodBaseRouteMaterialList.value;
       if (form.value.routeId) {
         await updateBaseRoute(form.value).finally(() => buttonLoading.value = false);
       } else {
@@ -350,13 +558,13 @@ const submitForm = () => {
       }
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
-
-      // 关闭维护工艺路线步骤对话框,重置数据
       ifOpen.value = false;
+      materialOpen.value = false;
       routeProcessBoList.value = [];
+      prodBaseRouteMaterialList.value = [];
       form.value.routeProcessBoList = [];
+      form.value.prodBaseRouteMaterialList = [];
       form.value.routeProcessVoList = [];
-
       await getList();
     }
   });
@@ -477,6 +685,72 @@ const getProcessList = async () => {
   processList.value = processRes.data;
 };
 
+/** 维护工艺路线关联物料 */
+const routeMaterialUpdate = async (row: BaseRouteVO) => {
+  reset();
+  const _routeId = row?.routeId || ids.value[0];
+  const routeRes = await getBaseRoute(_routeId);
+  form.value = routeRes.data;
+  prodBaseRouteMaterialList.value = routeRes.data.prodBaseRouteMaterialList || [];
+  submitShow.value = true;
+  materialOpen.value = true;
+  dialog.title = '维护工艺路线关联物料';
+};
+
+/** 修改rowRouteMaterialIndex方法，返回类名字符串 */
+const rowRouteMaterialIndex = ({ row, rowIndex }: { row: any; rowIndex: number }): string => {
+  row.index = rowIndex + 1;
+  return '';
+};
+
+/** 工艺路线关联物料添加按钮操作 */
+const handleAddRouteMaterial = () => {
+  prodBaseRouteMaterialList.value.push({
+    materialId: '',
+    activeFlag: '1',
+    remark: '',
+  });
+};
+
+/** 工艺路线关联物料删除按钮操作 */
+const handleDeleteRouteMaterial = () => {
+  if (checkedRouteMaterial.value.length === 0) {
+    proxy?.$modal.msgError('请先选择要删除的工艺路线关联物料数据');
+  } else {
+    prodBaseRouteMaterialList.value = prodBaseRouteMaterialList.value.filter(
+      item => !checkedRouteMaterial.value.some(checked => checked.materialId === item.materialId)
+    );
+    checkedRouteMaterial.value = [];
+  }
+};
+
+/** 复选框选中数据 */
+const handleRouteMaterialSelectionChange = (selection: ProdBaseRouteMaterial[]) => {
+  checkedRouteMaterial.value = selection;
+};
+
+const getMaterialListOptions = async () => {
+  const res = await getMaterialList({});
+  materialList.value = res.data || [];
+};
+
+const materialSelectRef = ref();
+const materialDialogOpen = ref(false);
+const currentMaterialRowIndex = ref(-1);
+
+const openMaterialDialog = (rowIndex) => {
+  currentMaterialRowIndex.value = rowIndex;
+  materialDialogOpen.value = true;
+};
+const handleMaterialSelection = () => {
+  const selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value;
+  if (selectedRow && currentMaterialRowIndex.value !== -1) {
+    console.log(selectedRow);
+    prodBaseRouteMaterialList.value[currentMaterialRowIndex.value].materialId = selectedRow.materialId;
+    prodBaseRouteMaterialList.value[currentMaterialRowIndex.value].materialName = selectedRow.materialName;
+  }
+  materialDialogOpen.value = false;
+};
 
 onMounted(() => {
   getProcessList();
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index a597ed2..19b014f 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -353,7 +353,7 @@ const data = reactive<PageData<MenuForm, MenuQuery>>({
 const copyForm = reactive({
   menuName: '',
   sourceMenuId: undefined as string | number | undefined,
-  parentId: 0,
+  parentId: 0 as string | number | undefined,
   orderNum: 0
 });