From f6fbc9cb452c4d483e4b53629f69642454fe3540 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 10 Jun 2025 14:58:55 +0800
Subject: [PATCH] =?UTF-8?q?featms(d):=20=E6=96=B0=E5=A2=9E=E6=A3=80?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A1=E5=88=92=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增检修计划明细页面，包括搜索、新增、修改、删除等功能
- 优化点巡检工单、润滑实例、保养工单等页面的详情展示
- 添加工作流定义ID更新相关API和功能
- 修复部分页面的样式和交互问题
---
 src/api/dms/dmsBillsInspectInstance/index.ts  |  18 +
 src/api/dms/dmsBillsInspectInstance/types.ts  |   6 +-
 .../dmsBillsInspectInstanceActivity/index.ts  |  76 ++
 .../dmsBillsInspectInstanceActivity/types.ts  | 281 +++++
 src/api/dms/dmsBillsLubeInstance/index.ts     |  17 +
 src/api/dms/dmsMaintInstanceActivity/index.ts |  94 ++
 src/api/dms/dmsMaintInstanceActivity/types.ts | 281 +++++
 src/api/dms/dmsRepairInstance/index.ts        |  18 +
 src/api/dms/dmsRepairInstance/types.ts        |   6 +-
 .../dms/dmsRepairInstanceActivity/types.ts    |  12 +-
 src/router/index.ts                           |   6 +-
 .../dms/dmsBillsInspectInstance/index.vue     |  18 +-
 .../dmsBillsInspectInstanceActivity/index.vue | 326 ++++++
 src/views/dms/dmsBillsLubeInstance/index.vue  |  25 +-
 src/views/dms/dmsBillsMaintInstance/index.vue |  12 +-
 .../dms/dmsFaultInstanceActivity/index.vue    |   4 +-
 src/views/dms/dmsInstanceFile/index.vue       |  19 +-
 .../dms/dmsMaintInstanceActivity/index.vue    | 334 ++++++
 src/views/dms/dmsPlanInspect/index.vue        |  27 +-
 src/views/dms/dmsPlanRepairDetail/copy.vue    | 310 ++++++
 src/views/dms/dmsRepairInstance/index.vue     |   4 +-
 .../dms/dmsRepairInstanceActivity/index.vue   | 965 +++++++++++-------
 22 files changed, 2421 insertions(+), 438 deletions(-)
 create mode 100644 src/api/dms/dmsBillsInspectInstanceActivity/index.ts
 create mode 100644 src/api/dms/dmsBillsInspectInstanceActivity/types.ts
 create mode 100644 src/api/dms/dmsMaintInstanceActivity/index.ts
 create mode 100644 src/api/dms/dmsMaintInstanceActivity/types.ts
 create mode 100644 src/views/dms/dmsBillsInspectInstanceActivity/index.vue
 create mode 100644 src/views/dms/dmsMaintInstanceActivity/index.vue
 create mode 100644 src/views/dms/dmsPlanRepairDetail/copy.vue

diff --git a/src/api/dms/dmsBillsInspectInstance/index.ts b/src/api/dms/dmsBillsInspectInstance/index.ts
index ea1bd3d..f73b0f3 100644
--- a/src/api/dms/dmsBillsInspectInstance/index.ts
+++ b/src/api/dms/dmsBillsInspectInstance/index.ts
@@ -75,3 +75,21 @@ export function getDmsBillsInspectInstanceList (query) {
         params: query
     });
 };
+
+/**
+ * 更新点巡检工单的工作流定义ID
+ * @param inspectInstanceId 点巡检工单的ID
+ * @param wfDefinitionId 工作流定义的ID
+ * @return 如果更新成功返回true，否则返回false
+ */
+export function updateWfDefinitionIdById (inspectInstanceId: string | number, wfDefinitionId: string | number) {
+  return request({
+    url: '/dms/dmsBillsInspectInstance/updateWfDefinitionIdById',
+    method: 'post',
+    params: {
+      inspectInstanceId,
+      wfDefinitionId
+    }
+  });
+};
+
diff --git a/src/api/dms/dmsBillsInspectInstance/types.ts b/src/api/dms/dmsBillsInspectInstance/types.ts
index ddcd24d..3d95540 100644
--- a/src/api/dms/dmsBillsInspectInstance/types.ts
+++ b/src/api/dms/dmsBillsInspectInstance/types.ts
@@ -10,7 +10,7 @@ export interface DmsBillsInspectInstanceVO {
   planInspectId: string | number;
 
   /**
-   * 流程定义ID，关联wf_definition_config的id
+   * 流程定义ID
    */
   wfDefinitionId: string | number;
 
@@ -73,7 +73,7 @@ export interface DmsBillsInspectInstanceForm extends BaseEntity {
   planInspectId?: string | number;
 
   /**
-   * 流程定义ID，关联wf_definition_config的id
+   * 流程定义ID
    */
   wfDefinitionId?: string | number;
 
@@ -142,7 +142,7 @@ export interface DmsBillsInspectInstanceQuery extends PageQuery {
   planInspectId?: string | number;
 
   /**
-   * 流程定义ID，关联wf_definition_config的id
+   * 流程定义ID
    */
   wfDefinitionId?: string | number;
 
diff --git a/src/api/dms/dmsBillsInspectInstanceActivity/index.ts b/src/api/dms/dmsBillsInspectInstanceActivity/index.ts
new file mode 100644
index 0000000..9de77be
--- /dev/null
+++ b/src/api/dms/dmsBillsInspectInstanceActivity/index.ts
@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsBillsInspectInstanceActivityVO, DmsBillsInspectInstanceActivityForm, DmsBillsInspectInstanceActivityQuery } from '@/api/dms/dmsBillsInspectInstanceActivity/types';
+
+/**
+ * 查询点巡检工单实例节点;此暂时不用列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsBillsInspectInstanceActivity = (query?: DmsBillsInspectInstanceActivityQuery): AxiosPromise<DmsBillsInspectInstanceActivityVO[]> => {
+  return request({
+    url: '/dms/dmsBillsInspectInstanceActivity/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询点巡检工单实例节点;此暂时不用详细
+ * @param instanceActivityId
+ */
+export const getDmsBillsInspectInstanceActivity = (instanceActivityId: string | number): AxiosPromise<DmsBillsInspectInstanceActivityVO> => {
+  return request({
+    url: '/dms/dmsBillsInspectInstanceActivity/' + instanceActivityId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增点巡检工单实例节点;此暂时不用
+ * @param data
+ */
+export const addDmsBillsInspectInstanceActivity = (data: DmsBillsInspectInstanceActivityForm) => {
+  return request({
+    url: '/dms/dmsBillsInspectInstanceActivity',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改点巡检工单实例节点;此暂时不用
+ * @param data
+ */
+export const updateDmsBillsInspectInstanceActivity = (data: DmsBillsInspectInstanceActivityForm) => {
+  return request({
+    url: '/dms/dmsBillsInspectInstanceActivity',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除点巡检工单实例节点;此暂时不用
+ * @param instanceActivityId
+ */
+export const delDmsBillsInspectInstanceActivity = (instanceActivityId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsBillsInspectInstanceActivity/' + instanceActivityId,
+    method: 'delete'
+  });
+};
+
+/**
+ * 下拉框查询点巡检工单实例节点;此暂时不用列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsBillsInspectInstanceActivityList (query) {
+    return request({
+        url: '/dms/dmsBillsInspectInstanceActivity/getDmsBillsInspectInstanceActivityList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/dms/dmsBillsInspectInstanceActivity/types.ts b/src/api/dms/dmsBillsInspectInstanceActivity/types.ts
new file mode 100644
index 0000000..9f0a47a
--- /dev/null
+++ b/src/api/dms/dmsBillsInspectInstanceActivity/types.ts
@@ -0,0 +1,281 @@
+export interface DmsBillsInspectInstanceActivityVO {
+  /**
+   * 巡检工单实例节点ID
+   */
+  instanceActivityId: string | number;
+
+  /**
+   * 巡检工单实例ID，关联dms_bills_inspect_instance的inspect_instance_id
+   */
+  inspectInstanceId: string | number;
+
+  /**
+   * 流程定义ID，
+   */
+  wfDefinitionId: string | number;
+
+  /**
+   * 工单流程节点ID
+   */
+  wfNodeId: string | number;
+
+  /**
+   * 巡检线路，关联dms_base_inspect_route的inspect_route_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  inspectRouteId: string | number;
+
+  /**
+   * 设备总数;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  deviceAmount: number;
+
+  /**
+   * 执行人员;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  performer: string;
+
+  /**
+   * 处理意见;第一步不显示，从第2步开始只显示此字段
+   */
+  processHandleResolution: string;
+
+  /**
+   * 状态(0已结束 1执行中 2待接取 3已转发）
+   */
+  processHandleStatus: string;
+
+  /**
+   * 工单流程步骤顺序
+   */
+  processStepOrder: number;
+
+  /**
+   * 执行开始时间
+   */
+  startTime: string;
+
+  /**
+   * 执行结束时间
+   */
+  endTime: string;
+
+  /**
+   * 处理人ID（关联sys_user的user_id)
+   */
+  handleUserId: string | number;
+
+  /**
+   * 处理人
+   */
+  handleBy: string;
+
+  /**
+   * 处理时间
+   */
+  handleTime: string;
+
+  /**
+   * 转单人用户id或转发协助用户id
+   */
+  transferUserId: string | number;
+
+  /**
+   * 用户预留1
+   */
+  attr1: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface DmsBillsInspectInstanceActivityForm extends BaseEntity {
+  /**
+   * 巡检工单实例节点ID
+   */
+  instanceActivityId?: string | number;
+
+  /**
+   * 巡检工单实例ID，关联dms_bills_inspect_instance的inspect_instance_id
+   */
+  inspectInstanceId?: string | number;
+
+  /**
+   * 流程定义ID
+   */
+  wfDefinitionId?: string | number;
+
+  /**
+   * 工单流程节点ID（关联wf_task_back_node的id）
+   */
+  wfNodeId?: string | number;
+
+  /**
+   * 巡检线路，关联dms_base_inspect_route的inspect_route_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  inspectRouteId?: string | number;
+
+  /**
+   * 设备总数;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  deviceAmount?: number;
+
+  /**
+   * 执行人员;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  performer?: string;
+
+  /**
+   * 处理意见;第一步不显示，从第2步开始只显示此字段
+   */
+  processHandleResolution?: string;
+
+  /**
+   * 状态(0已结束 1执行中 2待接取 3已转发）
+   */
+  processHandleStatus?: string;
+
+  /**
+   * 工单流程步骤顺序
+   */
+  processStepOrder?: number;
+
+  /**
+   * 执行开始时间
+   */
+  startTime?: string;
+
+  /**
+   * 执行结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 处理人ID（关联sys_user的user_id)
+   */
+  handleUserId?: string | number;
+
+  /**
+   * 处理人
+   */
+  handleBy?: string;
+
+  /**
+   * 处理时间
+   */
+  handleTime?: string;
+
+  /**
+   * 转单人用户id或转发协助用户id
+   */
+  transferUserId?: string | number;
+
+  /**
+   * 用户预留1
+   */
+  attr1?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface DmsBillsInspectInstanceActivityQuery extends PageQuery {
+
+  /**
+   * 巡检工单实例节点ID
+   */
+  instanceActivityId?: string | number;
+
+  /**
+   * 巡检工单实例ID，关联dms_bills_inspect_instance的inspect_instance_id
+   */
+  inspectInstanceId?: string | number;
+
+  /**
+   * 流程定义ID
+   */
+  wfDefinitionId?: string | number;
+
+  /**
+   * 工单流程节点ID（关联wf_task_back_node的id）
+   */
+  wfNodeId?: string | number;
+
+  /**
+   * 巡检线路，关联dms_base_inspect_route的inspect_route_id;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  inspectRouteId?: string | number;
+
+  /**
+   * 设备总数;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  deviceAmount?: number;
+
+  /**
+   * 执行人员;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  performer?: string;
+
+  /**
+   * 处理意见;第一步不显示，从第2步开始只显示此字段
+   */
+  processHandleResolution?: string;
+
+  /**
+   * 状态(0已结束 1执行中 2待接取 3已转发）
+   */
+  processHandleStatus?: string;
+
+  /**
+   * 工单流程步骤顺序
+   */
+  processStepOrder?: number;
+
+  /**
+   * 执行开始时间
+   */
+  startTime?: string;
+
+  /**
+   * 执行结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 处理人ID（关联sys_user的user_id)
+   */
+  handleUserId?: string | number;
+
+  /**
+   * 处理人
+   */
+  handleBy?: string;
+
+  /**
+   * 处理时间
+   */
+  handleTime?: string;
+
+  /**
+   * 转单人用户id或转发协助用户id
+   */
+  transferUserId?: string | number;
+
+  /**
+   * 用户预留1
+   */
+  attr1?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/dms/dmsBillsLubeInstance/index.ts b/src/api/dms/dmsBillsLubeInstance/index.ts
index a334011..45e7206 100644
--- a/src/api/dms/dmsBillsLubeInstance/index.ts
+++ b/src/api/dms/dmsBillsLubeInstance/index.ts
@@ -75,3 +75,20 @@ export function getDmsBillsLubeInstanceList (query) {
         params: query
     });
 };
+
+/**
+ * 更新润滑实例的工作流定义ID
+ * @param lubeInstanceId 润滑实例的ID
+ * @param wfDefinitionId 工作流定义的ID
+ * @return 如果更新成功返回true，否则返回false
+ */
+export function updateWfDefinitionIdById (lubeInstanceId: string | number, wfDefinitionId: string | number) {
+    return request({
+        url: '/dms/dmsBillsLubeInstance/updateWfDefinitionIdById',
+        method: 'post',
+        params: {
+            lubeInstanceId,
+            wfDefinitionId
+        }
+    });
+};
diff --git a/src/api/dms/dmsMaintInstanceActivity/index.ts b/src/api/dms/dmsMaintInstanceActivity/index.ts
new file mode 100644
index 0000000..caed686
--- /dev/null
+++ b/src/api/dms/dmsMaintInstanceActivity/index.ts
@@ -0,0 +1,94 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DmsMaintInstanceActivityVO, DmsMaintInstanceActivityForm, DmsMaintInstanceActivityQuery } from '@/api/dms/dmsMaintInstanceActivity/types';
+
+/**
+ * 查询保养工单实例节点;弃用列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDmsMaintInstanceActivity = (query?: DmsMaintInstanceActivityQuery): AxiosPromise<DmsMaintInstanceActivityVO[]> => {
+  return request({
+    url: '/dms/dmsMaintInstanceActivity/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询保养工单实例节点;弃用详细
+ * @param instanceActivityId
+ */
+export const getDmsMaintInstanceActivity = (instanceActivityId: string | number): AxiosPromise<DmsMaintInstanceActivityVO> => {
+  return request({
+    url: '/dms/dmsMaintInstanceActivity/' + instanceActivityId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增保养工单实例节点;弃用
+ * @param data
+ */
+export const addDmsMaintInstanceActivity = (data: DmsMaintInstanceActivityForm) => {
+  return request({
+    url: '/dms/dmsMaintInstanceActivity',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改保养工单实例节点;弃用
+ * @param data
+ */
+export const updateDmsMaintInstanceActivity = (data: DmsMaintInstanceActivityForm) => {
+  return request({
+    url: '/dms/dmsMaintInstanceActivity',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除保养工单实例节点;弃用
+ * @param instanceActivityId
+ */
+export const delDmsMaintInstanceActivity = (instanceActivityId: string | number | Array<string | number>) => {
+  return request({
+    url: '/dms/dmsMaintInstanceActivity/' + instanceActivityId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询保养工单实例节点;弃用列表
+ * @param query
+ * @returns {*}
+ */
+export function getDmsMaintInstanceActivityList (query) {
+    return request({
+        url: '/dms/dmsMaintInstanceActivity/getDmsMaintInstanceActivityList',
+        method: 'get',
+        params: query
+    });
+};
+
+/**
+ * 更新保养工单实例节点的工作流定义ID
+ * @param maintInstanceId 保养工单实例的ID
+ * @param wfDefinitionId 工作流定义的ID
+ * @return 如果更新成功返回true，否则返回false
+ */
+export function updateWfDefinitionIdById (maintInstanceId: string | number, wfDefinitionId: string | number) {
+  return request({
+      url: '/dms/dmsMaintInstanceActivity/updateWfDefinitionIdById',
+      method: 'post',
+      params: {
+          maintInstanceId,
+          wfDefinitionId
+      }
+  });
+};
\ No newline at end of file
diff --git a/src/api/dms/dmsMaintInstanceActivity/types.ts b/src/api/dms/dmsMaintInstanceActivity/types.ts
new file mode 100644
index 0000000..e2d2fa2
--- /dev/null
+++ b/src/api/dms/dmsMaintInstanceActivity/types.ts
@@ -0,0 +1,281 @@
+export interface DmsMaintInstanceActivityVO {
+  /**
+   * 保养工单实例节点ID
+   */
+  instanceActivityId: string | number;
+
+  /**
+   * 保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id
+   */
+  maintInstanceId: string | number;
+
+  /**
+   * 流程定义ID
+   */
+  wfDefinitionId: string | number;
+
+  /**
+   * 工单流程节点ID
+   */
+  wfNodeId: string | number;
+
+  /**
+   * 保养级别（1日常保养 2月度保养 3年度保养）;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  maintLevel: string;
+
+  /**
+   * 保养组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  maintGroup: string;
+
+  /**
+   * 保养负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  maintSupervisor: string;
+
+  /**
+   * 处理意见;第一步不显示，从第二步开始只显示此字段
+   */
+  processHandleResolution: string;
+
+  /**
+   * 状态(0已结束 1执行中 2待接取 3已转发）
+   */
+  processHandleStatus: string;
+
+  /**
+   * 工单流程步骤顺序
+   */
+  processStepOrder: number;
+
+  /**
+   * 执行开始时间
+   */
+  startTime: string;
+
+  /**
+   * 执行结束时间
+   */
+  endTime: string;
+
+  /**
+   * 处理人ID（关联sys_user的user_id)
+   */
+  handleUserId: string | number;
+
+  /**
+   * 处理人
+   */
+  handleBy: string;
+
+  /**
+   * 处理时间
+   */
+  handleTime: string;
+
+  /**
+   * 转单人用户id或转发协助用户id
+   */
+  transferUserId: string | number;
+
+  /**
+   * 用户预留1
+   */
+  attr1: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface DmsMaintInstanceActivityForm extends BaseEntity {
+  /**
+   * 保养工单实例节点ID
+   */
+  instanceActivityId?: string | number;
+
+  /**
+   * 保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id
+   */
+  maintInstanceId?: string | number;
+
+  /**
+   * 流程定义ID
+   */
+  wfDefinitionId?: string | number;
+
+  /**
+   * 工单流程节点ID
+   */
+  wfNodeId?: string | number;
+
+  /**
+   * 保养级别（1日常保养 2月度保养 3年度保养）;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  maintLevel?: string;
+
+  /**
+   * 保养组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  maintGroup?: string;
+
+  /**
+   * 保养负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  maintSupervisor?: string;
+
+  /**
+   * 处理意见;第一步不显示，从第二步开始只显示此字段
+   */
+  processHandleResolution?: string;
+
+  /**
+   * 状态(0已结束 1执行中 2待接取 3已转发）
+   */
+  processHandleStatus?: string;
+
+  /**
+   * 工单流程步骤顺序
+   */
+  processStepOrder?: number;
+
+  /**
+   * 执行开始时间
+   */
+  startTime?: string;
+
+  /**
+   * 执行结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 处理人ID（关联sys_user的user_id)
+   */
+  handleUserId?: string | number;
+
+  /**
+   * 处理人
+   */
+  handleBy?: string;
+
+  /**
+   * 处理时间
+   */
+  handleTime?: string;
+
+  /**
+   * 转单人用户id或转发协助用户id
+   */
+  transferUserId?: string | number;
+
+  /**
+   * 用户预留1
+   */
+  attr1?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface DmsMaintInstanceActivityQuery extends PageQuery {
+
+  /**
+   * 保养工单实例节点ID
+   */
+  instanceActivityId?: string | number;
+
+  /**
+   * 保养工单实例ID，关联dms_bills_maint_instance的maint_instance_id
+   */
+  maintInstanceId?: string | number;
+
+  /**
+   * 流程定义ID
+   */
+  wfDefinitionId?: string | number;
+
+  /**
+   * 工单流程节点ID
+   */
+  wfNodeId?: string | number;
+
+  /**
+   * 保养级别（1日常保养 2月度保养 3年度保养）;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  maintLevel?: string;
+
+  /**
+   * 保养组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  maintGroup?: string;
+
+  /**
+   * 保养负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的
+   */
+  maintSupervisor?: string;
+
+  /**
+   * 处理意见;第一步不显示，从第二步开始只显示此字段
+   */
+  processHandleResolution?: string;
+
+  /**
+   * 状态(0已结束 1执行中 2待接取 3已转发）
+   */
+  processHandleStatus?: string;
+
+  /**
+   * 工单流程步骤顺序
+   */
+  processStepOrder?: number;
+
+  /**
+   * 执行开始时间
+   */
+  startTime?: string;
+
+  /**
+   * 执行结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 处理人ID（关联sys_user的user_id)
+   */
+  handleUserId?: string | number;
+
+  /**
+   * 处理人
+   */
+  handleBy?: string;
+
+  /**
+   * 处理时间
+   */
+  handleTime?: string;
+
+  /**
+   * 转单人用户id或转发协助用户id
+   */
+  transferUserId?: string | number;
+
+  /**
+   * 用户预留1
+   */
+  attr1?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/dms/dmsRepairInstance/index.ts b/src/api/dms/dmsRepairInstance/index.ts
index 92b5bcf..6249bc9 100644
--- a/src/api/dms/dmsRepairInstance/index.ts
+++ b/src/api/dms/dmsRepairInstance/index.ts
@@ -75,3 +75,21 @@ export function getDmsRepairInstanceList (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/dmsRepairInstance/updateWfDefinitionIdById',
+    method: 'post',
+    params: {
+      repairInstanceId,
+      wfDefinitionId
+    }
+  });
+};
+
diff --git a/src/api/dms/dmsRepairInstance/types.ts b/src/api/dms/dmsRepairInstance/types.ts
index 8fbc702..b5965bb 100644
--- a/src/api/dms/dmsRepairInstance/types.ts
+++ b/src/api/dms/dmsRepairInstance/types.ts
@@ -10,7 +10,7 @@ export interface DmsRepairInstanceVO {
   planRepairId: string | number;
 
   /**
-   * 流程定义ID，关联wf_definition_config的id
+   * 流程定义ID
    */
   wfDefinitionId: string | number;
 
@@ -78,7 +78,7 @@ export interface DmsRepairInstanceForm extends BaseEntity {
   planRepairId?: string | number;
 
   /**
-   * 流程定义ID，关联wf_definition_config的id
+   * 流程定义ID
    */
   wfDefinitionId?: string | number;
 
@@ -147,7 +147,7 @@ export interface DmsRepairInstanceQuery extends PageQuery {
   planRepairId?: string | number;
 
   /**
-   * 流程定义ID，关联wf_definition_config的id
+   * 流程定义ID
    */
   wfDefinitionId?: string | number;
 
diff --git a/src/api/dms/dmsRepairInstanceActivity/types.ts b/src/api/dms/dmsRepairInstanceActivity/types.ts
index 423708b..31446bb 100644
--- a/src/api/dms/dmsRepairInstanceActivity/types.ts
+++ b/src/api/dms/dmsRepairInstanceActivity/types.ts
@@ -10,12 +10,12 @@ export interface DmsRepairInstanceActivityVO {
   repairInstanceId: string | number;
 
   /**
-   * 流程定义ID，关联wf_definition_config的id
+   * 流程定义ID
    */
   wfDefinitionId: string | number;
 
   /**
-   * 工单流程节点ID（关联wf_task_back_node的id）
+   * 工单流程节点ID
    */
   wfNodeId: string | number;
 
@@ -103,12 +103,12 @@ export interface DmsRepairInstanceActivityForm extends BaseEntity {
   repairInstanceId?: string | number;
 
   /**
-   * 流程定义ID，关联wf_definition_config的id
+   * 流程定义ID
    */
   wfDefinitionId?: string | number;
 
   /**
-   * 工单流程节点ID（关联wf_task_back_node的id）
+   * 工单流程节点ID
    */
   wfNodeId?: string | number;
 
@@ -197,12 +197,12 @@ export interface DmsRepairInstanceActivityQuery extends PageQuery {
   repairInstanceId?: string | number;
 
   /**
-   * 流程定义ID，关联wf_definition_config的id
+   * 流程定义ID
    */
   wfDefinitionId?: string | number;
 
   /**
-   * 工单流程节点ID（关联wf_task_back_node的id）
+   * 工单流程节点ID
    */
   wfNodeId?: string | number;
 
diff --git a/src/router/index.ts b/src/router/index.ts
index 104b265..be7b823 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -433,10 +433,10 @@ export const dynamicRoutes: RouteRecordRaw[] = [
   //   permissions: ['dms:dmsBillsMaintInstance:add'],
   //   children: [
   //     {
-  //       path: 'index/:maintInstanceId',
+  //       path: 'index',
   //       component: () => import('@/views/dms/dmsMaintInstanceActivity/index.vue'),
   //       name: 'dmsMaintInstanceActivity',
-  //       meta: { title: '保养工单明细', activeMenu: '/dms/dmsMaintInstanceActivity', icon: '' }
+  //       meta: { title: '保养工单明细', activeMenu: '/dms/dmsBillsMaintInstance', icon: '' }
   //     }
   //   ]
   // },
@@ -448,7 +448,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
   //   permissions: ['dms:dmsBillsInspectInstanceActivity:add'],
   //   children: [
   //     {
-  //       path: 'index/:inspctInstanceId',
+  //       path: 'index',
   //       component: () => import('@/views/dms/dmsBillsInspectInstanceActivity/index.vue'),
   //       name: 'dmsBillsInspectInstanceActivity',
   //       meta: { title: '点巡检工单明细', activeMenu: '/dms/dmsBillsInspectInstanceActivity', icon: '' }
diff --git a/src/views/dms/dmsBillsInspectInstance/index.vue b/src/views/dms/dmsBillsInspectInstance/index.vue
index 5f15f3b..11e3f88 100644
--- a/src/views/dms/dmsBillsInspectInstance/index.vue
+++ b/src/views/dms/dmsBillsInspectInstance/index.vue
@@ -129,11 +129,14 @@
         <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">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsInspectInstance:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBillsInspectInstance:remove']"></el-button>
+<!--            <el-tooltip content="修改" placement="top">-->
+<!--              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsInspectInstance:edit']"></el-button>-->
+<!--            </el-tooltip>-->
+<!--            <el-tooltip content="删除" placement="top">-->
+<!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBillsInspectInstance:remove']"></el-button>-->
+<!--            </el-tooltip>-->
+            <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>
           </template>
         </el-table-column>
@@ -400,6 +403,11 @@ const handleExport = () => {
   }, `dmsBillsInspectInstance_${new Date().getTime()}.xlsx`)
 }
 
+const router = useRouter();
+const handleShowDetail = (row: DmsBillsInspectInstanceVO) => {
+  router.push('/dms/dmsBillsInspectInstanceActivity/index/' + row.inspectInstanceId)
+}
+
 onMounted(() => {
   getList();
 });
diff --git a/src/views/dms/dmsBillsInspectInstanceActivity/index.vue b/src/views/dms/dmsBillsInspectInstanceActivity/index.vue
new file mode 100644
index 0000000..24aa453
--- /dev/null
+++ b/src/views/dms/dmsBillsInspectInstanceActivity/index.vue
@@ -0,0 +1,326 @@
+<template>
+  <div class="p-2">
+    <!-- 操作按钮区域 -->
+    <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">
+            <el-form-item label="工单编号">
+              <el-input v-model="workOrder.billsInspectCode" 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.createBy" 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>
+          <el-col :span="8">
+            <el-form-item label="巡检线路" prop="inspectRouteId">
+              <el-input v-model="form.inspectRouteId" placeholder="请输入巡检线路" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备总数" prop="deviceAmount">
+              <el-input-number v-model="form.deviceAmount" placeholder="设备总数" :min="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="执行人员" prop="performer">
+              <el-input v-model="form.performer" placeholder="请输入执行人员" />
+            </el-form-item>
+          </el-col>
+          
+          <!-- 处理意见：除第一步外都需要 -->
+          <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>
+    </el-card>
+
+    <!-- 审批组件 -->
+    <submitVerify 
+      ref="submitVerifyRef" 
+      :task-variables="taskVariables" 
+      @submit-callback="submitCallback" />
+    
+    <!-- 审批记录组件 -->
+    <approvalRecord ref="approvalRecordRef" />
+  </div>
+</template>
+
+<script setup name="DmsBillsInspectInstanceActivity" lang="ts">
+import { ref, reactive, toRefs, getCurrentInstance, onMounted, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import type { FormInstance, FormRules } from 'element-plus';
+import {
+  addDmsBillsInspectInstanceActivity
+} from '@/api/dms/dmsBillsInspectInstanceActivity';
+import {
+  DmsBillsInspectInstanceActivityForm
+} from '@/api/dms/dmsBillsInspectInstanceActivity/types';
+import { getDmsBillsInspectInstance } from '@/api/dms/dmsBillsInspectInstance';
+import { getCurrentTask } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { inspect_status } = toRefs<any>(proxy?.useDict('inspect_status'));
+const route = useRoute();
+const router = useRouter();
+
+// 表单引用
+const processFormRef = ref<FormInstance>();
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+// 基础数据
+const loading = ref(false);
+const buttonLoading = ref(false);
+const workOrder = ref<any>({});
+const workOrderStatusText = ref('');
+const currentTask = ref<any>(null);
+const taskVariables = ref<any>({});
+
+// 路由参数
+const routeParams = computed(() => route.query);
+
+// 表单数据
+const form = reactive<Partial<DmsBillsInspectInstanceActivityForm>>({
+  inspectInstanceId: routeParams.value.id,
+  inspectRouteId: undefined,
+  deviceAmount: undefined,
+  performer: undefined,
+  processHandleResolution: undefined
+});
+
+// 表单验证规则
+const rules = reactive<FormRules>({
+  inspectRouteId: [{ required: true, message: "巡检线路不能为空", trigger: "blur" }],
+  deviceAmount: [{ required: true, message: "设备总数不能为空", trigger: "blur" }],
+  performer: [{ required: true, message: "执行人员不能为空", trigger: "blur" }],
+  processHandleResolution: [{ required: false, message: "处理意见不能为空", trigger: "blur" }]
+});
+
+// 计算属性
+const approvalButtonShow = computed(() => {
+  return routeParams.value.type === 'approval' && currentTask.value;
+});
+
+const currentStepName = computed(() => {
+  if (!currentTask.value) return '处理';
+  return currentTask.value.nodeName || '处理';
+});
+
+const currentStepTitle = computed(() => {
+  if (!currentTask.value) return '工单处理';
+  return `当前节点：${currentTask.value.nodeName || '工单处理'}`;
+});
+
+const needProcessResolution = computed(() => {
+  return routeParams.value.type === 'approval';
+});
+
+// 初始化
+onMounted(async () => {
+  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;
+  }
+});
+
+// 加载工单信息
+const loadWorkOrderInfo = async () => {
+  const businessId = routeParams.value.id;
+  if (!businessId) {
+    proxy?.$modal.msgError('缺少工单ID参数');
+    return;
+  }
+  
+  const res = await getDmsBillsInspectInstance(businessId);
+  workOrder.value = res.data;
+  
+  // 设置状态显示文本
+  if (inspect_status.value && workOrder.value.inspectStatus !== undefined) {
+    const statusItem = inspect_status.value.find((item: any) => String(item.value) === String(workOrder.value.inspectStatus));
+    workOrderStatusText.value = statusItem ? statusItem.label : '未知状态';
+  } else {
+    workOrderStatusText.value = '未知状态';
+  }
+};
+
+// 加载当前任务信息
+const loadCurrentTask = async () => {
+  try {
+    const taskId = routeParams.value.taskId;
+    if (taskId) {
+      const res = await getCurrentTask(taskId);
+      currentTask.value = res.data;
+    }
+  } catch (error) {
+    console.error('获取任务信息失败:', error);
+  }
+};
+
+// 初始化表单数据
+const initializeFormData = () => {
+  // 基础信息从工单获取
+  form.inspectInstanceId = workOrder.value.inspectInstanceId;
+  form.inspectRouteId = workOrder.value.inspectRouteId;
+  form.deviceAmount = workOrder.value.deviceAmount;
+  form.performer = workOrder.value.performer;
+  
+  // 如果是审批模式，需要处理意见
+  if (routeParams.value.type === 'approval') {
+    rules.processHandleResolution = [{ required: true, message: "处理意见不能为空", trigger: "blur" }];
+  }
+};
+
+// 审批处理
+const approvalVerifyOpen = async () => {
+  if (!processFormRef.value) return;
+  
+  try {
+    const valid = await processFormRef.value.validate();
+    if (valid) {
+      // 准备任务变量
+      taskVariables.value = {
+        entity: {
+          inspectInstanceId: form.inspectInstanceId,
+          inspectRouteId: form.inspectRouteId,
+          deviceAmount: form.deviceAmount,
+          performer: form.performer,
+          processHandleResolution: form.processHandleResolution || ''
+        }
+      };
+      
+      // 直接使用传入的taskId进行审批
+      submitVerifyRef.value?.openDialog(routeParams.value.taskId);
+    }
+  } catch (error) {
+    proxy?.$modal.msgError('表单验证失败');
+  }
+};
+
+// 审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value?.init(routeParams.value.id);
+};
+
+// 提交回调
+const submitCallback = async () => {
+  try {
+    // 保存工单实例活动记录
+    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 addDmsBillsInspectInstanceActivity({
+      inspectInstanceId: form.inspectInstanceId,
+      inspectRouteId: form.inspectRouteId,
+      deviceAmount: form.deviceAmount,
+      performer: form.performer,
+      processHandleResolution: form.processHandleResolution || '',
+      handleTime: getCurrentDateTime()
+    });
+    
+    proxy?.$modal.msgSuccess(`${currentStepName.value}完成`);
+    
+    // 关闭页面返回
+    goBack();
+  } catch (error) {
+    console.error('保存业务数据失败:', error);
+    proxy?.$modal.msgError('保存业务数据失败');
+  }
+};
+
+// 返回
+const goBack = () => {
+  proxy?.$tab.closePage(proxy?.$route);
+  proxy?.$router.go(-1);
+};
+</script>
+
+<style scoped>
+.form-header {
+  font-size: 15px;
+  color: #409eff;
+  border-bottom: 1px solid #ddd;
+  margin: 8px 0 15px;
+  padding-bottom: 10px;
+}
+</style>
diff --git a/src/views/dms/dmsBillsLubeInstance/index.vue b/src/views/dms/dmsBillsLubeInstance/index.vue
index 53d1e9e..4d99bf2 100644
--- a/src/views/dms/dmsBillsLubeInstance/index.vue
+++ b/src/views/dms/dmsBillsLubeInstance/index.vue
@@ -86,9 +86,6 @@
           </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBillsLubeInstance:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsBillsLubeInstance:export']">导出</el-button>
           </el-col>-->
           <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -263,7 +260,14 @@
 </template>
 
 <script setup name="DmsBillsLubeInstance" lang="ts">
-import { listDmsBillsLubeInstance, getDmsBillsLubeInstance, delDmsBillsLubeInstance, addDmsBillsLubeInstance, updateDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
+import {
+  listDmsBillsLubeInstance,
+  getDmsBillsLubeInstance,
+  delDmsBillsLubeInstance,
+  addDmsBillsLubeInstance,
+  updateDmsBillsLubeInstance,
+  updateWfDefinitionIdById
+} from '@/api/dms/dmsBillsLubeInstance';
 import { DmsBillsLubeInstanceVO, DmsBillsLubeInstanceQuery, DmsBillsLubeInstanceForm } from '@/api/dms/dmsBillsLubeInstance/types';
 import { useRouter } from 'vue-router';
 import { startWorkFlow } from '@/api/workflow/task'
@@ -476,12 +480,11 @@ const handleStartWorkflow = async (row: DmsBillsLubeInstanceVO) => {
 
       const workflowRes = await startWorkFlow(workflowData);
 
-      // 更新工单的工作流定义ID
-      await updateDmsBillsLubeInstance({
-        ...row,
-        wfDefinitionId: workflowRes.data.taskId,
-        status: 'waiting'
-      });
+      // 检查工作流启动结果
+      if (!workflowRes || !workflowRes.data || !workflowRes.data.taskId) {
+        throw new Error('工作流启动失败，未获取到有效的taskId');
+      }
+      await updateWfDefinitionIdById(row.lubeInstanceId,workflowRes.data.taskId);
 
       // 准备第一个节点的任务变量
       taskVariables.value = {
@@ -503,7 +506,7 @@ const handleStartWorkflow = async (row: DmsBillsLubeInstanceVO) => {
     }
   } catch (error) {
     console.error('启动工作流失败:', error);
-    proxy?.$modal.msgError('启动工作流失败');
+    proxy?.$modal.msgError('启动工作流失败: ' + (error.message || '未知错误'));
   } finally {
     buttonLoading.value = false;
   }
diff --git a/src/views/dms/dmsBillsMaintInstance/index.vue b/src/views/dms/dmsBillsMaintInstance/index.vue
index c1f9469..4639047 100644
--- a/src/views/dms/dmsBillsMaintInstance/index.vue
+++ b/src/views/dms/dmsBillsMaintInstance/index.vue
@@ -137,11 +137,14 @@
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[14].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
+<!--            <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsMaintInstance:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBillsMaintInstance:remove']"></el-button>
+            </el-tooltip>-->
+            <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>
           </template>
         </el-table-column>
@@ -242,6 +245,8 @@
 <script setup name="DmsBillsMaintInstance" lang="ts">
 import { listDmsBillsMaintInstance, getDmsBillsMaintInstance, delDmsBillsMaintInstance, addDmsBillsMaintInstance, updateDmsBillsMaintInstance } from '@/api/dms/dmsBillsMaintInstance';
 import { DmsBillsMaintInstanceVO, DmsBillsMaintInstanceQuery, DmsBillsMaintInstanceForm } from '@/api/dms/dmsBillsMaintInstance/types';
+import {useRouter} from "vue-router";
+import {DmsBillsLubeInstanceVO} from "@/api/dms/dmsBillsLubeInstance/types";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { maint_status, maint_level } = toRefs<any>(proxy?.useDict('maint_status', 'maint_level'));
@@ -455,6 +460,11 @@ const handleView = (row?: DmsBillsMaintInstanceVO) => {
   });
 };
 
+const router = useRouter();
+const handleShowDetail = (row: DmsBillsMaintInstanceVO) => {
+  router.push('/dms/dmsMaintInstanceActivity/index/' + row.maintInstanceId);
+}
+
 onMounted(() => {
   getList();
 });
diff --git a/src/views/dms/dmsFaultInstanceActivity/index.vue b/src/views/dms/dmsFaultInstanceActivity/index.vue
index 932fd62..4ca4f44 100644
--- a/src/views/dms/dmsFaultInstanceActivity/index.vue
+++ b/src/views/dms/dmsFaultInstanceActivity/index.vue
@@ -7,8 +7,8 @@
             <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="故障报修工单ID，关联故障报修工单主键" prop="repairInstanceId">
-              <el-input v-model="queryParams.repairInstanceId" placeholder="请输入故障报修工单ID，关联故障报修工单主键" clearable @keyup.enter="handleQuery" />
+            <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" />
diff --git a/src/views/dms/dmsInstanceFile/index.vue b/src/views/dms/dmsInstanceFile/index.vue
index a147675..29d2f5f 100644
--- a/src/views/dms/dmsInstanceFile/index.vue
+++ b/src/views/dms/dmsInstanceFile/index.vue
@@ -89,11 +89,12 @@
 <!--        <el-form-item label="关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" prop="targetId">
           <el-input v-model="form.targetId" placeholder="请输入关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" />
         </el-form-item>-->
-        <el-form-item label="关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" prop="targetId">
+<!--        <el-form-item label="关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" prop="targetId">
           <el-input v-model="form.targetId" placeholder="请输入关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" />
-        </el-form-item>
-        <el-form-item label="故障文件地址，一般是图片" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入故障文件地址，一般是图片" />
+        </el-form-item>-->
+        <el-form-item label="故障文件地址" prop="filePath">
+<!--          <el-input v-model="form.filePath" placeholder="请输入故障文件地址，一般是图片" />-->
+          <file-upload v-model="form.filePath"/>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -233,7 +234,15 @@ const submitForm = () => {
       if (form.value.instanceFileId) {
         await updateDmsInstanceFile(form.value).finally(() =>  buttonLoading.value = false);
       } else {
-        await addDmsInstanceFile(form.value).finally(() =>  buttonLoading.value = false);
+        if (form.value.filePath === null || form.value.filePath.length === 0) {
+          proxy?.$modal.warning('请上传！');
+          return;
+        }
+        for (let e of form.value.filePath){
+          form.value.filePath = e.url;
+          await addDmsInstanceFile(form.value).finally(() =>  buttonLoading.value = false);
+        }
+
       }
       proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
diff --git a/src/views/dms/dmsMaintInstanceActivity/index.vue b/src/views/dms/dmsMaintInstanceActivity/index.vue
new file mode 100644
index 0000000..0a8ac90
--- /dev/null
+++ b/src/views/dms/dmsMaintInstanceActivity/index.vue
@@ -0,0 +1,334 @@
+<template>
+  <div class="p-2">
+    <!-- 操作按钮区域 -->
+    <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">
+            <el-form-item label="工单编号">
+              <el-input v-model="workOrder.billsMaintCode" 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.createBy" 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>
+          <el-col :span="8">
+            <el-form-item label="保养级别" prop="maintLevel">
+              <el-select v-model="form.maintLevel" placeholder="请选择保养级别">
+                <el-option 
+                  v-for="dict in maint_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="maintGroup">
+              <el-input v-model="form.maintGroup" placeholder="请输入保养组别" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="保养负责人" prop="maintSupervisor">
+              <el-input v-model="form.maintSupervisor" placeholder="请输入保养负责人" />
+            </el-form-item>
+          </el-col>
+          
+          <!-- 处理意见：除第一步外都需要 -->
+          <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>
+    </el-card>
+
+    <!-- 审批组件 -->
+    <submitVerify 
+      ref="submitVerifyRef" 
+      :task-variables="taskVariables" 
+      @submit-callback="submitCallback" />
+    
+    <!-- 审批记录组件 -->
+    <approvalRecord ref="approvalRecordRef" />
+  </div>
+</template>
+
+<script setup name="DmsMaintInstanceActivity" lang="ts">
+import { ref, reactive, toRefs, getCurrentInstance, onMounted, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import type { FormInstance, FormRules } from 'element-plus';
+import {
+  addDmsMaintInstanceActivity,
+  getDmsMaintInstanceActivityList
+} from '@/api/dms/dmsMaintInstanceActivity';
+import {
+  DmsMaintInstanceActivityForm
+} from '@/api/dms/dmsMaintInstanceActivity/types';
+import { getDmsBillsMaintInstance } from '@/api/dms/dmsBillsMaintInstance';
+import { getCurrentTask } from '@/api/workflow/task';
+import SubmitVerify from '@/components/Process/submitVerify.vue';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { maint_level } = toRefs<any>(proxy?.useDict('maint_level'));
+const route = useRoute();
+const router = useRouter();
+
+// 表单引用
+const processFormRef = ref<FormInstance>();
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+
+// 基础数据
+const loading = ref(false);
+const buttonLoading = ref(false);
+const workOrder = ref<any>({});
+const workOrderStatusText = ref('');
+const currentTask = ref<any>(null);
+const taskVariables = ref<any>({});
+
+// 路由参数
+const routeParams = computed(() => route.query);
+
+// 表单数据
+const form = reactive<Partial<DmsMaintInstanceActivityForm>>({
+  maintInstanceId: routeParams.value.id,
+  maintLevel: undefined,
+  maintGroup: undefined,
+  maintSupervisor: undefined,
+  processHandleResolution: undefined
+});
+
+// 表单验证规则
+const rules = reactive<FormRules>({
+  maintLevel: [{ required: true, message: "保养级别不能为空", trigger: "change" }],
+  maintGroup: [{ required: true, message: "保养组别不能为空", trigger: "blur" }],
+  maintSupervisor: [{ required: true, message: "保养负责人不能为空", trigger: "blur" }],
+  processHandleResolution: [{ required: false, message: "处理意见不能为空", trigger: "blur" }]
+});
+
+// 计算属性
+const approvalButtonShow = computed(() => {
+  return routeParams.value.type === 'approval' && currentTask.value;
+});
+
+const currentStepName = computed(() => {
+  if (!currentTask.value) return '处理';
+  return currentTask.value.nodeName || '处理';
+});
+
+const currentStepTitle = computed(() => {
+  if (!currentTask.value) return '工单处理';
+  return `当前节点：${currentTask.value.nodeName || '工单处理'}`;
+});
+
+const needProcessResolution = computed(() => {
+  return routeParams.value.type === 'approval';
+});
+
+// 初始化
+onMounted(async () => {
+  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;
+  }
+});
+
+// 加载工单信息
+const loadWorkOrderInfo = async () => {
+  const businessId = routeParams.value.id;
+  if (!businessId) {
+    proxy?.$modal.msgError('缺少工单ID参数');
+    return;
+  }
+  
+  const res = await getDmsBillsMaintInstance(businessId);
+  workOrder.value = res.data;
+  
+  // 设置状态显示文本
+  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 {
+    workOrderStatusText.value = '未知状态';
+  }
+};
+
+// 加载当前任务信息
+const loadCurrentTask = async () => {
+  try {
+    const taskId = routeParams.value.taskId;
+    if (taskId) {
+      const res = await getCurrentTask(taskId);
+      currentTask.value = res.data;
+    }
+  } catch (error) {
+    console.error('获取任务信息失败:', error);
+  }
+};
+
+// 初始化表单数据
+const initializeFormData = () => {
+  // 基础信息从工单获取
+  form.maintInstanceId = workOrder.value.maintInstanceId;
+  form.maintLevel = workOrder.value.maintLevel;
+  form.maintGroup = workOrder.value.maintGroup;
+  form.maintSupervisor = workOrder.value.maintSupervisor;
+  
+  // 如果是审批模式，需要处理意见
+  if (routeParams.value.type === 'approval') {
+    rules.processHandleResolution = [{ required: true, message: "处理意见不能为空", trigger: "blur" }];
+  }
+};
+
+// 审批处理
+const approvalVerifyOpen = async () => {
+  if (!processFormRef.value) return;
+  
+  try {
+    const valid = await processFormRef.value.validate();
+    if (valid) {
+      // 准备任务变量
+      taskVariables.value = {
+        entity: {
+          maintInstanceId: form.maintInstanceId,
+          maintLevel: form.maintLevel,
+          maintGroup: form.maintGroup,
+          maintSupervisor: form.maintSupervisor,
+          processHandleResolution: form.processHandleResolution || ''
+        }
+      };
+      
+      // 直接使用传入的taskId进行审批
+      submitVerifyRef.value?.openDialog(routeParams.value.taskId);
+    }
+  } catch (error) {
+    proxy?.$modal.msgError('表单验证失败');
+  }
+};
+
+// 审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value?.init(routeParams.value.id);
+};
+
+// 提交回调
+const submitCallback = async () => {
+  try {
+    // 保存工单实例活动记录
+    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 addDmsMaintInstanceActivity({
+      maintInstanceId: form.maintInstanceId,
+      maintLevel: form.maintLevel,
+      maintGroup: form.maintGroup,
+      maintSupervisor: form.maintSupervisor,
+      processHandleResolution: form.processHandleResolution || '',
+      handleTime: getCurrentDateTime()
+    });
+    
+    proxy?.$modal.msgSuccess(`${currentStepName.value}完成`);
+    
+    // 关闭页面返回
+    goBack();
+  } catch (error) {
+    console.error('保存业务数据失败:', error);
+    proxy?.$modal.msgError('保存业务数据失败');
+  }
+};
+
+// 返回
+const goBack = () => {
+  proxy?.$tab.closePage(proxy?.$route);
+  proxy?.$router.go(-1);
+};
+</script>
+
+<style scoped>
+.form-header {
+  font-size: 15px;
+  color: #409eff;
+  border-bottom: 1px solid #ddd;
+  margin: 8px 0 15px;
+  padding-bottom: 10px;
+}
+</style>
diff --git a/src/views/dms/dmsPlanInspect/index.vue b/src/views/dms/dmsPlanInspect/index.vue
index 1687b6f..c62e795 100644
--- a/src/views/dms/dmsPlanInspect/index.vue
+++ b/src/views/dms/dmsPlanInspect/index.vue
@@ -111,9 +111,9 @@
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[13].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="计划明细" placement="top">
+<!--            <el-tooltip content="计划明细" placement="top">
               <el-button link type="primary" icon="Right" @click="jumpToDetail(scope.row)" v-hasPermi="['dms:dmsPlanInspect:edit']"></el-button>
-            </el-tooltip>
+            </el-tooltip>-->
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsPlanInspect:edit']"></el-button>
             </el-tooltip>
@@ -126,6 +126,7 @@
 
       <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="dmsPlanInspectFormRef" :model="form" :rules="rules" label-width="120px">
@@ -141,7 +142,7 @@
         <el-form-item label="巡检级别" prop="inspectLevel">
           <el-radio-group v-model="form.inspectLevel">
             <el-radio
-              v-for="dict in inspect_level"
+              v-for="dict in dms_inspect_level"
               :key="dict.value"
               :label="dict.value"
             >{{dict.label}}</el-radio>
@@ -257,7 +258,7 @@
         </div>
       </template>
     </el-dialog>
-    
+
     <!-- 添加Cron表达式生成器弹窗 -->
     <el-dialog title="Cron表达式生成器" v-model="openCron" append-to-body destroy-on-close class="scrollbar">
       <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
@@ -269,13 +270,13 @@
 import { listDmsPlanInspect, getDmsPlanInspect, delDmsPlanInspect, addDmsPlanInspect, updateDmsPlanInspect } from '@/api/dms/dmsPlanInspect';
 import { DmsPlanInspectVO, DmsPlanInspectQuery, DmsPlanInspectForm } from '@/api/dms/dmsPlanInspect/types';
 import { getDmsBaseInspectRouteList } from "@/api/dms/dmsBaseInspectRoute";
-import { listUser } from "@/api/system/user";
+import { getUserList} from "@/api/system/user";
 import Crontab from '@/components/Crontab/index.vue';
 import { useRouter } from 'vue-router';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { active_flag, inspect_type, inspect_level } = toRefs<any>(proxy?.useDict('active_flag', 'inspect_type', 'inspect_level'));
+const { active_flag, inspect_type, dms_inspect_level } = toRefs<any>(proxy?.useDict('active_flag', 'inspect_type', 'dms_inspect_level'));
 
 const dmsPlanInspectList = ref<DmsPlanInspectVO[]>([]);
 const buttonLoading = ref(false);
@@ -569,7 +570,7 @@ const handleShowCron = () => {
       }
     }
   }
-  
+
   expression.value = cronExp || form.value.cronExpression || "";
   openCron.value = true;
 }
@@ -593,18 +594,14 @@ const getDmsInspectRouteList = async () => {
 
 //获取用户列表
 let userList = ref([]);
-const getUserList = async () => {
-  try {
-    const res = await listUser({ pageNum: 1, pageSize: 999 });
-    userList.value = res.rows;
-  } catch (error) {
-    console.error("获取用户列表失败:", error);
-  }
+const getUser = async () => {
+    const res = await getUserList(null);
+    userList.value = res.data;
 }
 
 onMounted(() => {
   getDmsInspectRouteList();
-  getUserList();
+  getUser();
   getList();
 });
 </script>
diff --git a/src/views/dms/dmsPlanRepairDetail/copy.vue b/src/views/dms/dmsPlanRepairDetail/copy.vue
new file mode 100644
index 0000000..bcd02c2
--- /dev/null
+++ b/src/views/dms/dmsPlanRepairDetail/copy.vue
@@ -0,0 +1,310 @@
+<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="planRepairDetailId">
+              <el-input v-model="queryParams.planRepairDetailId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="计划ID，关联dms_plan_repair的plan_maint_id" prop="planRepairId">
+              <el-input v-model="queryParams.planRepairId" placeholder="请输入计划ID，关联dms_plan_repair的plan_maint_id" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="检修计划明细类型(1设备 2设备类型)" prop="repairDetailTargetType">
+              <el-select v-model="queryParams.repairDetailTargetType" placeholder="请选择检修计划明细类型(1设备 2设备类型)" clearable >
+                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>-->
+            <el-form-item label="检修计划明细ID,根据检修计划明细类型关联对应表的主键" prop="repairDetailTargetId">
+              <el-input v-model="queryParams.repairDetailTargetId" placeholder="请输入检修计划明细ID,根据检修计划明细类型关联对应表的主键" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="故障类别" prop="faultType">
+              <el-select v-model="queryParams.faultType" placeholder="请选择故障类别" clearable >
+                <el-option v-for="dict in fault_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="检修说明" prop="repairDesc">
+              <el-input v-model="queryParams.repairDesc" placeholder="请输入检修说明" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="检修标准" prop="repairProtocol">
+              <el-input v-model="queryParams.repairProtocol" placeholder="请输入检修标准" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="操作描述" prop="operationDescription">
+              <el-input v-model="queryParams.operationDescription" 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:dmsPlanRepairDetail:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsPlanRepairDetail:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsPlanRepairDetail:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsPlanRepairDetail: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="dmsPlanRepairDetailList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="planRepairDetailId" v-if="columns[0].visible"/>
+        <el-table-column label="计划ID，关联dms_plan_repair的plan_maint_id" align="center" prop="planRepairId" v-if="columns[2].visible"/>
+        <el-table-column label="检修计划明细类型(1设备 2设备类型)" align="center" prop="repairDetailTargetType" v-if="columns[3].visible"/>
+        <el-table-column label="检修计划明细ID,根据检修计划明细类型关联对应表的主键" align="center" prop="repairDetailTargetId" v-if="columns[4].visible"/>
+        <el-table-column label="故障类别" align="center" prop="faultType" v-if="columns[5].visible">
+          <template #default="scope">
+            <dict-tag :options="fault_type" :value="scope.row.faultType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="检修说明" align="center" prop="repairDesc" v-if="columns[6].visible"/>
+        <el-table-column label="检修标准" align="center" prop="repairProtocol" v-if="columns[7].visible"/>
+        <el-table-column label="操作描述" align="center" prop="operationDescription" v-if="columns[8].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:dmsPlanRepairDetail:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsPlanRepairDetail: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" />
+    </el-card>
+    <!-- 添加或修改检修计划明细对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="dmsPlanRepairDetailFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="主键标识" prop="planRepairDetailId">
+          <el-input v-model="form.planRepairDetailId" placeholder="请输入主键标识" />
+        </el-form-item>
+        <el-form-item label="计划ID，关联dms_plan_repair的plan_maint_id" prop="planRepairId">
+          <el-input v-model="form.planRepairId" placeholder="请输入计划ID，关联dms_plan_repair的plan_maint_id" />
+        </el-form-item>
+<!--        <el-form-item label="检修计划明细类型(1设备 2设备类型)" prop="repairDetailTargetType">
+          <el-select v-model="form.repairDetailTargetType" placeholder="请选择检修计划明细类型(1设备 2设备类型)">
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>-->
+        <el-form-item label="检修计划明细ID,根据检修计划明细类型关联对应表的主键" prop="repairDetailTargetId">
+          <el-input v-model="form.repairDetailTargetId" placeholder="请输入检修计划明细ID,根据检修计划明细类型关联对应表的主键" />
+        </el-form-item>
+        <el-form-item label="故障类别" prop="faultType">
+          <el-select v-model="form.faultType" placeholder="请选择故障类别">
+            <el-option
+              v-for="dict in fault_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检修说明" prop="repairDesc">
+          <el-input v-model="form.repairDesc" placeholder="请输入检修说明" />
+        </el-form-item>
+        <el-form-item label="检修标准" prop="repairProtocol">
+          <el-input v-model="form.repairProtocol" placeholder="请输入检修标准" />
+        </el-form-item>
+        <el-form-item label="操作描述" prop="operationDescription">
+          <el-input v-model="form.operationDescription" 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>
+  </div>
+</template>
+
+<script setup name="DmsPlanRepairDetail" lang="ts">
+import { listDmsPlanRepairDetail, getDmsPlanRepairDetail, delDmsPlanRepairDetail, addDmsPlanRepairDetail, updateDmsPlanRepairDetail } from '@/api/dms/dmsPlanRepairDetail';
+import { DmsPlanRepairDetailVO, DmsPlanRepairDetailQuery, DmsPlanRepairDetailForm } from '@/api/dms/dmsPlanRepairDetail/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { fault_type } = toRefs<any>(proxy?.useDict('fault_type'));
+
+const dmsPlanRepairDetailList = ref<DmsPlanRepairDetailVO[]>([]);
+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 queryFormRef = ref<ElFormInstance>();
+const dmsPlanRepairDetailFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `主键标识`, visible: true },
+  { key: 1, label: `租户编号`, visible: true },
+  { key: 2, label: `计划ID，关联dms_plan_repair的plan_maint_id`, visible: true },
+  { key: 3, label: `检修计划明细类型(1设备 2设备类型)`, visible: true },
+  { key: 4, label: `检修计划明细ID,根据检修计划明细类型关联对应表的主键`, 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 },
+]);
+
+const initFormData: DmsPlanRepairDetailForm = {
+  planRepairDetailId: undefined,
+  planRepairId: undefined,
+  repairDetailTargetType: undefined,
+  repairDetailTargetId: undefined,
+  faultType: undefined,
+  repairDesc: undefined,
+  repairProtocol: undefined,
+  operationDescription: undefined,
+}
+const data = reactive<PageData<DmsPlanRepairDetailForm, DmsPlanRepairDetailQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    planRepairDetailId: undefined,
+    planRepairId: undefined,
+    repairDetailTargetType: undefined,
+    repairDetailTargetId: undefined,
+    faultType: undefined,
+    repairDesc: undefined,
+    repairProtocol: undefined,
+    operationDescription: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询检修计划明细列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDmsPlanRepairDetail(queryParams.value);
+  dmsPlanRepairDetailList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  dmsPlanRepairDetailFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DmsPlanRepairDetailVO[]) => {
+  ids.value = selection.map(item => item.planRepairDetailId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加检修计划明细";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DmsPlanRepairDetailVO) => {
+  reset();
+  const _planRepairDetailId = row?.planRepairDetailId || ids.value[0]
+  const res = await getDmsPlanRepairDetail(_planRepairDetailId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改检修计划明细";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  dmsPlanRepairDetailFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.planRepairDetailId) {
+        await updateDmsPlanRepairDetail(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDmsPlanRepairDetail(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DmsPlanRepairDetailVO) => {
+  const _planRepairDetailIds = row?.planRepairDetailId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除检修计划明细编号为"' + _planRepairDetailIds + '"的数据项？').finally(() => loading.value = false);
+  await delDmsPlanRepairDetail(_planRepairDetailIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('dms/dmsPlanRepairDetail/export', {
+    ...queryParams.value
+  }, `dmsPlanRepairDetail_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/dms/dmsRepairInstance/index.vue b/src/views/dms/dmsRepairInstance/index.vue
index 9f08cb0..575e4fe 100644
--- a/src/views/dms/dmsRepairInstance/index.vue
+++ b/src/views/dms/dmsRepairInstance/index.vue
@@ -78,7 +78,7 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+<!--          <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsRepairInstance:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -86,7 +86,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsRepairInstance:remove']">删除</el-button>
-          </el-col>
+          </el-col>-->
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsRepairInstance:export']">导出</el-button>
           </el-col>
diff --git a/src/views/dms/dmsRepairInstanceActivity/index.vue b/src/views/dms/dmsRepairInstanceActivity/index.vue
index d13e6d1..51ecf35 100644
--- a/src/views/dms/dmsRepairInstanceActivity/index.vue
+++ b/src/views/dms/dmsRepairInstanceActivity/index.vue
@@ -1,314 +1,222 @@
 <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" />
+    <!-- 工单信息区域 -->
+    <h4 class="form-header h4">工单信息</h4>
+    <el-card shadow="never" class="mb-[10px]">
+      <el-form label-width="120px">
+        <el-row>
+          <el-col :span="8" :offset="2">
+            <el-form-item label="工单编号">
+              <el-input v-model="billsInfo.billsRepairCode" disabled />
             </el-form-item>
-            <el-form-item label="维修工单实例ID，关联dms_bills_repair_instance的repair_instance_id" prop="repairInstanceId">
-              <el-input v-model="queryParams.repairInstanceId" placeholder="请输入维修工单实例ID，关联dms_bills_repair_instance的repair_instance_id" 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="repairType">
-              <el-select v-model="queryParams.repairType" placeholder="请选择检修类型(1简单检修 2整体检修);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" clearable >
-                <el-option v-for="dict in repair_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="repairGroup">
-              <el-input v-model="queryParams.repairGroup" placeholder="请输入检修组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="检修负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="repairSupervisor">
-              <el-input v-model="queryParams.repairSupervisor" placeholder="请输入检修负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="处理意见;第1步不显示，从第2步骤开始显示此字段" prop="processHandleResolution">
-              <el-input v-model="queryParams.processHandleResolution" placeholder="请输入处理意见;第1步不显示，从第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="用户预留1" prop="attr1">
-              <el-input v-model="queryParams.attr1" placeholder="请输入用户预留1" 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:dmsRepairInstanceActivity:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsRepairInstanceActivity:edit']">修改</el-button>
+          <el-col :span="8" :offset="2">
+            <el-form-item label="工单状态">
+              <el-input v-model="billsStatusCheck" disabled />
+            </el-form-item>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsRepairInstanceActivity:remove']">删除</el-button>
+          <el-col :span="8" :offset="2">
+            <el-form-item label="申请人">
+              <el-input v-model="billsInfo.createBy" disabled />
+            </el-form-item>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsRepairInstanceActivity:export']">导出</el-button>
+          <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-form-item>
           </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="dmsRepairInstanceActivityList" @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，关联dms_bills_repair_instance的repair_instance_id" align="center" prop="repairInstanceId" v-if="columns[1].visible"/>
-        <el-table-column label="流程定义ID，关联wf_definition_config的id" align="center" prop="wfDefinitionId" v-if="columns[2].visible"/>
-        <el-table-column label="工单流程节点ID" align="center" prop="wfNodeId" v-if="columns[3].visible"/>
-        <el-table-column label="检修类型(1简单检修 2整体检修);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" align="center" prop="repairType" v-if="columns[4].visible">
-          <template #default="scope">
-            <dict-tag :options="repair_type" :value="scope.row.repairType"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="检修组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" align="center" prop="repairGroup" v-if="columns[5].visible"/>
-        <el-table-column label="检修负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" align="center" prop="repairSupervisor" v-if="columns[6].visible"/>
-        <el-table-column label="处理意见;第1步不显示，从第2步骤开始显示此字段" align="center" prop="processHandleResolution" v-if="columns[7].visible"/>
-        <el-table-column label="状态(0已结束 1执行中 2待接取 3已转发）" align="center" prop="processHandleStatus" v-if="columns[8].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[9].visible"/>
-        <el-table-column label="执行开始时间" align="center" prop="startTime" width="180" v-if="columns[10].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[11].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[12].visible"/>
-        <el-table-column label="处理人" align="center" prop="handleBy" v-if="columns[13].visible"/>
-        <el-table-column label="处理时间" align="center" prop="handleTime" width="180" v-if="columns[14].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[15].visible"/>
-        <el-table-column label="用户预留1" align="center" prop="attr1" v-if="columns[16].visible"/>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[17].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:dmsRepairInstanceActivity:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsRepairInstanceActivity: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" />
-    </el-card>
-    <!-- 添加或修改检修工单实例节点;最后一步作为检修记录对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="dmsRepairInstanceActivityFormRef" :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，关联dms_bills_repair_instance的repair_instance_id" prop="repairInstanceId">
-          <el-input v-model="form.repairInstanceId" placeholder="请输入维修工单实例ID，关联dms_bills_repair_instance的repair_instance_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="repairType">
-          <el-select v-model="form.repairType" placeholder="请选择检修类型(1简单检修 2整体检修);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的">
-            <el-option
-                v-for="dict in repair_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="检修组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="repairGroup">
-          <el-input v-model="form.repairGroup" placeholder="请输入检修组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" />
-        </el-form-item>
-        <el-form-item label="检修负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="repairSupervisor">
-          <el-input v-model="form.repairSupervisor" placeholder="请输入检修负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" />
-        </el-form-item>
-        <el-form-item label="处理意见;第1步不显示，从第2步骤开始显示此字段" prop="processHandleResolution">
-          <el-input v-model="form.processHandleResolution" placeholder="请输入处理意见;第1步不显示，从第2步骤开始显示此字段" />
-        </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-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="用户预留1" prop="attr1">
-          <el-input v-model="form.attr1" placeholder="请输入用户预留1" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.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>
+    </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="dmsRepairInstanceActivityList.length > 0">已处理节点：步骤1（要求参数）</h4>
+        <el-row v-if="dmsRepairInstanceActivityList.length > 0">
+          <el-col :span="8">
+            <el-form-item label="检修类型" prop="repairType">
+              <el-select v-model="form.repairType" placeholder="检修类型" disabled>
+                <el-option v-for="dict in repair_type" :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="repairGroup">
+              <el-input v-model="form.repairGroup" placeholder="请输入检修组别" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检修负责人" prop="repairSupervisor">
+              <el-input v-model="form.repairSupervisor" placeholder="请输入检修负责人" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 中间步骤 (已处理的后续节点) -->
+        <template v-for="activity in dmsRepairInstanceActivityList" :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.repairType" placeholder="检修类型" disabled>
+                    <el-option v-for="dict in repair_type" :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.repairGroup" disabled placeholder="检修组别"> </el-input>
+        </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="检修负责人">
+                  <el-input v-model="activity.repairSupervisor" 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-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+
+        <!-- 当前步骤表单 (用于提交新节点) -->
+        <div v-if="isUpdate">
+          <h4 class="form-header h4">
+            {{
+              isCreatingWorkflow && dmsRepairInstanceActivityList.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="repairType">
+                  <el-select v-model="nextStepForm.repairType" placeholder="检修类型" :disabled="nextStepOrder === 3">
+                    <el-option v-for="dict in repair_type" :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="repairGroup">
+                  <el-input v-model="nextStepForm.repairGroup" placeholder="检修组别" :disabled="nextStepOrder === 3"></el-input>
+        </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="检修负责人" prop="repairSupervisor">
+                  <el-input v-model="nextStepForm.repairSupervisor" placeholder="检修负责人" :disabled="nextStepOrder === 3"></el-input>
+        </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="!(isCreatingWorkflow && dmsRepairInstanceActivityList.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.repairInstanceId !== null && billsInfo.status !== 'draft'" 
+                  type="primary"
+                  @click="handleApprovalRecord"
+                >
+                  流程进度
+                </el-button>
+              </el-col>
+            </el-row>
+      </el-form>
         </div>
-      </template>
-    </el-dialog>
+      </el-form>
+    </el-card>
+
+    <!-- 提交组件 -->
+    <submitVerify ref="submitVerifyRef" :task-variables="taskVariables as any" @submit-callback="submitCallback" @cancel-callback="cancelCallback" />
+    <!-- 审批记录 -->
+    <approvalRecord ref="approvalRecordRef" />
   </div>
 </template>
 
 <script setup name="DmsRepairInstanceActivity" lang="ts">
-import { listDmsRepairInstanceActivity, getDmsRepairInstanceActivity, delDmsRepairInstanceActivity, addDmsRepairInstanceActivity, updateDmsRepairInstanceActivity } from '@/api/dms/dmsRepairInstanceActivity';
-import { DmsRepairInstanceActivityVO, DmsRepairInstanceActivityQuery, DmsRepairInstanceActivityForm } from '@/api/dms/dmsRepairInstanceActivity/types';
+import { ref, reactive, toRefs, getCurrentInstance, onMounted, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import type { FormInstance, FormRules } from 'element-plus';
+import {
+  addDmsRepairInstanceActivity,
+  getDmsRepairInstanceActivityList,
+} from '@/api/dms/dmsRepairInstanceActivity';
+import {
+  DmsRepairInstanceActivityVO,
+  DmsRepairInstanceActivityForm
+} from '@/api/dms/dmsRepairInstanceActivity/types';
+import { getDmsRepairInstance } from '@/api/dms/dmsRepairInstance';
+
+import { startWorkFlow, 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 { FlowTaskVO } from '@/api/workflow/task/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { repair_type, process_handle_status } = toRefs<any>(proxy?.useDict('repair_type', 'process_handle_status'));
+const { repair_type, process_handle_status, repair_status } = toRefs<any>(proxy?.useDict('repair_type', 'process_handle_status', 'repair_status'));
+const route = useRoute();
 
-const dmsRepairInstanceActivityList = ref<DmsRepairInstanceActivityVO[]>([]);
-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 stepFormRef = ref<FormInstance>();
+const nextStepFormRef = ref<FormInstance>();
 
-const queryFormRef = ref<ElFormInstance>();
-const dmsRepairInstanceActivityFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
+const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+const taskVariables = ref<any>({});
+const submitFormData = ref<StartProcessBo>({
+  businessId: '',
+  flowCode: 'Repair01', // 检修工单流程编码，请根据实际情况修改
+  variables: {}
 });
 
-// 列显隐信息
-const columns = ref<FieldOption[]>([
-        { key: 0, label: `维修工单实例节点ID`, visible: true },
-        { key: 1, label: `维修工单实例ID，关联dms_bills_repair_instance的repair_instance_id`, visible: true },
-        { key: 2, label: `流程定义ID，关联wf_definition_config的id`, visible: true },
-        { key: 3, label: `工单流程节点ID`, visible: true },
-        { key: 4, label: `检修类型(1简单检修 2整体检修);最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的`, visible: true },
-        { key: 5, label: `检修组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的`, visible: true },
-        { key: 6, label: `检修负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的`, visible: true },
-        { key: 7, label: `处理意见;第1步不显示，从第2步骤开始显示此字段`, visible: true },
-        { key: 8, label: `状态(0已结束 1执行中 2待接取 3已转发）`, visible: true },
-        { key: 9, label: `工单流程步骤顺序`, visible: true },
-        { key: 10, label: `执行开始时间`, visible: true },
-        { key: 11, label: `执行结束时间`, visible: true },
-        { key: 12, label: `处理人ID`, visible: true },
-        { key: 13, label: `处理人`, visible: true },
-        { key: 14, label: `处理时间`, visible: true },
-        { key: 15, label: `转单人用户id或转发协助用户id`, visible: true },
-        { key: 16, label: `用户预留1`, 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: true },
-        { key: 22, label: `更新时间`, visible: true },
-]);
+const loading = ref(true);
+const dmsRepairInstanceActivityList = ref<DmsRepairInstanceActivityVO[]>([]);
+const billsInfo = ref<any>({});
+const billsStatusCheck = ref('');
+const isUpdate = ref(true);
+const repairInstanceId = route.params.repairInstanceId as string;
+const buttonLoading = ref(false);
 
-const initFormData: DmsRepairInstanceActivityForm = {
+const currentTaskId = ref<string | number | null>(null);
+const isCreatingWorkflow = ref(false);
+const buttonText = ref('创建工单并提交');
+
+const pendingActivityData = ref<DmsRepairInstanceActivityForm | null>(null);
+
+const nextStepOrder = computed(() => {
+  return dmsRepairInstanceActivityList.value.length + 1;
+});
+
+const form = reactive<Partial<DmsRepairInstanceActivityForm>>({
+  repairType: undefined,
+  repairGroup: undefined,
+  repairSupervisor: undefined,
+  remark: undefined,
+});
+
+const nextStepForm = reactive<DmsRepairInstanceActivityForm>({
   instanceActivityId: undefined,
-  repairInstanceId: undefined,
-  wfDefinitionId: undefined,
-  wfNodeId: undefined,
+  repairInstanceId: repairInstanceId,
   repairType: undefined,
   repairGroup: undefined,
   repairSupervisor: undefined,
@@ -323,16 +231,143 @@ const initFormData: DmsRepairInstanceActivityForm = {
   transferUserId: undefined,
   attr1: undefined,
   remark: undefined,
-}
-const data = reactive<PageData<DmsRepairInstanceActivityForm, DmsRepairInstanceActivityQuery>>({
-  form: {...initFormData},
-  queryParams: {
+});
+
+const nextStepFormRules = reactive<FormRules>({
+  repairType: [{ required: true, message: "检修类型不能为空", trigger: "change" }],
+  repairGroup: [{ required: true, message: "检修组别不能为空", trigger: "blur" }],
+  repairSupervisor: [{ required: true, message: "检修负责人不能为空", trigger: "blur" }],
+  processHandleResolution: [{ required: false, message: "处理意见不能为空", trigger: "blur" }],
+});
+
+onMounted(async () => {
+    await loadData();
+});
+
+async function loadData() {
+  loading.value = true;
+  try {
+    if (nextStepFormRef.value) {
+      nextStepFormRef.value.clearValidate();
+    }
+
+    await dmsRepairInstance(); 
+    await getList(); 
+
+    if (dmsRepairInstanceActivityList.value.length === 0) {
+      currentTaskId.value = null;
+      isCreatingWorkflow.value = true;
+    } else {
+      isCreatingWorkflow.value = false;
+      currentTaskId.value = null; 
+      const completedSteps = dmsRepairInstanceActivityList.value.length;
+
+      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: ${repairInstanceId}`);
+
+        try {
+          let tasks: FlowTaskVO[] = [];
+          if (expectedNodeName) {
+            const taskRes = await pageByTaskWait({
     pageNum: 1,
     pageSize: 10,
+              flowCode: submitFormData.value.flowCode, 
+              nodeName: expectedNodeName
+            });
+            if (taskRes.rows) {
+              tasks = taskRes.rows.filter(task => task.businessId === repairInstanceId);
+              if (tasks.length > 0) {
+                 console.log(`[loadData] Found ${tasks.length} task(s) using specific nodeName '${expectedNodeName}' and businessId '${repairInstanceId}'.`);
+              } else {
+                 console.log(`[loadData] No tasks found using specific nodeName '${expectedNodeName}' for businessId '${repairInstanceId}'. 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 '${repairInstanceId}'. Using the first one found: ${foundTask?.id}.`);
+          }
+
+          if (!foundTask) {
+            console.log(`[loadData] Task not found with specific nodeName. Fetching all waiting tasks for flowCode '${submitFormData.value.flowCode}' to filter by businessId '${repairInstanceId}'.`);
+            const taskResAll = await pageByTaskWait({
+              pageNum: 1,
+              pageSize: 50, 
+              flowCode: submitFormData.value.flowCode
+            });
+
+            if (taskResAll.rows && taskResAll.rows.length > 0) {
+              const businessTasks = taskResAll.rows.filter(task => task.businessId === repairInstanceId);
+              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 '${repairInstanceId}' 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 {
+                  foundTask = businessTasks[0];
+                  console.warn(`[loadData] Could not specifically match by nodeName among multiple tasks for businessId '${repairInstanceId}'. 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 '${repairInstanceId}' even after broader search by flowCode '${submitFormData.value.flowCode}'.`);
+              }
+            }
+          }
+
+          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 ${repairInstanceId} with flowCode ${submitFormData.value.flowCode}. 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();
+
+    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 = dmsRepairInstanceActivityList.value.length === 0;
+    updateButtonAndFormState();
+  } finally {
+    loading.value = false;
+  }
+}
+
+function updateButtonAndFormState() {
+  const activitiesCount = dmsRepairInstanceActivityList.value.length;
+  
+  if (activitiesCount === 0 && isCreatingWorkflow.value) {
+    buttonText.value = '创建工单并提交';
+    nextStepFormRules.processHandleResolution = [{ required: false, message: "处理意见不能为空", trigger: "blur" }];
+    Object.assign(nextStepForm, {
     instanceActivityId: undefined,
-    repairInstanceId: undefined,
-    wfDefinitionId: undefined,
-    wfNodeId: undefined,
+        repairInstanceId: repairInstanceId, 
     repairType: undefined,
     repairGroup: undefined,
     repairSupervisor: undefined,
@@ -346,106 +381,272 @@ const data = reactive<PageData<DmsRepairInstanceActivityForm, DmsRepairInstanceA
     handleTime: undefined,
     transferUserId: undefined,
     attr1: undefined,
-    params: {
+        remark: undefined,
+    });
+  } 
+  else if (currentTaskId.value && !isCreatingWorkflow.value) { 
+    const currentStepBasedOnActivities = activitiesCount + 1;
+
+    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" }];
+    }
+    
+    if (activitiesCount > 0) {
+      const firstActivity = dmsRepairInstanceActivityList.value[0];
+      const lastActivity = dmsRepairInstanceActivityList.value[activitiesCount - 1];
+      if (currentStepBasedOnActivities === 2) { 
+         Object.assign(nextStepForm, {
+          instanceActivityId: undefined,
+          repairInstanceId: repairInstanceId,
+          repairType: firstActivity.repairType,
+          repairGroup: firstActivity.repairGroup, 
+          repairSupervisor: firstActivity.repairSupervisor, 
+          processHandleResolution: '', 
+          remark: '', 
+          processHandleStatus: undefined,
+          processStepOrder: undefined,
+        });
+      } else if (currentStepBasedOnActivities === 3) { 
+        Object.assign(nextStepForm, {
+          instanceActivityId: undefined, 
+          repairInstanceId: repairInstanceId,
+          repairType: firstActivity.repairType,
+          repairGroup: firstActivity.repairGroup, 
+          repairSupervisor: firstActivity.repairSupervisor, 
+          processHandleResolution: '', 
+          remark: '', 
+          processHandleStatus: undefined,
+          processStepOrder: undefined,
+        });
+      } else { 
+        Object.assign(nextStepForm, {
+          instanceActivityId: undefined, 
+          repairInstanceId: repairInstanceId,
+          repairType: lastActivity.repairType,
+          repairGroup: lastActivity.repairGroup,
+          repairSupervisor: lastActivity.repairSupervisor,
+          processHandleResolution: '', 
+          remark: '', 
+          processHandleStatus: undefined,
+          processStepOrder: undefined,
+        });
+      }
+    } else { 
+        Object.assign(nextStepForm, {
+            instanceActivityId: undefined,
+            repairInstanceId: repairInstanceId,
+            processHandleResolution: '',
+            remark: '',
+        });
+    }
+  } else { 
+    buttonText.value = '暂无操作';
+    if (isUpdate.value) { 
+        nextStepFormRules.processHandleResolution = [{ required: false }];
     }
-  },
-  rules: {
   }
-});
+}
 
-const { queryParams, form, rules } = toRefs(data);
+const dmsRepairInstance = async () => {
+    const _repairInstanceId = repairInstanceId;
+    const res = await getDmsRepairInstance(_repairInstanceId);
+    billsInfo.value = res.data;
+
+    if (repair_status.value && billsInfo.value.billsStatus !== undefined) { 
+        const statusItem = repair_status.value.find((item: any) => String(item.value) === String(billsInfo.value.billsStatus));
+        billsStatusCheck.value = statusItem ? statusItem.label : '未知状态';
+    } else {
+        billsStatusCheck.value = '未知状态';
+    }
+};
 
-/** 查询检修工单实例节点;最后一步作为检修记录列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listDmsRepairInstanceActivity(queryParams.value);
-  dmsRepairInstanceActivityList.value = res.rows;
-  total.value = res.total;
+  try {
+    const res = await getDmsRepairInstanceActivityList({repairInstanceId: repairInstanceId}); 
+    dmsRepairInstanceActivityList.value = res.data;
+    
+    if (res.data && res.data.length > 0) {
+        Object.assign(form, { 
+            repairType: res.data[0].repairType,
+            repairGroup: res.data[0].repairGroup,
+            repairSupervisor: res.data[0].repairSupervisor,
+            remark: res.data[0].remark
+        });
+    } else { 
+        Object.assign(form, {
+            repairType: undefined,
+            repairGroup: undefined,
+            repairSupervisor: undefined,
+            remark: undefined
+        });
+    }
+    updateButtonAndFormState(); 
+
+  } catch (error) {
+    console.error('获取工单实例节点数据失败', error);
+    proxy?.$modal.msgError("获取工单实例节点数据失败");
+  } finally {
   loading.value = false;
 }
+};
 
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-}
-
-/** 表单重置 */
-const reset = () => {
-  form.value = {...initFormData};
-  dmsRepairInstanceActivityFormRef.value?.resetFields();
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-}
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: DmsRepairInstanceActivityVO[]) => {
-  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?: DmsRepairInstanceActivityVO) => {
-  reset();
-  const _instanceActivityId = row?.instanceActivityId || ids.value[0]
-  const res = await getDmsRepairInstanceActivity(_instanceActivityId);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = "修改检修工单实例节点;最后一步作为检修记录";
-}
-
-/** 提交按钮 */
-const submitForm = () => {
-  dmsRepairInstanceActivityFormRef.value?.validate(async (valid: boolean) => {
+const submitForm = async () => {
+  if (!nextStepFormRef.value) return;
+  
+  try {
+    buttonLoading.value = false;
+    pendingActivityData.value = null;
+    
+    nextStepFormRef.value.clearValidate();
+    
+    const valid = await nextStepFormRef.value.validate().catch(errors => {
+      console.error("表单验证错误:", errors);
+      return false;
+    });
+    
     if (valid) {
       buttonLoading.value = true;
-      if (form.value.instanceActivityId) {
-        await updateDmsRepairInstanceActivity(form.value).finally(() =>  buttonLoading.value = false);
-      } else {
-        await addDmsRepairInstanceActivity(form.value).finally(() =>  buttonLoading.value = false);
+      
+      try {
+        nextStepForm.processStepOrder = dmsRepairInstanceActivityList.value.length + 1;
+        nextStepForm.repairInstanceId = repairInstanceId; 
+
+        if (nextStepForm.processStepOrder > 1 && (nextStepForm.processHandleResolution === undefined || nextStepForm.processHandleResolution === null)) {
+          nextStepForm.processHandleResolution = '';
+        }
+        
+        pendingActivityData.value = JSON.parse(JSON.stringify(nextStepForm));
+
+        taskVariables.value = { 
+          entity: { 
+            repairInstanceId: pendingActivityData.value.repairInstanceId,
+            repairType: pendingActivityData.value.repairType,
+            repairGroup: pendingActivityData.value.repairGroup,
+            repairSupervisor: pendingActivityData.value.repairSupervisor,
+            processHandleResolution: pendingActivityData.value.processHandleResolution,
+            processStepOrder: pendingActivityData.value.processStepOrder
+          }
+        };
+
+        if (isCreatingWorkflow.value && dmsRepairInstanceActivityList.value.length === 0) {
+          submitFormData.value.businessId = repairInstanceId;
+          submitFormData.value.variables = taskVariables.value;
+
+          console.log("[submitForm] 开始启动工作流, businessId:", repairInstanceId);
+          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; 
+            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 || "提交失败，请检查数据或联系管理员");
       }
-      proxy?.$modal.msgSuccess("操作成功");
-      dialog.visible = false;
-      await getList();
+    } else {
+      buttonLoading.value = false;
+      proxy?.$modal.msgError("表单校验失败，请检查输入项");
     }
-  });
-}
+  } catch (error) {
+    buttonLoading.value = false;
+    console.error('[submitForm] 意外错误:', error);
+    proxy?.$modal.msgError("表单提交过程中发生错误");
+  }
+};
 
-/** 删除按钮操作 */
-const handleDelete = async (row?: DmsRepairInstanceActivityVO) => {
-  const _instanceActivityIds = row?.instanceActivityId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除检修工单实例节点;最后一步作为检修记录编号为"' + _instanceActivityIds + '"的数据项？').finally(() => loading.value = false);
-  await delDmsRepairInstanceActivity(_instanceActivityIds);
-  proxy?.$modal.msgSuccess("删除成功");
-  await getList();
-}
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(repairInstanceId); 
+};
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download('dms/dmsRepairInstanceActivity/export', {
-    ...queryParams.value
-  }, `dmsRepairInstanceActivity_${new Date().getTime()}.xlsx`)
-}
+const submitCallback = async () => {
+  console.log('[submitCallback] Invoked.');
 
-onMounted(() => {
-  getList();
-});
+  try {
+    if (pendingActivityData.value) {
+      const activityRes = await addDmsRepairInstanceActivity(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("工单完成数据已保存，工作流已结束。");
+      } else {
+        proxy?.$modal.msgSuccess("业务数据已保存，操作已继续。");
+      }
+    } else {
+      console.warn("[submitCallback] pendingActivityData was null upon callback.");
+    }
+  } catch (error) {
+    console.error('[submitCallback] Error saving business data:', error);
+    proxy?.$modal.msgError("关键错误：业务数据保存失败！工作流可能已推进，请紧急核查数据一致性。");
+  } finally {
+    buttonLoading.value = false;
+    pendingActivityData.value = null; 
+
+    if (isUpdate.value) {
+      try {
+        console.log("[submitCallback] Reloading data to reflect current workflow state...");
+        await loadData(); 
+        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 cancelCallback = () => {
+  console.log('[cancelCallback] 用户取消了操作');
+  pendingActivityData.value = null; 
+  buttonLoading.value = false;
+};
 </script>
+
+<style scoped>
+.form-header {
+  font-size: 15px;
+  color: #409eff;
+  border-bottom: 1px solid #ddd;
+  margin: 8px 0 15px;
+  padding-bottom: 10px;
+}
+</style>