From 25bc9bfbaa654867b5f5d07927033559a3a03f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 15 May 2025 08:47:15 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        |   2 +-
 src/views/mes/materialBom/index.vue | 138 ++++++++++++++--------------
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/package.json b/package.json
index 236319e..abec74b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite serve --mode development",
-    "build:prod": "node --max_old_space_size=9012 node_modules/vite/bin/vite.js build --mode production",
+    "build:prod": "node --max_old_space_size=8192 node_modules/vite/bin/vite.js build --mode production",
     "build:dev": "vite build --mode development",
     "preview": "vite preview",
     "lint:eslint": "eslint  --fix --ext .ts,.js,.vue ./src ",
diff --git a/src/views/mes/materialBom/index.vue b/src/views/mes/materialBom/index.vue
index ec5e6aa..dacfb5b 100644
--- a/src/views/mes/materialBom/index.vue
+++ b/src/views/mes/materialBom/index.vue
@@ -3,8 +3,8 @@
     <el-row :gutter="20">
       <!-- 生产bom树 -->
       <el-col :lg="6" :xs="24" style="" v-loading="treeLoading">
-        <el-card shadow="hover">
-          <el-input v-model="materialName" placeholder="请输入物料名称" prefix-icon="Search" clearable/>
+        <el-card shadow="hover" style="height: 100%;overflow:auto;">
+          <el-input v-model="materialName" placeholder="请输入物料名称" prefix-icon="Search" clearable />
           <el-tree
             ref="materialBomTreeRef"
             class="mt-2"
@@ -34,20 +34,20 @@
           <el-form ref="parentMaterialBomFormRef" label-width="120px" :model="parentForm" :rules="parentRules">
             <el-row>
               <el-form-item label='父物料ID' prop='parentId' v-if="false">
-                <el-input v-model='parentForm.parentId' placeholder='' style="width:360px"/>
+                <el-input v-model='parentForm.parentId' placeholder='' style="width:360px" />
               </el-form-item>
               <el-form-item label='父物料类型ID' prop='parentMaterialTypeId' v-if="false">
-                <el-input v-model='parentForm.parentMaterialTypeId' placeholder='' style="width:360px"/>
+                <el-input v-model='parentForm.parentMaterialTypeId' placeholder='' style="width:360px" />
               </el-form-item>
 
               <el-form-item label='父物料名称' prop='parentMaterialName'>
                 <el-input v-model='parentForm.parentMaterialName' placeholder='请点击检索物料'
                           @click='handleMaterialSelect(parentForm,SELECT_MATERIAL_MODEL.PARENT_SELECT)'
                           style="width:260px" @change="getList" suffix-icon="Search" readonly
-                          :disabled="parentMaterialDisabled"/>
+                          :disabled="parentMaterialDisabled" />
               </el-form-item>
               <el-form-item label="父物料类型名称" prop='parentMaterialTypeName'>
-                <el-input v-model='parentForm.parentMaterialTypeName' placeholder='' style="width:260px" readonly/>
+                <el-input v-model='parentForm.parentMaterialTypeName' placeholder='' style="width:260px" readonly />
               </el-form-item>
 
 
@@ -66,7 +66,7 @@
               <el-form-item label='父物料数量' prop='parentStandardAmount'>
                 <el-input-number v-model='parentForm.parentStandardAmount' :precision="2" :step="1"
                                  placeholder='请输入父物料数量'
-                                 style="width:200px"/>
+                                 style="width:200px" />
               </el-form-item>
 
               <el-form-item label='单位' prop='parentUnitId'>
@@ -105,29 +105,29 @@
           </template>
 
           <el-table :data="materialBomList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50" align="center"/>
-            <el-table-column type="index" width="50" align="center" label="序号"/>
+            <el-table-column type="selection" width="50" align="center" />
+            <el-table-column type="index" width="50" align="center" label="序号" />
             <el-table-column v-if="columns[0].visible" key="materialBomId" label="生产BOM_ID" align="center"
-                             prop="materialBomId"/>
+                             prop="materialBomId" />
             <el-table-column v-if="columns[1].visible" key="materialTypeCode" label="子物料类型编号" align="center"
-                             prop="materialTypeCode" :show-overflow-tooltip="true"/>
+                             prop="materialTypeCode" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[2].visible" key="materialTypeName" label="子物料类型名称" align="center"
-                             prop="materialTypeName" :show-overflow-tooltip="true" w/>
+                             prop="materialTypeName" :show-overflow-tooltip="true" w />
             <el-table-column v-if="columns[4].visible" key="materialId" label="子物料ID" align="center"
-                             prop="materialId" :show-overflow-tooltip="true"/>
+                             prop="materialId" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[5].visible" key="materialName" label="子物料名称" align="center"
                              prop="materialName" :show-overflow-tooltip="true">
               <template #default='scope'>
                 <el-input v-model='scope.row.materialName' placeholder='请点击检索物料'
                           @click='handleMaterialSelect(scope.row,SELECT_MATERIAL_MODEL.CHILD_SELECT)'
-                          suffix-icon="Search" readonly/>
+                          suffix-icon="Search" readonly />
               </template>
             </el-table-column>
             <el-table-column v-if="columns[6].visible" key="standardAmount" label="子物料数量" align="center"
                              prop="standardAmount" :show-overflow-tooltip="true" width="220px">
               <template #default='scope'>
                 <el-input-number v-model='scope.row.standardAmount' :precision="2" :step="1"
-                                 placeholder='请输入数量' style="width:180px"/>
+                                 placeholder='请输入数量' style="width:180px" />
               </template>
             </el-table-column>
 
@@ -190,18 +190,18 @@
         <!--        </el-form-item>-->
 
         <el-form-item label='子物料ID' prop='materialId' v-if="false">
-          <el-input v-model='form.materialId' placeholder='' style="width:360px"/>
+          <el-input v-model='form.materialId' placeholder='' style="width:360px" />
         </el-form-item>
 
         <el-form-item label='子物料名称' prop='materialName'>
           <el-input v-model='form.materialName' placeholder='请点击检索物料'
                     @click='handleMaterialSelect(form,SELECT_MATERIAL_MODEL.DIALOG_CHILD_SELECT)'
-                    style="width:360px"/>
+                    style="width:360px" />
         </el-form-item>
 
         <el-form-item label='子物料数量' prop='standardAmount'>
           <el-input-number v-model='form.standardAmount' :precision="2" :step="1" placeholder='请输入子物料数量'
-                           style="width:360px"/>
+                           style="width:360px" />
         </el-form-item>
 
         <el-form-item label='子物料单位' prop='unitId'>
@@ -244,22 +244,22 @@ import {
   listMaterialBomJoinStructure,
   addBatchMaterialBom,
   getUnitInfoList, getMaterialBomVersionList, getParentMaterialBom, deleteMaterialBoms
-} from "@/api/mes/materialBom";
+} from '@/api/mes/materialBom';
 
-import {MaterialBomVO, MaterialBomForm, MaterialBomQuery} from '@/api/mes/materialBom/types';
-import {BaseMaterialTypeVO} from '@/api/mes/baseMaterialType/types';
+import { MaterialBomVO, MaterialBomForm, MaterialBomQuery } from '@/api/mes/materialBom/types';
+import { BaseMaterialTypeVO } from '@/api/mes/baseMaterialType/types';
 import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
 
-import {to} from 'await-to-js';
-import {nextTick} from "vue";
-import {MaterialBomVersionVO} from "@/api/mes/materialBomVersion/types";
-import {BaseMeasurementUnitInfoVO} from "@/api/mes/baseMeasurementUnitInfo/types";
-import {BaseStructureBomTreeVO} from "@/api/mes/baseStructureBom/types";
+import { to } from 'await-to-js';
+import { nextTick } from 'vue';
+import { MaterialBomVersionVO } from '@/api/mes/materialBomVersion/types';
+import { BaseMeasurementUnitInfoVO } from '@/api/mes/baseMeasurementUnitInfo/types';
+import { BaseStructureBomTreeVO } from '@/api/mes/baseStructureBom/types';
 
 const materialTypeId = ref(0);//此值是传给选择物料信息弹框使用
 
 const router = useRouter();
-const {proxy} = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const materialBomList = ref<MaterialBomVO[]>();
 const saveMaterialBomList = ref<MaterialBomVO[]>([]);
 const treeLoading = ref(false);
@@ -293,18 +293,18 @@ const SELECT_MATERIAL_MODEL = ref({
   PARENT_SELECT: '1',//父级物料选择
   CHILD_SELECT: '2',//子级物料选择
   DIALOG_CHILD_SELECT: '3'//弹窗子级选择
-})
+});
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  {key: 0, label: `生产BOM_ID`, visible: false, children: []},
-  {key: 1, label: `子物料类型编号`, visible: true, children: []},
-  {key: 2, label: `子物料类型名称`, visible: true, children: []},
-  {key: 3, label: `BOM版本`, visible: false, children: []},
-  {key: 4, label: `子物料ID`, visible: false, children: []},
-  {key: 5, label: `子物料名称`, visible: true, children: []},
-  {key: 6, label: `子物料数量`, visible: true, children: []},
-  {key: 7, label: `子物料单位`, visible: true, children: []}
+  { key: 0, label: `生产BOM_ID`, visible: false, children: [] },
+  { key: 1, label: `子物料类型编号`, visible: true, children: [] },
+  { key: 2, label: `子物料类型名称`, visible: true, children: [] },
+  { key: 3, label: `BOM版本`, visible: false, children: [] },
+  { key: 4, label: `子物料ID`, visible: false, children: [] },
+  { key: 5, label: `子物料名称`, visible: true, children: [] },
+  { key: 6, label: `子物料数量`, visible: true, children: [] },
+  { key: 7, label: `子物料单位`, visible: true, children: [] }
 ]);
 
 const materialBomTreeRef = ref<ElTreeInstance>();
@@ -340,7 +340,7 @@ const initParentFormData: MaterialBomForm = {
   attachId: undefined,
   activeFlag: '1',
   remark: undefined,
-  materialTypeName: undefined,
+  materialTypeName: undefined
 };
 
 const initFormData: MaterialBomForm = {
@@ -364,12 +364,12 @@ const initFormData: MaterialBomForm = {
   attachId: undefined,
   activeFlag: '1',
   remark: undefined,
-  materialTypeName: undefined,
+  materialTypeName: undefined
 };
 
 const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
-  form: {...initFormData},
-  parentForm: {...initParentFormData},
+  form: { ...initFormData },
+  parentForm: { ...initParentFormData },
   queryParams: {
     materialBomId: undefined,
     parentId: undefined,
@@ -382,31 +382,31 @@ const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
   },
   rules: {
     materialTypeId: [
-      {required: true, message: "物料类型不能为空", trigger: "blur"}
+      { required: true, message: '物料类型不能为空', trigger: 'blur' }
     ],
     materialBomVersion: [
-      {required: true, message: "BOM版本不能为空", trigger: "blur"}
+      { required: true, message: 'BOM版本不能为空', trigger: 'blur' }
     ],
     materialName: [
-      {required: true, message: "物料名称不能为空", trigger: "blur"}
+      { required: true, message: '物料名称不能为空', trigger: 'blur' }
     ],
     standardAmount: [
-      {required: true, message: "子物料数量不能为空", trigger: "blur"}
+      { required: true, message: '子物料数量不能为空', trigger: 'blur' }
     ]
   },
 
   parentRules: {
     parentMaterialName: [
-      {required: true, message: "父物料名称不能为空", trigger: "blur"}
+      { required: true, message: '父物料名称不能为空', trigger: 'blur' }
     ],
     materialBomVersion: [
-      {required: true, message: "BOM版本不能为空", trigger: "blur"}
+      { required: true, message: 'BOM版本不能为空', trigger: 'blur' }
     ],
     parentStandardAmount: [
-      {required: true, message: "父物料数量不能为空", trigger: "blur"}
+      { required: true, message: '父物料数量不能为空', trigger: 'blur' }
     ],
     parentUnitId: [
-      {required: true, message: "父物料单位不能为空", trigger: "blur"}
+      { required: true, message: '父物料单位不能为空', trigger: 'blur' }
     ]
   }
 
@@ -421,9 +421,9 @@ const parentQueryParams = ref({
   materialName: undefined,
   materialBomVersion: undefined,
   params: {}
-})
+});
 
-const {queryParams, form, rules, parentForm, parentRules} = toRefs(data);
+const { queryParams, form, rules, parentForm, parentRules } = toRefs(data);
 
 /** 通过条件过滤节点  */
 const filterNode = (value: string, data: any) => {
@@ -452,7 +452,7 @@ const getTreeSelect = async () => {
     id: virtualTopNodeId,//materialBomId
     parentId: -1,
     materialId: 0,
-    label: "生产BOM",
+    label: '生产BOM',
     children: res.data
   };
   materialBomOptions.value.push(initialTree);
@@ -460,12 +460,12 @@ const getTreeSelect = async () => {
 
   // materialBomOptions.value = res.data;
   if (!focusKeyNode.value) {//如果之前没有focus
-    focusKeyNode.value = {treeKey: virtualTopNodeId};
+    focusKeyNode.value = { treeKey: virtualTopNodeId };
   } else {
-    const clickNode = findObjectByTreeKey(materialBomOptions.value, focusKeyNode.value.treeKey)
+    const clickNode = findObjectByTreeKey(materialBomOptions.value, focusKeyNode.value.treeKey);
     if (!clickNode) {
       focusKeyNode.value = undefined;
-      focusKeyNode.value = {treeKey: virtualTopNodeId};
+      focusKeyNode.value = { treeKey: virtualTopNodeId };
     }
 
     // if (!allTreeKeys || allTreeKeys.length <= 0) {
@@ -482,9 +482,9 @@ const getTreeSelect = async () => {
     // const focusKeyNodeIndex = materialBomOptions.value.findIndex((optionItem) => focusKeyNode.value.treeKey === optionItem.treeKey);//有嵌套children的，有可能找不到
   }
 
-  nextTick(function () {
+  nextTick(function() {
     materialBomTreeRef.value?.setCurrentKey(focusKeyNode.value.treeKey, true);
-  })
+  });
 
   loading.value = false;
   treeLoading.value = false;
@@ -507,12 +507,12 @@ const getList = async () => {
 const resetParentQueryParams = () => {
   parentQueryParams.value.parentId = undefined;//是当前节点的materialId
   parentQueryParams.value.materialBomVersion = undefined;
-}
+};
 
 const resetQueryParams = () => {
   queryParams.value.parentId = undefined;//materialid
   queryParams.value.parentMaterialTypeId = undefined;
-}
+};
 
 /** 节点单击事件 */
 const handleNodeClick = (data: MaterialBomVO) => {
@@ -528,7 +528,7 @@ const handleNodeClick = (data: MaterialBomVO) => {
     getParentMaterialBomInfo();
     queryParams.value.parentId = data.materialId;
     queryParams.value.parentMaterialTypeId = data.materialTypeId;
-    queryParams.value.materialBomVersion = data.materialBomVersion
+    queryParams.value.materialBomVersion = data.materialBomVersion;
     handleQuery();
   } else {
     if (materialBomVersionOptions.value.length > 0) {
@@ -543,10 +543,10 @@ const handleNodeClick = (data: MaterialBomVO) => {
 const clickDisplay = () => {
   if (queryParams.value.parentId === 0) {
     parentFormDisplay.value = false;
-    childTableTitle.value = "顶级物料";
+    childTableTitle.value = '顶级物料';
   } else {
     parentFormDisplay.value = true;
-    childTableTitle.value = "子级物料";
+    childTableTitle.value = '子级物料';
   }
 };
 
@@ -588,7 +588,7 @@ const handleDelete = async (row?: MaterialBomVO) => {
         });
         // alert(JSON.stringify(toDeleteMaterialBoms.value))
         if (toDeleteMaterialBoms.value.length > 0) {
-          await deleteMaterialBoms(toDeleteMaterialBoms.value)
+          await deleteMaterialBoms(toDeleteMaterialBoms.value);
           await getTreeSelect();
         }
 
@@ -619,7 +619,7 @@ const handleSelectionChange = (selection: MaterialBomVO[]) => {
 
 /** 重置操作表单 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   materialBomFormRef.value?.resetFields();
 };
 /** 取消按钮 */
@@ -734,7 +734,7 @@ const handleMaterialSelect = (row, selectMode) => {
   } else if (selectMode === SELECT_MATERIAL_MODEL.value.CHILD_SELECT) {//子级选择物料需要传值materialTypeId
     materialTypeId.value = row.materialTypeId;
   } else {
-    materialTypeId.value = undefined
+    materialTypeId.value = undefined;
   }
   materialOpen.value = true;
 };
@@ -801,7 +801,7 @@ const submitBatchSaveMaterialBoms = async () => {
         await addBatchMaterialBom(saveMaterialBomList.value);
         proxy?.$modal.msgSuccess('操作成功');
 
-        focusKeyNode.value.treeKey = parentForm.value.parentId + "-" + parentForm.value.materialBomVersion;
+        focusKeyNode.value.treeKey = parentForm.value.parentId + '-' + parentForm.value.materialBomVersion;
         focusKeyNode.value.materialBomVersion = parentForm.value.materialBomVersion;
         focusKeyNode.value.parentUnitId = parentForm.value.parentUnitId;
         focusKeyNode.value.parentStandardAmount = parentForm.value.parentStandardAmount;
@@ -817,13 +817,13 @@ const submitBatchSaveMaterialBoms = async () => {
       }
     }
   });
-}
+};
 
 
 /** 初始化单位数据 */
 const initUnitInfoData = async () => {
   if (unitInfoOptions.value === undefined || unitInfoOptions.value.length <= 0) {
-    const {data} = await getUnitInfoList();
+    const { data } = await getUnitInfoList();
     // alert(JSON.stringify(data))
     unitInfoOptions.value = data;
   }
@@ -833,7 +833,7 @@ const initUnitInfoData = async () => {
 const initMaterialBomVersionData = async () => {
   // alert(JSON.stringify(getMaterialBomVersionList))
   if (materialBomVersionOptions.value === undefined || materialBomVersionOptions.value.length <= 0) {
-    const {data} = await getMaterialBomVersionList();
+    const { data } = await getMaterialBomVersionList();
     materialBomVersionOptions.value = data;
 
     if (materialBomVersionOptions.value.length > 0) {
@@ -862,7 +862,7 @@ const findObjectByTreeKey = (list, targetTreeKey) => {
     }
   }
   return null;
-}
+};
 
 
 // const getClickNode = (obj) => {

From 6452bf288d33696a1bd99208a4990d9dc3748da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 15 May 2025 08:51:52 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/materialBom/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/materialBom/index.vue b/src/views/mes/materialBom/index.vue
index dacfb5b..8a9d054 100644
--- a/src/views/mes/materialBom/index.vue
+++ b/src/views/mes/materialBom/index.vue
@@ -2,8 +2,8 @@
   <div class="p-2">
     <el-row :gutter="20">
       <!-- 生产bom树 -->
-      <el-col :lg="6" :xs="24" style="" v-loading="treeLoading">
-        <el-card shadow="hover" style="height: 100%;overflow:auto;">
+      <el-col :lg="6" :xs="24" style="height: calc(100vh - 120px);overflow:auto;" v-loading="treeLoading">
+        <el-card shadow="hover" style="">
           <el-input v-model="materialName" placeholder="请输入物料名称" prefix-icon="Search" clearable />
           <el-tree
             ref="materialBomTreeRef"

From 0a092dec8f1cf86973854824411d1fb0dccb1275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 15 May 2025 09:49:30 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/materialBom/index.vue | 31 ++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/views/mes/materialBom/index.vue b/src/views/mes/materialBom/index.vue
index 8a9d054..9a63b24 100644
--- a/src/views/mes/materialBom/index.vue
+++ b/src/views/mes/materialBom/index.vue
@@ -2,8 +2,8 @@
   <div class="p-2">
     <el-row :gutter="20">
       <!-- 生产bom树 -->
-      <el-col :lg="6" :xs="24" style="height: calc(100vh - 120px);overflow:auto;" v-loading="treeLoading">
-        <el-card shadow="hover" style="">
+      <el-col :lg="6" :xs="24" style="" v-loading="treeLoading">
+        <el-card shadow="hover" style="height: calc(100vh - 120px);overflow:auto;">
           <el-input v-model="materialName" placeholder="请输入物料名称" prefix-icon="Search" clearable />
           <el-tree
             ref="materialBomTreeRef"
@@ -18,11 +18,17 @@
             @node-click="handleNodeClick"
           >
             <template #default="{ node, data }">
-              <el-tooltip :content="`${data.label}`">
-                <div class="custom-tree-node">
-                  <span>{{ node.label }}</span>
-                </div>
-              </el-tooltip>
+              <div>
+                <el-tooltip :content="`${data.label}`">
+                  <div class="custom-tree-node" style="display: inline-block;vertical-align: center">
+                    <span :style="{backgroundColor:getColor(data)?.[0],color:getColor(data)?.[1]}">{{ node.label
+                      }}</span>
+                  </div>
+                </el-tooltip>
+                <el-button type="primary" link @click="fun(data)">
+                  上传
+                </el-button>
+              </div>
             </template>
           </el-tree>
         </el-card>
@@ -880,6 +886,17 @@ const findObjectByTreeKey = (list, targetTreeKey) => {
 //   }
 //
 // }
+const getColor = (e) => {
+  if (e.materialBomVersion === '01') {
+    return ['#ff0000', '#fff'];
+  }
+  if (e.materialBomVersion === '02') {
+    return ['#00ff00', '#000'];
+  }
+  if (e.materialBomVersion === '03') {
+    return ['#0000ff', '#fff'];
+  }
+};
 </script>
 
 <style lang="scss" scoped></style>

From a861f54792341d4535035e225729334f0b846ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 15 May 2025 10:37:38 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/materialBom/index.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/mes/materialBom/index.vue b/src/views/mes/materialBom/index.vue
index 9a63b24..36f10e7 100644
--- a/src/views/mes/materialBom/index.vue
+++ b/src/views/mes/materialBom/index.vue
@@ -18,14 +18,17 @@
             @node-click="handleNodeClick"
           >
             <template #default="{ node, data }">
-              <div>
-                <el-tooltip :content="`${data.label}`">
-                  <div class="custom-tree-node" style="display: inline-block;vertical-align: center">
-                    <span :style="{backgroundColor:getColor(data)?.[0],color:getColor(data)?.[1]}">{{ node.label
+              <div style="width: 100%">
+                <el-tooltip :content="`${data.label}`" style="width: 100%">
+                  <div class="custom-tree-node"
+                       style="display: inline-block;vertical-align: top;max-width: 80%;overflow: hidden;">
+                    <span
+                      :style="{backgroundColor:getColor(data)?.[0],color:getColor(data)?.[1],verticalAlign: 'center'}">{{ node.label
                       }}</span>
                   </div>
                 </el-tooltip>
-                <el-button type="primary" link @click="fun(data)">
+                <el-button type="primary" link @click="fun(data)"
+                           style=" vertical-align: top; ">
                   上传
                 </el-button>
               </div>
@@ -899,4 +902,8 @@ const getColor = (e) => {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped>
+:deep(.el-tree-node__content) {
+  width: 100%;
+}
+</style>

From c4396d1a0279fbc48ba4bb816a870206ef6937fa Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Thu, 15 May 2025 10:39:43 +0800
Subject: [PATCH 5/7] =?UTF-8?q?1.3.2=20=E5=89=8D=E7=AB=AF=EF=BC=9A?=
 =?UTF-8?q?=E7=89=A9=E6=96=99bom=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/materialBom/index.vue | 311 ++++++++++++++++++----------
 1 file changed, 201 insertions(+), 110 deletions(-)

diff --git a/src/views/mes/materialBom/index.vue b/src/views/mes/materialBom/index.vue
index 36f10e7..cc351a8 100644
--- a/src/views/mes/materialBom/index.vue
+++ b/src/views/mes/materialBom/index.vue
@@ -4,7 +4,7 @@
       <!-- 生产bom树 -->
       <el-col :lg="6" :xs="24" style="" v-loading="treeLoading">
         <el-card shadow="hover" style="height: calc(100vh - 120px);overflow:auto;">
-          <el-input v-model="materialName" placeholder="请输入物料名称" prefix-icon="Search" clearable />
+          <el-input v-model="materialName" placeholder="请输入物料名称" prefix-icon="Search" clearable/>
           <el-tree
             ref="materialBomTreeRef"
             class="mt-2"
@@ -18,19 +18,17 @@
             @node-click="handleNodeClick"
           >
             <template #default="{ node, data }">
-              <div style="width: 100%">
-                <el-tooltip :content="`${data.label}`" style="width: 100%">
-                  <div class="custom-tree-node"
-                       style="display: inline-block;vertical-align: top;max-width: 80%;overflow: hidden;">
-                    <span
-                      :style="{backgroundColor:getColor(data)?.[0],color:getColor(data)?.[1],verticalAlign: 'center'}">{{ node.label
+              <div>
+                <el-button type="primary" link @click="fun(data)" v-if="node.activeFlag && node.activeFlag!==MATERIAL_BOM_ACTIVE_FLAG.ACTIVE">
+                  发布
+                </el-button>
+                <el-tooltip :content="`${data.label}`">
+                  <div class="custom-tree-node" style="display: inline-block;vertical-align: center">
+                    <span :style="{backgroundColor:getColor(data)?.[0],color:getColor(data)?.[1]}">{{ node.label
                       }}</span>
                   </div>
                 </el-tooltip>
-                <el-button type="primary" link @click="fun(data)"
-                           style=" vertical-align: top; ">
-                  上传
-                </el-button>
+
               </div>
             </template>
           </el-tree>
@@ -38,44 +36,66 @@
       </el-col>
 
       <el-col :lg="18" :xs="24" v-loading="loading">
-        <div>
           <el-divider content-position="left">父级物料</el-divider>
+          <el-card shadow="hover">
+          <template #header>
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-button v-has-permi="['mes:materialBom:add']" type="primary" plain icon="Plus"
+                           @click="addNewMaterialBomVersion()" :loading="btnLoading" :disabled="addNewMaterialBomVersionBtnDisabled">{{addNewMaterialBomVersionBtnText}}
+                </el-button>
+              </el-col>
+            </el-row>
+          </template>
+
           <el-form ref="parentMaterialBomFormRef" label-width="120px" :model="parentForm" :rules="parentRules">
-            <el-row>
+            <el-row :gutter="20">
               <el-form-item label='父物料ID' prop='parentId' v-if="false">
-                <el-input v-model='parentForm.parentId' placeholder='' style="width:360px" />
+                <el-input v-model='parentForm.parentId' placeholder='' style="width:360px"/>
               </el-form-item>
               <el-form-item label='父物料类型ID' prop='parentMaterialTypeId' v-if="false">
-                <el-input v-model='parentForm.parentMaterialTypeId' placeholder='' style="width:360px" />
+                <el-input v-model='parentForm.parentMaterialTypeId' placeholder='' style="width:360px"/>
+              </el-form-item>
+
+                <el-form-item label='状态' prop='activeFlag' style="width:260px">
+                  <el-select v-model='parentForm.activeFlag' disabled>
+                    <el-option v-for='dict in material_bom_active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
+                  </el-select>
+                </el-form-item>
+
+              <el-form-item label="BOM版本" prop='materialBomVersion'>
+                <el-input v-model='parentForm.materialBomVersion' placeholder='' style="width:260px" disabled/>
               </el-form-item>
 
               <el-form-item label='父物料名称' prop='parentMaterialName'>
                 <el-input v-model='parentForm.parentMaterialName' placeholder='请点击检索物料'
                           @click='handleMaterialSelect(parentForm,SELECT_MATERIAL_MODEL.PARENT_SELECT)'
                           style="width:260px" @change="getList" suffix-icon="Search" readonly
-                          :disabled="parentMaterialDisabled" />
+                          :disabled="parentMaterialDisabled"/>
               </el-form-item>
               <el-form-item label="父物料类型名称" prop='parentMaterialTypeName'>
-                <el-input v-model='parentForm.parentMaterialTypeName' placeholder='' style="width:260px" readonly />
+                <el-input v-model='parentForm.parentMaterialTypeName' placeholder='' style="width:260px" readonly/>
               </el-form-item>
 
 
-              <el-form-item label="BOM版本" prop='materialBomVersion' :model="parentForm">
-                <el-select v-model="parentForm.materialBomVersion"
-                           placeholder="请选择" style="width:200px">
-                  <el-option
-                    v-for="item in materialBomVersionOptions"
-                    :key="item.materialBomVersion"
-                    :label="item.materialBomVersion"
-                    :value="item.materialBomVersion"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
+
+
+<!--              <el-form-item label="BOM版本" prop='materialBomVersion' :model="parentForm">-->
+<!--                <el-select v-model="parentForm.materialBomVersion"-->
+<!--                           placeholder="请选择" style="width:200px">-->
+<!--                  <el-option-->
+<!--                    v-for="item in materialBomVersionOptions"-->
+<!--                    :key="item.materialBomVersion"-->
+<!--                    :label="item.materialBomVersion"-->
+<!--                    :value="item.materialBomVersion"-->
+<!--                  ></el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
 
               <el-form-item label='父物料数量' prop='parentStandardAmount'>
                 <el-input-number v-model='parentForm.parentStandardAmount' :precision="2" :step="1"
                                  placeholder='请输入父物料数量'
-                                 style="width:200px" />
+                                 style="width:200px"/>
               </el-form-item>
 
               <el-form-item label='单位' prop='parentUnitId'>
@@ -89,10 +109,13 @@
                 </el-select>
               </el-form-item>
 
+              <el-form-item label="BOM说明" prop='materialBomDesc'>
+                <el-input v-model='parentForm.materialBomDesc' placeholder='' style="width:360px" type="textarea"/>
+              </el-form-item>
 
             </el-row>
           </el-form>
-        </div>
+          </el-card>
 
 
         <el-divider content-position="left">子级物料</el-divider>
@@ -114,29 +137,29 @@
           </template>
 
           <el-table :data="materialBomList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column type="index" width="50" align="center" label="序号" />
+            <el-table-column type="selection" width="50" align="center"/>
+            <el-table-column type="index" width="50" align="center" label="序号"/>
             <el-table-column v-if="columns[0].visible" key="materialBomId" label="生产BOM_ID" align="center"
-                             prop="materialBomId" />
+                             prop="materialBomId"/>
             <el-table-column v-if="columns[1].visible" key="materialTypeCode" label="子物料类型编号" align="center"
-                             prop="materialTypeCode" :show-overflow-tooltip="true" />
+                             prop="materialTypeCode" :show-overflow-tooltip="true"/>
             <el-table-column v-if="columns[2].visible" key="materialTypeName" label="子物料类型名称" align="center"
-                             prop="materialTypeName" :show-overflow-tooltip="true" w />
+                             prop="materialTypeName" :show-overflow-tooltip="true" w/>
             <el-table-column v-if="columns[4].visible" key="materialId" label="子物料ID" align="center"
-                             prop="materialId" :show-overflow-tooltip="true" />
+                             prop="materialId" :show-overflow-tooltip="true"/>
             <el-table-column v-if="columns[5].visible" key="materialName" label="子物料名称" align="center"
                              prop="materialName" :show-overflow-tooltip="true">
               <template #default='scope'>
                 <el-input v-model='scope.row.materialName' placeholder='请点击检索物料'
                           @click='handleMaterialSelect(scope.row,SELECT_MATERIAL_MODEL.CHILD_SELECT)'
-                          suffix-icon="Search" readonly />
+                          suffix-icon="Search" readonly/>
               </template>
             </el-table-column>
             <el-table-column v-if="columns[6].visible" key="standardAmount" label="子物料数量" align="center"
                              prop="standardAmount" :show-overflow-tooltip="true" width="220px">
               <template #default='scope'>
                 <el-input-number v-model='scope.row.standardAmount' :precision="2" :step="1"
-                                 placeholder='请输入数量' style="width:180px" />
+                                 placeholder='请输入数量' style="width:180px"/>
               </template>
             </el-table-column>
 
@@ -199,18 +222,18 @@
         <!--        </el-form-item>-->
 
         <el-form-item label='子物料ID' prop='materialId' v-if="false">
-          <el-input v-model='form.materialId' placeholder='' style="width:360px" />
+          <el-input v-model='form.materialId' placeholder='' style="width:360px"/>
         </el-form-item>
 
         <el-form-item label='子物料名称' prop='materialName'>
           <el-input v-model='form.materialName' placeholder='请点击检索物料'
                     @click='handleMaterialSelect(form,SELECT_MATERIAL_MODEL.DIALOG_CHILD_SELECT)'
-                    style="width:360px" />
+                    style="width:360px"/>
         </el-form-item>
 
         <el-form-item label='子物料数量' prop='standardAmount'>
           <el-input-number v-model='form.standardAmount' :precision="2" :step="1" placeholder='请输入子物料数量'
-                           style="width:360px" />
+                           style="width:360px"/>
         </el-form-item>
 
         <el-form-item label='子物料单位' prop='unitId'>
@@ -252,23 +275,28 @@ import {
   materialBomTreeSelect,
   listMaterialBomJoinStructure,
   addBatchMaterialBom,
-  getUnitInfoList, getMaterialBomVersionList, getParentMaterialBom, deleteMaterialBoms
-} from '@/api/mes/materialBom';
+  getUnitInfoList, getMaterialBomVersionList, getParentMaterialBom, deleteMaterialBoms,
+  selectNextMaterialBomVersion
+} from "@/api/mes/materialBom";
 
-import { MaterialBomVO, MaterialBomForm, MaterialBomQuery } from '@/api/mes/materialBom/types';
-import { BaseMaterialTypeVO } from '@/api/mes/baseMaterialType/types';
+import {MaterialBomVO, MaterialBomForm, MaterialBomQuery} from '@/api/mes/materialBom/types';
+import {BaseMaterialTypeVO} from '@/api/mes/baseMaterialType/types';
 import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
 
-import { to } from 'await-to-js';
-import { nextTick } from 'vue';
-import { MaterialBomVersionVO } from '@/api/mes/materialBomVersion/types';
-import { BaseMeasurementUnitInfoVO } from '@/api/mes/baseMeasurementUnitInfo/types';
-import { BaseStructureBomTreeVO } from '@/api/mes/baseStructureBom/types';
+import {to} from 'await-to-js';
+import {nextTick} from "vue";
+import {MaterialBomVersionVO} from "@/api/mes/materialBomVersion/types";
+import {BaseMeasurementUnitInfoVO} from "@/api/mes/baseMeasurementUnitInfo/types";
+import {BaseStructureBomTreeVO} from "@/api/mes/baseStructureBom/types";
 
 const materialTypeId = ref(0);//此值是传给选择物料信息弹框使用
 
 const router = useRouter();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
+
+const { material_bom_active_flag } = toRefs<any>(proxy?.useDict('material_bom_active_flag'));
+
+
 const materialBomList = ref<MaterialBomVO[]>();
 const saveMaterialBomList = ref<MaterialBomVO[]>([]);
 const treeLoading = ref(false);
@@ -302,18 +330,31 @@ const SELECT_MATERIAL_MODEL = ref({
   PARENT_SELECT: '1',//父级物料选择
   CHILD_SELECT: '2',//子级物料选择
   DIALOG_CHILD_SELECT: '3'//弹窗子级选择
-});
+})
+
+const MATERIAL_BOM_ACTIVE_FLAG = ref({
+  ACTIVE: '1',//启用
+  HISTORY: '2',//历史
+  DESIGN: '3'//设计中
+})
+
+const addNewMaterialBomVersionBtnText = ref('新增中');
+const addNewMaterialBomVersionBtnDisabled = ref(true);
+
+const publishBtnDisplay = ref(false);
+
+const initialMaterialBomVersion = ref('01');
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `生产BOM_ID`, visible: false, children: [] },
-  { key: 1, label: `子物料类型编号`, visible: true, children: [] },
-  { key: 2, label: `子物料类型名称`, visible: true, children: [] },
-  { key: 3, label: `BOM版本`, visible: false, children: [] },
-  { key: 4, label: `子物料ID`, visible: false, children: [] },
-  { key: 5, label: `子物料名称`, visible: true, children: [] },
-  { key: 6, label: `子物料数量`, visible: true, children: [] },
-  { key: 7, label: `子物料单位`, visible: true, children: [] }
+  {key: 0, label: `生产BOM_ID`, visible: false, children: []},
+  {key: 1, label: `子物料类型编号`, visible: true, children: []},
+  {key: 2, label: `子物料类型名称`, visible: true, children: []},
+  {key: 3, label: `BOM版本`, visible: false, children: []},
+  {key: 4, label: `子物料ID`, visible: false, children: []},
+  {key: 5, label: `子物料名称`, visible: true, children: []},
+  {key: 6, label: `子物料数量`, visible: true, children: []},
+  {key: 7, label: `子物料单位`, visible: true, children: []}
 ]);
 
 const materialBomTreeRef = ref<ElTreeInstance>();
@@ -347,9 +388,9 @@ const initParentFormData: MaterialBomForm = {
   assembleTime: undefined,
   materialClassfication: undefined,
   attachId: undefined,
-  activeFlag: '1',
+  activeFlag: undefined,
   remark: undefined,
-  materialTypeName: undefined
+  materialTypeName: undefined,
 };
 
 const initFormData: MaterialBomForm = {
@@ -371,14 +412,14 @@ const initFormData: MaterialBomForm = {
   assembleTime: undefined,
   materialClassfication: undefined,
   attachId: undefined,
-  activeFlag: '1',
+  activeFlag: undefined,
   remark: undefined,
-  materialTypeName: undefined
+  materialTypeName: undefined,
 };
 
 const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
-  form: { ...initFormData },
-  parentForm: { ...initParentFormData },
+  form: {...initFormData},
+  parentForm: {...initParentFormData},
   queryParams: {
     materialBomId: undefined,
     parentId: undefined,
@@ -391,31 +432,31 @@ const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
   },
   rules: {
     materialTypeId: [
-      { required: true, message: '物料类型不能为空', trigger: 'blur' }
+      {required: true, message: "物料类型不能为空", trigger: "blur"}
     ],
     materialBomVersion: [
-      { required: true, message: 'BOM版本不能为空', trigger: 'blur' }
+      {required: true, message: "BOM版本不能为空", trigger: "blur"}
     ],
     materialName: [
-      { required: true, message: '物料名称不能为空', trigger: 'blur' }
+      {required: true, message: "物料名称不能为空", trigger: "blur"}
     ],
     standardAmount: [
-      { required: true, message: '子物料数量不能为空', trigger: 'blur' }
+      {required: true, message: "子物料数量不能为空", trigger: "blur"}
     ]
   },
 
   parentRules: {
     parentMaterialName: [
-      { required: true, message: '父物料名称不能为空', trigger: 'blur' }
+      {required: true, message: "父物料名称不能为空", trigger: "blur"}
     ],
     materialBomVersion: [
-      { required: true, message: 'BOM版本不能为空', trigger: 'blur' }
+      {required: true, message: "BOM版本不能为空", trigger: "blur"}
     ],
     parentStandardAmount: [
-      { required: true, message: '父物料数量不能为空', trigger: 'blur' }
+      {required: true, message: "父物料数量不能为空", trigger: "blur"}
     ],
     parentUnitId: [
-      { required: true, message: '父物料单位不能为空', trigger: 'blur' }
+      {required: true, message: "父物料单位不能为空", trigger: "blur"}
     ]
   }
 
@@ -430,9 +471,9 @@ const parentQueryParams = ref({
   materialName: undefined,
   materialBomVersion: undefined,
   params: {}
-});
+})
 
-const { queryParams, form, rules, parentForm, parentRules } = toRefs(data);
+const {queryParams, form, rules, parentForm, parentRules} = toRefs(data);
 
 /** 通过条件过滤节点  */
 const filterNode = (value: string, data: any) => {
@@ -461,7 +502,7 @@ const getTreeSelect = async () => {
     id: virtualTopNodeId,//materialBomId
     parentId: -1,
     materialId: 0,
-    label: '生产BOM',
+    label: "生产BOM",
     children: res.data
   };
   materialBomOptions.value.push(initialTree);
@@ -469,14 +510,14 @@ const getTreeSelect = async () => {
 
   // materialBomOptions.value = res.data;
   if (!focusKeyNode.value) {//如果之前没有focus
-    focusKeyNode.value = { treeKey: virtualTopNodeId };
+    focusKeyNode.value = {treeKey: virtualTopNodeId};
   } else {
-    const clickNode = findObjectByTreeKey(materialBomOptions.value, focusKeyNode.value.treeKey);
+    const clickNode = findObjectByTreeKey(materialBomOptions.value, focusKeyNode.value.treeKey)
+
     if (!clickNode) {
       focusKeyNode.value = undefined;
-      focusKeyNode.value = { treeKey: virtualTopNodeId };
+      focusKeyNode.value = {treeKey: virtualTopNodeId};
     }
-
     // if (!allTreeKeys || allTreeKeys.length <= 0) {
     //   focusKeyNode.value = {
     //     treeKey: virtualTopNodeId,
@@ -491,9 +532,9 @@ const getTreeSelect = async () => {
     // const focusKeyNodeIndex = materialBomOptions.value.findIndex((optionItem) => focusKeyNode.value.treeKey === optionItem.treeKey);//有嵌套children的，有可能找不到
   }
 
-  nextTick(function() {
+  nextTick(function () {
     materialBomTreeRef.value?.setCurrentKey(focusKeyNode.value.treeKey, true);
-  });
+  })
 
   loading.value = false;
   treeLoading.value = false;
@@ -504,6 +545,16 @@ const getTreeSelect = async () => {
   // materialTypeOptions.value[0].children.push(dd);
 };
 
+/** 查询生产bom列表 */
+const getNextMaterialBomVersion = async () => {
+  //顶级节点，如果是重新修改父级物料则重新获取最新版本
+  // loading.value = true;
+  const res = await selectNextMaterialBomVersion(parentForm.value.parentId);
+  parentForm.value.materialBomVersion = res.data;
+  // materialBomList.value = res.data;
+  // loading.value = false;
+};
+
 /** 查询生产bom列表 */
 const getList = async () => {
   //如果是有节点的则加载数据，如果是顶级节点生产BOM则不加载数据
@@ -516,17 +567,21 @@ const getList = async () => {
 const resetParentQueryParams = () => {
   parentQueryParams.value.parentId = undefined;//是当前节点的materialId
   parentQueryParams.value.materialBomVersion = undefined;
-};
+}
 
 const resetQueryParams = () => {
   queryParams.value.parentId = undefined;//materialid
   queryParams.value.parentMaterialTypeId = undefined;
-};
+}
 
 /** 节点单击事件 */
 const handleNodeClick = (data: MaterialBomVO) => {
   materialBomList.value = [];
   parentMaterialDisabled.value = true;
+  publishBtnDisplay.value = false;
+  addNewMaterialBomVersionBtnDisabled.value = true;
+  btnLoading.value = true;
+
   resetParentForm();
   resetQueryParams();
   resetParentQueryParams();
@@ -535,27 +590,39 @@ const handleNodeClick = (data: MaterialBomVO) => {
     parentQueryParams.value.parentId = data.materialId;//是当前节点的materialId
     parentQueryParams.value.materialBomVersion = data.materialBomVersion;
     getParentMaterialBomInfo();
-    queryParams.value.parentId = data.materialId;
-    queryParams.value.parentMaterialTypeId = data.materialTypeId;
-    queryParams.value.materialBomVersion = data.materialBomVersion;
-    handleQuery();
+
   } else {
-    if (materialBomVersionOptions.value.length > 0) {
-      parentForm.value.materialBomVersion = materialBomVersionOptions.value[0].materialBomVersion;
-      queryParams.value.materialBomVersion = materialBomVersionOptions.value[0].materialBomVersion;
-    }
+    parentForm.value.activeFlag = MATERIAL_BOM_ACTIVE_FLAG.value.DESIGN;
+    handleBtnStatus();
+    btnLoading.value = false;
+    // if (materialBomVersionOptions.value.length > 0) {
+    //   parentForm.value.materialBomVersion = materialBomVersionOptions.value[0].materialBomVersion;
+    //   queryParams.value.materialBomVersion = materialBomVersionOptions.value[0].materialBomVersion;
+    // }
   }
   parentMaterialDisabled.value = focusKeyNode.value.treeKey != -1;
 };
 
+const handleBtnStatus = () =>{
+  if(parentForm.value.materialBomVersion && parentForm.value.materialBomVersion!==''){
+    addNewMaterialBomVersionBtnDisabled.value = false;
+    addNewMaterialBomVersionBtnText.value = "新增版本";
+    publishBtnDisplay.value = parentForm.value.activeFlag !== MATERIAL_BOM_ACTIVE_FLAG.value.ACTIVE;
+  }else{
+    addNewMaterialBomVersionBtnDisabled.value = true;
+    addNewMaterialBomVersionBtnText.value = "新增中";
+    publishBtnDisplay.value = false;
+  }
+
+};
 
 const clickDisplay = () => {
   if (queryParams.value.parentId === 0) {
     parentFormDisplay.value = false;
-    childTableTitle.value = '顶级物料';
+    childTableTitle.value = "顶级物料";
   } else {
     parentFormDisplay.value = true;
-    childTableTitle.value = '子级物料';
+    childTableTitle.value = "子级物料";
   }
 };
 
@@ -597,7 +664,7 @@ const handleDelete = async (row?: MaterialBomVO) => {
         });
         // alert(JSON.stringify(toDeleteMaterialBoms.value))
         if (toDeleteMaterialBoms.value.length > 0) {
-          await deleteMaterialBoms(toDeleteMaterialBoms.value);
+          await deleteMaterialBoms(toDeleteMaterialBoms.value)
           await getTreeSelect();
         }
 
@@ -628,7 +695,7 @@ const handleSelectionChange = (selection: MaterialBomVO[]) => {
 
 /** 重置操作表单 */
 const reset = () => {
-  form.value = { ...initFormData };
+  form.value = {...initFormData};
   materialBomFormRef.value?.resetFields();
 };
 /** 取消按钮 */
@@ -743,7 +810,7 @@ const handleMaterialSelect = (row, selectMode) => {
   } else if (selectMode === SELECT_MATERIAL_MODEL.value.CHILD_SELECT) {//子级选择物料需要传值materialTypeId
     materialTypeId.value = row.materialTypeId;
   } else {
-    materialTypeId.value = undefined;
+    materialTypeId.value = undefined
   }
   materialOpen.value = true;
 };
@@ -755,14 +822,15 @@ const submitMaterialForm = () => {
 
   //此处只有是父级物料时赋值
   if (globalSelectMode.value === SELECT_MATERIAL_MODEL.value.PARENT_SELECT) {
+    editedRow.value.materialBomVersion = undefined;
     editedRow.value.parentId = selectedRow.materialId;
     editedRow.value.parentMaterialName = selectedRow.materialName;
     editedRow.value.parentMaterialTypeId = selectedRow.materialTypeId;
     editedRow.value.parentMaterialTypeName = selectedRow.matrialTypeName;
-
     queryParams.value.parentId = selectedRow.materialId;
     queryParams.value.parentMaterialTypeId = selectedRow.materialTypeId;
 
+    getNextMaterialBomVersion();
     // alert(JSON.stringify(queryParams.value))
     getList();
   } else {
@@ -796,9 +864,12 @@ const submitBatchSaveMaterialBoms = async () => {
 
             item.parentId = parentForm.value.parentId;
             item.parentUnitId = parentForm.value.parentUnitId;
-            item.materialBomVersion = parentForm.value.materialBomVersion;
             item.parentStandardAmount = parentForm.value.parentStandardAmount;
             item.parentMaterialTypeId = parentForm.value.parentMaterialTypeId;
+
+            item.materialBomDesc = parentForm.value.materialBomDesc;
+            item.materialBomVersion = parentForm.value.materialBomVersion;
+            item.activeFlag = parentForm.value.activeFlag;
             saveMaterialBomList.value.push(item);
           }
         }
@@ -810,7 +881,9 @@ const submitBatchSaveMaterialBoms = async () => {
         await addBatchMaterialBom(saveMaterialBomList.value);
         proxy?.$modal.msgSuccess('操作成功');
 
-        focusKeyNode.value.treeKey = parentForm.value.parentId + '-' + parentForm.value.materialBomVersion;
+        focusKeyNode.value.treeKey = parentForm.value.parentId + "-" + parentForm.value.materialBomVersion;
+        focusKeyNode.value.materialId = parentForm.value.parentId;
+        focusKeyNode.value.materialTypeId = parentForm.value.parentMaterialTypeId
         focusKeyNode.value.materialBomVersion = parentForm.value.materialBomVersion;
         focusKeyNode.value.parentUnitId = parentForm.value.parentUnitId;
         focusKeyNode.value.parentStandardAmount = parentForm.value.parentStandardAmount;
@@ -826,13 +899,13 @@ const submitBatchSaveMaterialBoms = async () => {
       }
     }
   });
-};
+}
 
 
 /** 初始化单位数据 */
 const initUnitInfoData = async () => {
   if (unitInfoOptions.value === undefined || unitInfoOptions.value.length <= 0) {
-    const { data } = await getUnitInfoList();
+    const {data} = await getUnitInfoList();
     // alert(JSON.stringify(data))
     unitInfoOptions.value = data;
   }
@@ -842,7 +915,7 @@ const initUnitInfoData = async () => {
 const initMaterialBomVersionData = async () => {
   // alert(JSON.stringify(getMaterialBomVersionList))
   if (materialBomVersionOptions.value === undefined || materialBomVersionOptions.value.length <= 0) {
-    const { data } = await getMaterialBomVersionList();
+    const {data} = await getMaterialBomVersionList();
     materialBomVersionOptions.value = data;
 
     if (materialBomVersionOptions.value.length > 0) {
@@ -858,7 +931,18 @@ const initMaterialBomVersionData = async () => {
 const getParentMaterialBomInfo = async () => {
   const res = await getParentMaterialBom(parentQueryParams.value);
   parentForm.value = res.data;
+  handleBtnStatus();
 
+  if(!parentForm.value.materialBomVersion || parentForm.value.materialBomVersion===''){
+    parentForm.value.materialBomVersion = initialMaterialBomVersion.value;
+    parentForm.value.activeFlag = MATERIAL_BOM_ACTIVE_FLAG.value.DESIGN;
+  }
+
+  queryParams.value.parentId = parentForm.value.parentId
+  queryParams.value.parentMaterialTypeId = parentForm.value.parentMaterialTypeId
+  queryParams.value.materialBomVersion = parentForm.value.materialBomVersion
+  handleQuery();
+  btnLoading.value = false;
 };
 
 
@@ -871,8 +955,19 @@ const findObjectByTreeKey = (list, targetTreeKey) => {
     }
   }
   return null;
-};
+}
 
+/** 基于当前父级物料和版本，新增物料bom版本 */
+const addNewMaterialBomVersion = async () => {
+  loading.value = true;
+   parentForm.value.activeFlag = MATERIAL_BOM_ACTIVE_FLAG.value.DESIGN;
+   await getNextMaterialBomVersion();
+   materialBomList.value.forEach(childMaterialBom => {
+       childMaterialBom.materialBomId = undefined;
+   });
+   loading.value = false;
+   console.log( materialBomList);
+};
 
 // const getClickNode = (obj) => {
 //   // 如果当前对象有 id,并且与之前focus的id相同，则收集
@@ -902,8 +997,4 @@ const getColor = (e) => {
 };
 </script>
 
-<style lang="less" scoped>
-:deep(.el-tree-node__content) {
-  width: 100%;
-}
-</style>
+<style lang="scss" scoped></style>

From fd422fae5ef4f801868415736d592248136bd2c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 15 May 2025 10:42:54 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/materialBom/index.vue | 243 ++++++++++++++--------------
 1 file changed, 125 insertions(+), 118 deletions(-)

diff --git a/src/views/mes/materialBom/index.vue b/src/views/mes/materialBom/index.vue
index cc351a8..980fde2 100644
--- a/src/views/mes/materialBom/index.vue
+++ b/src/views/mes/materialBom/index.vue
@@ -4,7 +4,7 @@
       <!-- 生产bom树 -->
       <el-col :lg="6" :xs="24" style="" v-loading="treeLoading">
         <el-card shadow="hover" style="height: calc(100vh - 120px);overflow:auto;">
-          <el-input v-model="materialName" placeholder="请输入物料名称" prefix-icon="Search" clearable/>
+          <el-input v-model="materialName" placeholder="请输入物料名称" prefix-icon="Search" clearable />
           <el-tree
             ref="materialBomTreeRef"
             class="mt-2"
@@ -18,17 +18,19 @@
             @node-click="handleNodeClick"
           >
             <template #default="{ node, data }">
-              <div>
-                <el-button type="primary" link @click="fun(data)" v-if="node.activeFlag && node.activeFlag!==MATERIAL_BOM_ACTIVE_FLAG.ACTIVE">
-                  发布
-                </el-button>
-                <el-tooltip :content="`${data.label}`">
-                  <div class="custom-tree-node" style="display: inline-block;vertical-align: center">
-                    <span :style="{backgroundColor:getColor(data)?.[0],color:getColor(data)?.[1]}">{{ node.label
+              <div style="width: 100%">
+                <el-tooltip :content="`${data.label}`" style="width: 100%">
+                  <div class="custom-tree-node"
+                       style="display: inline-block;vertical-align: top;max-width: 80%;overflow: hidden;">
+                    <span
+                      :style="{backgroundColor:getColor(data)?.[0],color:getColor(data)?.[1],verticalAlign: 'center'}">{{ node.label
                       }}</span>
                   </div>
                 </el-tooltip>
-
+                <el-button type="primary" link @click="fun(data)"
+                           style=" vertical-align: top; ">
+                  上传
+                </el-button>
               </div>
             </template>
           </el-tree>
@@ -36,13 +38,14 @@
       </el-col>
 
       <el-col :lg="18" :xs="24" v-loading="loading">
-          <el-divider content-position="left">父级物料</el-divider>
-          <el-card shadow="hover">
+        <el-divider content-position="left">父级物料</el-divider>
+        <el-card shadow="hover">
           <template #header>
             <el-row :gutter="10">
               <el-col :span="1.5">
                 <el-button v-has-permi="['mes:materialBom:add']" type="primary" plain icon="Plus"
-                           @click="addNewMaterialBomVersion()" :loading="btnLoading" :disabled="addNewMaterialBomVersionBtnDisabled">{{addNewMaterialBomVersionBtnText}}
+                           @click="addNewMaterialBomVersion()" :loading="btnLoading"
+                           :disabled="addNewMaterialBomVersionBtnDisabled">{{ addNewMaterialBomVersionBtnText }}
                 </el-button>
               </el-col>
             </el-row>
@@ -51,51 +54,50 @@
           <el-form ref="parentMaterialBomFormRef" label-width="120px" :model="parentForm" :rules="parentRules">
             <el-row :gutter="20">
               <el-form-item label='父物料ID' prop='parentId' v-if="false">
-                <el-input v-model='parentForm.parentId' placeholder='' style="width:360px"/>
+                <el-input v-model='parentForm.parentId' placeholder='' style="width:360px" />
               </el-form-item>
               <el-form-item label='父物料类型ID' prop='parentMaterialTypeId' v-if="false">
-                <el-input v-model='parentForm.parentMaterialTypeId' placeholder='' style="width:360px"/>
+                <el-input v-model='parentForm.parentMaterialTypeId' placeholder='' style="width:360px" />
               </el-form-item>
 
-                <el-form-item label='状态' prop='activeFlag' style="width:260px">
-                  <el-select v-model='parentForm.activeFlag' disabled>
-                    <el-option v-for='dict in material_bom_active_flag' :key='dict.value' :label='dict.label' :value='dict.value' />
-                  </el-select>
-                </el-form-item>
+              <el-form-item label='状态' prop='activeFlag' style="width:260px">
+                <el-select v-model='parentForm.activeFlag' disabled>
+                  <el-option v-for='dict in material_bom_active_flag' :key='dict.value' :label='dict.label'
+                             :value='dict.value' />
+                </el-select>
+              </el-form-item>
 
               <el-form-item label="BOM版本" prop='materialBomVersion'>
-                <el-input v-model='parentForm.materialBomVersion' placeholder='' style="width:260px" disabled/>
+                <el-input v-model='parentForm.materialBomVersion' placeholder='' style="width:260px" disabled />
               </el-form-item>
 
               <el-form-item label='父物料名称' prop='parentMaterialName'>
                 <el-input v-model='parentForm.parentMaterialName' placeholder='请点击检索物料'
                           @click='handleMaterialSelect(parentForm,SELECT_MATERIAL_MODEL.PARENT_SELECT)'
                           style="width:260px" @change="getList" suffix-icon="Search" readonly
-                          :disabled="parentMaterialDisabled"/>
+                          :disabled="parentMaterialDisabled" />
               </el-form-item>
               <el-form-item label="父物料类型名称" prop='parentMaterialTypeName'>
-                <el-input v-model='parentForm.parentMaterialTypeName' placeholder='' style="width:260px" readonly/>
+                <el-input v-model='parentForm.parentMaterialTypeName' placeholder='' style="width:260px" readonly />
               </el-form-item>
 
 
-
-
-<!--              <el-form-item label="BOM版本" prop='materialBomVersion' :model="parentForm">-->
-<!--                <el-select v-model="parentForm.materialBomVersion"-->
-<!--                           placeholder="请选择" style="width:200px">-->
-<!--                  <el-option-->
-<!--                    v-for="item in materialBomVersionOptions"-->
-<!--                    :key="item.materialBomVersion"-->
-<!--                    :label="item.materialBomVersion"-->
-<!--                    :value="item.materialBomVersion"-->
-<!--                  ></el-option>-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
+              <!--              <el-form-item label="BOM版本" prop='materialBomVersion' :model="parentForm">-->
+              <!--                <el-select v-model="parentForm.materialBomVersion"-->
+              <!--                           placeholder="请选择" style="width:200px">-->
+              <!--                  <el-option-->
+              <!--                    v-for="item in materialBomVersionOptions"-->
+              <!--                    :key="item.materialBomVersion"-->
+              <!--                    :label="item.materialBomVersion"-->
+              <!--                    :value="item.materialBomVersion"-->
+              <!--                  ></el-option>-->
+              <!--                </el-select>-->
+              <!--              </el-form-item>-->
 
               <el-form-item label='父物料数量' prop='parentStandardAmount'>
                 <el-input-number v-model='parentForm.parentStandardAmount' :precision="2" :step="1"
                                  placeholder='请输入父物料数量'
-                                 style="width:200px"/>
+                                 style="width:200px" />
               </el-form-item>
 
               <el-form-item label='单位' prop='parentUnitId'>
@@ -110,12 +112,12 @@
               </el-form-item>
 
               <el-form-item label="BOM说明" prop='materialBomDesc'>
-                <el-input v-model='parentForm.materialBomDesc' placeholder='' style="width:360px" type="textarea"/>
+                <el-input v-model='parentForm.materialBomDesc' placeholder='' style="width:360px" type="textarea" />
               </el-form-item>
 
             </el-row>
           </el-form>
-          </el-card>
+        </el-card>
 
 
         <el-divider content-position="left">子级物料</el-divider>
@@ -137,29 +139,29 @@
           </template>
 
           <el-table :data="materialBomList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="50" align="center"/>
-            <el-table-column type="index" width="50" align="center" label="序号"/>
+            <el-table-column type="selection" width="50" align="center" />
+            <el-table-column type="index" width="50" align="center" label="序号" />
             <el-table-column v-if="columns[0].visible" key="materialBomId" label="生产BOM_ID" align="center"
-                             prop="materialBomId"/>
+                             prop="materialBomId" />
             <el-table-column v-if="columns[1].visible" key="materialTypeCode" label="子物料类型编号" align="center"
-                             prop="materialTypeCode" :show-overflow-tooltip="true"/>
+                             prop="materialTypeCode" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[2].visible" key="materialTypeName" label="子物料类型名称" align="center"
-                             prop="materialTypeName" :show-overflow-tooltip="true" w/>
+                             prop="materialTypeName" :show-overflow-tooltip="true" w />
             <el-table-column v-if="columns[4].visible" key="materialId" label="子物料ID" align="center"
-                             prop="materialId" :show-overflow-tooltip="true"/>
+                             prop="materialId" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[5].visible" key="materialName" label="子物料名称" align="center"
                              prop="materialName" :show-overflow-tooltip="true">
               <template #default='scope'>
                 <el-input v-model='scope.row.materialName' placeholder='请点击检索物料'
                           @click='handleMaterialSelect(scope.row,SELECT_MATERIAL_MODEL.CHILD_SELECT)'
-                          suffix-icon="Search" readonly/>
+                          suffix-icon="Search" readonly />
               </template>
             </el-table-column>
             <el-table-column v-if="columns[6].visible" key="standardAmount" label="子物料数量" align="center"
                              prop="standardAmount" :show-overflow-tooltip="true" width="220px">
               <template #default='scope'>
                 <el-input-number v-model='scope.row.standardAmount' :precision="2" :step="1"
-                                 placeholder='请输入数量' style="width:180px"/>
+                                 placeholder='请输入数量' style="width:180px" />
               </template>
             </el-table-column>
 
@@ -222,18 +224,18 @@
         <!--        </el-form-item>-->
 
         <el-form-item label='子物料ID' prop='materialId' v-if="false">
-          <el-input v-model='form.materialId' placeholder='' style="width:360px"/>
+          <el-input v-model='form.materialId' placeholder='' style="width:360px" />
         </el-form-item>
 
         <el-form-item label='子物料名称' prop='materialName'>
           <el-input v-model='form.materialName' placeholder='请点击检索物料'
                     @click='handleMaterialSelect(form,SELECT_MATERIAL_MODEL.DIALOG_CHILD_SELECT)'
-                    style="width:360px"/>
+                    style="width:360px" />
         </el-form-item>
 
         <el-form-item label='子物料数量' prop='standardAmount'>
           <el-input-number v-model='form.standardAmount' :precision="2" :step="1" placeholder='请输入子物料数量'
-                           style="width:360px"/>
+                           style="width:360px" />
         </el-form-item>
 
         <el-form-item label='子物料单位' prop='unitId'>
@@ -277,22 +279,22 @@ import {
   addBatchMaterialBom,
   getUnitInfoList, getMaterialBomVersionList, getParentMaterialBom, deleteMaterialBoms,
   selectNextMaterialBomVersion
-} from "@/api/mes/materialBom";
+} from '@/api/mes/materialBom';
 
-import {MaterialBomVO, MaterialBomForm, MaterialBomQuery} from '@/api/mes/materialBom/types';
-import {BaseMaterialTypeVO} from '@/api/mes/baseMaterialType/types';
+import { MaterialBomVO, MaterialBomForm, MaterialBomQuery } from '@/api/mes/materialBom/types';
+import { BaseMaterialTypeVO } from '@/api/mes/baseMaterialType/types';
 import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
 
-import {to} from 'await-to-js';
-import {nextTick} from "vue";
-import {MaterialBomVersionVO} from "@/api/mes/materialBomVersion/types";
-import {BaseMeasurementUnitInfoVO} from "@/api/mes/baseMeasurementUnitInfo/types";
-import {BaseStructureBomTreeVO} from "@/api/mes/baseStructureBom/types";
+import { to } from 'await-to-js';
+import { nextTick } from 'vue';
+import { MaterialBomVersionVO } from '@/api/mes/materialBomVersion/types';
+import { BaseMeasurementUnitInfoVO } from '@/api/mes/baseMeasurementUnitInfo/types';
+import { BaseStructureBomTreeVO } from '@/api/mes/baseStructureBom/types';
 
 const materialTypeId = ref(0);//此值是传给选择物料信息弹框使用
 
 const router = useRouter();
-const {proxy} = getCurrentInstance() as ComponentInternalInstance;
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const { material_bom_active_flag } = toRefs<any>(proxy?.useDict('material_bom_active_flag'));
 
@@ -330,13 +332,13 @@ const SELECT_MATERIAL_MODEL = ref({
   PARENT_SELECT: '1',//父级物料选择
   CHILD_SELECT: '2',//子级物料选择
   DIALOG_CHILD_SELECT: '3'//弹窗子级选择
-})
+});
 
 const MATERIAL_BOM_ACTIVE_FLAG = ref({
   ACTIVE: '1',//启用
   HISTORY: '2',//历史
   DESIGN: '3'//设计中
-})
+});
 
 const addNewMaterialBomVersionBtnText = ref('新增中');
 const addNewMaterialBomVersionBtnDisabled = ref(true);
@@ -347,14 +349,14 @@ const initialMaterialBomVersion = ref('01');
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  {key: 0, label: `生产BOM_ID`, visible: false, children: []},
-  {key: 1, label: `子物料类型编号`, visible: true, children: []},
-  {key: 2, label: `子物料类型名称`, visible: true, children: []},
-  {key: 3, label: `BOM版本`, visible: false, children: []},
-  {key: 4, label: `子物料ID`, visible: false, children: []},
-  {key: 5, label: `子物料名称`, visible: true, children: []},
-  {key: 6, label: `子物料数量`, visible: true, children: []},
-  {key: 7, label: `子物料单位`, visible: true, children: []}
+  { key: 0, label: `生产BOM_ID`, visible: false, children: [] },
+  { key: 1, label: `子物料类型编号`, visible: true, children: [] },
+  { key: 2, label: `子物料类型名称`, visible: true, children: [] },
+  { key: 3, label: `BOM版本`, visible: false, children: [] },
+  { key: 4, label: `子物料ID`, visible: false, children: [] },
+  { key: 5, label: `子物料名称`, visible: true, children: [] },
+  { key: 6, label: `子物料数量`, visible: true, children: [] },
+  { key: 7, label: `子物料单位`, visible: true, children: [] }
 ]);
 
 const materialBomTreeRef = ref<ElTreeInstance>();
@@ -390,7 +392,7 @@ const initParentFormData: MaterialBomForm = {
   attachId: undefined,
   activeFlag: undefined,
   remark: undefined,
-  materialTypeName: undefined,
+  materialTypeName: undefined
 };
 
 const initFormData: MaterialBomForm = {
@@ -414,12 +416,12 @@ const initFormData: MaterialBomForm = {
   attachId: undefined,
   activeFlag: undefined,
   remark: undefined,
-  materialTypeName: undefined,
+  materialTypeName: undefined
 };
 
 const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
-  form: {...initFormData},
-  parentForm: {...initParentFormData},
+  form: { ...initFormData },
+  parentForm: { ...initParentFormData },
   queryParams: {
     materialBomId: undefined,
     parentId: undefined,
@@ -432,31 +434,31 @@ const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
   },
   rules: {
     materialTypeId: [
-      {required: true, message: "物料类型不能为空", trigger: "blur"}
+      { required: true, message: '物料类型不能为空', trigger: 'blur' }
     ],
     materialBomVersion: [
-      {required: true, message: "BOM版本不能为空", trigger: "blur"}
+      { required: true, message: 'BOM版本不能为空', trigger: 'blur' }
     ],
     materialName: [
-      {required: true, message: "物料名称不能为空", trigger: "blur"}
+      { required: true, message: '物料名称不能为空', trigger: 'blur' }
     ],
     standardAmount: [
-      {required: true, message: "子物料数量不能为空", trigger: "blur"}
+      { required: true, message: '子物料数量不能为空', trigger: 'blur' }
     ]
   },
 
   parentRules: {
     parentMaterialName: [
-      {required: true, message: "父物料名称不能为空", trigger: "blur"}
+      { required: true, message: '父物料名称不能为空', trigger: 'blur' }
     ],
     materialBomVersion: [
-      {required: true, message: "BOM版本不能为空", trigger: "blur"}
+      { required: true, message: 'BOM版本不能为空', trigger: 'blur' }
     ],
     parentStandardAmount: [
-      {required: true, message: "父物料数量不能为空", trigger: "blur"}
+      { required: true, message: '父物料数量不能为空', trigger: 'blur' }
     ],
     parentUnitId: [
-      {required: true, message: "父物料单位不能为空", trigger: "blur"}
+      { required: true, message: '父物料单位不能为空', trigger: 'blur' }
     ]
   }
 
@@ -471,9 +473,9 @@ const parentQueryParams = ref({
   materialName: undefined,
   materialBomVersion: undefined,
   params: {}
-})
+});
 
-const {queryParams, form, rules, parentForm, parentRules} = toRefs(data);
+const { queryParams, form, rules, parentForm, parentRules } = toRefs(data);
 
 /** 通过条件过滤节点  */
 const filterNode = (value: string, data: any) => {
@@ -502,7 +504,7 @@ const getTreeSelect = async () => {
     id: virtualTopNodeId,//materialBomId
     parentId: -1,
     materialId: 0,
-    label: "生产BOM",
+    label: '生产BOM',
     children: res.data
   };
   materialBomOptions.value.push(initialTree);
@@ -510,13 +512,13 @@ const getTreeSelect = async () => {
 
   // materialBomOptions.value = res.data;
   if (!focusKeyNode.value) {//如果之前没有focus
-    focusKeyNode.value = {treeKey: virtualTopNodeId};
+    focusKeyNode.value = { treeKey: virtualTopNodeId };
   } else {
-    const clickNode = findObjectByTreeKey(materialBomOptions.value, focusKeyNode.value.treeKey)
+    const clickNode = findObjectByTreeKey(materialBomOptions.value, focusKeyNode.value.treeKey);
 
     if (!clickNode) {
       focusKeyNode.value = undefined;
-      focusKeyNode.value = {treeKey: virtualTopNodeId};
+      focusKeyNode.value = { treeKey: virtualTopNodeId };
     }
     // if (!allTreeKeys || allTreeKeys.length <= 0) {
     //   focusKeyNode.value = {
@@ -532,9 +534,9 @@ const getTreeSelect = async () => {
     // const focusKeyNodeIndex = materialBomOptions.value.findIndex((optionItem) => focusKeyNode.value.treeKey === optionItem.treeKey);//有嵌套children的，有可能找不到
   }
 
-  nextTick(function () {
+  nextTick(function() {
     materialBomTreeRef.value?.setCurrentKey(focusKeyNode.value.treeKey, true);
-  })
+  });
 
   loading.value = false;
   treeLoading.value = false;
@@ -567,12 +569,12 @@ const getList = async () => {
 const resetParentQueryParams = () => {
   parentQueryParams.value.parentId = undefined;//是当前节点的materialId
   parentQueryParams.value.materialBomVersion = undefined;
-}
+};
 
 const resetQueryParams = () => {
   queryParams.value.parentId = undefined;//materialid
   queryParams.value.parentMaterialTypeId = undefined;
-}
+};
 
 /** 节点单击事件 */
 const handleNodeClick = (data: MaterialBomVO) => {
@@ -603,14 +605,14 @@ const handleNodeClick = (data: MaterialBomVO) => {
   parentMaterialDisabled.value = focusKeyNode.value.treeKey != -1;
 };
 
-const handleBtnStatus = () =>{
-  if(parentForm.value.materialBomVersion && parentForm.value.materialBomVersion!==''){
+const handleBtnStatus = () => {
+  if (parentForm.value.materialBomVersion && parentForm.value.materialBomVersion !== '') {
     addNewMaterialBomVersionBtnDisabled.value = false;
-    addNewMaterialBomVersionBtnText.value = "新增版本";
+    addNewMaterialBomVersionBtnText.value = '新增版本';
     publishBtnDisplay.value = parentForm.value.activeFlag !== MATERIAL_BOM_ACTIVE_FLAG.value.ACTIVE;
-  }else{
+  } else {
     addNewMaterialBomVersionBtnDisabled.value = true;
-    addNewMaterialBomVersionBtnText.value = "新增中";
+    addNewMaterialBomVersionBtnText.value = '新增中';
     publishBtnDisplay.value = false;
   }
 
@@ -619,10 +621,10 @@ const handleBtnStatus = () =>{
 const clickDisplay = () => {
   if (queryParams.value.parentId === 0) {
     parentFormDisplay.value = false;
-    childTableTitle.value = "顶级物料";
+    childTableTitle.value = '顶级物料';
   } else {
     parentFormDisplay.value = true;
-    childTableTitle.value = "子级物料";
+    childTableTitle.value = '子级物料';
   }
 };
 
@@ -664,7 +666,7 @@ const handleDelete = async (row?: MaterialBomVO) => {
         });
         // alert(JSON.stringify(toDeleteMaterialBoms.value))
         if (toDeleteMaterialBoms.value.length > 0) {
-          await deleteMaterialBoms(toDeleteMaterialBoms.value)
+          await deleteMaterialBoms(toDeleteMaterialBoms.value);
           await getTreeSelect();
         }
 
@@ -695,7 +697,7 @@ const handleSelectionChange = (selection: MaterialBomVO[]) => {
 
 /** 重置操作表单 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   materialBomFormRef.value?.resetFields();
 };
 /** 取消按钮 */
@@ -810,7 +812,7 @@ const handleMaterialSelect = (row, selectMode) => {
   } else if (selectMode === SELECT_MATERIAL_MODEL.value.CHILD_SELECT) {//子级选择物料需要传值materialTypeId
     materialTypeId.value = row.materialTypeId;
   } else {
-    materialTypeId.value = undefined
+    materialTypeId.value = undefined;
   }
   materialOpen.value = true;
 };
@@ -881,9 +883,9 @@ const submitBatchSaveMaterialBoms = async () => {
         await addBatchMaterialBom(saveMaterialBomList.value);
         proxy?.$modal.msgSuccess('操作成功');
 
-        focusKeyNode.value.treeKey = parentForm.value.parentId + "-" + parentForm.value.materialBomVersion;
+        focusKeyNode.value.treeKey = parentForm.value.parentId + '-' + parentForm.value.materialBomVersion;
         focusKeyNode.value.materialId = parentForm.value.parentId;
-        focusKeyNode.value.materialTypeId = parentForm.value.parentMaterialTypeId
+        focusKeyNode.value.materialTypeId = parentForm.value.parentMaterialTypeId;
         focusKeyNode.value.materialBomVersion = parentForm.value.materialBomVersion;
         focusKeyNode.value.parentUnitId = parentForm.value.parentUnitId;
         focusKeyNode.value.parentStandardAmount = parentForm.value.parentStandardAmount;
@@ -899,13 +901,13 @@ const submitBatchSaveMaterialBoms = async () => {
       }
     }
   });
-}
+};
 
 
 /** 初始化单位数据 */
 const initUnitInfoData = async () => {
   if (unitInfoOptions.value === undefined || unitInfoOptions.value.length <= 0) {
-    const {data} = await getUnitInfoList();
+    const { data } = await getUnitInfoList();
     // alert(JSON.stringify(data))
     unitInfoOptions.value = data;
   }
@@ -915,7 +917,7 @@ const initUnitInfoData = async () => {
 const initMaterialBomVersionData = async () => {
   // alert(JSON.stringify(getMaterialBomVersionList))
   if (materialBomVersionOptions.value === undefined || materialBomVersionOptions.value.length <= 0) {
-    const {data} = await getMaterialBomVersionList();
+    const { data } = await getMaterialBomVersionList();
     materialBomVersionOptions.value = data;
 
     if (materialBomVersionOptions.value.length > 0) {
@@ -933,14 +935,14 @@ const getParentMaterialBomInfo = async () => {
   parentForm.value = res.data;
   handleBtnStatus();
 
-  if(!parentForm.value.materialBomVersion || parentForm.value.materialBomVersion===''){
+  if (!parentForm.value.materialBomVersion || parentForm.value.materialBomVersion === '') {
     parentForm.value.materialBomVersion = initialMaterialBomVersion.value;
     parentForm.value.activeFlag = MATERIAL_BOM_ACTIVE_FLAG.value.DESIGN;
   }
 
-  queryParams.value.parentId = parentForm.value.parentId
-  queryParams.value.parentMaterialTypeId = parentForm.value.parentMaterialTypeId
-  queryParams.value.materialBomVersion = parentForm.value.materialBomVersion
+  queryParams.value.parentId = parentForm.value.parentId;
+  queryParams.value.parentMaterialTypeId = parentForm.value.parentMaterialTypeId;
+  queryParams.value.materialBomVersion = parentForm.value.materialBomVersion;
   handleQuery();
   btnLoading.value = false;
 };
@@ -955,18 +957,18 @@ const findObjectByTreeKey = (list, targetTreeKey) => {
     }
   }
   return null;
-}
+};
 
 /** 基于当前父级物料和版本，新增物料bom版本 */
 const addNewMaterialBomVersion = async () => {
   loading.value = true;
-   parentForm.value.activeFlag = MATERIAL_BOM_ACTIVE_FLAG.value.DESIGN;
-   await getNextMaterialBomVersion();
-   materialBomList.value.forEach(childMaterialBom => {
-       childMaterialBom.materialBomId = undefined;
-   });
-   loading.value = false;
-   console.log( materialBomList);
+  parentForm.value.activeFlag = MATERIAL_BOM_ACTIVE_FLAG.value.DESIGN;
+  await getNextMaterialBomVersion();
+  materialBomList.value.forEach(childMaterialBom => {
+    childMaterialBom.materialBomId = undefined;
+  });
+  loading.value = false;
+  console.log(materialBomList);
 };
 
 // const getClickNode = (obj) => {
@@ -997,4 +999,9 @@ const getColor = (e) => {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped>
+
+:deep(.el-tree-node__content) {
+  width: 100%;
+}
+</style>

From b48397841a146c9b699fab8cd67eb5fee034e674 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 15 May 2025 14:19:29 +0800
Subject: [PATCH 7/7] =?UTF-8?q?update(dms):=20=E4=B8=BA=E6=B6=A6=E6=BB=91?=
 =?UTF-8?q?=E5=92=8C=E7=82=B9=E5=B7=A1=E6=A3=80=E5=B7=A5=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- types加字段
- 润滑工单实例多个方案备份
- 优化fault的页面，还仍需进一步完善优化
---
 src/api/dms/dmsBillsInspectInstance/types.ts  |   5 +
 src/api/dms/dmsBillsLubeInstance/types.ts     |  14 +
 src/views/dms/dmsBillsFaultInstance/index.vue |   4 +-
 .../dmsBillsLubeInstanceActivity/backuo1.vue  | 522 ++++++++++++++++
 .../dmsBillsLubeInstanceActivity/backup2.vue  | 450 ++++++++++++++
 .../dmsBillsLubeInstanceActivity/backup3.vue  | 476 +++++++++++++++
 .../dms/dmsBillsLubeInstanceActivity/copy.vue | 389 +++++++-----
 .../dmsBillsLubeInstanceActivity/copy2.vue    | 475 +++++++++++++++
 .../dmsBillsLubeInstanceActivity/index.vue    | 493 +++++++--------
 .../dms/dmsBillsLubeInstanceActivity/trae.vue | 563 ++++++++++++++++++
 src/views/dms/dmsInstanceFile/index.vue       |  52 +-
 11 files changed, 3024 insertions(+), 419 deletions(-)
 create mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/backuo1.vue
 create mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/backup2.vue
 create mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/backup3.vue
 create mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/copy2.vue
 create mode 100644 src/views/dms/dmsBillsLubeInstanceActivity/trae.vue

diff --git a/src/api/dms/dmsBillsInspectInstance/types.ts b/src/api/dms/dmsBillsInspectInstance/types.ts
index 01cab8f..ddcd24d 100644
--- a/src/api/dms/dmsBillsInspectInstance/types.ts
+++ b/src/api/dms/dmsBillsInspectInstance/types.ts
@@ -122,6 +122,11 @@ export interface DmsBillsInspectInstanceForm extends BaseEntity {
    */
   remark?: string;
 
+  /**
+   * 工单状态（draft草稿 waiting待处理 processing处理中 completed已完成 cancel已取消 back已退回）
+   */
+  status?: string;
+
 }
 
 export interface DmsBillsInspectInstanceQuery extends PageQuery {
diff --git a/src/api/dms/dmsBillsLubeInstance/types.ts b/src/api/dms/dmsBillsLubeInstance/types.ts
index e6c8acd..8edf270 100644
--- a/src/api/dms/dmsBillsLubeInstance/types.ts
+++ b/src/api/dms/dmsBillsLubeInstance/types.ts
@@ -141,6 +141,16 @@ export interface DmsBillsLubeInstanceForm extends BaseEntity {
    */
   planLubeCode?: string;
 
+  /**
+   * 工单状态（draft草稿 waiting待处理 processing处理中 completed已完成 cancel已取消 back已退回）
+   */
+  status?: string;
+
+  createBy?: string;
+
+  createTime?: string;
+
+
 }
 
 export interface DmsBillsLubeInstanceQuery extends PageQuery {
@@ -214,6 +224,10 @@ export interface DmsBillsLubeInstanceQuery extends PageQuery {
    * 润滑工单编号
    */
   planLubeCode?: string;
+
+  createBy?: string;
+
+  createTime?: string;
 }
 
 
diff --git a/src/views/dms/dmsBillsFaultInstance/index.vue b/src/views/dms/dmsBillsFaultInstance/index.vue
index 0f1c375..1bb687a 100644
--- a/src/views/dms/dmsBillsFaultInstance/index.vue
+++ b/src/views/dms/dmsBillsFaultInstance/index.vue
@@ -15,11 +15,11 @@
                 <el-option v-for="dict in instance_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="报修来源类型" prop="faultSourceType">
+<!--            <el-form-item label="报修来源类型" prop="faultSourceType" label-width="100px">
               <el-select v-model="queryParams.faultSourceType" placeholder="请选择报修来源类型" clearable >
                 <el-option v-for="dict in fault_source_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
             <!--            <el-form-item label="报修来源ID" prop="faultSourceId">
                           <el-input v-model="queryParams.faultSourceId" placeholder="请输入报修来源ID" clearable @keyup.enter="handleQuery" />
                         </el-form-item>
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/backuo1.vue b/src/views/dms/dmsBillsLubeInstanceActivity/backuo1.vue
new file mode 100644
index 0000000..2c4fb3d
--- /dev/null
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/backuo1.vue
@@ -0,0 +1,522 @@
+<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
new file mode 100644
index 0000000..fd1bc8b
--- /dev/null
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/backup2.vue
@@ -0,0 +1,450 @@
+<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
new file mode 100644
index 0000000..417a0b1
--- /dev/null
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/backup3.vue
@@ -0,0 +1,476 @@
+<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
index 0a8dc10..242c64b 100644
--- a/src/views/dms/dmsBillsLubeInstanceActivity/copy.vue
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/copy.vue
@@ -4,49 +4,75 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <!--            <el-form-item label="主键标识" prop="billsLubeDetailId">
-                          <el-input v-model="queryParams.billsLubeDetailId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
-                        </el-form-item>
-                        <el-form-item label="润滑工单" prop="lubeInstanceId">
-                          <el-input v-model="queryParams.lubeInstanceId" placeholder="请输入润滑工单" clearable @keyup.enter="handleQuery" />
-                        </el-form-item>-->
-            <!--            <el-form-item label="设备" prop="machineId">
-                          <el-input v-model="queryParams.machineId" placeholder="请输入设备" clearable @keyup.enter="handleQuery" />
-                        </el-form-item>
-                        <el-form-item label="润滑部位" prop="lubeStationId">
-                          <el-input v-model="queryParams.lubeStationId" placeholder="请输入润滑部位" clearable @keyup.enter="handleQuery" />
-                        </el-form-item>
-                        <el-form-item label="润滑标准" prop="lubeStandardId">
-                          <el-input v-model="queryParams.lubeStandardId" placeholder="请输入润滑标准" clearable @keyup.enter="handleQuery" />
-                        </el-form-item>
-                        <el-form-item label="操作描述" prop="operationDescription">
-                          <el-input v-model="queryParams.operationDescription" placeholder="请输入操作描述" clearable @keyup.enter="handleQuery" />
-                        </el-form-item>-->
-            <el-form-item label="润滑状态" prop="maintStatus">
-              <el-select v-model="queryParams.maintStatus" placeholder="请选择润滑状态" clearable >
-                <el-option v-for="dict in lube_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            <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="润滑开始时间" prop="beginTime" label-width="100px">
+            <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.beginTime"
+                              v-model="queryParams.startTime"
                               type="date"
                               value-format="YYYY-MM-DD"
-                              placeholder="请选择润滑开始时间"
+                              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="激活标识" prop="activeFlag">
-              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
-                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
+            <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>
@@ -61,57 +87,68 @@
       <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:dmsBillsLubeDetail:add']">新增</el-button>
+            <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:dmsBillsLubeDetail:edit']">修改</el-button>
+            <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:dmsBillsLubeDetail:remove']">删除</el-button>
+            <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:dmsBillsLubeDetail:export']">导出</el-button>
+            <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="dmsBillsLubeDetailList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="dmsBillsLubeInstanceActivityList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键标识" align="center" prop="billsLubeDetailId" v-if="columns[0].visible"/>
-        <el-table-column label="润滑工单" align="center" prop="lubeInstanceId" v-if="columns[2].visible"/>
-        <el-table-column label="设备" align="center" prop="machineId" v-if="columns[3].visible"/>
-        <el-table-column label="润滑部位" align="center" prop="lubeStationId" v-if="columns[4].visible"/>
-        <el-table-column label="润滑标准" align="center" prop="lubeStandardId" v-if="columns[5].visible"/>
-        <el-table-column label="操作描述" align="center" prop="operationDescription" v-if="columns[6].visible"/>
-        <el-table-column label="润滑状态" align="center" prop="maintStatus" v-if="columns[7].visible">
+        <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_status" :value="scope.row.maintStatus"/>
+            <dict-tag :options="lube_level" :value="scope.row.lubeLevel"/>
           </template>
         </el-table-column>
-        <el-table-column label="润滑开始时间" align="center" prop="beginTime" width="180" v-if="columns[8].visible">
+        <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">
-            <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <dict-tag :options="process_handle_status" :value="scope.row.processHandleStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="润滑结束时间" align="center" prop="endTime" width="180" v-if="columns[9].visible">
+        <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="激活标识" align="center" prop="activeFlag" v-if="columns[10].visible">
+        <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">
-            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+            <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[11].visible"/>
+        <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:dmsBillsLubeDetail:edit']"></el-button>
+              <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:dmsBillsLubeDetail:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:dmsBillsLubeInstanceActivity:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -119,62 +156,88 @@
 
       <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="dmsBillsLubeDetailFormRef" :model="form" :rules="rules" label-width="120px">
-        <!--        <el-form-item label="主键标识" prop="billsLubeDetailId">
-                  <el-input v-model="form.billsLubeDetailId" placeholder="请输入主键标识" />
-                </el-form-item>-->
-        <el-form-item label="润滑工单" prop="lubeInstanceId">
-          <!--          <el-input v-model="form.lubeInstanceId" placeholder="请输入润滑工单" />-->
+      <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="设备" prop="machineId">
-          <!--          <el-input v-model="form.machineId" placeholder="请输入设备" />-->
+        <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="润滑部位" prop="lubeStationId">
-          <!--          <el-input v-model="form.lubeStationId" placeholder="请输入润滑部位" />-->
+        <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="润滑标准" prop="lubeStandardId">
-          <!--          <el-input v-model="form.lubeStandardId" placeholder="请输入润滑标准" />-->
+        <el-form-item label="工单流程节点ID" prop="wfNodeId">
+          <el-input v-model="form.wfNodeId" placeholder="请输入工单流程节点ID" />
         </el-form-item>
-        <el-form-item label="操作描述" prop="operationDescription">
-          <el-input v-model="form.operationDescription" placeholder="请输入操作描述" />
+        <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="润滑状态" prop="maintStatus">
-          <el-select v-model="form.maintStatus" placeholder="请选择润滑状态">
+        <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_status"
+              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="润滑开始时间" prop="beginTime">
+        <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.beginTime"
+                          v-model="form.startTime"
                           type="datetime"
                           value-format="YYYY-MM-DD HH:mm:ss"
-                          placeholder="请选择润滑开始时间">
+                          placeholder="请选择执行开始时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="润滑结束时间" prop="endTime">
+        <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="请选择润滑结束时间">
+                          placeholder="请选择执行结束时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="激活标识" prop="activeFlag">
-          <el-select v-model="form.activeFlag" placeholder="请选择激活标识">
-            <el-option
-              v-for="dict in active_flag"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
+        <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="请输入备注" />
@@ -190,14 +253,14 @@
   </div>
 </template>
 
-<script setup name="DmsBillsLubeDetail" lang="ts">
-import { listDmsBillsLubeDetail, getDmsBillsLubeDetail, delDmsBillsLubeDetail, addDmsBillsLubeDetail, updateDmsBillsLubeDetail } from '@/api/dms/dmsBillsLubeDetail';
-import { DmsBillsLubeDetailVO, DmsBillsLubeDetailQuery, DmsBillsLubeDetailForm } from '@/api/dms/dmsBillsLubeDetail/types';
+<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 { active_flag, lube_status } = toRefs<any>(proxy?.useDict('active_flag', 'lube_status'));
+const { lube_level, process_handle_status } = toRefs<any>(proxy?.useDict('lube_level', 'process_handle_status'));
 
-const dmsBillsLubeDetailList = ref<DmsBillsLubeDetailVO[]>([]);
+const dmsBillsLubeInstanceActivityList = ref<DmsBillsLubeInstanceActivityVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -207,7 +270,7 @@ const multiple = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const dmsBillsLubeDetailFormRef = ref<ElFormInstance>();
+const dmsBillsLubeInstanceActivityFormRef = ref<ElFormInstance>();
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -216,70 +279,88 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `主键标识`, visible: false },
-  { key: 1, label: `租户编号`, visible: false },
-  { key: 2, label: `润滑工单`, visible: true },
-  { key: 3, label: `设备`, visible: true },
-  { key: 4, label: `润滑部位`, visible: true },
-  { key: 5, label: `润滑标准`, visible: true },
-  { key: 6, label: `操作描述`, visible: true },
-  { key: 7, label: `润滑状态`, visible: true },
-  { key: 8, label: `润滑开始时间`, visible: true },
-  { key: 9, label: `润滑结束时间`, visible: true },
-  { key: 10, label: `激活标识`, visible: true },
-  { key: 11, label: `备注`, visible: true },
-  { key: 12, label: `创建部门`, visible: false },
-  { key: 13, label: `创建人`, visible: false },
-  { key: 14, label: `创建时间`, visible: false },
-  { key: 15, label: `更新人`, visible: false },
-  { key: 16, label: `更新时间`, visible: false },
+  { 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: DmsBillsLubeDetailForm = {
-  billsLubeDetailId: undefined,
+const initFormData: DmsBillsLubeInstanceActivityForm = {
+  instanceActivityId: undefined,
   lubeInstanceId: undefined,
-  machineId: undefined,
-  lubeStationId: undefined,
-  lubeStandardId: undefined,
-  operationDescription: undefined,
-  maintStatus: undefined,
-  beginTime: undefined,
+  wfDefinitionId: undefined,
+  wfNodeId: undefined,
+  lubeGroup: undefined,
+  lubeSupervisor: undefined,
+  lubeLevel: undefined,
+  processHandleResolution: undefined,
+  processHandleStatus: undefined,
+  processStepOrder: undefined,
+  startTime: undefined,
   endTime: undefined,
-  activeFlag: undefined,
+  handleUserId: undefined,
+  handleBy: undefined,
+  handleTime: undefined,
+  transferUserId: undefined,
+  attr1: undefined,
   remark: undefined,
 }
-const data = reactive<PageData<DmsBillsLubeDetailForm, DmsBillsLubeDetailQuery>>({
+const data = reactive<PageData<DmsBillsLubeInstanceActivityForm, DmsBillsLubeInstanceActivityQuery>>({
   form: {...initFormData},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    billsLubeDetailId: undefined,
+    instanceActivityId: undefined,
     lubeInstanceId: undefined,
-    machineId: undefined,
-    lubeStationId: undefined,
-    lubeStandardId: undefined,
-    operationDescription: undefined,
-    maintStatus: undefined,
-    beginTime: undefined,
+    wfDefinitionId: undefined,
+    wfNodeId: undefined,
+    lubeGroup: undefined,
+    lubeSupervisor: undefined,
+    lubeLevel: undefined,
+    processHandleResolution: undefined,
+    processHandleStatus: undefined,
+    processStepOrder: undefined,
+    startTime: undefined,
     endTime: undefined,
-    activeFlag: undefined,
+    handleUserId: undefined,
+    handleBy: undefined,
+    handleTime: undefined,
+    transferUserId: undefined,
+    attr1: undefined,
     params: {
     }
   },
   rules: {
-    activeFlag: [
-      { required: true, message: "激活标识不能为空", trigger: "change" }
-    ],
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
-/** 查询润滑工单明细列表 */
+/** 查询润滑工单实例节点列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listDmsBillsLubeDetail(queryParams.value);
-  dmsBillsLubeDetailList.value = res.rows;
+  const res = await listDmsBillsLubeInstanceActivity(queryParams.value);
+  dmsBillsLubeInstanceActivityList.value = res.rows;
   total.value = res.total;
   loading.value = false;
 }
@@ -293,7 +374,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = {...initFormData};
-  dmsBillsLubeDetailFormRef.value?.resetFields();
+  dmsBillsLubeInstanceActivityFormRef.value?.resetFields();
 }
 
 /** 搜索按钮操作 */
@@ -309,8 +390,8 @@ const resetQuery = () => {
 }
 
 /** 多选框选中数据 */
-const handleSelectionChange = (selection: DmsBillsLubeDetailVO[]) => {
-  ids.value = selection.map(item => item.billsLubeDetailId);
+const handleSelectionChange = (selection: DmsBillsLubeInstanceActivityVO[]) => {
+  ids.value = selection.map(item => item.instanceActivityId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
@@ -319,28 +400,28 @@ const handleSelectionChange = (selection: DmsBillsLubeDetailVO[]) => {
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加润滑工单明细";
+  dialog.title = "添加润滑工单实例节点";
 }
 
 /** 修改按钮操作 */
-const handleUpdate = async (row?: DmsBillsLubeDetailVO) => {
+const handleUpdate = async (row?: DmsBillsLubeInstanceActivityVO) => {
   reset();
-  const _billsLubeDetailId = row?.billsLubeDetailId || ids.value[0]
-  const res = await getDmsBillsLubeDetail(_billsLubeDetailId);
+  const _instanceActivityId = row?.instanceActivityId || ids.value[0]
+  const res = await getDmsBillsLubeInstanceActivity(_instanceActivityId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改润滑工单明细";
+  dialog.title = "修改润滑工单实例节点";
 }
 
 /** 提交按钮 */
 const submitForm = () => {
-  dmsBillsLubeDetailFormRef.value?.validate(async (valid: boolean) => {
+  dmsBillsLubeInstanceActivityFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
-      if (form.value.billsLubeDetailId) {
-        await updateDmsBillsLubeDetail(form.value).finally(() =>  buttonLoading.value = false);
+      if (form.value.instanceActivityId) {
+        await updateDmsBillsLubeInstanceActivity(form.value).finally(() =>  buttonLoading.value = false);
       } else {
-        await addDmsBillsLubeDetail(form.value).finally(() =>  buttonLoading.value = false);
+        await addDmsBillsLubeInstanceActivity(form.value).finally(() =>  buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
@@ -350,19 +431,19 @@ const submitForm = () => {
 }
 
 /** 删除按钮操作 */
-const handleDelete = async (row?: DmsBillsLubeDetailVO) => {
-  const _billsLubeDetailIds = row?.billsLubeDetailId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除润滑工单明细编号为"' + _billsLubeDetailIds + '"的数据项？').finally(() => loading.value = false);
-  await delDmsBillsLubeDetail(_billsLubeDetailIds);
+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/dmsBillsLubeDetail/export', {
+  proxy?.download('dms/dmsBillsLubeInstanceActivity/export', {
     ...queryParams.value
-  }, `dmsBillsLubeDetail_${new Date().getTime()}.xlsx`)
+  }, `dmsBillsLubeInstanceActivity_${new Date().getTime()}.xlsx`)
 }
 
 onMounted(() => {
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/copy2.vue b/src/views/dms/dmsBillsLubeInstanceActivity/copy2.vue
new file mode 100644
index 0000000..a4cf1e5
--- /dev/null
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/copy2.vue
@@ -0,0 +1,475 @@
+<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 cf0915b..d6865b6 100644
--- a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
@@ -36,93 +36,89 @@
 
     <!-- 流程步骤展示区域 -->
     <el-card shadow="never" class="mb-[10px]">
-      <el-row>
-        <el-form ref="stepFormRef" :model="form" label-width="100px">
-          <!-- 第一步 -->
-          <h4 class="form-header h4" v-if="wfProcessActivityList.length > 0">
-            {{wfProcessActivityList[0]?.processActivityName}}
-          </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>
+      <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, index) in dmsBillsLubeInstanceActivityList" :key="activity.instanceActivityId">
-            <div v-if="activity.processStepOrder != 1">
-              <h4 class="form-header h4">{{activity.name || '流程节点'}}</h4>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="润滑级别">
-                    <el-select
-                      v-model="activity.lubeLevel"
-                      placeholder="润滑级别"
-                      :disabled="activity.processStepOrder != currentStepOrder">
-                      <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="activity.processStepOrder != currentStepOrder"
-                      placeholder="润滑组别">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="润滑负责人">
-                    <el-input
-                      v-model="activity.lubeSupervisor"
-                      :disabled="activity.processStepOrder != currentStepOrder"
-                      placeholder="润滑负责人">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="处理意见">
-                    <el-input
-                      v-model="activity.processHandleResolution"
-                      :disabled="activity.processStepOrder != currentStepOrder"
-                      placeholder="处理意见">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </div>
-          </template>
+        <!-- 中间步骤 (已处理的后续节点) -->
+        <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="canSubmitNext && isUpdate">
-            <h4 class="form-header h4" v-if="wfProcessActivityList.length > dmsBillsLubeInstanceActivityList.length">
-              {{wfProcessActivityList[dmsBillsLubeInstanceActivityList.length]?.processActivityName}}
-            </h4>
+        <!-- 当前步骤表单 (用于提交新节点) -->
+        <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">
@@ -137,27 +133,31 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="润滑组别">
+                <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="润滑负责人">
+                <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="处理意见">
+              <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>
-          </div>
-        </el-form>
-      </el-row>
+          </el-form>
+        </div>
+      </el-form>
     </el-card>
 
     <!-- 润滑计划详情区域 -->
@@ -171,13 +171,18 @@
         <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 { ElFormInstance } from 'element-plus';
 import { useRoute, useRouter } from 'vue-router';
+import type { FormInstance, FormRules } from 'element-plus'; // 引入 FormInstance 和 FormRules 类型
 import {
   listDmsBillsLubeInstanceActivity,
   addDmsBillsLubeInstanceActivity
@@ -186,71 +191,61 @@ import {
   DmsBillsLubeInstanceActivityVO,
   DmsBillsLubeInstanceActivityForm
 } from '@/api/dms/dmsBillsLubeInstanceActivity/types';
-import { listDmsBillsLubeInstance } from '@/api/dms/dmsBillsLubeInstance';
-// import { listWfprocessactivity } from '@/api/system/common/wfprocessactivity';
-// import { selectPlanLubeDetailByPlanLubeId } from '@/api/dms/dmsPlanLubeDetail';
-// import { selectUserIdByDmsBillsLubeInstanceActivityId } from '@/api/dms/dmsBillsLubeInstanceActivity';
-import { useUserStore } from '@/store/modules/user';
+import { getDmsBillsLubeInstance } 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 router = useRouter();
-const userStore = useUserStore();
 
 // 表单实例
-const stepFormRef = ref<ElFormInstance>();
+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: 'Lube01',
+  variables: {}
+});
 
 // 基础数据定义
 const loading = ref(true);
 const dmsBillsLubeInstanceActivityList = ref<DmsBillsLubeInstanceActivityVO[]>([]);
-const wfProcessActivityList = ref<any[]>([]);
-const billsInfo = ref<any>({});
-const planLubeDetail = ref<any[]>([]);
-const billsStatusCheck = ref('');
-const isUpdate = ref(true);
-const planLubeId = ref('');
-const currentStepOrder = ref(0);
-const lubeInstanceId = route.params.lubeInstanceId as string;
+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 canSubmitNext = computed(() => {
-  return dmsBillsLubeInstanceActivityList.value.length < wfProcessActivityList.value.length;
-});
-
-// 表单数据
-const form = reactive<DmsBillsLubeInstanceActivityForm>({
-  instanceActivityId: undefined,
-  lubeInstanceId: lubeInstanceId,
-  wfDefinitionId: undefined,
-  wfNodeId: undefined,
+// 表单数据 (用于展示第一个已处理节点的信息)
+const form = reactive<Partial<DmsBillsLubeInstanceActivityForm>>({
   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,
   lubeGroup: undefined,
   lubeSupervisor: undefined,
   lubeLevel: undefined,
@@ -267,6 +262,15 @@ const nextStepForm = reactive<DmsBillsLubeInstanceActivityForm>({
   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,
@@ -284,72 +288,49 @@ onMounted(() => {
   }
 
   // 加载工单实例数据
-  getDmsBillsLubeInstance();
+  dmsBillsLubeInstance();
   // 加载工单实例节点数据
   getList();
 });
 
 // 获取工单实例数据
-const getDmsBillsLubeInstance = async () => {
-  try {
-    const res = await listDmsBillsLubeInstance({ lubeInstanceId });
-    if (res.rows && res.rows.length > 0) {
-      billsInfo.value = res.rows[0];
-      planLubeId.value = res.rows[0].planLubeId;
+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;
+
+      // 设置工单状态显示文本
       if (lube_level.value && billsInfo.value.lubeStatus !== undefined) {
-        const statusItem = lube_level.value.find((item: any) => item.value == billsInfo.value.lubeStatus);
+        const statusItem = lube_level.value.find((item: any) => String(item.value) === String(billsInfo.value.lubeStatus));
         billsStatusCheck.value = statusItem ? statusItem.label : '未知状态';
+      } else {
+        billsStatusCheck.value = '未知状态';
       }
 
-      // 获取流程定义
-      getWfprocessActivity(res.rows[0].wfProcessId || 106);
-
       // 获取润滑计划详情
       if (planLubeId.value) {
-        getPlanLubeDetail();
+        getPlanLubeDetailData();
       }
-    }
-  } catch (error) {
-    console.error('获取工单实例数据失败', error);
-  }
-};
-
-// 获取流程定义
-const getWfprocessActivity = async (wfProcessId: number) => {
-  try {
-    // const res = await listWfprocessactivity({ wfProcessId });
-    wfProcessActivityList.value = res.rows;
-
-    // 更新实例节点名称
-    if (dmsBillsLubeInstanceActivityList.value.length > 0) {
-      dmsBillsLubeInstanceActivityList.value.forEach(activity => {
-        const matchedProcess = wfProcessActivityList.value.find(
-          process => process.processActivityOrder === activity.processStepOrder
-        );
-        if (matchedProcess) {
-          activity.name = matchedProcess.processActivityName;
-        }
-      });
-    }
-
-    // 检查当前用户是否有权限处理
-    checkUserPermission();
-  } catch (error) {
-    console.error('获取流程定义失败', error);
-  }
 };
 
 // 获取润滑计划详情
-const getPlanLubeDetail = async () => {
+const getPlanLubeDetailData = async () => {
+  if (!planLubeId.value) return;
+  loading.value = true;
   try {
-    const res = await selectPlanLubeDetailByPlanLubeId(planLubeId.value);
-    planLubeDetail.value = res.rows;
+    const res = await getDmsPlanLubeDetail(planLubeId.value);
+    planLubeDetail.value = res && res.rows ? [res.rows] : [];
   } catch (error) {
     console.error('获取润滑计划详情失败', error);
-  } finally {
-    loading.value = false;
+    proxy?.$modal.msgError("获取润滑计划详情失败");
   }
 };
 
@@ -360,8 +341,8 @@ const getList = async () => {
     const res = await listDmsBillsLubeInstanceActivity(queryParams);
     dmsBillsLubeInstanceActivityList.value = res.rows;
 
-    // 填充第一步数据
-    if (res.rows.length > 0) {
+    // 填充第一步数据 (用于表单展示)
+    if (res.rows && res.rows.length > 0) {
       Object.assign(form, {
         lubeGroup: res.rows[0].lubeGroup,
         lubeSupervisor: res.rows[0].lubeSupervisor,
@@ -369,80 +350,114 @@ const getList = async () => {
         remark: res.rows[0].remark
       });
 
-      // 初始化下一步表单数据
-      const lastActivity = res.rows[res.rows.length - 1];
+      // 根据步骤数初始化下一步表单数据
+      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: lastActivity.lubeGroup,
-        lubeSupervisor: lastActivity.lubeSupervisor,
-        lubeLevel: lastActivity.lubeLevel,
-        processStepOrder: res.rows.length + 1,
-        processHandleResolution: null
+        lubeGroup: undefined,
+        lubeSupervisor: undefined,
+        lubeLevel: undefined,
+        processHandleResolution: null,
+        remark: ''
       });
-
-      currentStepOrder.value = res.rows.length + 1;
     }
+
+    // 更新表单校验规则
+    nextStepFormRules.processHandleResolution = [{
+      required: nextStepOrder.value > 1,
+      message: "处理意见不能为空",
+      trigger: "blur"
+    }];
+
   } catch (error) {
     console.error('获取工单实例节点数据失败', error);
+    proxy?.$modal.msgError("获取工单实例节点数据失败");
   } finally {
     loading.value = false;
   }
 };
 
-// 检查当前用户是否有权限处理
-const checkUserPermission = async () => {
-  if (dmsBillsLubeInstanceActivityList.value.length === wfProcessActivityList.value.length) {
-    try {
-      const hasPermission = await selectUserIdByDmsBillsLubeInstanceActivityId(
-        lubeInstanceId,
-        userStore.userId
-      );
+// 提交表单
+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 (!hasPermission) {
-        proxy?.$modal.alert("您没有权限处理此工单");
-        // 关闭当前标签页
-        proxy?.$store.dispatch("tagsView/delView", route);
-        // 跳转到列表页
-        router.replace({ path: "/dms/deviceLube/dmsBillsLubeInstance" });
+        // 在第一步时不需要处理意见
+        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;
       }
-    } catch (error) {
-      console.error('检查权限失败', error);
+    } else {
+      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 {
+    buttonLoading.value = false;
   }
 };
 
-// 提交表单
-const submitForm = async () => {
-  try {
-    // 验证表单
-    if (!nextStepForm.processHandleResolution) {
-      proxy?.$modal.msgError("请填写处理意见");
-      return;
-    }
+// 审批记录
+const handleApprovalRecord = () => {
+  approvalRecordRef.value.init(lubeInstanceId);
+};
 
-    // 设置流程定义ID
-    if (wfProcessActivityList.value.length > 0) {
-      const currentProcess = wfProcessActivityList.value.find(
-        process => process.processActivityOrder === nextStepOrder.value
-      );
-      if (currentProcess) {
-        nextStepForm.processActivityId = currentProcess.processActivityId;
-      }
-    }
-
-    // 设置其他字段
-    nextStepForm.processStepOrder = nextStepOrder.value;
-    nextStepForm.wfLength = wfProcessActivityList.value.length;
-
-    // 提交
-    await addDmsBillsLubeInstanceActivity(nextStepForm);
-    proxy?.$modal.msgSuccess("提交成功");
-
-    // 重新加载数据
-    await getList();
-  } catch (error) {
-    console.error('提交失败', error);
-    proxy?.$modal.msgError("提交失败");
-  }
+// 提交回调
+const submitCallback = async () => {
+  await getList(); // 刷新列表获取最新节点
+  proxy?.$modal.msgSuccess("操作成功");
 };
 </script>
 
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/trae.vue b/src/views/dms/dmsBillsLubeInstanceActivity/trae.vue
new file mode 100644
index 0000000..96eb7a6
--- /dev/null
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/trae.vue
@@ -0,0 +1,563 @@
+<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
diff --git a/src/views/dms/dmsInstanceFile/index.vue b/src/views/dms/dmsInstanceFile/index.vue
index bb6531d..a147675 100644
--- a/src/views/dms/dmsInstanceFile/index.vue
+++ b/src/views/dms/dmsInstanceFile/index.vue
@@ -4,20 +4,20 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="主键标识" prop="instanceFileId">
+<!--            <el-form-item label="主键标识" prop="instanceFileId">
               <el-input v-model="queryParams.instanceFileId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="关联类型(1维修前，2维修后)" prop="targetType">
-              <el-select v-model="queryParams.targetType" placeholder="请选择关联类型(1维修前，2维修后)" clearable >
+            </el-form-item>-->
+            <el-form-item label="关联类型" prop="targetType">
+              <el-select v-model="queryParams.targetType" placeholder="请选择关联类型" clearable >
                 <el-option v-for="dict in target_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" prop="targetId">
+<!--            <el-form-item label="关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" prop="targetId">
               <el-input v-model="queryParams.targetId" placeholder="请输入关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="故障文件地址，一般是图片" prop="filePath">
+            </el-form-item>-->
+<!--            <el-form-item label="故障文件地址，一般是图片" prop="filePath">
               <el-input v-model="queryParams.filePath" placeholder="请输入故障文件地址，一般是图片" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -49,13 +49,14 @@
       <el-table v-loading="loading" :data="dmsInstanceFileList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="主键标识" align="center" prop="instanceFileId" v-if="columns[0].visible"/>
-        <el-table-column label="关联类型(1维修前，2维修后)" align="center" prop="targetType" v-if="columns[2].visible">
+        <el-table-column label="关联类型" align="center" prop="targetType" v-if="columns[2].visible">
           <template #default="scope">
             <dict-tag :options="target_type" :value="scope.row.targetType"/>
           </template>
         </el-table-column>
-        <el-table-column label="关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" align="center" prop="targetId" v-if="columns[3].visible"/>
-        <el-table-column label="故障文件地址，一般是图片" align="center" prop="filePath" v-if="columns[4].visible"/>
+<!--        <el-table-column label="关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" align="center" prop="targetId" v-if="columns[3].visible"/>-->
+        <el-table-column label="关联节点" align="center" prop="targetId" v-if="columns[3].visible"/>
+        <el-table-column label="故障文件地址" align="center" prop="filePath" v-if="columns[4].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -73,10 +74,10 @@
     <!-- 添加或修改维修工单文件对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="dmsInstanceFileFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="主键标识" prop="instanceFileId">
+<!--        <el-form-item label="主键标识" prop="instanceFileId">
           <el-input v-model="form.instanceFileId" placeholder="请输入主键标识" />
-        </el-form-item>
-        <el-form-item label="关联类型(1维修前，2维修后)" prop="targetType">
+        </el-form-item>-->
+        <el-form-item label="关联类型" prop="targetType">
           <el-radio-group v-model="form.targetType">
             <el-radio
               v-for="dict in target_type"
@@ -85,6 +86,9 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
+<!--        <el-form-item label="关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" prop="targetId">
+          <el-input v-model="form.targetId" placeholder="请输入关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" />
+        </el-form-item>-->
         <el-form-item label="关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" prop="targetId">
           <el-input v-model="form.targetId" placeholder="请输入关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID" />
         </el-form-item>
@@ -128,16 +132,16 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `主键标识`, visible: true },
-        { key: 1, label: `租户编号`, visible: true },
-        { key: 2, label: `关联类型(1维修前，2维修后)`, visible: true },
-        { key: 3, label: `关联类型为1时关联维修工单实例节点主键，关联类型为2时关联维修记录ID`, visible: true },
-        { key: 4, label: `故障文件地址，一般是图片`, visible: true },
-        { key: 5, label: `创建部门`, visible: true },
-        { key: 6, label: `创建人`, visible: true },
-        { key: 7, label: `创建时间`, visible: true },
-        { key: 8, label: `更新人`, visible: true },
-        { key: 9, label: `更新时间`, visible: true },
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `租户编号`, visible: false },
+        { key: 2, label: `关联类型`, visible: true },
+        { key: 3, label: `关联`, visible: false },
+        { key: 4, label: `故障文件地址`, visible: true },
+        { key: 5, label: `创建部门`, visible: false },
+        { key: 6, label: `创建人`, visible: false },
+        { key: 7, label: `创建时间`, visible: false },
+        { key: 8, label: `更新人`, visible: false },
+        { key: 9, label: `更新时间`, visible: false },
 ]);
 
 const initFormData: DmsInstanceFileForm = {