From d572430460ab12d52eaebefb6802f24f48200801 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Wed, 21 May 2025 11:13:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor(dms):=20index=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=B5=81=E7=A8=8B=E6=94=B9=E4=B8=BAv2=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=BC=80=E5=A7=8B-=E5=B7=A5=E5=8D=95=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA-=E5=B7=A5=E5=8D=95=E5=A4=84=E7=90=86-=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=AE=8C=E6=88=90-=E7=BB=93=E6=9D=9F=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=B6=A6=E6=BB=91=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=AE=9E=E4=BE=8B=E5=A4=87=E4=BB=BD=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dms/dmsBillsLubeInstanceActivity/types.ts |  12 +-
 .../dmsBillsLubeInstanceActivity/backuo1.vue  | 522 ----------------
 .../dmsBillsLubeInstanceActivity/backup2.vue  | 450 --------------
 .../dmsBillsLubeInstanceActivity/backup3.vue  | 476 ---------------
 .../dms/dmsBillsLubeInstanceActivity/copy.vue | 452 --------------
 .../dmsBillsLubeInstanceActivity/copy2.vue    | 475 ---------------
 .../dmsBillsLubeInstanceActivity/index.vue    | 544 +++++++++++++----
 .../dms/dmsBillsLubeInstanceActivity/trae.vue | 563 ------------------
 8 files changed, 440 insertions(+), 3054 deletions(-)
 delete mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/backuo1.vue
 delete mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/backup2.vue
 delete mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/backup3.vue
 delete mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/copy.vue
 delete mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/copy2.vue
 delete mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/trae.vue

diff --git a/src/api/dms/dmsBillsLubeInstanceActivity/types.ts b/src/api/dms/dmsBillsLubeInstanceActivity/types.ts
index 130f2ff..04ef0d0 100644
--- a/src/api/dms/dmsBillsLubeInstanceActivity/types.ts
+++ b/src/api/dms/dmsBillsLubeInstanceActivity/types.ts
@@ -10,12 +10,12 @@ export interface DmsBillsLubeInstanceActivityVO {
   lubeInstanceId: 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 DmsBillsLubeInstanceActivityForm extends BaseEntity {
   lubeInstanceId?: 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 DmsBillsLubeInstanceActivityQuery extends PageQuery {
   lubeInstanceId?: 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/views/dms/dmsBillsLubeInstanceActivity/backuo1.vue b/src/views/dms/dmsBillsLubeInstanceActivity/backuo1.vue
deleted file mode 100644
index 2c4fb3d..0000000
--- a/src/views/dms/dmsBillsLubeInstanceActivity/backuo1.vue
+++ /dev/null
@@ -1,522 +0,0 @@
-<template>
-  <div class="p-2">
-    <!-- 工单信息区域 -->
-    <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.billsLubeCode" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" :offset="2">
-            <el-form-item label="工单状态">
-              <el-input v-model="billsStatusCheck" disabled />
-            </el-form-item>
-          </el-col>
-          <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="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>
-        </el-row>
-      </el-form>
-    </el-card>
-
-    <!-- 流程步骤展示区域 -->
-    <el-card shadow="never" class="mb-[10px]">
-      <el-form ref="stepFormRef" :model="form" label-width="100px">
-        <!-- 第一步 -->
-        <!-- <h4 class="form-header h4" v-if="wfProcessActivityList.length > 0">
-          {{wfProcessActivityList[0]?.processActivityName}}
-        </h4> -->
-        <h4 class="form-header h4" v-if="dmsBillsLubeInstanceActivityList.length > 0">已处理节点：步骤1</h4>
-        <el-row v-if="dmsBillsLubeInstanceActivityList.length > 0">
-          <el-col :span="8">
-            <el-form-item label="润滑级别" prop="lubeLevel">
-              <el-select v-model="form.lubeLevel" placeholder="润滑级别" disabled>
-                <el-option
-                  v-for="dict in lube_level"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="润滑组别" prop="lubeGroup">
-              <el-input v-model="form.lubeGroup" placeholder="请输入润滑组别" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="润滑负责人" prop="lubeSupervisor">
-              <el-input v-model="form.lubeSupervisor" placeholder="请输入润滑负责人" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- 中间步骤 (已处理的后续节点) -->
-        <template v-for="(activity) in dmsBillsLubeInstanceActivityList" :key="activity.instanceActivityId">
-          <div v-if="activity.processStepOrder && activity.processStepOrder > 1">
-            <h4 class="form-header h4">{{ `已处理节点：步骤${activity.processStepOrder}` }}</h4>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="润滑级别">
-                  <el-select
-                    v-model="activity.lubeLevel"
-                    placeholder="润滑级别"
-                    disabled>
-                    <el-option
-                      v-for="dict in lube_level"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑组别">
-                  <el-input
-                    v-model="activity.lubeGroup"
-                    disabled
-                    placeholder="润滑组别">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑负责人">
-                  <el-input
-                    v-model="activity.lubeSupervisor"
-                    disabled
-                    placeholder="润滑负责人">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="处理意见">
-                  <el-input
-                    v-model="activity.processHandleResolution"
-                    disabled
-                    placeholder="处理意见">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-        </template>
-
-        <!-- 当前步骤表单 (用于提交新节点) -->
-        <div v-if="isUpdate">
-          <!-- <h4 class="form-header h4" v-if="wfProcessActivityList.length > dmsBillsLubeInstanceActivityList.length">
-            {{wfProcessActivityList[dmsBillsLubeInstanceActivityList.length]?.processActivityName}}
-          </h4> -->
-          <h4 class="form-header h4">当前处理节点：步骤{{ nextStepOrder }}</h4>
-          <el-form ref="nextStepFormRef" :model="nextStepForm" :rules="nextStepFormRules" label-width="100px">
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="润滑级别" prop="lubeLevel">
-                  <el-select v-model="nextStepForm.lubeLevel" placeholder="润滑级别">
-                    <el-option
-                      v-for="dict in lube_level"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑组别" prop="lubeGroup">
-                  <el-input v-model="nextStepForm.lubeGroup" placeholder="润滑组别"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                  <el-input v-model="nextStepForm.lubeSupervisor" placeholder="润滑负责人"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <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">提 交</el-button>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </el-form>
-    </el-card>
-
-    <!-- 润滑计划详情区域 -->
-    <el-card shadow="never">
-      <h4 class="form-header h4 text-center">润滑计划详细信息</h4>
-      <el-table v-loading="loading" :data="planLubeDetail">
-        <el-table-column label="计划ID" align="center" prop="planLubeId" />
-        <el-table-column label="设备名称" align="center" prop="deviceName" />
-        <el-table-column label="润滑部位" align="center" prop="lubeStationName" />
-        <el-table-column label="润滑标准" align="center" prop="lubeStandardCode" />
-        <el-table-column label="操作描述" align="center" prop="operationDescription" />
-      </el-table>
-    </el-card>
-  </div>
-</template>
-
-<script setup name="DmsBillsLubeInstanceActivity" lang="ts">
-import { ref, reactive, toRefs, getCurrentInstance, onMounted, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import type { FormInstance, FormRules } from 'element-plus'; // 引入 FormInstance 和 FormRules 类型
-import {
-  listDmsBillsLubeInstanceActivity,
-  addDmsBillsLubeInstanceActivity
-  // getDmsBillsLubeInstanceActivity, //  原型中用于权限检查，此处暂时注释
-} from '@/api/dms/dmsBillsLubeInstanceActivity';
-import {
-  DmsBillsLubeInstanceActivityVO,
-  DmsBillsLubeInstanceActivityForm
-} from '@/api/dms/dmsBillsLubeInstanceActivity/types';
-import { listDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
-
-// import { getDmsPlanLubeDetail } from '@/api/dms/dmsPlanLubeDetail'; // 原有代码，使用下面的API
-import { getDmsPlanLubeDetail } from '@/api/dms/dmsPlanLubeDetail'; // 参照原型API命名并修正导入
-// import { getDmsBillsLubeInstanceActivity } from '@/api/dms/dmsBillsLubeInstanceActivity'; // 原有代码，与上方重复，暂时注释
-// import { useUserStore } from '@/store/modules/user'; // 原型中用于权限检查，此处暂时注释
-import {DmsPlanLubeDetailVO} from "@/api/dms/dmsPlanLubeDetail/types";
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-// 确保 useDict 加载了原型中用到的 'dms_lube_status'，如果 billsStatusCheck 需要此字典的话。
-// 当前 Vue 3 代码 billsStatusCheck 使用了 lube_level，暂时保持不变。
-// 如果工单状态确实需要 dms_lube_status，则应修改为 proxy?.useDict('lube_level', 'process_handle_status', 'dms_lube_status');
-const { lube_level, process_handle_status } = toRefs<any>(proxy?.useDict('lube_level', 'process_handle_status'));
-const route = useRoute();
-// const router = useRouter(); // 原型中用于权限不通过时跳转，此处暂时注释
-// const userStore = useUserStore(); // 原型中用于权限检查，此处暂时注释
-
-// 表单实例
-const stepFormRef = ref<FormInstance>(); // 主表单 ref
-const nextStepFormRef = ref<FormInstance>(); // 下一步表单 ref
-
-// 基础数据定义
-const loading = ref(true);
-const dmsBillsLubeInstanceActivityList = ref<DmsBillsLubeInstanceActivityVO[]>([]);
-// const wfProcessActivityList = ref<any[]>([]); // 工作流相关，已移除
-const billsInfo = ref<any>({}); // 工单主体信息，对应原型中的 dmsBillsLubeInstanceList[0]
-const planLubeDetail = ref<DmsPlanLubeDetailVO[]>([]);
-const billsStatusCheck = ref(''); // 工单状态显示文本
-const isUpdate = ref(true); // 控制是否显示提交表单区域
-const planLubeId = ref(''); // 润滑计划ID，从工单信息中获取
-// const currentStepOrder = ref(0); // 用于控制中间步骤的显示逻辑，在Vue3中，已处理节点直接disabled
-const lubeInstanceId = route.params.lubeInstanceId as string; // 类型断言
-
-// 计算下一步序号
-const nextStepOrder = computed(() => {
-  return dmsBillsLubeInstanceActivityList.value.length + 1;
-});
-
-// 是否可以提交下一步 (原基于wfProcessActivityList判断，现移除该判断逻辑)
-// const canSubmitNext = computed(() => {
-//   return dmsBillsLubeInstanceActivityList.value.length < wfProcessActivityList.value.length;
-// });
-
-// 表单数据 (用于展示第一个已处理节点的信息)
-const form = reactive<Partial<DmsBillsLubeInstanceActivityForm>>({ // 使用 Partial 允许部分字段
-                                                                   // instanceActivityId: undefined, // 不需要
-                                                                   // lubeInstanceId: undefined, // 不需要
-                                                                   // wfDefinitionId: undefined, // 工作流相关
-                                                                   // wfNodeId: undefined, // 工作流相关
-  lubeGroup: undefined,
-  lubeSupervisor: undefined,
-  lubeLevel: undefined,
-  // processHandleResolution: undefined, // 第一个节点通常没有处理意见输入
-  // processHandleStatus: undefined, // 不需要
-  // processStepOrder: undefined, // 不需要
-  // startTime: undefined, // 不需要
-  // endTime: undefined, // 不需要
-  // handleUserId: undefined, // 不需要
-  // handleBy: undefined, // 不需要
-  // handleTime: undefined, // 不需要
-  // transferUserId: undefined, // 不需要
-  // attr1: undefined, //不需要
-  remark: undefined, // 第一个节点的备注
-});
-
-// 下一步表单 (用于提交新的节点)
-const nextStepForm = reactive<DmsBillsLubeInstanceActivityForm>({
-  instanceActivityId: undefined, // 新增时为空
-  lubeInstanceId: lubeInstanceId, // 从路由获取
-  // wfDefinitionId: undefined, // 工作流相关
-  // wfNodeId: undefined, // 工作流相关
-  // processActivityId: undefined, // 原型中动态获取，此处移除
-  lubeGroup: undefined,
-  lubeSupervisor: undefined,
-  lubeLevel: undefined,
-  processHandleResolution: undefined,
-  processHandleStatus: undefined, // 可根据业务逻辑设置默认值
-  processStepOrder: undefined, // 将在getList中或提交前设置
-  startTime: undefined, // 可根据业务逻辑设置
-  endTime: undefined, // 可根据业务逻辑设置
-  handleUserId: undefined, // 可从用户store获取
-  handleBy: undefined, // 可从用户store获取
-  handleTime: undefined, // 可在提交时设置
-  transferUserId: undefined,
-  attr1: undefined,
-  remark: undefined,
-  // wfLength: undefined, // 工作流相关
-});
-
-// 下一步表单校验规则
-const nextStepFormRules = reactive<FormRules>({
-  lubeLevel: [{ required: true, message: "润滑级别不能为空", trigger: "change" }],
-  lubeGroup: [{ required: true, message: "润滑组别不能为空", trigger: "blur" }],
-  lubeSupervisor: [{ required: true, message: "润滑负责人不能为空", trigger: "blur" }],
-  processHandleResolution: [{ required: true, message: "处理意见不能为空", trigger: "blur" }],
-});
-
-// 查询参数
-const queryParams = reactive({
-  pageNum: 1,
-  pageSize: 50, // 参照原型，一次获取较多数据，避免分页
-  lubeInstanceId: lubeInstanceId,
-});
-
-// 初始化数据
-onMounted(() => {
-  // 判断当前页面是查看还是编辑
-  if(route.name === 'childDmsBillsLubeInstanceActivity') {
-    isUpdate.value = true;
-  } else if(route.name === 'selectChildDmsBillsLubeInstanceActivity') {
-    isUpdate.value = false;
-  }
-
-  // 加载工单实例数据
-  getDmsBillsLubeInstance();
-  // 加载工单实例节点数据
-  getList();
-});
-
-// 获取工单实例数据 (对应原型 getDmsBillsLubeInstance)
-const getDmsBillsLubeInstance = async () => {
-  try {
-    // queryParams.lubeInstanceId = lubeInstanceId; // queryParams中已包含lubeInstanceId
-    const res = await listDmsBillsLubeInstance(queryParams); // queryParams 本身就是 reactive，不需要 .value
-    if (res.rows && res.rows.length > 0) {
-      billsInfo.value = res.rows[0];
-      // 确保 planLubeId 是字符串类型
-      const lubeIdFromServer = res.rows[0].planLubeId;
-      planLubeId.value = typeof lubeIdFromServer === 'number' ? String(lubeIdFromServer) : lubeIdFromServer;
-
-      // 设置工单状态显示文本 (对应原型中的状态转换)
-      // 注意：原型使用 dms_lube_status 字典，当前Vue3代码使用 lube_level。
-      // 若不一致，需调整 useDict 或此处的逻辑。当前按Vue3现有代码处理。
-      if (lube_level.value && billsInfo.value.lubeStatus !== undefined) {
-        const statusItem = lube_level.value.find((item: any) => String(item.value) === String(billsInfo.value.lubeStatus));
-        billsStatusCheck.value = statusItem ? statusItem.label : '未知状态';
-      } else {
-        billsStatusCheck.value = '未知状态';
-      }
-
-      // 获取流程定义 (原型中调用 getWfprocessActivity，此处已移除该逻辑)
-      // getWfprocessActivity(res.rows[0].wfProcessId || 106); // 工作流相关
-
-      // 获取润滑计划详情 (对应原型中 selectDmsBillsLubeDetail)
-      if (planLubeId.value) {
-        getPlanLubeDetailData(); // 封装的函数名，避免与 API 重名
-      }
-    } else {
-      proxy?.$modal.msgError("未查询到工单信息");
-    }
-  } catch (error) {
-    console.error('获取工单实例数据失败', error);
-    proxy?.$modal.msgError("获取工单实例数据失败");
-  }
-};
-
-// 获取流程定义 (原型中的 getWfprocessActivity，此处注释并说明其功能)
-// const getWfprocessActivity = async (wfProcessId: number) => {
-//   // 此函数在原型中用于获取预定义的流程步骤 (wfProcessActivityList)
-//   // 并用这些步骤的名称更新 dmsBillsLubeInstanceActivityList 中对应节点的 'name' 属性
-//   // 以及进行权限检查等。由于工作流逻辑已移除，此函数不再需要。
-//   // try {
-//   //   const res = await listWfprocessactivity({ wfProcessId }); // API调用
-//   //   wfProcessActivityList.value = res.rows;
-//   //
-//   //   // 更新实例节点名称
-//   //   if (dmsBillsLubeInstanceActivityList.value.length > 0 && wfProcessActivityList.value.length > 0) {
-//   //     dmsBillsLubeInstanceActivityList.value.forEach(activity => {
-//   //       const matchedProcess = wfProcessActivityList.value.find(
-//   //         process => process.processActivityOrder === activity.processStepOrder
-//   //       );
-//   //       if (matchedProcess) {
-//   //         activity.name = matchedProcess.processActivityName;
-//   //       }
-//   //     });
-//   //   }
-//   //
-//   //   // 检查当前用户是否有权限处理 (原型中的 checkUserPermission 调用位置)
-//   //   checkUserPermission();
-//   // } catch (error) {
-//   //   console.error('获取流程定义失败', error);
-//   // }
-// };
-
-// 获取润滑计划详情 (对应原型 selectDmsBillsLubeDetail)
-const getPlanLubeDetailData = async () => { // 修改函数名以避免与导入的API重名
-  if (!planLubeId.value) return;
-  loading.value = true; // 开始加载时设置
-  try {
-    const res = await getDmsPlanLubeDetail(planLubeId.value); // 此处使用 planLubeId.value
-    // 如果 res.rows 是单个对象，则将其包装在数组中；如果不存在，则使用空数组
-    planLubeDetail.value = res && res.rows ? [res.rows] : [];
-  } catch (error) {
-    console.error('获取润滑计划详情失败', error);
-    proxy?.$modal.msgError("获取润滑计划详情失败");
-  } finally {
-    // loading.value = false; // loading 应在 getList 完成后统一处理或分别处理
-  }
-};
-
-// 获取工单实例节点数据 (对应原型 getList)
-const getList = async () => {
-  loading.value = true;
-  try {
-    const res = await listDmsBillsLubeInstanceActivity(queryParams); // queryParams 本身就是 reactive
-    dmsBillsLubeInstanceActivityList.value = res.rows;
-
-    // 填充第一步数据 (用于表单展示)
-    if (res.rows && res.rows.length > 0) {
-      Object.assign(form, {
-        lubeGroup: res.rows[0].lubeGroup,
-        lubeSupervisor: res.rows[0].lubeSupervisor,
-        lubeLevel: res.rows[0].lubeLevel,
-        remark: res.rows[0].remark // 对应原型中 form 的初始化
-      });
-
-      // 初始化下一步表单数据 (基于最后一个已处理节点)
-      const lastActivity = res.rows[res.rows.length - 1];
-      Object.assign(nextStepForm, {
-        lubeGroup: lastActivity.lubeGroup,
-        lubeSupervisor: lastActivity.lubeSupervisor,
-        lubeLevel: lastActivity.lubeLevel,
-        processHandleResolution: null, // 清空处理意见
-        remark: '' // 清空备注或根据业务设置
-        // processStepOrder 字段将在提交时使用 nextStepOrder.value
-      });
-
-      // currentStepOrder.value = res.rows.length + 1; // Vue3中此变量意义不大，因为已处理节点直接disabled
-    } else {
-      // 如果没有已处理节点，则 nextStepForm 可能需要全新初始化或默认值
-      Object.assign(nextStepForm, { // 全新初始化示例
-        lubeGroup: undefined,
-        lubeSupervisor: undefined,
-        lubeLevel: undefined,
-        processHandleResolution: null,
-        remark: ''
-      });
-    }
-
-    // 原型中此处会再次调用 getWfprocessActivity 以便在获取到列表后进行权限判断
-    // listWfprocessactivity(this.queryParamWfProcessActivity).then(response=>{
-    //   this.wfProcessActivityList = response.rows;
-    //   this.getselectUserIdByRepairInstanceId(); // 权限检查
-    // });
-    // 权限检查逻辑 (原型中的 getselectUserIdByRepairInstanceId)，此处暂时注释
-    // checkUserPermission();
-
-  } catch (error) {
-    console.error('获取工单实例节点数据失败', error);
-    proxy?.$modal.msgError("获取工单实例节点数据失败");
-  } finally {
-    loading.value = false;
-  }
-};
-
-// 检查当前用户是否有权限处理 (原型中的 checkUserPermission 和 getselectUserIdByRepairInstanceId)
-// const checkUserPermission = async () => {
-//   // 此函数在原型中用于检查用户是否有权限处理当前工单的下一步
-//   // 它依赖于 wfProcessActivityList 来判断是否为最后一步，并调用 API (如 selectUserIdByDmsBillsLubeInstanceActivityId)
-//   // 由于工作流和相关API已移除/注释，此功能需要根据新的业务逻辑实现。
-//   // if (dmsBillsLubeInstanceActivityList.value.length === wfProcessActivityList.value.length) { // 依赖 wfProcessActivityList
-//   //   try {
-//   //     const hasPermission = await getDmsBillsLubeInstanceActivity( // API 可能需要调整
-//   //       lubeInstanceId,
-//   //       userStore.userId // 依赖 userStore
-//   //     );
-//   //
-//   //     if (!hasPermission) {
-//   //       proxy?.$modal.alert("您没有权限处理此工单");
-//   //       // 关闭当前标签页
-//   //       // proxy?.$store.dispatch("tagsView/delView", route); // Vuex store dispatch
-//   //       // 跳转到列表页
-//   //       // router.replace({ path: "/dms/deviceLube/dmsBillsLubeInstance" }); // router跳转
-//   //     }
-//   //   } catch (error) {
-//   //     console.error('检查权限失败', error);
-//   //   }
-//   // }
-// };
-
-// 提交表单 (对应原型 submitForm)
-const submitForm = async () => {
-  if (!nextStepFormRef.value) return;
-  await nextStepFormRef.value.validate(async (valid) => {
-    if (valid) {
-      try {
-        // 设置流程步骤顺序
-        nextStepForm.processStepOrder = nextStepOrder.value;
-        nextStepForm.lubeInstanceId = lubeInstanceId; // 确保 lubeInstanceId 已设置
-
-        // 工作流相关字段设置 (原型中)
-        // if (wfProcessActivityList.value.length > 0) {
-        //   const currentProcess = wfProcessActivityList.value.find(
-        //     process => process.processActivityOrder === nextStepOrder.value
-        //   );
-        //   if (currentProcess) {
-        //     nextStepForm.processActivityId = currentProcess.processActivityId;
-        //   }
-        // }
-        // nextStepForm.wfLength = wfProcessActivityList.value.length;
-
-
-        // 提交
-        await addDmsBillsLubeInstanceActivity(nextStepForm);
-        proxy?.$modal.msgSuccess("提交成功");
-
-        // 重新加载数据
-        await getList(); // 刷新列表获取最新节点
-        // 成功提交后，可以考虑重置 nextStepForm，如果还需要连续提交的话
-        // nextStepFormRef.value.resetFields(); // 这会重置表单到初始值
-
-      } catch (error) {
-        console.error('提交失败', error);
-        proxy?.$modal.msgError("提交失败，请检查数据或联系管理员");
-      }
-    } else {
-      proxy?.$modal.msgError("表单校验失败，请检查输入项");
-    }
-  });
-};
-</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/dmsBillsLubeInstanceActivity/backup2.vue b/src/views/dms/dmsBillsLubeInstanceActivity/backup2.vue
deleted file mode 100644
index fd1bc8b..0000000
--- a/src/views/dms/dmsBillsLubeInstanceActivity/backup2.vue
+++ /dev/null
@@ -1,450 +0,0 @@
-<template>
-    <div class="p-2">
-      <!-- 工单信息区域 -->
-      <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.billsLubeCode" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" :offset="2">
-              <el-form-item label="工单状态">
-                <el-input v-model="billsStatusCheck" disabled />
-              </el-form-item>
-            </el-col>
-            <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="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>
-          </el-row>
-        </el-form>
-      </el-card>
-  
-      <!-- 流程步骤展示区域 -->
-      <el-card shadow="never" class="mb-[10px]">
-        <el-form ref="stepFormRef" :model="form" label-width="100px">
-          <!-- 第一步 -->
-          <h4 class="form-header h4" v-if="dmsBillsLubeInstanceActivityList.length > 0">已处理节点：步骤1</h4>
-          <el-row v-if="dmsBillsLubeInstanceActivityList.length > 0">
-            <el-col :span="8">
-              <el-form-item label="润滑级别" prop="lubeLevel">
-                <el-select v-model="form.lubeLevel" placeholder="润滑级别" disabled>
-                  <el-option
-                    v-for="dict in lube_level"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="润滑组别" prop="lubeGroup">
-                <el-input v-model="form.lubeGroup" placeholder="请输入润滑组别" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                <el-input v-model="form.lubeSupervisor" placeholder="请输入润滑负责人" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <!-- 中间步骤 (已处理的后续节点) -->
-          <template v-for="(activity) in dmsBillsLubeInstanceActivityList" :key="activity.instanceActivityId">
-            <div v-if="activity.processStepOrder && activity.processStepOrder > 1">
-              <h4 class="form-header h4">{{ `已处理节点：步骤${activity.processStepOrder}` }}</h4>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="润滑级别">
-                    <el-select
-                      v-model="activity.lubeLevel"
-                      placeholder="润滑级别"
-                      disabled>
-                      <el-option
-                        v-for="dict in lube_level"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑组别">
-                    <el-input
-                      v-model="activity.lubeGroup"
-                      disabled
-                      placeholder="润滑组别">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑负责人">
-                    <el-input
-                      v-model="activity.lubeSupervisor"
-                      disabled
-                      placeholder="润滑负责人">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="处理意见">
-                    <el-input
-                      v-model="activity.processHandleResolution"
-                      disabled
-                      placeholder="处理意见">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </div>
-          </template>
-  
-          <!-- 当前步骤表单 (用于提交新节点) -->
-          <div v-if="isUpdate">
-            <h4 class="form-header h4">当前处理节点：步骤{{ nextStepOrder }}</h4>
-            <el-form ref="nextStepFormRef" :model="nextStepForm" :rules="nextStepFormRules" label-width="100px">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="润滑级别" prop="lubeLevel">
-                    <el-select v-model="nextStepForm.lubeLevel" placeholder="润滑级别">
-                      <el-option
-                        v-for="dict in lube_level"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑组别" prop="lubeGroup">
-                    <el-input v-model="nextStepForm.lubeGroup" placeholder="润滑组别"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                    <el-input v-model="nextStepForm.lubeSupervisor" placeholder="润滑负责人"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <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">提 交</el-button>
-                  <el-button v-if="billsInfo && billsInfo.lubeInstanceId !== null && billsInfo.status !== 'draft'" type='primary'
-                            @click='handleApprovalRecord'>
-                    流程进度
-                  </el-button>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </el-form>
-      </el-card>
-  
-      <!-- 润滑计划详情区域 -->
-      <el-card shadow="never">
-        <h4 class="form-header h4 text-center">润滑计划详细信息</h4>
-        <el-table v-loading="loading" :data="planLubeDetail">
-          <el-table-column label="计划ID" align="center" prop="planLubeId" />
-          <el-table-column label="设备名称" align="center" prop="deviceName" />
-          <el-table-column label="润滑部位" align="center" prop="lubeStationName" />
-          <el-table-column label="润滑标准" align="center" prop="lubeStandardCode" />
-          <el-table-column label="操作描述" align="center" prop="operationDescription" />
-        </el-table>
-      </el-card>
-      
-      <!-- 提交组件 -->
-      <submitVerify ref='submitVerifyRef' :task-variables='taskVariables' @submit-callback='submitCallback' />
-      <!-- 审批记录 -->
-      <approvalRecord ref='approvalRecordRef' />
-    </div>
-  </template>
-  
-  <script setup name="DmsBillsLubeInstanceActivity" lang="ts">
-  import { ref, reactive, toRefs, getCurrentInstance, onMounted, computed } from 'vue';
-  import { useRoute, useRouter } from 'vue-router';
-  import type { FormInstance, FormRules } from 'element-plus'; // 引入 FormInstance 和 FormRules 类型
-  import {
-    listDmsBillsLubeInstanceActivity,
-    addDmsBillsLubeInstanceActivity
-  } from '@/api/dms/dmsBillsLubeInstanceActivity';
-  import {
-    DmsBillsLubeInstanceActivityVO,
-    DmsBillsLubeInstanceActivityForm
-  } from '@/api/dms/dmsBillsLubeInstanceActivity/types';
-  import { listDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
-  import { getDmsPlanLubeDetail } from '@/api/dms/dmsPlanLubeDetail';
-  import {DmsPlanLubeDetailVO} from "@/api/dms/dmsPlanLubeDetail/types";
-  // 引入工作流相关组件和API
-  import { startWorkFlow } 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';
-  
-  const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-  const { lube_level, process_handle_status } = toRefs<any>(proxy?.useDict('lube_level', 'process_handle_status'));
-  const route = useRoute();
-  
-  // 表单实例
-  const stepFormRef = ref<FormInstance>(); // 主表单 ref
-  const nextStepFormRef = ref<FormInstance>(); // 下一步表单 ref
-  
-  // 工作流相关
-  const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
-  const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
-  const taskVariables = ref<Record<string, any>>({});
-  const submitFormData = ref<StartProcessBo>({
-    businessId: '',
-    flowCode: 'lubeProcess', // 假设润滑工单流程代码为lubeProcess
-    variables: {}
-  });
-  
-  // 基础数据定义
-  const loading = ref(true);
-  const dmsBillsLubeInstanceActivityList = ref<DmsBillsLubeInstanceActivityVO[]>([]);
-  const billsInfo = ref<any>({}); // 工单主体信息
-  const planLubeDetail = ref<DmsPlanLubeDetailVO[]>([]);
-  const billsStatusCheck = ref(''); // 工单状态显示文本
-  const isUpdate = ref(true); // 控制是否显示提交表单区域
-  const planLubeId = ref(''); // 润滑计划ID，从工单信息中获取
-  const lubeInstanceId = route.params.lubeInstanceId as string; // 类型断言
-  const buttonLoading = ref(false);
-  
-  // 计算下一步序号
-  const nextStepOrder = computed(() => {
-    return dmsBillsLubeInstanceActivityList.value.length + 1;
-  });
-  
-  // 表单数据 (用于展示第一个已处理节点的信息)
-  const form = reactive<Partial<DmsBillsLubeInstanceActivityForm>>({
-    lubeGroup: undefined,
-    lubeSupervisor: undefined,
-    lubeLevel: undefined,
-    remark: undefined,
-  });
-  
-  // 下一步表单 (用于提交新的节点)
-  const nextStepForm = reactive<DmsBillsLubeInstanceActivityForm>({
-    instanceActivityId: undefined,
-    lubeInstanceId: lubeInstanceId,
-    lubeGroup: undefined,
-    lubeSupervisor: undefined,
-    lubeLevel: undefined,
-    processHandleResolution: undefined,
-    processHandleStatus: undefined,
-    processStepOrder: undefined,
-    startTime: undefined,
-    endTime: undefined,
-    handleUserId: undefined,
-    handleBy: undefined,
-    handleTime: undefined,
-    transferUserId: undefined,
-    attr1: undefined,
-    remark: undefined,
-  });
-  
-  // 下一步表单校验规则
-  const nextStepFormRules = reactive<FormRules>({
-    lubeLevel: [{ required: true, message: "润滑级别不能为空", trigger: "change" }],
-    lubeGroup: [{ required: true, message: "润滑组别不能为空", trigger: "blur" }],
-    lubeSupervisor: [{ required: true, message: "润滑负责人不能为空", trigger: "blur" }],
-    processHandleResolution: [{ required: true, message: "处理意见不能为空", trigger: "blur" }],
-  });
-  
-  // 查询参数
-  const queryParams = reactive({
-    pageNum: 1,
-    pageSize: 50,
-    lubeInstanceId: lubeInstanceId,
-  });
-  
-  // 初始化数据
-  onMounted(() => {
-    // 判断当前页面是查看还是编辑
-    if(route.name === 'childDmsBillsLubeInstanceActivity') {
-      isUpdate.value = true;
-    } else if(route.name === 'selectChildDmsBillsLubeInstanceActivity') {
-      isUpdate.value = false;
-    }
-  
-    // 加载工单实例数据
-    getDmsBillsLubeInstance();
-    // 加载工单实例节点数据
-    getList();
-  });
-  
-  // 获取工单实例数据
-  const getDmsBillsLubeInstance = async () => {
-    try {
-      const res = await listDmsBillsLubeInstance(queryParams);
-      if (res.rows && res.rows.length > 0) {
-        billsInfo.value = res.rows[0];
-        // 确保 planLubeId 是字符串类型
-        const lubeIdFromServer = res.rows[0].planLubeId;
-        planLubeId.value = typeof lubeIdFromServer === 'number' ? String(lubeIdFromServer) : lubeIdFromServer;
-  
-        // 设置工单状态显示文本
-        if (lube_level.value && billsInfo.value.lubeStatus !== undefined) {
-          const statusItem = lube_level.value.find((item: any) => String(item.value) === String(billsInfo.value.lubeStatus));
-          billsStatusCheck.value = statusItem ? statusItem.label : '未知状态';
-        } else {
-          billsStatusCheck.value = '未知状态';
-        }
-
-        // 获取润滑计划详情
-        if (planLubeId.value) {
-          getPlanLubeDetailData();
-        }
-      } else {
-        proxy?.$modal.msgError("未查询到工单信息");
-      }
-    } catch (error) {
-      console.error('获取工单实例数据失败', error);
-      proxy?.$modal.msgError("获取工单实例数据失败");
-    }
-  };
-  
-  // 获取润滑计划详情
-  const getPlanLubeDetailData = async () => {
-    if (!planLubeId.value) return;
-    loading.value = true;
-    try {
-      const res = await getDmsPlanLubeDetail(planLubeId.value);
-      planLubeDetail.value = res && res.rows ? [res.rows] : [];
-    } catch (error) {
-      console.error('获取润滑计划详情失败', error);
-      proxy?.$modal.msgError("获取润滑计划详情失败");
-    }
-  };
-  
-  // 获取工单实例节点数据
-  const getList = async () => {
-    loading.value = true;
-    try {
-      const res = await listDmsBillsLubeInstanceActivity(queryParams);
-      dmsBillsLubeInstanceActivityList.value = res.rows;
-  
-      // 填充第一步数据 (用于表单展示)
-      if (res.rows && res.rows.length > 0) {
-        Object.assign(form, {
-          lubeGroup: res.rows[0].lubeGroup,
-          lubeSupervisor: res.rows[0].lubeSupervisor,
-          lubeLevel: res.rows[0].lubeLevel,
-          remark: res.rows[0].remark
-        });
-  
-        // 初始化下一步表单数据 (基于最后一个已处理节点)
-        const lastActivity = res.rows[res.rows.length - 1];
-        Object.assign(nextStepForm, {
-          lubeGroup: lastActivity.lubeGroup,
-          lubeSupervisor: lastActivity.lubeSupervisor,
-          lubeLevel: lastActivity.lubeLevel,
-          processHandleResolution: null,
-          remark: ''
-        });
-      } else {
-        // 如果没有已处理节点，则 nextStepForm 全新初始化
-        Object.assign(nextStepForm, {
-          lubeGroup: undefined,
-          lubeSupervisor: undefined,
-          lubeLevel: undefined,
-          processHandleResolution: null,
-          remark: ''
-        });
-      }
-    } catch (error) {
-      console.error('获取工单实例节点数据失败', error);
-      proxy?.$modal.msgError("获取工单实例节点数据失败");
-    } finally {
-      loading.value = false;
-    }
-  };
-  
-  // 提交表单
-  const submitForm = async () => {
-    if (!nextStepFormRef.value) return;
-    await nextStepFormRef.value.validate(async (valid) => {
-      if (valid) {
-        try {
-          buttonLoading.value = true;
-          // 设置流程步骤顺序
-          nextStepForm.processStepOrder = nextStepOrder.value;
-          nextStepForm.lubeInstanceId = lubeInstanceId;
-  
-          // 提交
-          const res = await addDmsBillsLubeInstanceActivity(nextStepForm);
-          
-          // 启动工作流
-          await handleStartWorkFlow(res.data);
-          
-        } catch (error) {
-          console.error('提交失败', error);
-          proxy?.$modal.msgError("提交失败，请检查数据或联系管理员");
-          buttonLoading.value = false;
-        }
-      } else {
-        proxy?.$modal.msgError("表单校验失败，请检查输入项");
-      }
-    });
-  };
-  
-  // 启动工作流
-  const handleStartWorkFlow = async (data: any) => {
-    try {
-      submitFormData.value.businessId = lubeInstanceId;
-      //流程变量
-      taskVariables.value = {
-        data: data
-      };
-      submitFormData.value.variables = taskVariables.value;
-      const resp = await startWorkFlow(submitFormData.value);
-      if (submitVerifyRef.value) {
-        buttonLoading.value = false;
-        submitVerifyRef.value.openDialog(resp.data.taskId);
-      }
-    } finally {
-      buttonLoading.value = false;
-    }
-  };
-  
-  // 审批记录
-  const handleApprovalRecord = () => {
-    approvalRecordRef.value.init(lubeInstanceId);
-  };
-  
-  // 提交回调
-  const submitCallback = async () => {
-    await getList(); // 刷新列表获取最新节点
-    proxy?.$modal.msgSuccess("操作成功");
-  };
-  </script>
-  
-  <style scoped>
-  .form-header {
-    font-size: 15px;
-    color: #409eff;
-    border-bottom: 1px solid #ddd;
-    margin: 8px 0 15px;
-    padding-bottom: 10px;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/backup3.vue b/src/views/dms/dmsBillsLubeInstanceActivity/backup3.vue
deleted file mode 100644
index 417a0b1..0000000
--- a/src/views/dms/dmsBillsLubeInstanceActivity/backup3.vue
+++ /dev/null
@@ -1,476 +0,0 @@
-<template>
-    <div class="p-2">
-      <!-- 工单信息区域 -->
-      <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.billsLubeCode" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" :offset="2">
-              <el-form-item label="工单状态">
-                <el-input v-model="billsStatusCheck" disabled />
-              </el-form-item>
-            </el-col>
-            <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="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>
-          </el-row>
-        </el-form>
-      </el-card>
-  
-      <!-- 流程步骤展示区域 -->
-      <el-card shadow="never" class="mb-[10px]">
-        <el-form ref="stepFormRef" :model="form" label-width="100px">
-          <!-- 第一步 -->
-          <h4 class="form-header h4" v-if="dmsBillsLubeInstanceActivityList.length > 0">已处理节点：步骤1（要求参数）</h4>
-          <el-row v-if="dmsBillsLubeInstanceActivityList.length > 0">
-            <el-col :span="8">
-              <el-form-item label="润滑级别" prop="lubeLevel">
-                <el-select v-model="form.lubeLevel" placeholder="润滑级别" disabled>
-                  <el-option
-                    v-for="dict in lube_level"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="润滑组别" prop="lubeGroup">
-                <el-input v-model="form.lubeGroup" placeholder="请输入润滑组别" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                <el-input v-model="form.lubeSupervisor" placeholder="请输入润滑负责人" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <!-- 中间步骤 (已处理的后续节点) -->
-          <template v-for="(activity) in dmsBillsLubeInstanceActivityList" :key="activity.instanceActivityId">
-            <div v-if="activity.processStepOrder && activity.processStepOrder > 1">
-              <h4 class="form-header h4">{{ `已处理节点：步骤${activity.processStepOrder}（实际参数）` }}</h4>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="润滑级别">
-                    <el-select
-                      v-model="activity.lubeLevel"
-                      placeholder="润滑级别"
-                      disabled>
-                      <el-option
-                        v-for="dict in lube_level"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑组别">
-                    <el-input
-                      v-model="activity.lubeGroup"
-                      disabled
-                      placeholder="润滑组别">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑负责人">
-                    <el-input
-                      v-model="activity.lubeSupervisor"
-                      disabled
-                      placeholder="润滑负责人">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="处理意见">
-                    <el-input
-                      v-model="activity.processHandleResolution"
-                      disabled
-                      placeholder="处理意见">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </div>
-          </template>
-  
-          <!-- 当前步骤表单 (用于提交新节点) -->
-          <div v-if="isUpdate">
-            <h4 class="form-header h4">当前处理节点：步骤{{ nextStepOrder }}{{ nextStepOrder === 2 ? '（实际参数）' : '' }}</h4>
-            <el-form ref="nextStepFormRef" :model="nextStepForm" :rules="nextStepFormRules" label-width="100px">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="润滑级别" prop="lubeLevel">
-                    <el-select v-model="nextStepForm.lubeLevel" placeholder="润滑级别">
-                      <el-option
-                        v-for="dict in lube_level"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑组别" prop="lubeGroup">
-                    <el-input v-model="nextStepForm.lubeGroup" placeholder="润滑组别"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                    <el-input v-model="nextStepForm.lubeSupervisor" placeholder="润滑负责人"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24" v-if="nextStepOrder > 1">
-                  <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">提 交</el-button>
-                  <el-button v-if="billsInfo && billsInfo.lubeInstanceId !== null && billsInfo.status !== 'draft'" type='primary'
-                            @click='handleApprovalRecord'>
-                    流程进度
-                  </el-button>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </el-form>
-      </el-card>
-  
-      <!-- 润滑计划详情区域 -->
-      <el-card shadow="never">
-        <h4 class="form-header h4 text-center">润滑计划详细信息</h4>
-        <el-table v-loading="loading" :data="planLubeDetail">
-          <el-table-column label="计划ID" align="center" prop="planLubeId" />
-          <el-table-column label="设备名称" align="center" prop="deviceName" />
-          <el-table-column label="润滑部位" align="center" prop="lubeStationName" />
-          <el-table-column label="润滑标准" align="center" prop="lubeStandardCode" />
-          <el-table-column label="操作描述" align="center" prop="operationDescription" />
-        </el-table>
-      </el-card>
-      
-      <!-- 提交组件 -->
-      <submitVerify ref='submitVerifyRef' :task-variables="taskVariables as any" @submit-callback='submitCallback' />
-      <!-- 审批记录 -->
-      <approvalRecord ref='approvalRecordRef' />
-    </div>
-  </template>
-  
-  <script setup name="DmsBillsLubeInstanceActivity" lang="ts">
-  import { ref, reactive, toRefs, getCurrentInstance, onMounted, computed } from 'vue';
-  import { useRoute, useRouter } from 'vue-router';
-  import type { FormInstance, FormRules } from 'element-plus'; // 引入 FormInstance 和 FormRules 类型
-  import {
-    listDmsBillsLubeInstanceActivity,
-    addDmsBillsLubeInstanceActivity
-  } from '@/api/dms/dmsBillsLubeInstanceActivity';
-  import {
-    DmsBillsLubeInstanceActivityVO,
-    DmsBillsLubeInstanceActivityForm
-  } from '@/api/dms/dmsBillsLubeInstanceActivity/types';
-  import { listDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
-  import { getDmsPlanLubeDetail } from '@/api/dms/dmsPlanLubeDetail';
-  import {DmsPlanLubeDetailVO} from "@/api/dms/dmsPlanLubeDetail/types";
-  // 引入工作流相关组件和API
-  import { startWorkFlow } 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';
-  
-  const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-  const { lube_level, process_handle_status } = toRefs<any>(proxy?.useDict('lube_level', 'process_handle_status'));
-  const route = useRoute();
-  
-  // 表单实例
-  const stepFormRef = ref<FormInstance>(); // 主表单 ref
-  const nextStepFormRef = ref<FormInstance>(); // 下一步表单 ref
-  
-  // 工作流相关
-  const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
-  const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
-  const taskVariables = ref<any>({});
-  const submitFormData = ref<StartProcessBo>({
-    businessId: '',
-    flowCode: 'lubeProcess', // 假设润滑工单流程代码为lubeProcess
-    variables: {}
-  });
-  
-  // 基础数据定义
-  const loading = ref(true);
-  const dmsBillsLubeInstanceActivityList = ref<DmsBillsLubeInstanceActivityVO[]>([]);
-  const billsInfo = ref<any>({}); // 工单主体信息
-  const planLubeDetail = ref<DmsPlanLubeDetailVO[]>([]);
-  const billsStatusCheck = ref(''); // 工单状态显示文本
-  const isUpdate = ref(true); // 控制是否显示提交表单区域
-  const planLubeId = ref(''); // 润滑计划ID，从工单信息中获取
-  const lubeInstanceId = route.params.lubeInstanceId as string; // 类型断言
-  const buttonLoading = ref(false);
-  
-  // 计算下一步序号
-  const nextStepOrder = computed(() => {
-    return dmsBillsLubeInstanceActivityList.value.length + 1;
-  });
-  
-  // 表单数据 (用于展示第一个已处理节点的信息)
-  const form = reactive<Partial<DmsBillsLubeInstanceActivityForm>>({
-    lubeGroup: undefined,
-    lubeSupervisor: undefined,
-    lubeLevel: undefined,
-    remark: undefined,
-  });
-  
-  // 下一步表单 (用于提交新的节点)
-  const nextStepForm = reactive<DmsBillsLubeInstanceActivityForm>({
-    instanceActivityId: undefined,
-    lubeInstanceId: lubeInstanceId,
-    lubeGroup: undefined,
-    lubeSupervisor: undefined,
-    lubeLevel: undefined,
-    processHandleResolution: undefined,
-    processHandleStatus: undefined,
-    processStepOrder: undefined,
-    startTime: undefined,
-    endTime: undefined,
-    handleUserId: undefined,
-    handleBy: undefined,
-    handleTime: undefined,
-    transferUserId: undefined,
-    attr1: undefined,
-    remark: undefined,
-  });
-  
-  // 下一步表单校验规则
-  const nextStepFormRules = reactive<FormRules>({
-    lubeLevel: [{ required: true, message: "润滑级别不能为空", trigger: "change" }],
-    lubeGroup: [{ required: true, message: "润滑组别不能为空", trigger: "blur" }],
-    lubeSupervisor: [{ required: true, message: "润滑负责人不能为空", trigger: "blur" }],
-    // 处理意见仅在第二步及以后验证
-    processHandleResolution: [{ required: nextStepOrder.value > 1, message: "处理意见不能为空", trigger: "blur" }],
-  });
-  
-  // 查询参数
-  const queryParams = reactive({
-    pageNum: 1,
-    pageSize: 50,
-    lubeInstanceId: lubeInstanceId,
-  });
-  
-  // 初始化数据
-  onMounted(() => {
-    // 判断当前页面是查看还是编辑
-    if(route.name === 'childDmsBillsLubeInstanceActivity') {
-      isUpdate.value = true;
-    } else if(route.name === 'selectChildDmsBillsLubeInstanceActivity') {
-      isUpdate.value = false;
-    }
-  
-    // 加载工单实例数据
-    getDmsBillsLubeInstance();
-    // 加载工单实例节点数据
-    getList();
-  });
-  
-  // 获取工单实例数据
-  const getDmsBillsLubeInstance = async () => {
-    try {
-      const res = await listDmsBillsLubeInstance(queryParams);
-      if (res.rows && res.rows.length > 0) {
-        billsInfo.value = res.rows[0];
-        // 确保 planLubeId 是字符串类型
-        const lubeIdFromServer = res.rows[0].planLubeId;
-        planLubeId.value = typeof lubeIdFromServer === 'number' ? String(lubeIdFromServer) : lubeIdFromServer;
-  
-        // 设置工单状态显示文本
-        if (lube_level.value && billsInfo.value.lubeStatus !== undefined) {
-          const statusItem = lube_level.value.find((item: any) => String(item.value) === String(billsInfo.value.lubeStatus));
-          billsStatusCheck.value = statusItem ? statusItem.label : '未知状态';
-        } else {
-          billsStatusCheck.value = '未知状态';
-        }
-
-        // 获取润滑计划详情
-        if (planLubeId.value) {
-          getPlanLubeDetailData();
-        }
-      } else {
-        proxy?.$modal.msgError("未查询到工单信息");
-      }
-    } catch (error) {
-      console.error('获取工单实例数据失败', error);
-      proxy?.$modal.msgError("获取工单实例数据失败");
-    }
-  };
-  
-  // 获取润滑计划详情
-  const getPlanLubeDetailData = async () => {
-    if (!planLubeId.value) return;
-    loading.value = true;
-    try {
-      const res = await getDmsPlanLubeDetail(planLubeId.value);
-      planLubeDetail.value = res && res.rows ? [res.rows] : [];
-    } catch (error) {
-      console.error('获取润滑计划详情失败', error);
-      proxy?.$modal.msgError("获取润滑计划详情失败");
-    }
-  };
-  
-  // 获取工单实例节点数据
-  const getList = async () => {
-    loading.value = true;
-    try {
-      const res = await listDmsBillsLubeInstanceActivity(queryParams);
-      dmsBillsLubeInstanceActivityList.value = res.rows;
-  
-      // 填充第一步数据 (用于表单展示)
-      if (res.rows && res.rows.length > 0) {
-        Object.assign(form, {
-          lubeGroup: res.rows[0].lubeGroup,
-          lubeSupervisor: res.rows[0].lubeSupervisor,
-          lubeLevel: res.rows[0].lubeLevel,
-          remark: res.rows[0].remark
-        });
-  
-        // 根据步骤数初始化下一步表单数据
-        if (nextStepOrder.value === 2) {
-          // 第二步，复制第一步的润滑组别和润滑负责人
-          Object.assign(nextStepForm, {
-            lubeGroup: res.rows[0].lubeGroup,
-            lubeSupervisor: res.rows[0].lubeSupervisor,
-            lubeLevel: res.rows[0].lubeLevel,
-            processHandleResolution: null, // 第二步需要填写处理意见
-            remark: ''
-          });
-        } else if (nextStepOrder.value > 2) {
-          // 第三步及以后，使用最后一个节点的数据
-          const lastActivity = res.rows[res.rows.length - 1];
-          Object.assign(nextStepForm, {
-            lubeGroup: lastActivity.lubeGroup,
-            lubeSupervisor: lastActivity.lubeSupervisor,
-            lubeLevel: lastActivity.lubeLevel,
-            processHandleResolution: null, // 清空处理意见
-            remark: ''
-          });
-        }
-      } else {
-        // 如果没有已处理节点，则 nextStepForm 全新初始化
-        Object.assign(nextStepForm, {
-          lubeGroup: undefined,
-          lubeSupervisor: undefined,
-          lubeLevel: undefined,
-          processHandleResolution: null,
-          remark: ''
-        });
-      }
-      
-      // 更新表单校验规则
-      nextStepFormRules.processHandleResolution = [{ 
-        required: nextStepOrder.value > 1, 
-        message: "处理意见不能为空", 
-        trigger: "blur" 
-      }];
-      
-    } catch (error) {
-      console.error('获取工单实例节点数据失败', error);
-      proxy?.$modal.msgError("获取工单实例节点数据失败");
-    } finally {
-      loading.value = false;
-    }
-  };
-  
-  // 提交表单
-  const submitForm = async () => {
-    if (!nextStepFormRef.value) return;
-    await nextStepFormRef.value.validate(async (valid) => {
-      if (valid) {
-        try {
-          buttonLoading.value = true;
-          // 设置流程步骤顺序
-          nextStepForm.processStepOrder = nextStepOrder.value;
-          nextStepForm.lubeInstanceId = lubeInstanceId;
-  
-          // 在第一步时不需要处理意见
-          if (nextStepOrder.value === 1) {
-            nextStepForm.processHandleResolution = null;
-          }
-  
-          // 提交
-          const res = await addDmsBillsLubeInstanceActivity(nextStepForm);
-          
-          // 启动工作流
-          await handleStartWorkFlow(res.data);
-          
-        } catch (error) {
-          console.error('提交失败', error);
-          proxy?.$modal.msgError("提交失败，请检查数据或联系管理员");
-          buttonLoading.value = false;
-        }
-      } else {
-        proxy?.$modal.msgError("表单校验失败，请检查输入项");
-      }
-    });
-  };
-  
-  // 启动工作流
-  const handleStartWorkFlow = async (data: any) => {
-    try {
-      submitFormData.value.businessId = lubeInstanceId;
-      //流程变量
-      taskVariables.value = {
-        data: data
-      };
-      submitFormData.value.variables = taskVariables.value;
-      const resp = await startWorkFlow(submitFormData.value);
-      if (submitVerifyRef.value) {
-        buttonLoading.value = false;
-        submitVerifyRef.value.openDialog(resp.data.taskId);
-      }
-    } finally {
-      buttonLoading.value = false;
-    }
-  };
-  
-  // 审批记录
-  const handleApprovalRecord = () => {
-    approvalRecordRef.value.init(lubeInstanceId);
-  };
-  
-  // 提交回调
-  const submitCallback = async () => {
-    await getList(); // 刷新列表获取最新节点
-    proxy?.$modal.msgSuccess("操作成功");
-  };
-  </script>
-  
-  <style scoped>
-  .form-header {
-    font-size: 15px;
-    color: #409eff;
-    border-bottom: 1px solid #ddd;
-    margin: 8px 0 15px;
-    padding-bottom: 10px;
-  }
-  </style>
-  
\ No newline at end of file
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/copy.vue b/src/views/dms/dmsBillsLubeInstanceActivity/copy.vue
deleted file mode 100644
index 242c64b..0000000
--- a/src/views/dms/dmsBillsLubeInstanceActivity/copy.vue
+++ /dev/null
@@ -1,452 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="润滑工单实例节点ID" prop="instanceActivityId">
-              <el-input v-model="queryParams.instanceActivityId" placeholder="请输入润滑工单实例节点ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="润滑工单实例ID，关联dms_bills_lube_instance的lube_instance_id" prop="lubeInstanceId">
-              <el-input v-model="queryParams.lubeInstanceId" placeholder="请输入润滑工单实例ID，关联dms_bills_lube_instance的lube_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步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="lubeGroup">
-              <el-input v-model="queryParams.lubeGroup" placeholder="请输入润滑组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="润滑负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="lubeSupervisor">
-              <el-input v-model="queryParams.lubeSupervisor" placeholder="请输入润滑负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="润滑级别" prop="lubeLevel">
-              <el-select v-model="queryParams.lubeLevel" placeholder="请选择润滑级别" clearable >
-                <el-option v-for="dict in lube_level" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </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:dmsBillsLubeInstanceActivity:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsLubeInstanceActivity:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBillsLubeInstanceActivity:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:dmsBillsLubeInstanceActivity: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="dmsBillsLubeInstanceActivityList" @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_lube_instance的lube_instance_id" align="center" prop="lubeInstanceId" v-if="columns[2].visible"/>
-        <el-table-column label="流程定义ID,关联wf_definition_config的id" align="center" prop="wfDefinitionId" v-if="columns[3].visible"/>
-        <el-table-column label="工单流程节点ID" align="center" prop="wfNodeId" v-if="columns[4].visible"/>
-        <el-table-column label="润滑组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" align="center" prop="lubeGroup" v-if="columns[5].visible"/>
-        <el-table-column label="润滑负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" align="center" prop="lubeSupervisor" v-if="columns[6].visible"/>
-        <el-table-column label="润滑级别" align="center" prop="lubeLevel" v-if="columns[7].visible">
-          <template #default="scope">
-            <dict-tag :options="lube_level" :value="scope.row.lubeLevel"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理意见;第1步不显示，从第2步只显示此字段" align="center" prop="processHandleResolution" v-if="columns[8].visible"/>
-        <el-table-column label="状态(0已结束 1执行中 2待接取 3已转发）" align="center" prop="processHandleStatus" v-if="columns[9].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[10].visible"/>
-        <el-table-column label="执行开始时间" align="center" prop="startTime" width="180" v-if="columns[11].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[12].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[13].visible"/>
-        <el-table-column label="处理人" align="center" prop="handleBy" v-if="columns[14].visible"/>
-        <el-table-column label="处理时间" align="center" prop="handleTime" width="180" v-if="columns[15].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[16].visible"/>
-        <el-table-column label="用户预留1" align="center" prop="attr1" v-if="columns[17].visible"/>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[18].visible"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsLubeInstanceActivity:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBillsLubeInstanceActivity: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="dmsBillsLubeInstanceActivityFormRef" :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_lube_instance的lube_instance_id" prop="lubeInstanceId">
-          <el-input v-model="form.lubeInstanceId" placeholder="请输入润滑工单实例ID，关联dms_bills_lube_instance的lube_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步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="lubeGroup">
-          <el-input v-model="form.lubeGroup" placeholder="请输入润滑组别;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" />
-        </el-form-item>
-        <el-form-item label="润滑负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" prop="lubeSupervisor">
-          <el-input v-model="form.lubeSupervisor" placeholder="请输入润滑负责人;最后一步自动复制第1步的，可在第2步修改，修改保存后为第2步的记录，第1步为要求的，第2步为实际的" />
-        </el-form-item>
-        <el-form-item label="润滑级别" prop="lubeLevel">
-          <el-select v-model="form.lubeLevel" placeholder="请选择润滑级别">
-            <el-option
-              v-for="dict in lube_level"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-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>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="DmsBillsLubeInstanceActivity" lang="ts">
-import { listDmsBillsLubeInstanceActivity, getDmsBillsLubeInstanceActivity, delDmsBillsLubeInstanceActivity, addDmsBillsLubeInstanceActivity, updateDmsBillsLubeInstanceActivity } from '@/api/dms/dmsBillsLubeInstanceActivity';
-import { DmsBillsLubeInstanceActivityVO, DmsBillsLubeInstanceActivityQuery, DmsBillsLubeInstanceActivityForm } from '@/api/dms/dmsBillsLubeInstanceActivity/types';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { lube_level, process_handle_status } = toRefs<any>(proxy?.useDict('lube_level', 'process_handle_status'));
-
-const dmsBillsLubeInstanceActivityList = ref<DmsBillsLubeInstanceActivityVO[]>([]);
-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 dmsBillsLubeInstanceActivityFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-// 列显隐信息
-const columns = ref<FieldOption[]>([
-  { key: 0, label: `润滑工单实例节点ID`, visible: true },
-  { key: 1, label: `租户编号`, visible: true },
-  { key: 2, label: `润滑工单实例ID，关联dms_bills_lube_instance的lube_instance_id`, visible: true },
-  { key: 3, label: `流程定义ID,关联wf_definition_config的id`, visible: true },
-  { key: 4, label: `工单流程节点ID`, 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: `润滑级别`, visible: true },
-  { key: 8, label: `处理意见;第1步不显示，从第2步只显示此字段`, visible: true },
-  { key: 9, label: `状态(0已结束 1执行中 2待接取 3已转发）`, visible: true },
-  { key: 10, label: `工单流程步骤顺序`, visible: true },
-  { key: 11, label: `执行开始时间`, visible: true },
-  { key: 12, label: `执行结束时间`, visible: true },
-  { key: 13, label: `处理人ID`, visible: true },
-  { key: 14, label: `处理人`, visible: true },
-  { key: 15, label: `处理时间`, visible: true },
-  { key: 16, label: `转单人用户id或转发协助用户id`, visible: true },
-  { key: 17, label: `用户预留1`, 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 },
-  { key: 23, label: `更新时间`, visible: true },
-]);
-
-const initFormData: DmsBillsLubeInstanceActivityForm = {
-  instanceActivityId: undefined,
-  lubeInstanceId: undefined,
-  wfDefinitionId: undefined,
-  wfNodeId: undefined,
-  lubeGroup: undefined,
-  lubeSupervisor: undefined,
-  lubeLevel: undefined,
-  processHandleResolution: undefined,
-  processHandleStatus: undefined,
-  processStepOrder: undefined,
-  startTime: undefined,
-  endTime: undefined,
-  handleUserId: undefined,
-  handleBy: undefined,
-  handleTime: undefined,
-  transferUserId: undefined,
-  attr1: undefined,
-  remark: undefined,
-}
-const data = reactive<PageData<DmsBillsLubeInstanceActivityForm, DmsBillsLubeInstanceActivityQuery>>({
-  form: {...initFormData},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    instanceActivityId: undefined,
-    lubeInstanceId: undefined,
-    wfDefinitionId: undefined,
-    wfNodeId: undefined,
-    lubeGroup: undefined,
-    lubeSupervisor: undefined,
-    lubeLevel: undefined,
-    processHandleResolution: undefined,
-    processHandleStatus: undefined,
-    processStepOrder: undefined,
-    startTime: undefined,
-    endTime: undefined,
-    handleUserId: undefined,
-    handleBy: undefined,
-    handleTime: undefined,
-    transferUserId: undefined,
-    attr1: undefined,
-    params: {
-    }
-  },
-  rules: {
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询润滑工单实例节点列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listDmsBillsLubeInstanceActivity(queryParams.value);
-  dmsBillsLubeInstanceActivityList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-}
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-}
-
-/** 表单重置 */
-const reset = () => {
-  form.value = {...initFormData};
-  dmsBillsLubeInstanceActivityFormRef.value?.resetFields();
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-}
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: DmsBillsLubeInstanceActivityVO[]) => {
-  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?: DmsBillsLubeInstanceActivityVO) => {
-  reset();
-  const _instanceActivityId = row?.instanceActivityId || ids.value[0]
-  const res = await getDmsBillsLubeInstanceActivity(_instanceActivityId);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = "修改润滑工单实例节点";
-}
-
-/** 提交按钮 */
-const submitForm = () => {
-  dmsBillsLubeInstanceActivityFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.instanceActivityId) {
-        await updateDmsBillsLubeInstanceActivity(form.value).finally(() =>  buttonLoading.value = false);
-      } else {
-        await addDmsBillsLubeInstanceActivity(form.value).finally(() =>  buttonLoading.value = false);
-      }
-      proxy?.$modal.msgSuccess("操作成功");
-      dialog.visible = false;
-      await getList();
-    }
-  });
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: DmsBillsLubeInstanceActivityVO) => {
-  const _instanceActivityIds = row?.instanceActivityId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除润滑工单实例节点编号为"' + _instanceActivityIds + '"的数据项？').finally(() => loading.value = false);
-  await delDmsBillsLubeInstanceActivity(_instanceActivityIds);
-  proxy?.$modal.msgSuccess("删除成功");
-  await getList();
-}
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download('dms/dmsBillsLubeInstanceActivity/export', {
-    ...queryParams.value
-  }, `dmsBillsLubeInstanceActivity_${new Date().getTime()}.xlsx`)
-}
-
-onMounted(() => {
-  getList();
-});
-</script>
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/copy2.vue b/src/views/dms/dmsBillsLubeInstanceActivity/copy2.vue
deleted file mode 100644
index a4cf1e5..0000000
--- a/src/views/dms/dmsBillsLubeInstanceActivity/copy2.vue
+++ /dev/null
@@ -1,475 +0,0 @@
-<template>
-  <div class="p-2">
-    <!-- 工单信息区域 -->
-    <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.billsLubeCode" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" :offset="2">
-            <el-form-item label="工单状态">
-              <el-input v-model="billsStatusCheck" disabled />
-            </el-form-item>
-          </el-col>
-          <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="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>
-        </el-row>
-      </el-form>
-    </el-card>
-
-    <!-- 流程步骤展示区域 -->
-    <el-card shadow="never" class="mb-[10px]">
-      <el-form ref="stepFormRef" :model="form" label-width="100px">
-        <!-- 第一步 -->
-        <h4 class="form-header h4" v-if="dmsBillsLubeInstanceActivityList.length > 0">已处理节点：步骤1（要求参数）</h4>
-        <el-row v-if="dmsBillsLubeInstanceActivityList.length > 0">
-          <el-col :span="8">
-            <el-form-item label="润滑级别" prop="lubeLevel">
-              <el-select v-model="form.lubeLevel" placeholder="润滑级别" disabled>
-                <el-option
-                  v-for="dict in lube_level"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="润滑组别" prop="lubeGroup">
-              <el-input v-model="form.lubeGroup" placeholder="请输入润滑组别" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="润滑负责人" prop="lubeSupervisor">
-              <el-input v-model="form.lubeSupervisor" placeholder="请输入润滑负责人" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- 中间步骤 (已处理的后续节点) -->
-        <template v-for="(activity) in dmsBillsLubeInstanceActivityList" :key="activity.instanceActivityId">
-          <div v-if="activity.processStepOrder && activity.processStepOrder > 1">
-            <h4 class="form-header h4">{{ `已处理节点：步骤${activity.processStepOrder}（实际参数）` }}</h4>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="润滑级别">
-                  <el-select
-                    v-model="activity.lubeLevel"
-                    placeholder="润滑级别"
-                    disabled>
-                    <el-option
-                      v-for="dict in lube_level"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑组别">
-                  <el-input
-                    v-model="activity.lubeGroup"
-                    disabled
-                    placeholder="润滑组别">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑负责人">
-                  <el-input
-                    v-model="activity.lubeSupervisor"
-                    disabled
-                    placeholder="润滑负责人">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="处理意见">
-                  <el-input
-                    v-model="activity.processHandleResolution"
-                    disabled
-                    placeholder="处理意见">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-        </template>
-
-        <!-- 当前步骤表单 (用于提交新节点) -->
-        <div v-if="isUpdate">
-          <h4 class="form-header h4">当前处理节点：步骤{{ nextStepOrder }}{{ nextStepOrder === 2 ? '（实际参数）' : '' }}</h4>
-          <el-form ref="nextStepFormRef" :model="nextStepForm" :rules="nextStepFormRules" label-width="100px">
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="润滑级别" prop="lubeLevel">
-                  <el-select v-model="nextStepForm.lubeLevel" placeholder="润滑级别">
-                    <el-option
-                      v-for="dict in lube_level"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑组别" prop="lubeGroup">
-                  <el-input v-model="nextStepForm.lubeGroup" placeholder="润滑组别"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                  <el-input v-model="nextStepForm.lubeSupervisor" placeholder="润滑负责人"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24" v-if="nextStepOrder > 1">
-                <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">提 交</el-button>
-                <el-button v-if="billsInfo && billsInfo.lubeInstanceId !== null && billsInfo.status !== 'draft'" type='primary'
-                           @click='handleApprovalRecord'>
-                  流程进度
-                </el-button>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </el-form>
-    </el-card>
-
-    <!-- 润滑计划详情区域 -->
-    <el-card shadow="never">
-      <h4 class="form-header h4 text-center">润滑计划详细信息</h4>
-      <el-table v-loading="loading" :data="planLubeDetail">
-        <el-table-column label="计划ID" align="center" prop="planLubeId" />
-        <el-table-column label="设备名称" align="center" prop="deviceName" />
-        <el-table-column label="润滑部位" align="center" prop="lubeStationName" />
-        <el-table-column label="润滑标准" align="center" prop="lubeStandardCode" />
-        <el-table-column label="操作描述" align="center" prop="operationDescription" />
-      </el-table>
-    </el-card>
-
-    <!-- 提交组件 -->
-    <submitVerify ref='submitVerifyRef' :task-variables="taskVariables as any" @submit-callback='submitCallback' />
-    <!-- 审批记录 -->
-    <approvalRecord ref='approvalRecordRef' />
-  </div>
-</template>
-
-<script setup name="DmsBillsLubeInstanceActivity" lang="ts">
-import { ref, reactive, toRefs, getCurrentInstance, onMounted, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import type { FormInstance, FormRules } from 'element-plus'; // 引入 FormInstance 和 FormRules 类型
-import {
-  listDmsBillsLubeInstanceActivity,
-  addDmsBillsLubeInstanceActivity
-} from '@/api/dms/dmsBillsLubeInstanceActivity';
-import {
-  DmsBillsLubeInstanceActivityVO,
-  DmsBillsLubeInstanceActivityForm
-} from '@/api/dms/dmsBillsLubeInstanceActivity/types';
-import { listDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
-import { getDmsPlanLubeDetail } from '@/api/dms/dmsPlanLubeDetail';
-import {DmsPlanLubeDetailVO} from "@/api/dms/dmsPlanLubeDetail/types";
-// 引入工作流相关组件和API
-import { startWorkFlow } 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';
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { lube_level, process_handle_status } = toRefs<any>(proxy?.useDict('lube_level', 'process_handle_status'));
-const route = useRoute();
-
-// 表单实例
-const stepFormRef = ref<FormInstance>(); // 主表单 ref
-const nextStepFormRef = ref<FormInstance>(); // 下一步表单 ref
-
-// 工作流相关
-const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
-const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
-const taskVariables = ref<any>({});
-const submitFormData = ref<StartProcessBo>({
-  businessId: '',
-  flowCode: 'lubeProcess', // 假设润滑工单流程代码为lubeProcess
-  variables: {}
-});
-
-// 基础数据定义
-const loading = ref(true);
-const dmsBillsLubeInstanceActivityList = ref<DmsBillsLubeInstanceActivityVO[]>([]);
-const billsInfo = ref<any>({}); // 工单主体信息
-const planLubeDetail = ref<DmsPlanLubeDetailVO[]>([]);
-const billsStatusCheck = ref(''); // 工单状态显示文本
-const isUpdate = ref(true); // 控制是否显示提交表单区域
-const planLubeId = ref(''); // 润滑计划ID，从工单信息中获取
-const lubeInstanceId = route.params.lubeInstanceId as string; // 类型断言
-const buttonLoading = ref(false);
-
-// 计算下一步序号
-const nextStepOrder = computed(() => {
-  return dmsBillsLubeInstanceActivityList.value.length + 1;
-});
-
-// 表单数据 (用于展示第一个已处理节点的信息)
-const form = reactive<Partial<DmsBillsLubeInstanceActivityForm>>({
-  lubeGroup: undefined,
-  lubeSupervisor: undefined,
-  lubeLevel: undefined,
-  remark: undefined,
-});
-
-// 下一步表单 (用于提交新的节点)
-const nextStepForm = reactive<DmsBillsLubeInstanceActivityForm>({
-  instanceActivityId: undefined,
-  lubeInstanceId: lubeInstanceId,
-  lubeGroup: undefined,
-  lubeSupervisor: undefined,
-  lubeLevel: undefined,
-  processHandleResolution: undefined,
-  processHandleStatus: undefined,
-  processStepOrder: undefined,
-  startTime: undefined,
-  endTime: undefined,
-  handleUserId: undefined,
-  handleBy: undefined,
-  handleTime: undefined,
-  transferUserId: undefined,
-  attr1: undefined,
-  remark: undefined,
-});
-
-// 下一步表单校验规则
-const nextStepFormRules = reactive<FormRules>({
-  lubeLevel: [{ required: true, message: "润滑级别不能为空", trigger: "change" }],
-  lubeGroup: [{ required: true, message: "润滑组别不能为空", trigger: "blur" }],
-  lubeSupervisor: [{ required: true, message: "润滑负责人不能为空", trigger: "blur" }],
-  // 处理意见仅在第二步及以后验证
-  processHandleResolution: [{ required: nextStepOrder.value > 1, message: "处理意见不能为空", trigger: "blur" }],
-});
-
-// 查询参数
-const queryParams = reactive({
-  pageNum: 1,
-  pageSize: 50,
-  lubeInstanceId: lubeInstanceId,
-});
-
-// 初始化数据
-onMounted(() => {
-  // 判断当前页面是查看还是编辑
-  if(route.name === 'childDmsBillsLubeInstanceActivity') {
-    isUpdate.value = true;
-  } else if(route.name === 'selectChildDmsBillsLubeInstanceActivity') {
-    isUpdate.value = false;
-  }
-
-  // 加载工单实例数据
-  getDmsBillsLubeInstance();
-  // 加载工单实例节点数据
-  getList();
-});
-
-// 获取工单实例数据
-const getDmsBillsLubeInstance = async () => {
-  try {
-    const res = await listDmsBillsLubeInstance(queryParams);
-    if (res.rows && res.rows.length > 0) {
-      billsInfo.value = res.rows[0];
-      // 确保 planLubeId 是字符串类型
-      const lubeIdFromServer = res.rows[0].planLubeId;
-      planLubeId.value = typeof lubeIdFromServer === 'number' ? String(lubeIdFromServer) : lubeIdFromServer;
-
-      // 设置工单状态显示文本
-      if (lube_level.value && billsInfo.value.lubeStatus !== undefined) {
-        const statusItem = lube_level.value.find((item: any) => String(item.value) === String(billsInfo.value.lubeStatus));
-        billsStatusCheck.value = statusItem ? statusItem.label : '未知状态';
-      } else {
-        billsStatusCheck.value = '未知状态';
-      }
-
-      // 获取润滑计划详情
-      if (planLubeId.value) {
-        getPlanLubeDetailData();
-      }
-    } else {
-      proxy?.$modal.msgError("未查询到工单信息");
-    }
-  } catch (error) {
-    console.error('获取工单实例数据失败', error);
-    proxy?.$modal.msgError("获取工单实例数据失败");
-  }
-};
-
-// 获取润滑计划详情
-const getPlanLubeDetailData = async () => {
-  if (!planLubeId.value) return;
-  loading.value = true;
-  try {
-    const res = await getDmsPlanLubeDetail(planLubeId.value);
-    planLubeDetail.value = res && res.rows ? [res.rows] : [];
-  } catch (error) {
-    console.error('获取润滑计划详情失败', error);
-    proxy?.$modal.msgError("获取润滑计划详情失败");
-  }
-};
-
-// 获取工单实例节点数据
-const getList = async () => {
-  loading.value = true;
-  try {
-    const res = await listDmsBillsLubeInstanceActivity(queryParams);
-    dmsBillsLubeInstanceActivityList.value = res.rows;
-
-    // 填充第一步数据 (用于表单展示)
-    if (res.rows && res.rows.length > 0) {
-      Object.assign(form, {
-        lubeGroup: res.rows[0].lubeGroup,
-        lubeSupervisor: res.rows[0].lubeSupervisor,
-        lubeLevel: res.rows[0].lubeLevel,
-        remark: res.rows[0].remark
-      });
-
-      // 根据步骤数初始化下一步表单数据
-      if (nextStepOrder.value === 2) {
-        // 第二步，复制第一步的润滑组别和润滑负责人
-        Object.assign(nextStepForm, {
-          lubeGroup: res.rows[0].lubeGroup,
-          lubeSupervisor: res.rows[0].lubeSupervisor,
-          lubeLevel: res.rows[0].lubeLevel,
-          processHandleResolution: null, // 第二步需要填写处理意见
-          remark: ''
-        });
-      } else if (nextStepOrder.value > 2) {
-        // 第三步及以后，使用最后一个节点的数据
-        const lastActivity = res.rows[res.rows.length - 1];
-        Object.assign(nextStepForm, {
-          lubeGroup: lastActivity.lubeGroup,
-          lubeSupervisor: lastActivity.lubeSupervisor,
-          lubeLevel: lastActivity.lubeLevel,
-          processHandleResolution: null, // 清空处理意见
-          remark: ''
-        });
-      }
-    } else {
-      // 如果没有已处理节点，则 nextStepForm 全新初始化
-      Object.assign(nextStepForm, {
-        lubeGroup: undefined,
-        lubeSupervisor: undefined,
-        lubeLevel: undefined,
-        processHandleResolution: null,
-        remark: ''
-      });
-    }
-
-    // 更新表单校验规则
-    nextStepFormRules.processHandleResolution = [{
-      required: nextStepOrder.value > 1,
-      message: "处理意见不能为空",
-      trigger: "blur"
-    }];
-
-  } catch (error) {
-    console.error('获取工单实例节点数据失败', error);
-    proxy?.$modal.msgError("获取工单实例节点数据失败");
-  } finally {
-    loading.value = false;
-  }
-};
-
-// 提交表单
-const submitForm = async () => {
-  if (!nextStepFormRef.value) return;
-  await nextStepFormRef.value.validate(async (valid) => {
-    if (valid) {
-      try {
-        buttonLoading.value = true;
-        // 设置流程步骤顺序
-        nextStepForm.processStepOrder = nextStepOrder.value;
-        nextStepForm.lubeInstanceId = lubeInstanceId;
-
-        // 在第一步时不需要处理意见
-        if (nextStepOrder.value === 1) {
-          nextStepForm.processHandleResolution = null;
-        }
-
-        // 提交
-        const res = await addDmsBillsLubeInstanceActivity(nextStepForm);
-
-        // 启动工作流
-        await handleStartWorkFlow(res.data);
-
-      } catch (error) {
-        console.error('提交失败', error);
-        proxy?.$modal.msgError("提交失败，请检查数据或联系管理员");
-        buttonLoading.value = false;
-      }
-    } else {
-      proxy?.$modal.msgError("表单校验失败，请检查输入项");
-    }
-  });
-};
-
-// 启动工作流
-const handleStartWorkFlow = async (data: any) => {
-  try {
-    submitFormData.value.businessId = lubeInstanceId;
-    //流程变量
-    taskVariables.value = {
-      data: data
-    };
-    submitFormData.value.variables = taskVariables.value;
-    const resp = await startWorkFlow(submitFormData.value);
-    if (submitVerifyRef.value) {
-      buttonLoading.value = false;
-      submitVerifyRef.value.openDialog(resp.data.taskId);
-    }
-  } finally {
-    buttonLoading.value = false;
-  }
-};
-
-// 审批记录
-const handleApprovalRecord = () => {
-  approvalRecordRef.value.init(lubeInstanceId);
-};
-
-// 提交回调
-const submitCallback = async () => {
-  await getList(); // 刷新列表获取最新节点
-  proxy?.$modal.msgSuccess("操作成功");
-};
-</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/dmsBillsLubeInstanceActivity/index.vue b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
index d6865b6..760111e 100644
--- a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
@@ -43,12 +43,7 @@
           <el-col :span="8">
             <el-form-item label="润滑级别" prop="lubeLevel">
               <el-select v-model="form.lubeLevel" placeholder="润滑级别" disabled>
-                <el-option
-                  v-for="dict in lube_level"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
-                </el-option>
+                <el-option v-for="dict in lube_level" :key="dict.value" :label="dict.label" :value="dict.value"> </el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -65,50 +60,30 @@
         </el-row>
 
         <!-- 中间步骤 (已处理的后续节点) -->
-        <template v-for="(activity) in dmsBillsLubeInstanceActivityList" :key="activity.instanceActivityId">
+        <template v-for="activity in dmsBillsLubeInstanceActivityList" :key="activity.instanceActivityId">
           <div v-if="activity.processStepOrder && activity.processStepOrder > 1">
-            <h4 class="form-header h4">{{ `已处理节点：步骤${activity.processStepOrder}（实际参数）` }}</h4>
+            <h4 class="form-header h4">{{ `已处理节点：步骤${activity.processStepOrder}（${activity.processStepOrder === 2 ? '实际参数' : '工单完成'}）` }}</h4>
             <el-row>
               <el-col :span="8">
                 <el-form-item label="润滑级别">
-                  <el-select
-                    v-model="activity.lubeLevel"
-                    placeholder="润滑级别"
-                    disabled>
-                    <el-option
-                      v-for="dict in lube_level"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value">
-                    </el-option>
+                  <el-select v-model="activity.lubeLevel" placeholder="润滑级别" disabled>
+                    <el-option v-for="dict in lube_level" :key="dict.value" :label="dict.label" :value="dict.value"> </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="润滑组别">
-                  <el-input
-                    v-model="activity.lubeGroup"
-                    disabled
-                    placeholder="润滑组别">
-                  </el-input>
+                  <el-input v-model="activity.lubeGroup" disabled placeholder="润滑组别"> </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="润滑负责人">
-                  <el-input
-                    v-model="activity.lubeSupervisor"
-                    disabled
-                    placeholder="润滑负责人">
-                  </el-input>
+                  <el-input v-model="activity.lubeSupervisor" disabled placeholder="润滑负责人"> </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="处理意见">
-                  <el-input
-                    v-model="activity.processHandleResolution"
-                    disabled
-                    placeholder="处理意见">
-                  </el-input>
+                  <el-input v-model="activity.processHandleResolution" disabled placeholder="处理意见"> </el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -117,40 +92,51 @@
 
         <!-- 当前步骤表单 (用于提交新节点) -->
         <div v-if="isUpdate">
-          <h4 class="form-header h4">当前处理节点：步骤{{ nextStepOrder }}{{ nextStepOrder === 2 ? '（实际参数）' : '' }}</h4>
+          <h4 class="form-header h4">
+            {{
+              isCreatingWorkflow && dmsBillsLubeInstanceActivityList.length === 0
+                ? `创建工单：步骤1（要求参数）`
+                : `当前处理节点：步骤${nextStepOrder}${nextStepOrder === 2 ? '（实际参数）' : nextStepOrder === 3 ? '（工单完成）' : ''}`
+            }}
+          </h4>
           <el-form ref="nextStepFormRef" :model="nextStepForm" :rules="nextStepFormRules" label-width="100px">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="润滑级别" prop="lubeLevel">
-                  <el-select v-model="nextStepForm.lubeLevel" placeholder="润滑级别">
-                    <el-option
-                      v-for="dict in lube_level"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value">
-                    </el-option>
+                  <el-select v-model="nextStepForm.lubeLevel" placeholder="润滑级别" :disabled="nextStepOrder === 3">
+                    <el-option v-for="dict in lube_level" :key="dict.value" :label="dict.label" :value="dict.value"> </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="润滑组别" prop="lubeGroup">
-                  <el-input v-model="nextStepForm.lubeGroup" placeholder="润滑组别"></el-input>
+                  <el-input v-model="nextStepForm.lubeGroup" placeholder="润滑组别" :disabled="nextStepOrder === 3"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                  <el-input v-model="nextStepForm.lubeSupervisor" placeholder="润滑负责人"></el-input>
+                  <el-input v-model="nextStepForm.lubeSupervisor" placeholder="润滑负责人" :disabled="nextStepOrder === 3"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="24" v-if="nextStepOrder > 1">
+              <el-col :span="24" v-if="!(isCreatingWorkflow && dmsBillsLubeInstanceActivityList.length === 0)">
                 <el-form-item label="处理意见" prop="processHandleResolution">
                   <el-input v-model="nextStepForm.processHandleResolution" placeholder="处理意见"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="24" class="text-center mt-4">
-                <el-button type="primary" @click="submitForm">提 交</el-button>
-                <el-button v-if="billsInfo && billsInfo.lubeInstanceId !== null && billsInfo.status !== 'draft'" type='primary'
-                           @click='handleApprovalRecord'>
+                <el-button
+                  type="primary"
+                  @click="submitForm"
+                  :loading="buttonLoading"
+                  :disabled="buttonLoading || (!currentTaskId && !isCreatingWorkflow)"
+                >
+                  {{ buttonText }}
+                </el-button>
+                <el-button
+                  v-if="billsInfo && billsInfo.lubeInstanceId !== null && billsInfo.status !== 'draft'"
+                  type="primary"
+                  @click="handleApprovalRecord"
+                >
                   流程进度
                 </el-button>
               </el-col>
@@ -164,8 +150,7 @@
     <el-card shadow="never">
       <h4 class="form-header h4 text-center">润滑计划详细信息</h4>
       <el-table v-loading="loading" :data="planLubeDetail">
-        <el-table-column label="计划ID" align="center" prop="planLubeId" />
-        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备名称" align="center" prop="machineName" />
         <el-table-column label="润滑部位" align="center" prop="lubeStationName" />
         <el-table-column label="润滑标准" align="center" prop="lubeStandardCode" />
         <el-table-column label="操作描述" align="center" prop="operationDescription" />
@@ -173,9 +158,9 @@
     </el-card>
 
     <!-- 提交组件 -->
-    <submitVerify ref='submitVerifyRef' :task-variables="taskVariables as any" @submit-callback='submitCallback' />
+    <submitVerify ref="submitVerifyRef" :task-variables="taskVariables as any" @submit-callback="submitCallback" @cancel-callback="cancelCallback" />
     <!-- 审批记录 -->
-    <approvalRecord ref='approvalRecordRef' />
+    <approvalRecord ref="approvalRecordRef" />
   </div>
 </template>
 
@@ -185,20 +170,24 @@ import { useRoute, useRouter } from 'vue-router';
 import type { FormInstance, FormRules } from 'element-plus'; // 引入 FormInstance 和 FormRules 类型
 import {
   listDmsBillsLubeInstanceActivity,
-  addDmsBillsLubeInstanceActivity
+  addDmsBillsLubeInstanceActivity,
+  updateDmsBillsLubeInstanceActivity
 } from '@/api/dms/dmsBillsLubeInstanceActivity';
 import {
   DmsBillsLubeInstanceActivityVO,
   DmsBillsLubeInstanceActivityForm
 } from '@/api/dms/dmsBillsLubeInstanceActivity/types';
 import { getDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
-import { getDmsPlanLubeDetail } from '@/api/dms/dmsPlanLubeDetail';
+import { getDmsPlanLubeDetailList} from '@/api/dms/dmsPlanLubeDetail';
 import {DmsPlanLubeDetailVO} from "@/api/dms/dmsPlanLubeDetail/types";
 // 引入工作流相关组件和API
-import { startWorkFlow } from '@/api/workflow/task';
+import { startWorkFlow, pageByTaskWait } from '@/api/workflow/task';
+import { pageByCurrent } from '@/api/workflow/instance';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+import { FlowInstanceQuery, FlowInstanceVO } from '@/api/workflow/instance/types';
+import { TaskQuery, FlowTaskVO } from '@/api/workflow/task/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { lube_level, process_handle_status } = toRefs<any>(proxy?.useDict('lube_level', 'process_handle_status'));
@@ -229,6 +218,14 @@ const planLubeId = ref(''); // 润滑计划ID，从工单信息中获取
 const lubeInstanceId = route.params.lubeInstanceId as string; // 类型断言
 const buttonLoading = ref(false);
 
+// 新增状态
+const currentTaskId = ref<string | number | null>(null);
+const isCreatingWorkflow = ref(false); // true 表示在走创建流程的第一步（startWorkFlow）
+const buttonText = ref('创建工单并提交');
+
+// 暂存业务数据，等待工作流提交成功后再保存
+const pendingActivityData = ref<DmsBillsLubeInstanceActivityForm | null>(null);
+
 // 计算下一步序号
 const nextStepOrder = computed(() => {
   return dmsBillsLubeInstanceActivityList.value.length + 1;
@@ -267,19 +264,19 @@ const nextStepFormRules = reactive<FormRules>({
   lubeLevel: [{ required: true, message: "润滑级别不能为空", trigger: "change" }],
   lubeGroup: [{ required: true, message: "润滑组别不能为空", trigger: "blur" }],
   lubeSupervisor: [{ required: true, message: "润滑负责人不能为空", trigger: "blur" }],
-  // 处理意见仅在第二步及以后验证
-  processHandleResolution: [{ required: nextStepOrder.value > 1, message: "处理意见不能为空", trigger: "blur" }],
+  // 处理意见的校验会由 updateButtonAndFormState 动态设置
+  processHandleResolution: [{ required: false, message: "处理意见不能为空", trigger: "blur" }],
 });
 
 // 查询参数
 const queryParams = reactive({
   pageNum: 1,
-  pageSize: 50,
+  pageSize: 150,
   lubeInstanceId: lubeInstanceId,
 });
 
 // 初始化数据
-onMounted(() => {
+onMounted(async () => {
   // 判断当前页面是查看还是编辑
   if(route.name === 'childDmsBillsLubeInstanceActivity') {
     isUpdate.value = true;
@@ -287,23 +284,235 @@ onMounted(() => {
     isUpdate.value = false;
   }
 
-  // 加载工单实例数据
-  dmsBillsLubeInstance();
-  // 加载工单实例节点数据
-  getList();
+  if (isUpdate.value) { // 仅在编辑模式下加载数据和设置状态
+    await loadData();
+  } else {
+    // 查看模式也需要加载工单信息和已处理节点
+    await dmsBillsLubeInstance();
+    await getList();
+    loading.value = false;
+  }
 });
 
+async function loadData() {
+  loading.value = true;
+  try {
+    // 先清除表单验证状态，避免在数据加载过程中触发不必要的表单验证错误
+    if (nextStepFormRef.value) {
+      nextStepFormRef.value.clearValidate();
+    }
+
+    await dmsBillsLubeInstance();
+    await getList(); // 获取已处理节点会影响 nextStepOrder 和 nextStepForm 的初始化
+
+    if (dmsBillsLubeInstanceActivityList.value.length === 0) {
+      currentTaskId.value = null;
+      isCreatingWorkflow.value = true;
+    } else {
+      isCreatingWorkflow.value = false;
+      currentTaskId.value = null; // 重置当前任务ID，准备从流程引擎获取
+      const completedSteps = dmsBillsLubeInstanceActivityList.value.length;
+
+      // 如果流程业务步骤少于3步（工单创建、工单处理、工单完成），则尝试获取当前活动任务
+      if (completedSteps < 3) {
+        proxy?.$modal.loading("正在获取最新流程任务...");
+        let expectedNodeName = '';
+        if (completedSteps === 1) expectedNodeName = '工单处理';
+        else if (completedSteps === 2) expectedNodeName = '工单完成';
+
+        console.log(`[loadData] Attempting to find current task. Completed steps: ${completedSteps}, Expected next node: '${expectedNodeName}' for businessId: ${lubeInstanceId}`);
+
+        try {
+          let tasks: FlowTaskVO[] = [];
+          // 尝试使用期望的节点名称进行精确查找
+          if (expectedNodeName) {
+            const taskRes = await pageByTaskWait({
+              pageNum: 1,
+              pageSize: 10, // 通常特定业务ID和节点名称的任务不会很多
+              flowCode: 'Lube01', // 从 submitFormData 获取或确认此编码正确
+              nodeName: expectedNodeName
+            });
+            if (taskRes.rows) {
+              tasks = taskRes.rows.filter(task => task.businessId === lubeInstanceId);
+              if (tasks.length > 0) {
+                 console.log(`[loadData] Found ${tasks.length} task(s) using specific nodeName '${expectedNodeName}' and businessId '${lubeInstanceId}'.`);
+              } else {
+                 console.log(`[loadData] No tasks found using specific nodeName '${expectedNodeName}' for businessId '${lubeInstanceId}'. Will try broader search.`);
+              }
+            }
+          }
+
+          let foundTask: FlowTaskVO | undefined = tasks.length > 0 ? tasks[0] : undefined; // 如果有多个，暂时取第一个
+          if (tasks.length > 1) {
+            console.warn(`[loadData] Multiple tasks (${tasks.length}) found with specific nodeName '${expectedNodeName}' and businessId '${lubeInstanceId}'. Using the first one found: ${foundTask?.id}.`);
+          }
+
+          // 如果未通过特定节点名称找到，则尝试仅通过flowCode查找，然后匹配businessId
+          if (!foundTask) {
+            console.log(`[loadData] Task not found with specific nodeName. Fetching all waiting tasks for flowCode 'Lube01' to filter by businessId '${lubeInstanceId}'.`);
+            const taskResAll = await pageByTaskWait({
+              pageNum: 1,
+              pageSize: 50, // 获取更多任务以便筛选
+              flowCode: 'Lube01'
+            });
+
+            if (taskResAll.rows && taskResAll.rows.length > 0) {
+              const businessTasks = taskResAll.rows.filter(task => task.businessId === lubeInstanceId);
+              if (businessTasks.length === 1) {
+                foundTask = businessTasks[0];
+                console.log(`[loadData] Found single task by businessId from all waiting tasks: ${foundTask.id}, Node: ${foundTask.nodeName}`);
+              } else if (businessTasks.length > 1) {
+                console.warn(`[loadData] Multiple tasks (${businessTasks.length}) found for businessId '${lubeInstanceId}' from all waiting tasks. Attempting to match with expectedNodeName '${expectedNodeName}'.`);
+                if (expectedNodeName) {
+                  foundTask = businessTasks.find(task => task.nodeName === expectedNodeName);
+                }
+                if (foundTask) {
+                  console.log(`[loadData] Matched task by expectedNodeName from multiple: ${foundTask.id}`);
+                } else {
+                  // Fallback: 如果仍有多个或无法通过expectedNodeName匹配，则取第一个（或记录更严重的警告）
+                  foundTask = businessTasks[0]; 
+                  console.warn(`[loadData] Could not specifically match by nodeName among multiple tasks for businessId '${lubeInstanceId}'. Using the first one found: ${foundTask?.id}, Node: ${foundTask?.nodeName}. Review workflow design if this is not correct.`);
+                }
+              } else {
+                 console.log(`[loadData] No tasks found for businessId '${lubeInstanceId}' even after broader search by flowCode 'Lube01'.`);
+              }
+            }
+          }
+
+          if (foundTask) {
+            currentTaskId.value = foundTask.id;
+            console.log(`[loadData] Successfully set currentTaskId via pageByTaskWait to: ${currentTaskId.value} (Node: ${foundTask.nodeName}, BusinessID: ${foundTask.businessId})`);
+          } else {
+            console.warn(`[loadData] No suitable waiting task found for businessId ${lubeInstanceId} with flowCode Lube01. Button may show '暂无操作'.`);
+          }
+        } catch (error) {
+          console.error("[loadData] Error fetching current task via pageByTaskWait:", error);
+          proxy?.$modal.msgError("获取最新流程任务失败");
+        } finally {
+          proxy?.$modal.closeLoading();
+        }
+      } else {
+        console.log("[loadData] All expected business steps completed (>=3) or initial creation. No active task to fetch from workflow via pageByTaskWait for middle steps.");
+      }
+    }
+
+    updateButtonAndFormState();
+
+    // 数据加载后再次清除表单验证状态，确保UI渲染正确
+    setTimeout(() => {
+      if (nextStepFormRef.value) {
+        nextStepFormRef.value.clearValidate();
+      }
+    }, 100);
+  } catch (error) {
+    console.error("Failed to load initial data", error);
+    proxy?.$modal.msgError("加载数据失败");
+    // 出错时，尝试恢复到一个相对安全的状态
+    currentTaskId.value = null;
+    isCreatingWorkflow.value = dmsBillsLubeInstanceActivityList.value.length === 0;
+    updateButtonAndFormState();
+  } finally {
+    loading.value = false;
+  }
+}
+
+function updateButtonAndFormState() {
+  const activitiesCount = dmsBillsLubeInstanceActivityList.value.length;
+  
+  // 第一步：创建工单（工单创建）
+  if (activitiesCount === 0 && isCreatingWorkflow.value) {
+    buttonText.value = '创建工单并提交';
+    nextStepFormRules.processHandleResolution = [{ required: false, message: "处理意见不能为空", trigger: "blur" }];
+    // 清理 nextStepForm
+    Object.assign(nextStepForm, {
+        instanceActivityId: undefined, // 重置ID
+        lubeInstanceId: lubeInstanceId, // 确保lubeInstanceId正确
+        lubeGroup: undefined,
+        lubeSupervisor: undefined,
+        lubeLevel: undefined,
+        processHandleResolution: undefined,
+        processHandleStatus: undefined,
+        processStepOrder: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        handleUserId: undefined,
+        handleBy: undefined,
+        handleTime: undefined,
+        transferUserId: undefined,
+        attr1: undefined,
+        remark: undefined,
+    });
+  } 
+  // 有待办任务ID，且非创建模式
+  else if (currentTaskId.value && !isCreatingWorkflow.value) { 
+    const currentStepBasedOnActivities = activitiesCount + 1; // 下一步是第几步
+
+    if (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) {
+      if (currentStepBasedOnActivities === 3) {
+        // 第三步应复制第一步的数据
+        const firstActivity = dmsBillsLubeInstanceActivityList.value[0];
+        Object.assign(nextStepForm, {
+          instanceActivityId: undefined, // 新节点ID为空
+          lubeInstanceId: lubeInstanceId,
+          lubeGroup: firstActivity.lubeGroup, // 复制第一步的数据
+          lubeSupervisor: firstActivity.lubeSupervisor, // 复制第一步的数据
+          lubeLevel: firstActivity.lubeLevel, // 复制第一步的数据
+          processHandleResolution: '', // 清空处理意见
+          remark: '', // 清空备注
+          processHandleStatus: undefined,
+          processStepOrder: undefined,
+        });
+      } else {
+        // 其他步骤使用最后一个节点的数据
+        const lastActivity = dmsBillsLubeInstanceActivityList.value[activitiesCount - 1];
+        Object.assign(nextStepForm, {
+          instanceActivityId: undefined, // 新节点ID为空
+          lubeInstanceId: lubeInstanceId,
+          lubeGroup: lastActivity.lubeGroup,
+          lubeSupervisor: lastActivity.lubeSupervisor,
+          lubeLevel: lastActivity.lubeLevel,
+          processHandleResolution: '', // 清空处理意见
+          remark: '', // 清空备注
+          processHandleStatus: undefined,
+          processStepOrder: undefined,
+        });
+      }
+    } else { // 有 currentTaskId 但没有历史活动，这通常不应该发生，但为了健壮性处理
+        Object.assign(nextStepForm, {
+            instanceActivityId: undefined,
+            lubeInstanceId: lubeInstanceId,
+            processHandleResolution: '',
+            remark: '',
+        });
+    }
+  } else { // 没有待办任务（可能已结束、非处理人打开、或查看模式）或状态不明确
+    buttonText.value = '暂无操作';
+    if (isUpdate.value) { // 如果是编辑模式但无操作，则禁用提交相关的校验
+        nextStepFormRules.processHandleResolution = [{ required: false }];
+    }
+  }
+}
+
 // 获取工单实例数据
 const dmsBillsLubeInstance = async () => {
-
-    // const res = await listDmsBillsLubeInstance(queryParams);
-    //billsInfo.value = res.rows[0];
     const _lubeInstanceId = lubeInstanceId;
     const res = await getDmsBillsLubeInstance(_lubeInstanceId);
     billsInfo.value = res.data;
 
       // 确保 planLubeId 是字符串类型
-      // const lubeIdFromServer = res.rows[0].planLubeId;
       const lubeIdFromServer = res.data.planLubeId;
       planLubeId.value = typeof lubeIdFromServer === 'number' ? String(lubeIdFromServer) : lubeIdFromServer;
 
@@ -325,13 +534,8 @@ const dmsBillsLubeInstance = async () => {
 const getPlanLubeDetailData = async () => {
   if (!planLubeId.value) return;
   loading.value = true;
-  try {
-    const res = await getDmsPlanLubeDetail(planLubeId.value);
-    planLubeDetail.value = res && res.rows ? [res.rows] : [];
-  } catch (error) {
-    console.error('获取润滑计划详情失败', error);
-    proxy?.$modal.msgError("获取润滑计划详情失败");
-  }
+    const res = await getDmsPlanLubeDetailList({planLubeId: planLubeId.value});
+    planLubeDetail.value = res.data;
 };
 
 // 获取工单实例节点数据
@@ -360,8 +564,18 @@ const getList = async () => {
           processHandleResolution: null, // 第二步需要填写处理意见
           remark: ''
         });
-      } else if (nextStepOrder.value > 2) {
-        // 第三步及以后，使用最后一个节点的数据
+      } else if (nextStepOrder.value === 3) {
+        // 第三步，复制第一步的润滑组别和润滑负责人
+        const firstActivity = res.rows[0];
+        Object.assign(nextStepForm, {
+          lubeGroup: firstActivity.lubeGroup, // 复制第一步数据
+          lubeSupervisor: firstActivity.lubeSupervisor, // 复制第一步数据
+          lubeLevel: firstActivity.lubeLevel, // 复制第一步数据
+          processHandleResolution: null, // 清空处理意见
+          remark: ''
+        });
+      } else if (nextStepOrder.value > 3) {
+        // 第四步及以后，使用最后一个节点的数据（正常不会有这种情况）
         const lastActivity = res.rows[res.rows.length - 1];
         Object.assign(nextStepForm, {
           lubeGroup: lastActivity.lubeGroup,
@@ -400,52 +614,98 @@ const getList = async () => {
 // 提交表单
 const submitForm = async () => {
   if (!nextStepFormRef.value) return;
-  await nextStepFormRef.value.validate(async (valid) => {
+  
+  try {
+    // 清空之前的错误状态
+    buttonLoading.value = false;
+    pendingActivityData.value = null;
+    
+    // 触发一次校验更新，确保最新的rules生效
+    nextStepFormRef.value.clearValidate();
+    
+    const valid = await nextStepFormRef.value.validate().catch(errors => {
+      console.error("表单验证错误:", errors);
+      return false;
+    });
+    
     if (valid) {
+      buttonLoading.value = true;
+      
       try {
-        buttonLoading.value = true;
-        // 设置流程步骤顺序
-        nextStepForm.processStepOrder = nextStepOrder.value;
+        nextStepForm.processStepOrder = dmsBillsLubeInstanceActivityList.value.length + 1;
         nextStepForm.lubeInstanceId = lubeInstanceId;
 
-        // 在第一步时不需要处理意见
-        if (nextStepOrder.value === 1) {
-          nextStepForm.processHandleResolution = null;
+        // 确保处理意见有值，避免数据库NOT NULL约束异常
+        if (nextStepForm.processHandleResolution === undefined || nextStepForm.processHandleResolution === null) {
+          nextStepForm.processHandleResolution = '';
         }
 
-        // 提交
-        const res = await addDmsBillsLubeInstanceActivity(nextStepForm);
+        // 复制一份表单数据用于后续保存
+        pendingActivityData.value = JSON.parse(JSON.stringify(nextStepForm));
 
-        // 启动工作流
-        await handleStartWorkFlow(res.data);
+        // 将当前表单的数据放入流程变量 - 仅传递简单必要字段而不是整个对象
+        taskVariables.value = { 
+          entity: {
+            lubeInstanceId: pendingActivityData.value.lubeInstanceId,
+            lubeGroup: pendingActivityData.value.lubeGroup,
+            lubeSupervisor: pendingActivityData.value.lubeSupervisor,
+            lubeLevel: pendingActivityData.value.lubeLevel,
+            processHandleResolution: pendingActivityData.value.processHandleResolution,
+            processStepOrder: pendingActivityData.value.processStepOrder
+          }
+        };
 
-      } catch (error) {
-        console.error('提交失败', error);
-        proxy?.$modal.msgError("提交失败，请检查数据或联系管理员");
+        if (isCreatingWorkflow.value && dmsBillsLubeInstanceActivityList.value.length === 0) {
+          // 步骤一: 创建工单，启动工作流
+          submitFormData.value.businessId = lubeInstanceId;
+          submitFormData.value.variables = taskVariables.value;
+
+          console.log("[submitForm] 开始启动工作流, businessId:", lubeInstanceId);
+          const workflowRes = await startWorkFlow(submitFormData.value);
+          
+          if (!workflowRes || !workflowRes.data || !workflowRes.data.taskId) {
+            buttonLoading.value = false;
+            throw new Error("工作流启动失败，未能获取有效的任务ID");
+          }
+          
+          console.log("[submitForm] 工作流启动成功, taskId:", workflowRes.data.taskId);
+          
+          if (submitVerifyRef.value) {
+            buttonLoading.value = false; // openDialog 前重置loading
+            submitVerifyRef.value.openDialog(String(workflowRes.data.taskId));
+          } else {
+            buttonLoading.value = false;
+            throw new Error("提交流程组件不可用");
+          }
+        } else if (currentTaskId.value && !isCreatingWorkflow.value) {
+          // 第二步或第三步：处理工作流节点
+          console.log("[submitForm] 处理工作流节点, taskId:", currentTaskId.value);
+          
+          if (submitVerifyRef.value) {
+            buttonLoading.value = false;
+            submitVerifyRef.value.openDialog(String(currentTaskId.value));
+          } else {
+            buttonLoading.value = false;
+            throw new Error("提交流程组件不可用");
+          }
+        } else {
+          buttonLoading.value = false;
+          throw new Error("未知的提交流程状态或没有待办任务ID");
+        }
+      } catch (error: any) {
         buttonLoading.value = false;
+        pendingActivityData.value = null; // 出错时清空待处理数据
+        console.error('[submitForm] 提交失败:', error);
+        proxy?.$modal.msgError(error.message || "提交失败，请检查数据或联系管理员");
       }
     } else {
+      buttonLoading.value = false;
       proxy?.$modal.msgError("表单校验失败，请检查输入项");
     }
-  });
-};
-
-// 启动工作流
-const handleStartWorkFlow = async (data: any) => {
-  try {
-    submitFormData.value.businessId = lubeInstanceId;
-    //流程变量
-    taskVariables.value = {
-      entity: data
-    };
-    submitFormData.value.variables = taskVariables.value;
-    const resp = await startWorkFlow(submitFormData.value);
-    if (submitVerifyRef.value) {
-      buttonLoading.value = false;
-      submitVerifyRef.value.openDialog(resp.data.taskId);
-    }
-  } finally {
+  } catch (error) {
     buttonLoading.value = false;
+    console.error('[submitForm] 意外错误:', error);
+    proxy?.$modal.msgError("表单提交过程中发生错误");
   }
 };
 
@@ -455,9 +715,73 @@ const handleApprovalRecord = () => {
 };
 
 // 提交回调
-const submitCallback = async () => {
-  await getList(); // 刷新列表获取最新节点
-  proxy?.$modal.msgSuccess("操作成功");
+const submitCallback = async (/* success?: boolean, nextTaskId?: string | number | null */) => {
+  // success 和 nextTaskId 参数在此被注释掉或忽略，
+  // 因为 submitVerify.vue 组件的 submitCallback 事件没有传递这些参数，
+  // 导致它们在父组件中始终是 undefined。
+  console.log('[submitCallback] Invoked.');
+
+  try {
+    if (pendingActivityData.value) {
+      // 当 submitCallback 被调用，我们假定 submitVerify.vue 中的工作流步骤已被尝试。
+      // 现在，我们尝试保存业务数据。
+      const activityRes = await addDmsBillsLubeInstanceActivity(pendingActivityData.value);
+      console.log("[submitCallback] Business data saved successfully:", activityRes.data);
+
+      // 根据已暂存的待处理活动数据的步骤顺序来判断当前完成的是哪个步骤
+      const stepOrderOfSavedData = pendingActivityData.value.processStepOrder;
+
+      if (stepOrderOfSavedData === 1) {
+        proxy?.$modal.msgSuccess("工单创建数据已保存，流程已流转。");
+      } else if (stepOrderOfSavedData === 2) {
+        proxy?.$modal.msgSuccess("工单处理数据已保存，流程已流转。");
+      } else if (stepOrderOfSavedData === 3) {
+        proxy?.$modal.msgSuccess("工单完成数据已保存，工作流已结束。");
+        // 流程结束后，currentTaskId 应该在 loadData 后变为 null
+      } else {
+        // 这是一个通用回退，理论上不应发生，因为步骤是明确的1, 2, 或 3
+        proxy?.$modal.msgSuccess("业务数据已保存，操作已继续。");
+      }
+      // 注意：实际的下一个任务ID (currentTaskId) 将由后续的 loadData() 调用来确定和更新。
+    } else {
+      // 如果 pendingActivityData.value 为 null，
+      // 这可能意味着 submitForm 未能正确设置它，或者是一个取消操作。
+      // submitVerify.vue 的内部 "操作成功" 消息可能已经显示。
+      // 此处我们不应再显示一个全局的错误，除非我们能确定这是一个未预期的状态。
+      console.warn("[submitCallback] pendingActivityData was null upon callback. This might be normal if a cancel operation occurred or submitForm failed before calling workflow.");
+    }
+  } catch (error) {
+    console.error('[submitCallback] Error saving business data:', error);
+    // 这是一个严重问题：工作流可能已推进，但业务数据未能保存。
+    proxy?.$modal.msgError("关键错误：业务数据保存失败！工作流可能已推进，请紧急核查数据一致性。");
+  } finally {
+    // 重置加载和工作流创建状态
+    buttonLoading.value = false;
+    // 一旦提交尝试发生（无论成功与否），就不再是"正在创建工作流"的初始状态了。
+    // isCreatingWorkflow 的状态将在 loadData 完成后，根据实际的活动列表长度被重新评估。
+    // isCreatingWorkflow.value = false; // 暂时注释掉，让loadData来决定
+    
+    pendingActivityData.value = null; // 清空暂存的业务数据
+
+    // 重新加载数据以反映工作流的最新状态和更新UI
+    if (isUpdate.value) {
+      try {
+        console.log("[submitCallback] Reloading data to reflect current workflow state...");
+        await loadData(); // loadData 会更新 currentTaskId, dmsBillsLubeInstanceActivityList, 和按钮状态等。
+        console.log("[submitCallback] Data reloaded. Current Task ID is now:", currentTaskId.value);
+      } catch (loadError) {
+        console.error('[submitCallback] Failed to reload data post-submission attempt:', loadError);
+        proxy?.$modal.msgError("数据刷新失败，请手动刷新页面以查看最新状态。");
+      }
+    }
+  }
+};
+
+// 取消回调
+const cancelCallback = () => {
+  console.log('[cancelCallback] 用户取消了操作');
+  pendingActivityData.value = null; // 清空待保存数据
+  buttonLoading.value = false;
 };
 </script>
 
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/trae.vue b/src/views/dms/dmsBillsLubeInstanceActivity/trae.vue
deleted file mode 100644
index 96eb7a6..0000000
--- a/src/views/dms/dmsBillsLubeInstanceActivity/trae.vue
+++ /dev/null
@@ -1,563 +0,0 @@
-<template>
-    <div class="p-2">
-      <!-- 顶部操作按钮区域 -->
-      <el-card shadow="never" class="mb-[10px]">
-        <div style="display: flex; justify-content: space-between">
-          <div>
-            <el-button v-if="submitButtonShow" :loading="buttonLoading" type="info" @click="submitForm('draft')">暂存
-            </el-button>
-            <el-button v-if="submitButtonShow" :loading="buttonLoading" type="primary" @click="submitForm('submit')">提交
-            </el-button>
-            <el-button v-if="approvalButtonShow" :loading="buttonLoading" type="primary" @click="approvalVerifyOpen">
-              审批
-            </el-button>
-            <el-button v-if="billsInfo.billsLubeInstanceId && billsInfo.lubeStatus !== 'draft'" type="primary"
-                      @click="handleApprovalRecord">
-              流程进度
-            </el-button>
-          </div>
-          <div>
-            <el-button style="float: right" @click="goBack()">返回</el-button>
-          </div>
-        </div>
-      </el-card>
-      
-      <!-- 工单信息区域 -->
-      <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.billsLubeCode" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" :offset="2">
-              <el-form-item label="工单状态">
-                <el-input v-model="billsStatusCheck" disabled />
-              </el-form-item>
-            </el-col>
-            <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="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>
-          </el-row>
-        </el-form>
-      </el-card>
-  
-      <!-- 流程步骤展示区域 -->
-      <el-card shadow="never" class="mb-[10px]">
-        <el-form ref="stepFormRef" :model="form" label-width="100px">
-          <!-- 第一步 -->
-          <h4 class="form-header h4" v-if="dmsBillsLubeInstanceActivityList.length > 0">已处理节点：步骤1</h4>
-          <el-row v-if="dmsBillsLubeInstanceActivityList.length > 0">
-            <el-col :span="8">
-              <el-form-item label="润滑级别" prop="lubeLevel">
-                <el-select v-model="form.lubeLevel" placeholder="润滑级别" disabled>
-                  <el-option
-                    v-for="dict in lube_level"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="润滑组别" prop="lubeGroup">
-                <el-input v-model="form.lubeGroup" placeholder="请输入润滑组别" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                <el-input v-model="form.lubeSupervisor" placeholder="请输入润滑负责人" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <!-- 中间步骤 (已处理的后续节点) -->
-          <template v-for="(activity) in dmsBillsLubeInstanceActivityList" :key="activity.instanceActivityId">
-            <div v-if="activity.processStepOrder && activity.processStepOrder > 1">
-              <h4 class="form-header h4">{{ `已处理节点：步骤${activity.processStepOrder}` }}</h4>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="润滑级别">
-                    <el-select
-                      v-model="activity.lubeLevel"
-                      placeholder="润滑级别"
-                      disabled>
-                      <el-option
-                        v-for="dict in lube_level"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑组别">
-                    <el-input
-                      v-model="activity.lubeGroup"
-                      disabled
-                      placeholder="润滑组别">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑负责人">
-                    <el-input
-                      v-model="activity.lubeSupervisor"
-                      disabled
-                      placeholder="润滑负责人">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="处理意见">
-                    <el-input
-                      v-model="activity.processHandleResolution"
-                      disabled
-                      placeholder="处理意见">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </div>
-          </template>
-  
-          <!-- 当前步骤表单 (用于提交新节点) -->
-          <div v-if="isUpdate">
-            <h4 class="form-header h4">当前处理节点：步骤{{ nextStepOrder }}</h4>
-            <el-form ref="nextStepFormRef" :model="nextStepForm" :rules="nextStepFormRules" label-width="100px">
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="润滑级别" prop="lubeLevel">
-                    <el-select v-model="nextStepForm.lubeLevel" placeholder="润滑级别">
-                      <el-option
-                        v-for="dict in lube_level"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑组别" prop="lubeGroup">
-                    <el-input v-model="nextStepForm.lubeGroup" placeholder="润滑组别"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑负责人" prop="lubeSupervisor">
-                    <el-input v-model="nextStepForm.lubeSupervisor" placeholder="润滑负责人"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <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="submitNextStep">提 交</el-button>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-        </el-form>
-      </el-card>
-  
-      <!-- 润滑计划详情区域 -->
-      <el-card shadow="never">
-        <h4 class="form-header h4 text-center">润滑计划详细信息</h4>
-        <el-table v-loading="loading" :data="planLubeDetail">
-          <el-table-column label="计划ID" align="center" prop="planLubeId" />
-          <el-table-column label="设备名称" align="center" prop="deviceName" />
-          <el-table-column label="润滑部位" align="center" prop="lubeStationName" />
-          <el-table-column label="润滑标准" align="center" prop="lubeStandardCode" />
-          <el-table-column label="操作描述" align="center" prop="operationDescription" />
-        </el-table>
-      </el-card>
-      
-      <!-- 提交组件 -->
-      <submitVerify ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
-      <!-- 审批记录 -->
-      <approvalRecord ref="approvalRecordRef" />
-      <el-dialog v-model="dialogVisible.visible" :title="dialogVisible.title" :before-close="handleClose" width="500">
-        <el-select v-model="flowCode" placeholder="Select" style="width: 240px">
-          <el-option v-for="item in flowCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
-        <template #footer>
-          <div class="dialog-footer">
-            <el-button @click="handleClose">取消</el-button>
-            <el-button type="primary" @click="submitFlow()">确认</el-button>
-          </div>
-        </template>
-      </el-dialog>
-    </div>
-  </template>
-  
-  <script setup name="DmsBillsLubeInstanceActivity" lang="ts">
-  import { ref, reactive, toRefs, getCurrentInstance, onMounted, computed } from 'vue';
-  import { useRoute, useRouter } from 'vue-router';
-  import type { FormInstance, FormRules } from 'element-plus';
-  import { startWorkFlow } from '@/api/workflow/task';
-  import SubmitVerify from '@/components/Process/submitVerify.vue';
-  import ApprovalRecord from '@/components/Process/approvalRecord.vue';
-  import { AxiosResponse } from 'axios';
-  import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
-  import {
-    listDmsBillsLubeInstanceActivity,
-    addDmsBillsLubeInstanceActivity
-  } from '@/api/dms/dmsBillsLubeInstanceActivity';
-  import {
-    DmsBillsLubeInstanceActivityVO,
-    DmsBillsLubeInstanceActivityForm
-  } from '@/api/dms/dmsBillsLubeInstanceActivity/types';
-  import { listDmsBillsLubeInstance, updateDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
-  import { getDmsPlanLubeDetail } from '@/api/dms/dmsPlanLubeDetail';
-  import { DmsPlanLubeDetailVO } from "@/api/dms/dmsPlanLubeDetail/types";
-  
-  const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-  const { lube_level, process_handle_status } = toRefs<any>(proxy?.useDict('lube_level', 'process_handle_status'));
-  const route = useRoute();
-  const router = useRouter();
-  
-  // 表单实例
-  const stepFormRef = ref<FormInstance>();
-  const nextStepFormRef = ref<FormInstance>();
-  
-  // 基础数据定义
-  const loading = ref(true);
-  const buttonLoading = ref(false);
-  const dmsBillsLubeInstanceActivityList = ref<DmsBillsLubeInstanceActivityVO[]>([]);
-  const billsInfo = ref<any>({});
-  const planLubeDetail = ref<DmsPlanLubeDetailVO[]>([]);
-  const billsStatusCheck = ref('');
-  const isUpdate = ref(true);
-  const planLubeId = ref('');
-  const lubeInstanceId = route.params.lubeInstanceId as string;
-  
-  // 工作流相关
-  const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
-  const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
-  const routeParams = ref<Record<string, any>>({});
-  
-  const flowCodeOptions = [
-    {
-      value: 'planlube',
-      label: '润滑工单申请'
-    }
-  ];
-  
-  const flowCode = ref<string>('');
-  
-  const dialogVisible = reactive<DialogOption>({
-    visible: false,
-    title: '流程定义'
-  });
-  
-  const submitFormData = ref<StartProcessBo>({
-    businessId: '',
-    flowCode: '',
-    variables: {}
-  });
-  
-  const taskVariables = ref<Record<string, any>>({});
-  
-  // 计算下一步序号
-  const nextStepOrder = computed(() => {
-    return dmsBillsLubeInstanceActivityList.value.length + 1;
-  });
-  
-  // 表单数据 (用于展示第一个已处理节点的信息)
-  const form = reactive<Partial<DmsBillsLubeInstanceActivityForm>>({
-    lubeGroup: undefined,
-    lubeSupervisor: undefined,
-    lubeLevel: undefined,
-    remark: undefined,
-  });
-  
-  // 下一步表单 (用于提交新的节点)
-  const nextStepForm = reactive<DmsBillsLubeInstanceActivityForm>({
-    instanceActivityId: undefined,
-    lubeInstanceId: lubeInstanceId,
-    lubeGroup: undefined,
-    lubeSupervisor: undefined,
-    lubeLevel: undefined,
-    processHandleResolution: undefined,
-    processHandleStatus: undefined,
-    processStepOrder: undefined,
-    startTime: undefined,
-    endTime: undefined,
-    handleUserId: undefined,
-    handleBy: undefined,
-    handleTime: undefined,
-    transferUserId: undefined,
-    attr1: undefined,
-    remark: undefined,
-  });
-  
-  // 下一步表单校验规则
-  const nextStepFormRules = reactive<FormRules>({
-    lubeLevel: [{ required: true, message: "润滑级别不能为空", trigger: "change" }],
-    lubeGroup: [{ required: true, message: "润滑组别不能为空", trigger: "blur" }],
-    lubeSupervisor: [{ required: true, message: "润滑负责人不能为空", trigger: "blur" }],
-    processHandleResolution: [{ required: true, message: "处理意见不能为空", trigger: "blur" }],
-  });
-  
-  // 查询参数
-  const queryParams = reactive({
-    pageNum: 1,
-    pageSize: 50,
-    lubeInstanceId: lubeInstanceId,
-  });
-  
-  // 初始化数据
-  onMounted(() => {
-    // 判断当前页面是查看还是编辑
-    routeParams.value = proxy.$route.query;
-    if(route.name === 'childDmsBillsLubeInstanceActivity') {
-      isUpdate.value = true;
-    } else if(route.name === 'selectChildDmsBillsLubeInstanceActivity') {
-      isUpdate.value = false;
-    }
-  
-    // 加载工单实例数据
-    getDmsBillsLubeInstance();
-    // 加载工单实例节点数据
-    getList();
-  });
-  
-  // 获取工单实例数据
-  const getDmsBillsLubeInstance = async () => {
-    try {
-      const res = await listDmsBillsLubeInstance(queryParams);
-      if (res.rows && res.rows.length > 0) {
-        billsInfo.value = res.rows[0];
-        // 确保 planLubeId 是字符串类型
-        const lubeIdFromServer = res.rows[0].planLubeId;
-        planLubeId.value = typeof lubeIdFromServer === 'number' ? String(lubeIdFromServer) : lubeIdFromServer;
-  
-        // 设置工单状态显示文本
-        if (lube_level.value && billsInfo.value.lubeStatus !== undefined) {
-          const statusItem = lube_level.value.find((item: any) => String(item.value) === String(billsInfo.value.lubeStatus));
-          billsStatusCheck.value = statusItem ? statusItem.label : '未知状态';
-        } else {
-          billsStatusCheck.value = '未知状态';
-        }
-  
-        // 获取润滑计划详情
-        if (planLubeId.value) {
-          getPlanLubeDetailData();
-        }
-      } else {
-        proxy?.$modal.msgError("未查询到工单信息");
-      }
-    } catch (error) {
-      console.error('获取工单实例数据失败', error);
-      proxy?.$modal.msgError("获取工单实例数据失败");
-    }
-  };
-  
-  // 获取润滑计划详情
-  const getPlanLubeDetailData = async () => {
-    if (!planLubeId.value) return;
-    loading.value = true;
-    try {
-      const res = await getDmsPlanLubeDetail(planLubeId.value);
-      planLubeDetail.value = res && res.rows ? [res.rows] : [];
-    } catch (error) {
-      console.error('获取润滑计划详情失败', error);
-      proxy?.$modal.msgError("获取润滑计划详情失败");
-    } finally {
-      loading.value = false;
-    }
-  };
-  
-  // 获取工单实例节点数据
-  const getList = async () => {
-    loading.value = true;
-    try {
-      const res = await listDmsBillsLubeInstanceActivity(queryParams);
-      dmsBillsLubeInstanceActivityList.value = res.rows;
-  
-      // 填充第一步数据 (用于表单展示)
-      if (res.rows && res.rows.length > 0) {
-        Object.assign(form, {
-          lubeGroup: res.rows[0].lubeGroup,
-          lubeSupervisor: res.rows[0].lubeSupervisor,
-          lubeLevel: res.rows[0].lubeLevel,
-          remark: res.rows[0].remark
-        });
-  
-        // 初始化下一步表单数据 (基于最后一个已处理节点)
-        const lastActivity = res.rows[res.rows.length - 1];
-        Object.assign(nextStepForm, {
-          lubeGroup: lastActivity.lubeGroup,
-          lubeSupervisor: lastActivity.lubeSupervisor,
-          lubeLevel: lastActivity.lubeLevel,
-          processHandleResolution: null,
-          remark: ''
-        });
-      } else {
-        // 如果没有已处理节点，则 nextStepForm 可能需要全新初始化或默认值
-        Object.assign(nextStepForm, {
-          lubeGroup: undefined,
-          lubeSupervisor: undefined,
-          lubeLevel: undefined,
-          processHandleResolution: null,
-          remark: ''
-        });
-      }
-    } catch (error) {
-      console.error('获取工单实例节点数据失败', error);
-      proxy?.$modal.msgError("获取工单实例节点数据失败");
-    } finally {
-      loading.value = false;
-    }
-  };
-  
-  // 提交下一步节点
-  const submitNextStep = async () => {
-    if (!nextStepFormRef.value) return;
-    
-    await nextStepFormRef.value.validate(async (valid: boolean) => {
-      if (valid) {
-        try {
-          loading.value = true;
-          // 设置步骤序号
-          nextStepForm.processStepOrder = nextStepOrder.value;
-          
-          // 提交新节点
-          await addDmsBillsLubeInstanceActivity(nextStepForm);
-          proxy?.$modal.msgSuccess("提交成功");
-          
-          // 刷新数据
-          await getList();
-          
-          // 清空表单
-          Object.assign(nextStepForm, {
-            processHandleResolution: null,
-            remark: ''
-          });
-        } catch (error) {
-          console.error('提交节点失败', error);
-          proxy?.$modal.msgError("提交失败");
-        } finally {
-          loading.value = false;
-        }
-      }
-    });
-  };
-  
-  // 工作流相关方法
-  const handleClose = () => {
-    dialogVisible.visible = false;
-    flowCode.value = '';
-    buttonLoading.value = false;
-  };
-  
-  // 提交按钮
-  const submitForm = (status: string) => {
-    try {
-      buttonLoading.value = true;
-      if (status === 'draft') {
-        // 暂存逻辑
-        buttonLoading.value = false;
-        proxy?.$modal.msgSuccess('暂存成功');
-        goBack();
-      } else {
-        // 提交逻辑
-        if ((billsInfo.value.status === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') {
-          flowCode.value = flowCodeOptions[0].value;
-          dialogVisible.visible = true;
-          return;
-        }
-        
-        // 说明启动过先随意传个参数
-        if (flowCode.value === '' || flowCode.value === null) {
-          flowCode.value = 'xx';
-        }
-        
-        handleStartWorkFlow(billsInfo.value);
-      }
-    } finally {
-      buttonLoading.value = false;
-    }
-  };
-  
-  const submitFlow = async () => {
-    handleStartWorkFlow(billsInfo.value);
-    dialogVisible.visible = false;
-  };
-  
-  // 提交申请
-  const handleStartWorkFlow = async (data: any): Promise<void> => {
-    try {
-      submitFormData.value.flowCode = flowCode.value;
-      submitFormData.value.businessId = data.lubeInstanceId;
-      // 流程变量
-      taskVariables.value = {
-        data: data
-      };
-      submitFormData.value.variables = taskVariables.value;
-      const resp = await startWorkFlow(submitFormData.value);
-      if (submitVerifyRef.value) {
-        buttonLoading.value = false;
-        submitVerifyRef.value.openDialog(resp.data.taskId);
-      }
-    } finally {
-      buttonLoading.value = false;
-    }
-  };
-  
-  // 审批记录
-  const handleApprovalRecord = (): void => {
-    approvalRecordRef.value?.init(billsInfo.value.lubeInstanceId);
-  };
-  
-  // 提交回调
-  const submitCallback = async () => {
-    await proxy.$tab.closePage(proxy.$route);
-    goBack();
-    // 不要返回任何值，确保函数返回void
-  };
-  
-  // 返回
-  const goBack = () => {
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.go(-1);
-  };
-  
-  // 审批
-  const approvalVerifyOpen = async () => {
-    submitVerifyRef.value?.openDialog(routeParams.value.taskId);
-  };
-  
-  // 校验提交按钮是否显示
-  const submitButtonShow = computed(() => {
-    return (
-      routeParams.value.type === 'add' ||
-      (routeParams.value.type === 'update' &&
-        billsInfo.value.status &&
-        (billsInfo.value.status === 'draft' || billsInfo.value.status === 'cancel' || billsInfo.value.status === 'back'))
-    );
-  });
-  
-  // 校验审批按钮是否显示
-  const approvalButtonShow = computed(() => {
-    return routeParams.value.type === 'approval' && billsInfo.value.status && billsInfo.value.status === 'waiting';
-  });
-  </script>
\ No newline at end of file