From 252d670ed04e8dff2b4fce10835ce7c8af0de998 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Fri, 20 Jun 2025 22:25:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=95=85=E9=9A=9C=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=AE=E5=B7=A5=E5=8D=95=E5=90=AF=E5=8A=A8=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增更新故障报修工单工作流定义 ID 的接口和方法
- 添加启动工作流的按钮和相关逻辑
- 实现工作流启动后自动打开审批组件处理第一个节点
- 增加查看工单进度的功能
- 优化故障报修工单列表界面，移除不必要的搜索条件
---
 src/api/dms/dmsBillsFaultInstance/index.ts    |   17 +
 src/router/index.ts                           |   15 +
 src/views/dms/dmsBillsFaultInstance/index.vue |  101 +-
 .../dmsBillsInspectInstanceActivity/index.vue |   10 +-
 .../dmsBillsLubeInstanceActivity/index.vue    |    4 +-
 .../dms/dmsFaultInstanceActivity/index.vue    | 1059 +++++++++--------
 .../dms/dmsMaintInstanceActivity/index.vue    |   10 +-
 7 files changed, 697 insertions(+), 519 deletions(-)

diff --git a/src/api/dms/dmsBillsFaultInstance/index.ts b/src/api/dms/dmsBillsFaultInstance/index.ts
index 455b2b3..a93337a 100644
--- a/src/api/dms/dmsBillsFaultInstance/index.ts
+++ b/src/api/dms/dmsBillsFaultInstance/index.ts
@@ -75,3 +75,20 @@ export function getDmsBillsFaultInstanceList (query) {
         params: query
     });
 };
+
+/**
+ * 更新故障报修工单的工作流定义ID
+ * @param repairInstanceId 故障报修工单的ID
+ * @param wfDefinitionId 工作流定义的ID
+ * @return 如果更新成功返回true，否则返回false
+ */
+export function updateWfDefinitionIdById (repairInstanceId: string | number, wfDefinitionId: string | number) {
+  return request({
+    url: '/dms/dmsBillsFaultInstance/updateWfDefinitionIdById',
+    method: 'post',
+    params: {
+      repairInstanceId,
+      wfDefinitionId
+    }
+  });
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 8a41fd8..19e4075 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -384,6 +384,21 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     ]
   },
 
+  {
+    path: '/dms/dmsFaultInstanceActivity',
+    component: Layout,
+    hidden: true,
+    permissions: ['dms:dmsBillsFaultInstance:add'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/dms/dmsFaultInstanceActivity/index.vue'),
+        name: 'dmsFaultInstanceActivity',
+        meta: { title: '维修工单明细', activeMenu: '/dms/dmsBillsFaultInstance', icon: '' }
+      }
+    ]
+  },
+
   {
     path: '/dms/dmsPlanMaintDetail',
     component: Layout,
diff --git a/src/views/dms/dmsBillsFaultInstance/index.vue b/src/views/dms/dmsBillsFaultInstance/index.vue
index 1bb687a..089effc 100644
--- a/src/views/dms/dmsBillsFaultInstance/index.vue
+++ b/src/views/dms/dmsBillsFaultInstance/index.vue
@@ -28,9 +28,6 @@
                         </el-form-item>
                         <el-form-item label="设备" prop="machineId">
                           <el-input v-model="queryParams.machineId" placeholder="请输入设备" clearable @keyup.enter="handleQuery" />
-                        </el-form-item>
-                        <el-form-item label="申请人" prop="applyUser">
-                          <el-input v-model="queryParams.applyUser" placeholder="请输入申请人" clearable @keyup.enter="handleQuery" />
                         </el-form-item>-->
             <!--            <el-form-item label="申请时间" prop="applyTime">
                           <el-date-picker clearable
@@ -171,6 +168,12 @@
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[18].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:dmsBillsFaultInstance:edit']"></el-button>
             </el-tooltip>
@@ -184,6 +187,12 @@
       <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="dmsBillsFaultInstanceFormRef" :model="form" :rules="rules" label-width="80px">
@@ -315,9 +324,12 @@
 </template>
 
 <script setup name="DmsBillsFaultInstance" lang="ts">
-import { listDmsBillsFaultInstance, getDmsBillsFaultInstance, delDmsBillsFaultInstance, addDmsBillsFaultInstance, updateDmsBillsFaultInstance } from '@/api/dms/dmsBillsFaultInstance';
+import { listDmsBillsFaultInstance, getDmsBillsFaultInstance, delDmsBillsFaultInstance, addDmsBillsFaultInstance, updateDmsBillsFaultInstance, updateWfDefinitionIdById } from '@/api/dms/dmsBillsFaultInstance';
 import { DmsBillsFaultInstanceVO, DmsBillsFaultInstanceQuery, DmsBillsFaultInstanceForm } from '@/api/dms/dmsBillsFaultInstance/types';
 import {getDmsBaseMachineInfoList} from "@/api/dms/dmsBaseMachineInfo";
+import { useRouter } from 'vue-router';
+import { startWorkFlow } from '@/api/workflow/task'
+import SubmitVerify from '@/components/Process/submitVerify.vue'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { repair_confirm, active_flag, fault_source_type, bills_status, instance_type } = toRefs<any>(proxy?.useDict('repair_confirm', 'active_flag', 'fault_source_type', 'bills_status', 'instance_type'));
@@ -570,6 +582,87 @@ const getDeviceList = async () => {
   deviceList = res.data;
 }
 
+// 启动工单工作流
+const handleStartWorkflow = async (row: DmsBillsFaultInstanceVO) => {
+  try {
+    const confirmResult = await proxy?.$modal.confirm(
+      `确认启动故障报修工单"${row.billsFaultCode}"的工作流？`
+    );
+
+    if (confirmResult) {
+      buttonLoading.value = true;
+
+      // 启动工作流
+      const workflowData = {
+        businessId: row.repairInstanceId,
+        flowCode: 'Fault01',
+        variables: {
+          repairInstanceId: row.repairInstanceId,
+          billsFaultCode: row.billsFaultCode,
+          instanceType: row.instanceType,
+          faultSourceType: row.faultSourceType,
+          machineId: row.machineId
+        }
+      };
+
+      const workflowRes = await startWorkFlow(workflowData);
+
+      // 检查工作流启动结果
+      if (!workflowRes || !workflowRes.data || !workflowRes.data.taskId) {
+        throw new Error('工作流启动失败，未获取到有效的taskId');
+      }
+      await updateWfDefinitionIdById(row.repairInstanceId, workflowRes.data.taskId);
+
+      // 准备第一个节点的任务变量
+      taskVariables.value = {
+        entity: {
+          repairInstanceId: row.repairInstanceId,
+          instanceType: row.instanceType,
+          faultSourceType: row.faultSourceType,
+          machineId: row.machineId,
+          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('启动工作流失败: ' + (error.message || '未知错误'));
+  } finally {
+    buttonLoading.value = false;
+  }
+};
+
+// 查看工单进度
+const router = useRouter();
+const handleWorkflowProgress = (row: DmsBillsFaultInstanceVO) => {
+  // 跳转到审批记录查看页面
+  router.push({
+    path: '/workflow/process/record',
+    query: { businessId: row.repairInstanceId }
+  });
+};
+
+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(() => {
   getDeviceList();
diff --git a/src/views/dms/dmsBillsInspectInstanceActivity/index.vue b/src/views/dms/dmsBillsInspectInstanceActivity/index.vue
index 40783a5..aabb025 100644
--- a/src/views/dms/dmsBillsInspectInstanceActivity/index.vue
+++ b/src/views/dms/dmsBillsInspectInstanceActivity/index.vue
@@ -99,10 +99,10 @@
                 :rows="3" 
                 placeholder="请输入处理意见" />
             </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-card>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
 
     <!-- 审批组件 -->
     <submitVerify 
@@ -294,7 +294,7 @@ const submitForm = async (status: string) => {
     const valid = await processFormRef.value.validate();
     if (valid) {
       buttonLoading.value = true;
-      
+
       if (status === 'draft') {
         // 暂存逻辑
         await addDmsBillsInspectInstanceActivity({
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
index 691d04b..3718207 100644
--- a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
@@ -301,7 +301,7 @@ const initializeFormData = () => {
     form.lubeLevel = workOrder.value.lubeLevel;
     form.lubeGroup = workOrder.value.lubeGroup;
     form.lubeSupervisor = workOrder.value.lubeSupervisor;
-  } else {
+    } else {
     // 第二步、第三步：从工单基础信息预填充
     form.lubeLevel = workOrder.value.lubeLevel;
     form.lubeGroup = workOrder.value.lubeGroup;
@@ -317,7 +317,7 @@ const submitForm = async (status: string) => {
     const valid = await processFormRef.value.validate();
     if (valid) {
       buttonLoading.value = true;
-      
+
       if (status === 'draft') {
         // 暂存逻辑
         await addDmsBillsLubeInstanceActivity({
diff --git a/src/views/dms/dmsFaultInstanceActivity/index.vue b/src/views/dms/dmsFaultInstanceActivity/index.vue
index 4ca4f44..a993363 100644
--- a/src/views/dms/dmsFaultInstanceActivity/index.vue
+++ b/src/views/dms/dmsFaultInstanceActivity/index.vue
@@ -1,579 +1,632 @@
 <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="维修工单实例节点ID" prop="instanceActivityId">
-              <el-input v-model="queryParams.instanceActivityId" placeholder="请输入维修工单实例节点ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="故障报修工单" prop="repairInstanceId">
-              <el-input v-model="queryParams.repairInstanceId" placeholder="请输入故障报修工单" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="流程定义ID,关联wf_definition_config的id" prop="wfDefinitionId">
-              <el-input v-model="queryParams.wfDefinitionId" placeholder="请输入流程定义ID,关联wf_definition_config的id" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="工单流程节点ID" prop="wfNodeId">
-              <el-input v-model="queryParams.wfNodeId" placeholder="请输入工单流程节点ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="故障类型(1外部故障 2内部故障);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="faultType">
-              <el-select v-model="queryParams.faultType" placeholder="请选择故障类型(1外部故障 2内部故障);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" clearable >
-                <el-option v-for="dict in activity_fault_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="故障描述;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="faultDescription">
-              <el-input v-model="queryParams.faultDescription" placeholder="请输入故障描述;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="涉及操作，关联数据字典，可以选择多个;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="designOperations">
-              <el-input v-model="queryParams.designOperations" placeholder="请输入涉及操作，关联数据字典，可以选择多个;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="设备ID，关联prod_base_machine_info的machine_id" prop="machineId">
-              <el-input v-model="queryParams.machineId" placeholder="请输入设备ID，关联prod_base_machine_info的machine_id" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="维修类型" prop="repairType">
-              <el-select v-model="queryParams.repairType" placeholder="请选择维修类型" clearable >
-                <el-option v-for="dict in fault_repair_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="外协单位，关联dms_base_outsourcing_info的outsourcing_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="outsourcingId">
-              <el-input v-model="queryParams.outsourcingId" placeholder="请输入外协单位，关联dms_base_outsourcing_info的outsourcing_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="处理意见;第一步不显示，从第2个步骤开始显示此字段" prop="processHandleResolution">
-              <el-input v-model="queryParams.processHandleResolution" placeholder="请输入处理意见;第一步不显示，从第2个步骤开始显示此字段" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="状态(0已结束 1执行中 2待接取 3已转发）" prop="processHandleStatus">
-              <el-select v-model="queryParams.processHandleStatus" placeholder="请选择状态(0已结束 1执行中 2待接取 3已转发）" clearable >
-                <el-option v-for="dict in process_handle_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="工单流程步骤顺序" prop="processStepOrder">
-              <el-input v-model="queryParams.processStepOrder" placeholder="请输入工单流程步骤顺序" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="执行开始时间" prop="startTime">
-              <el-date-picker clearable
-                v-model="queryParams.startTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择执行开始时间"
-              />
-            </el-form-item>
-            <el-form-item label="执行结束时间" prop="endTime">
-              <el-date-picker clearable
-                v-model="queryParams.endTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择执行结束时间"
-              />
-            </el-form-item>
-            <el-form-item label="处理人ID" prop="handleUserId">
-              <el-input v-model="queryParams.handleUserId" placeholder="请输入处理人ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="处理人" prop="handleBy">
-              <el-input v-model="queryParams.handleBy" placeholder="请输入处理人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="处理时间" prop="handleTime">
-              <el-date-picker clearable
-                v-model="queryParams.handleTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择处理时间"
-              />
-            </el-form-item>
-            <el-form-item label="转单人用户id或转发协助用户id" prop="transferUserId">
-              <el-input v-model="queryParams.transferUserId" placeholder="请输入转单人用户id或转发协助用户id" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="检查后的故障判断" prop="checkedFault">
-              <el-input v-model="queryParams.checkedFault" placeholder="请输入检查后的故障判断" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="维修措施" prop="protectedMethod">
-              <el-input v-model="queryParams.protectedMethod" placeholder="请输入维修措施" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="维修人" prop="repairer">
-              <el-input v-model="queryParams.repairer" placeholder="请输入维修人" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="维修结果" prop="repairConfirm">
-              <el-select v-model="queryParams.repairConfirm" placeholder="请选择维修结果" clearable >
-                <el-option v-for="dict in fault_repair_confirm" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="确认时间" prop="confirmTime">
-              <el-date-picker clearable
-                v-model="queryParams.confirmTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择确认时间"
-              />
-            </el-form-item>
-            <el-form-item label="关联更换零部件内容" prop="componentsPartsId">
-              <el-input v-model="queryParams.componentsPartsId" placeholder="请输入关联更换零部件内容" clearable @keyup.enter="handleQuery" />
-            </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-form-item>
-          </el-form>
-        </el-card>
-      </div>
-    </transition>
-
+    <!-- 操作按钮区域 -->
     <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="['dms:dmsFaultInstanceActivity:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsFaultInstanceActivity:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsFaultInstanceActivity:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsFaultInstanceActivity:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="dmsFaultInstanceActivityList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="维修工单实例节点ID" align="center" prop="instanceActivityId" v-if="columns[0].visible"/>
-        <el-table-column label="故障报修工单ID，关联故障报修工单主键" align="center" prop="repairInstanceId" v-if="columns[2].visible"/>
-        <el-table-column label="流程定义ID,关联wf_definition_config的id" align="center" prop="wfDefinitionId" v-if="columns[3].visible"/>
-        <el-table-column label="工单流程节点ID" align="center" prop="wfNodeId" v-if="columns[4].visible"/>
-        <el-table-column label="故障类型(1外部故障 2内部故障);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" align="center" prop="faultType" v-if="columns[5].visible">
-          <template #default="scope">
-            <dict-tag :options="activity_fault_type" :value="scope.row.faultType"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="故障描述;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" align="center" prop="faultDescription" v-if="columns[6].visible"/>
-        <el-table-column label="涉及操作，关联数据字典，可以选择多个;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" align="center" prop="designOperations" v-if="columns[7].visible"/>
-        <el-table-column label="设备ID，关联prod_base_machine_info的machine_id" align="center" prop="machineId" v-if="columns[8].visible"/>
-        <el-table-column label="维修类型" align="center" prop="repairType" v-if="columns[9].visible">
-          <template #default="scope">
-            <dict-tag :options="fault_repair_type" :value="scope.row.repairType"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="外协单位，关联dms_base_outsourcing_info的outsourcing_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" align="center" prop="outsourcingId" v-if="columns[10].visible"/>
-        <el-table-column label="处理意见;第一步不显示，从第2个步骤开始显示此字段" align="center" prop="processHandleResolution" v-if="columns[11].visible"/>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[12].visible"/>
-        <el-table-column label="状态(0已结束 1执行中 2待接取 3已转发）" align="center" prop="processHandleStatus" v-if="columns[13].visible">
-          <template #default="scope">
-            <dict-tag :options="process_handle_status" :value="scope.row.processHandleStatus"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="工单流程步骤顺序" align="center" prop="processStepOrder" v-if="columns[14].visible"/>
-        <el-table-column label="执行开始时间" align="center" prop="startTime" width="180" v-if="columns[15].visible">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="执行结束时间" align="center" prop="endTime" width="180" v-if="columns[16].visible">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理人ID" align="center" prop="handleUserId" v-if="columns[17].visible"/>
-        <el-table-column label="处理人" align="center" prop="handleBy" v-if="columns[18].visible"/>
-        <el-table-column label="处理时间" align="center" prop="handleTime" width="180" v-if="columns[19].visible">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="转单人用户id或转发协助用户id" align="center" prop="transferUserId" v-if="columns[20].visible"/>
-        <el-table-column label="检查后的故障判断" align="center" prop="checkedFault" v-if="columns[21].visible"/>
-        <el-table-column label="维修内容" align="center" prop="repairContent" v-if="columns[22].visible"/>
-        <el-table-column label="维修措施" align="center" prop="protectedMethod" v-if="columns[23].visible"/>
-        <el-table-column label="维修人" align="center" prop="repairer" v-if="columns[24].visible"/>
-        <el-table-column label="维修结果" align="center" prop="repairConfirm" v-if="columns[25].visible">
-          <template #default="scope">
-            <dict-tag :options="fault_repair_confirm" :value="scope.row.repairConfirm"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="确认时间" align="center" prop="confirmTime" width="180" v-if="columns[26].visible">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.confirmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="关联更换零部件内容" align="center" prop="componentsPartsId" v-if="columns[27].visible"/>
-        <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="handleUpdate(scope.row)" v-hasPermi="['dms:dmsFaultInstanceActivity:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsFaultInstanceActivity:remove']"></el-button>
-            </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" />
+      <div style="display: flex; justify-content: space-between">
+        <div>
+          <el-button 
+            v-if="submitButtonShow" 
+            :loading="buttonLoading" 
+            type="info" 
+            @click="submitForm('draft')">
+            暂存
+          </el-button>
+          <el-button 
+            v-if="submitButtonShow" 
+            :loading="buttonLoading" 
+            type="primary" 
+            @click="submitForm('submit')">
+            提交
+          </el-button>
+          <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-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="dmsFaultInstanceActivityFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="维修工单实例节点ID" prop="instanceActivityId">
-          <el-input v-model="form.instanceActivityId" placeholder="请输入维修工单实例节点ID" />
-        </el-form-item>
-        <el-form-item label="故障报修工单ID，关联故障报修工单主键" prop="repairInstanceId">
-          <el-input v-model="form.repairInstanceId" placeholder="请输入故障报修工单ID，关联故障报修工单主键" />
-        </el-form-item>
-        <el-form-item label="流程定义ID,关联wf_definition_config的id" prop="wfDefinitionId">
-          <el-input v-model="form.wfDefinitionId" placeholder="请输入流程定义ID,关联wf_definition_config的id" />
-        </el-form-item>
-        <el-form-item label="工单流程节点ID" prop="wfNodeId">
-          <el-input v-model="form.wfNodeId" placeholder="请输入工单流程节点ID" />
-        </el-form-item>
-        <el-form-item label="故障类型(1外部故障 2内部故障);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="faultType">
-          <el-select v-model="form.faultType" placeholder="请选择故障类型(1外部故障 2内部故障);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的">
+
+    <!-- 工单基本信息区域 -->
+    <el-card shadow="never" class="mb-[10px]">
+      <h4 class="form-header">工单基本信息</h4>
+      <el-form label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="工单编号">
+              <el-input v-model="workOrder.billsFaultCode" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工单状态">
+              <el-input v-model="workOrderStatusText" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请人">
+              <el-input v-model="workOrder.applyUser" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="设备编号">
+              <el-input v-model="workOrder.machineCode" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备名称">
+              <el-input v-model="workOrder.machineName" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申请时间">
+              <el-input v-model="workOrder.applyTime" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <!-- 当前步骤处理区域 -->
+    <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>
+          <!-- 第一步：故障报修信息 -->
+          <template v-if="currentStepOrder === 1">
+            <el-col :span="8">
+        <el-form-item label="故障类型" prop="faultType">
+          <el-select v-model="form.faultType" placeholder="请选择故障类型">
             <el-option
                 v-for="dict in activity_fault_type"
                 :key="dict.value"
                 :label="dict.label"
-                :value="dict.value"
-            ></el-option>
+                    :value="dict.value">
+                  </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="故障描述;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="faultDescription">
-          <el-input v-model="form.faultDescription" placeholder="请输入故障描述;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" />
-        </el-form-item>
-        <el-form-item label="涉及操作，关联数据字典，可以选择多个;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="designOperations">
-          <el-input v-model="form.designOperations" placeholder="请输入涉及操作，关联数据字典，可以选择多个;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" />
-        </el-form-item>
-        <el-form-item label="设备ID，关联prod_base_machine_info的machine_id" prop="machineId">
-          <el-input v-model="form.machineId" placeholder="请输入设备ID，关联prod_base_machine_info的machine_id" />
-        </el-form-item>
+            </el-col>
+            <el-col :span="8">
         <el-form-item label="维修类型" prop="repairType">
           <el-select v-model="form.repairType" placeholder="请选择维修类型">
             <el-option
                 v-for="dict in fault_repair_type"
                 :key="dict.value"
                 :label="dict.label"
-                :value="dict.value"
-            ></el-option>
+                    :value="dict.value">
+                  </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="外协单位，关联dms_base_outsourcing_info的outsourcing_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="outsourcingId">
-          <el-input v-model="form.outsourcingId" placeholder="请输入外协单位，关联dms_base_outsourcing_info的outsourcing_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" />
+            </el-col>
+            <el-col :span="8">
+        <el-form-item label="外协单位" prop="outsourcingId">
+          <el-input v-model="form.outsourcingId" placeholder="请输入外协单位" />
         </el-form-item>
-        <el-form-item label="处理意见;第一步不显示，从第2个步骤开始显示此字段" prop="processHandleResolution">
-          <el-input v-model="form.processHandleResolution" placeholder="请输入处理意见;第一步不显示，从第2个步骤开始显示此字段" />
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="故障描述" prop="faultDescription">
+                <el-input 
+                  v-model="form.faultDescription" 
+                  type="textarea" 
+                  :rows="3" 
+                  placeholder="请输入故障描述" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="涉及操作" prop="designOperations">
+                <el-input 
+                  v-model="form.designOperations" 
+                  type="textarea" 
+                  :rows="2" 
+                  placeholder="请输入涉及操作" />
         </el-form-item>
-        <el-form-item label="状态(0已结束 1执行中 2待接取 3已转发）" prop="processHandleStatus">
-          <el-select v-model="form.processHandleStatus" placeholder="请选择状态(0已结束 1执行中 2待接取 3已转发）">
-            <el-option
-                v-for="dict in process_handle_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-            ></el-option>
-          </el-select>
+            </el-col>
+          </template>
+
+          <!-- 第二步：维修处理 -->
+          <template v-if="currentStepOrder === 2">
+            <el-col :span="8">
+              <el-form-item label="故障类型">
+                <el-input v-model="form.faultType" disabled />
         </el-form-item>
-        <el-form-item label="工单流程步骤顺序" prop="processStepOrder">
-          <el-input v-model="form.processStepOrder" placeholder="请输入工单流程步骤顺序" />
-        </el-form-item>
-        <el-form-item label="执行开始时间" prop="startTime">
-          <el-date-picker clearable
-            v-model="form.startTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择执行开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="执行结束时间" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择执行结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="处理人ID" prop="handleUserId">
-          <el-input v-model="form.handleUserId" placeholder="请输入处理人ID" />
-        </el-form-item>
-        <el-form-item label="处理人" prop="handleBy">
-          <el-input v-model="form.handleBy" placeholder="请输入处理人" />
-        </el-form-item>
-        <el-form-item label="处理时间" prop="handleTime">
-          <el-date-picker clearable
-            v-model="form.handleTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择处理时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="转单人用户id或转发协助用户id" prop="transferUserId">
-          <el-input v-model="form.transferUserId" placeholder="请输入转单人用户id或转发协助用户id" />
-        </el-form-item>
-        <el-form-item label="检查后的故障判断" prop="checkedFault">
-          <el-input v-model="form.checkedFault" placeholder="请输入检查后的故障判断" />
-        </el-form-item>
-        <el-form-item label="维修内容">
-          <editor v-model="form.repairContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="维修措施" prop="protectedMethod">
-          <el-input v-model="form.protectedMethod" placeholder="请输入维修措施" />
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="维修类型">
+                <el-input v-model="form.repairType" disabled />
         </el-form-item>
+            </el-col>
+            <el-col :span="8">
         <el-form-item label="维修人" prop="repairer">
           <el-input v-model="form.repairer" placeholder="请输入维修人" />
         </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检查后的故障判断" prop="checkedFault">
+                <el-input 
+                  v-model="form.checkedFault" 
+                  type="textarea" 
+                  :rows="3" 
+                  placeholder="请输入检查后的故障判断" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="维修措施" prop="protectedMethod">
+                <el-input 
+                  v-model="form.protectedMethod" 
+                  type="textarea" 
+                  :rows="3" 
+                  placeholder="请输入维修措施" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="维修内容" prop="repairContent">
+                <el-input 
+                  v-model="form.repairContent" 
+                  type="textarea" 
+                  :rows="4" 
+                  placeholder="请输入维修内容" />
+              </el-form-item>
+            </el-col>
+          </template>
+
+          <!-- 第三步：维修确认 -->
+          <template v-if="currentStepOrder === 3">
+            <el-col :span="8">
+              <el-form-item label="维修人">
+                <el-input v-model="form.repairer" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
         <el-form-item label="维修结果" prop="repairConfirm">
           <el-select v-model="form.repairConfirm" placeholder="请选择维修结果">
             <el-option
                 v-for="dict in fault_repair_confirm"
                 :key="dict.value"
                 :label="dict.label"
-                :value="dict.value"
-            ></el-option>
+                    :value="dict.value">
+                  </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认时间" prop="confirmTime">
-          <el-date-picker clearable
-            v-model="form.confirmTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择确认时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="关联更换零部件内容" prop="componentsPartsId">
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="关联更换零部件" prop="componentsPartsId">
           <el-input v-model="form.componentsPartsId" placeholder="请输入关联更换零部件内容" />
         </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="维修内容">
+                <el-input v-model="form.repairContent" type="textarea" :rows="3" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="维修措施">
+                <el-input v-model="form.protectedMethod" type="textarea" :rows="3" disabled />
+              </el-form-item>
+            </el-col>
+          </template>
+          
+          <!-- 处理意见：除第一步外都需要 -->
+          <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>
       </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-card>
+
+    <!-- 审批组件 -->
+    <submitVerify 
+      ref="submitVerifyRef" 
+      :task-variables="taskVariables" 
+      @submit-callback="submitCallback" />
+    
+    <!-- 审批记录组件 -->
+    <approvalRecord ref="approvalRecordRef" />
+
   </div>
 </template>
 
-<script setup name="DmsFaultInstanceActivity" lang="ts">
-import { listDmsFaultInstanceActivity, getDmsFaultInstanceActivity, delDmsFaultInstanceActivity, addDmsFaultInstanceActivity, updateDmsFaultInstanceActivity } from '@/api/dms/dmsFaultInstanceActivity';
-import { DmsFaultInstanceActivityVO, DmsFaultInstanceActivityQuery, DmsFaultInstanceActivityForm } from '@/api/dms/dmsFaultInstanceActivity/types';
+<script setup name="FaultWorkOrderProcess" lang="ts">
+// 导入相关模块
+import { ref, reactive, computed, onMounted, getCurrentInstance, toRefs } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { getDmsBillsFaultInstance } from '@/api/dms/dmsBillsFaultInstance';
+import { addDmsFaultInstanceActivity } from '@/api/dms/dmsFaultInstanceActivity';
+import { pageByTaskWait } from '@/api/workflow/task';
+import { getCurrentDateTime } from '@/utils/dateUtils';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { fault_repair_type, activity_fault_type, fault_repair_confirm, process_handle_status } = toRefs<any>(proxy?.useDict('fault_repair_type', 'activity_fault_type', 'fault_repair_confirm', 'process_handle_status'));
+const { fault_repair_type, activity_fault_type, fault_repair_confirm } = toRefs<any>(proxy?.useDict('fault_repair_type', 'activity_fault_type', 'fault_repair_confirm'));
+const route = useRoute();
+const router = useRouter();
 
-const dmsFaultInstanceActivityList = ref<DmsFaultInstanceActivityVO[]>([]);
-const buttonLoading = ref(false);
+// 基础数据
 const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
+const buttonLoading = ref(false);
+const routeParams = ref<Record<string, any>>({});
+const workOrder = ref<any>({});
+const workOrderStatusText = ref('');
 
-const queryFormRef = ref<ElFormInstance>();
-const dmsFaultInstanceActivityFormRef = ref<ElFormInstance>();
+// 表单相关
+const processFormRef = ref<ElFormInstance>();
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
+// 当前任务信息
+const currentTask = ref<any>(null);
+const currentStepOrder = ref(1);
+const taskVariables = ref<any>({});
 
-// 列显隐信息
-const columns = ref<FieldOption[]>([
-        { key: 0, label: `维修工单实例节点ID`, visible: true },
-        { key: 1, label: `租户编号`, visible: true },
-        { key: 2, label: `故障报修工单ID，关联故障报修工单主键`, visible: true },
-        { key: 3, label: `流程定义ID,关联wf_definition_config的id`, visible: true },
-        { key: 4, label: `工单流程节点ID`, visible: true },
-        { key: 5, label: `故障类型(1外部故障 2内部故障);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的`, visible: true },
-        { key: 6, label: `故障描述;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的`, visible: true },
-        { key: 7, label: `涉及操作，关联数据字典，可以选择多个;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的`, visible: true },
-        { key: 8, label: `设备ID，关联prod_base_machine_info的machine_id`, visible: true },
-        { key: 9, label: `维修类型`, visible: true },
-        { key: 10, label: `外协单位，关联dms_base_outsourcing_info的outsourcing_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的`, visible: true },
-        { key: 11, label: `处理意见;第一步不显示，从第2个步骤开始显示此字段`, visible: true },
-        { key: 12, label: `备注`, visible: true },
-        { key: 13, label: `状态(0已结束 1执行中 2待接取 3已转发）`, visible: true },
-        { key: 14, label: `工单流程步骤顺序`, visible: true },
-        { key: 15, label: `执行开始时间`, visible: true },
-        { key: 16, label: `执行结束时间`, visible: true },
-        { key: 17, label: `处理人ID`, visible: true },
-        { key: 18, label: `处理人`, visible: true },
-        { key: 19, label: `处理时间`, visible: true },
-        { key: 20, label: `转单人用户id或转发协助用户id`, visible: true },
-        { key: 21, label: `检查后的故障判断`, visible: true },
-        { key: 22, label: `维修内容`, visible: true },
-        { key: 23, label: `维修措施`, visible: true },
-        { key: 24, label: `维修人`, visible: true },
-        { key: 25, label: `维修结果`, visible: true },
-        { key: 26, label: `确认时间`, visible: true },
-        { key: 27, label: `关联更换零部件内容`, visible: true },
-        { key: 28, label: `创建部门`, visible: true },
-        { key: 29, label: `创建人`, visible: true },
-        { key: 30, label: `创建时间`, visible: true },
-        { key: 31, label: `更新人`, visible: true },
-        { key: 32, label: `更新时间`, visible: true },
-]);
-
-const initFormData: DmsFaultInstanceActivityForm = {
-  instanceActivityId: undefined,
+// 表单数据
+const initFormData = {
   repairInstanceId: undefined,
-  wfDefinitionId: undefined,
-  wfNodeId: undefined,
   faultType: undefined,
   faultDescription: undefined,
   designOperations: undefined,
-  machineId: undefined,
   repairType: undefined,
   outsourcingId: undefined,
-  processHandleResolution: undefined,
-  remark: undefined,
-  processHandleStatus: undefined,
-  processStepOrder: undefined,
-  startTime: undefined,
-  endTime: undefined,
-  handleUserId: undefined,
-  handleBy: undefined,
-  handleTime: undefined,
-  transferUserId: undefined,
   checkedFault: undefined,
   repairContent: undefined,
   protectedMethod: undefined,
   repairer: undefined,
   repairConfirm: undefined,
-  confirmTime: undefined,
   componentsPartsId: undefined,
-}
-const data = reactive<PageData<DmsFaultInstanceActivityForm, DmsFaultInstanceActivityQuery>>({
-  form: {...initFormData},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    instanceActivityId: undefined,
-    repairInstanceId: undefined,
-    wfDefinitionId: undefined,
-    wfNodeId: undefined,
-    faultType: undefined,
-    faultDescription: undefined,
-    designOperations: undefined,
-    machineId: undefined,
-    repairType: undefined,
-    outsourcingId: undefined,
     processHandleResolution: undefined,
-    processHandleStatus: undefined,
-    processStepOrder: undefined,
-    startTime: undefined,
-    endTime: undefined,
-    handleUserId: undefined,
-    handleBy: undefined,
-    handleTime: undefined,
-    transferUserId: undefined,
-    checkedFault: undefined,
-    repairContent: undefined,
-    protectedMethod: undefined,
-    repairer: undefined,
-    repairConfirm: undefined,
-    confirmTime: undefined,
-    componentsPartsId: undefined,
-    params: {
+  processStepOrder: undefined
+};
+
+const form = reactive({ ...initFormData });
+
+// 表单验证规则
+const rules = reactive({
+  faultType: [{ required: true, message: '故障类型不能为空', trigger: 'change' }],
+  faultDescription: [{ required: true, message: '故障描述不能为空', trigger: 'blur' }],
+  repairType: [{ required: true, message: '维修类型不能为空', trigger: 'change' }],
+  repairer: [{ required: false, message: '维修人不能为空', trigger: 'blur' }],
+  checkedFault: [{ required: false, message: '检查后的故障判断不能为空', trigger: 'blur' }],
+  protectedMethod: [{ required: false, message: '维修措施不能为空', trigger: 'blur' }],
+  repairContent: [{ required: false, message: '维修内容不能为空', trigger: 'blur' }],
+  repairConfirm: [{ required: false, message: '维修结果不能为空', trigger: 'change' }],
+  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 currentStepTitle = computed(() => {
+  const stepTitles = {
+    1: '步骤1：故障报修（要求参数）',
+    2: '步骤2：维修处理（实际参数）',
+    3: '步骤3：维修确认'
+  };
+  return stepTitles[currentStepOrder.value] || '工单处理';
+});
+
+const approvalButtonShow = computed(() => {
+  return routeParams.value.type === 'approval' && currentTask.value;
+});
+
+// 提交按钮显示控制逻辑
+const submitButtonShow = computed(() => {
+  return (
+    routeParams.value.type === 'add' ||
+    (routeParams.value.type === 'update' &&
+      workOrder.value.billsStatus &&
+      (workOrder.value.billsStatus === 'draft' || workOrder.value.billsStatus === 'cancel' || workOrder.value.billsStatus === 'back'))
+  );
+});
+
+// 初始化
+onMounted(async () => {
+  routeParams.value = route.query;
+  loading.value = true;
+  
+  try {
+    // 获取工单信息
+    await loadWorkOrderInfo();
+    
+    // 获取当前任务信息
+    if (routeParams.value.type === 'approval') {
+      await loadCurrentTask();
     }
-  },
-  rules: {
+    
+    // 初始化表单数据
+    initializeFormData();
+    
+  } catch (error) {
+    console.error('初始化失败:', error);
+    proxy?.$modal.msgError('加载数据失败');
+  } finally {
+    loading.value = false;
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+// 加载工单信息
+const loadWorkOrderInfo = async () => {
+  // 从query参数获取businessId
+  const businessId = routeParams.value.id;
+  
+  if (!businessId) {
+    proxy?.$modal.msgError('缺少工单ID参数');
+    return;
+  }
+  
+  const res = await getDmsBillsFaultInstance(businessId);
+  workOrder.value = res.data;
+  
+  // 设置状态显示文本
+  workOrderStatusText.value = getStatusText(workOrder.value.billsStatus);
+};
 
-/** 查询故障报修工单实例节点列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listDmsFaultInstanceActivity(queryParams.value);
-  dmsFaultInstanceActivityList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-}
+// 加载当前任务信息
+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: 'Fault01' // 故障维修流程代码
+  });
+  
+  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 (needProcessResolution.value) {
+      rules.processHandleResolution = [
+        { required: true, message: '处理意见不能为空', trigger: 'blur' }
+      ];
+    }
+  }
+};
 
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-}
+// 初始化表单数据
+const initializeFormData = () => {
+  // 基础信息从工单获取
+  form.repairInstanceId = workOrder.value.repairInstanceId;
+  form.processStepOrder = currentStepOrder.value;
+  
+  if (currentStepOrder.value === 1) {
+    // 第一步：故障报修，表单为空等待用户填写
+    form.faultType = workOrder.value.faultType;
+    form.faultDescription = workOrder.value.faultDescription;
+    form.designOperations = workOrder.value.designOperations;
+    form.repairType = workOrder.value.repairType;
+    form.outsourcingId = workOrder.value.outsourcingId;
+  } else {
+    // 第二步、第三步：从工单基础信息预填充
+    form.faultType = workOrder.value.faultType;
+    form.faultDescription = workOrder.value.faultDescription;
+    form.designOperations = workOrder.value.designOperations;
+    form.repairType = workOrder.value.repairType;
+    form.outsourcingId = workOrder.value.outsourcingId;
+    form.checkedFault = workOrder.value.checkedFault;
+    form.repairContent = workOrder.value.repairContent;
+    form.protectedMethod = workOrder.value.protectedMethod;
+    form.repairer = workOrder.value.repairer;
+    form.repairConfirm = workOrder.value.repairConfirm;
+    form.componentsPartsId = workOrder.value.componentsPartsId;
+  }
+};
 
-/** 表单重置 */
-const reset = () => {
-  form.value = {...initFormData};
-  dmsFaultInstanceActivityFormRef.value?.resetFields();
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-}
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: DmsFaultInstanceActivityVO[]) => {
-  ids.value = selection.map(item => item.instanceActivityId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = "添加故障报修工单实例节点";
-}
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: DmsFaultInstanceActivityVO) => {
-  reset();
-  const _instanceActivityId = row?.instanceActivityId || ids.value[0]
-  const res = await getDmsFaultInstanceActivity(_instanceActivityId);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = "修改故障报修工单实例节点";
-}
-
-/** 提交按钮 */
-const submitForm = () => {
-  dmsFaultInstanceActivityFormRef.value?.validate(async (valid: boolean) => {
+// 提交表单方法
+const submitForm = async (status: string) => {
+  if (!processFormRef.value) return;
+  
+  try {
+    const valid = await processFormRef.value.validate();
     if (valid) {
       buttonLoading.value = true;
-      if (form.value.instanceActivityId) {
-        await updateDmsFaultInstanceActivity(form.value).finally(() =>  buttonLoading.value = false);
+      
+      if (status === 'draft') {
+        // 暂存逻辑
+        await addDmsFaultInstanceActivity({
+          repairInstanceId: form.repairInstanceId,
+          faultType: form.faultType,
+          faultDescription: form.faultDescription,
+          designOperations: form.designOperations,
+          repairType: form.repairType,
+          outsourcingId: form.outsourcingId,
+          checkedFault: form.checkedFault || '',
+          repairContent: form.repairContent || '',
+          protectedMethod: form.protectedMethod || '',
+          repairer: form.repairer || '',
+          repairConfirm: form.repairConfirm,
+          componentsPartsId: form.componentsPartsId,
+          processHandleResolution: form.processHandleResolution || '',
+          processStepOrder: form.processStepOrder,
+          handleTime: getCurrentDateTime()
+        });
+        
+        proxy?.$modal.msgSuccess('暂存成功');
+        goBack();
       } else {
-        await addDmsFaultInstanceActivity(form.value).finally(() =>  buttonLoading.value = false);
+        // 提交逻辑
+        // 准备任务变量
+        taskVariables.value = {
+          entity: {
+            repairInstanceId: form.repairInstanceId,
+            faultType: form.faultType,
+            faultDescription: form.faultDescription,
+            designOperations: form.designOperations,
+            repairType: form.repairType,
+            outsourcingId: form.outsourcingId,
+            checkedFault: form.checkedFault || '',
+            repairContent: form.repairContent || '',
+            protectedMethod: form.protectedMethod || '',
+            repairer: form.repairer || '',
+            repairConfirm: form.repairConfirm,
+            componentsPartsId: form.componentsPartsId,
+            processHandleResolution: form.processHandleResolution || '',
+            processStepOrder: form.processStepOrder
+          }
+        };
+        
+        // 启动工作流或继续处理
+        if (routeParams.value.taskId) {
+          submitVerifyRef.value?.openDialog(routeParams.value.taskId);
+        } else {
+          // 处理新建状态的提交
+          proxy?.$modal.msgSuccess('提交成功');
+          goBack();
+        }
       }
-      proxy?.$modal.msgSuccess("操作成功");
-      dialog.visible = false;
-      await getList();
     }
-  });
-}
+  } catch (error) {
+    console.error('提交失败:', error);
+    proxy?.$modal.msgError('提交失败');
+  } finally {
+    buttonLoading.value = false;
+  }
+};
 
-/** 删除按钮操作 */
-const handleDelete = async (row?: DmsFaultInstanceActivityVO) => {
-  const _instanceActivityIds = row?.instanceActivityId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除故障报修工单实例节点编号为"' + _instanceActivityIds + '"的数据项？').finally(() => loading.value = false);
-  await delDmsFaultInstanceActivity(_instanceActivityIds);
-  proxy?.$modal.msgSuccess("删除成功");
-  await getList();
-}
+// 审批处理
+const approvalVerifyOpen = async () => {
+  if (!processFormRef.value) return;
+  
+  try {
+    const valid = await processFormRef.value.validate();
+    if (valid) {
+      // 准备任务变量
+      taskVariables.value = {
+        entity: {
+          repairInstanceId: form.repairInstanceId,
+          faultType: form.faultType,
+          faultDescription: form.faultDescription,
+          designOperations: form.designOperations,
+          repairType: form.repairType,
+          outsourcingId: form.outsourcingId,
+          checkedFault: form.checkedFault || '',
+          repairContent: form.repairContent || '',
+          protectedMethod: form.protectedMethod || '',
+          repairer: form.repairer || '',
+          repairConfirm: form.repairConfirm,
+          componentsPartsId: form.componentsPartsId,
+          processHandleResolution: form.processHandleResolution || '',
+          processStepOrder: form.processStepOrder
+        }
+      };
+      
+      // 直接使用传入的taskId进行审批
+      submitVerifyRef.value?.openDialog(routeParams.value.taskId);
+    }
+  } catch (error) {
+    proxy?.$modal.msgError('表单验证失败，请检查输入项');
+  }
+};
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download('dms/dmsFaultInstanceActivity/export', {
-    ...queryParams.value
-  }, `dmsFaultInstanceActivity_${new Date().getTime()}.xlsx`)
-}
+// 提交回调
+const submitCallback = async () => {
+  try {
+    // 保存工单实例活动记录
+    await addDmsFaultInstanceActivity({
+      repairInstanceId: form.repairInstanceId,
+      faultType: form.faultType,
+      faultDescription: form.faultDescription,
+      designOperations: form.designOperations,
+      repairType: form.repairType,
+      outsourcingId: form.outsourcingId,
+      checkedFault: form.checkedFault || '',
+      repairContent: form.repairContent || '',
+      protectedMethod: form.protectedMethod || '',
+      repairer: form.repairer || '',
+      repairConfirm: form.repairConfirm,
+      componentsPartsId: form.componentsPartsId,
+      processHandleResolution: form.processHandleResolution || '',
+      processStepOrder: form.processStepOrder,
+      handleTime: getCurrentDateTime()
+    });
+    
+    proxy?.$modal.msgSuccess(`${currentStepName.value}完成`);
+    
+    // 关闭页面返回
+    goBack();
+  } catch (error) {
+    console.error('保存业务数据失败:', error);
+    proxy?.$modal.msgError('保存业务数据失败');
+  }
+};
 
-onMounted(() => {
-  getList();
-});
+// 审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value?.init(routeParams.value.id);
+};
+
+// 返回
+const goBack = () => {
+  proxy?.$tab.closePage(proxy?.$route);
+  router.go(-1);
+};
+
+// 工具函数
+const getStatusText = (status: string) => {
+  const statusMap = {
+    '0': '待维修',
+    '1': '维修中',
+    '2': '维修完成',
+    'draft': '草稿',
+    'cancel': '已取消'
+  };
+  return statusMap[status] || '未知状态';
+};
 </script>
+
+<style scoped>
+.form-header {
+  margin-bottom: 16px;
+  color: #303133;
+  font-weight: 600;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dms/dmsMaintInstanceActivity/index.vue b/src/views/dms/dmsMaintInstanceActivity/index.vue
index 6193493..c4b6d7b 100644
--- a/src/views/dms/dmsMaintInstanceActivity/index.vue
+++ b/src/views/dms/dmsMaintInstanceActivity/index.vue
@@ -105,9 +105,9 @@
                 type="textarea" 
                 :rows="3" 
                 placeholder="请输入处理意见" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+                </el-form-item>
+              </el-col>
+            </el-row>
       </el-form>
     </el-card>
 
@@ -248,7 +248,7 @@ const loadWorkOrderInfo = async () => {
   if (maint_level.value && workOrder.value.maintStatus !== undefined) {
     const statusItem = maint_level.value.find((item: any) => String(item.value) === String(workOrder.value.maintStatus));
     workOrderStatusText.value = statusItem ? statusItem.label : '未知状态';
-  } else {
+    } else {
     workOrderStatusText.value = '未知状态';
   }
 };
@@ -319,7 +319,7 @@ const submitForm = async (status: string) => {
       } else {
         // 提交逻辑
         // 准备任务变量
-        taskVariables.value = {
+        taskVariables.value = { 
           entity: {
             maintInstanceId: form.maintInstanceId,
             maintLevel: form.maintLevel,