From 0ca92b846ef86fdfb9c2f3384c11f8da4a198f80 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Fri, 30 May 2025 16:24:57 +0800
Subject: [PATCH] =?UTF-8?q?change(dms):=20=E4=BC=98=E5=8C=96=E6=B6=A6?=
 =?UTF-8?q?=E6=BB=91=E5=B7=A5=E5=8D=95=E5=AE=9E=E4=BE=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除润滑工单实例路由的动态参数
- 从 query 参数获取工单 ID 和任务 ID
- 更新工单信息和当前任务加载逻辑
- 修改审批记录初始化方式
- 注释保养工单实例和点巡检工单实例相关路由
---
 src/router/index.ts                           | 35 +++++++++++++++++--
 .../dmsBillsLubeInstanceActivity/index.vue    | 20 +++++------
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index de4867a..104b265 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -346,7 +346,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     permissions: ['dms:dmsBillsLubeInstance:add'],
     children: [
       {
-        path: 'index/:lubeInstanceId',
+        path: 'index',
         component: () => import('@/views/dms/dmsBillsLubeInstanceActivity/index.vue'),
         name: 'dmsBillsLubeInstanceActivity',
         meta: { title: '润滑工单明细', activeMenu: '/dms/dmsBillsLubeInstance', icon: '' }
@@ -424,7 +424,38 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         meta: { title: '保养工单申请', activeMenu: '/dms/maint/maintEdit', noCache: true }
       }
     ]
-  }
+  },
+
+  // {
+  //   path: '/dms/dmsMaintInstanceActivity',
+  //   component: Layout,
+  //   hidden: true,
+  //   permissions: ['dms:dmsBillsMaintInstance:add'],
+  //   children: [
+  //     {
+  //       path: 'index/:maintInstanceId',
+  //       component: () => import('@/views/dms/dmsMaintInstanceActivity/index.vue'),
+  //       name: 'dmsMaintInstanceActivity',
+  //       meta: { title: '保养工单明细', activeMenu: '/dms/dmsMaintInstanceActivity', icon: '' }
+  //     }
+  //   ]
+  // },
+  //
+  // {
+  //   path: '/dms/dmsBillsInspectInstanceActivity',
+  //   component: Layout,
+  //   hidden: true,
+  //   permissions: ['dms:dmsBillsInspectInstanceActivity:add'],
+  //   children: [
+  //     {
+  //       path: 'index/:inspctInstanceId',
+  //       component: () => import('@/views/dms/dmsBillsInspectInstanceActivity/index.vue'),
+  //       name: 'dmsBillsInspectInstanceActivity',
+  //       meta: { title: '点巡检工单明细', activeMenu: '/dms/dmsBillsInspectInstanceActivity', icon: '' }
+  //     }
+  //   ]
+  // },
+
 
 ];
 
diff --git a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
index 94dab35..97989af 100644
--- a/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
+++ b/src/views/dms/dmsBillsLubeInstanceActivity/index.vue
@@ -91,9 +91,9 @@
                 type="textarea" 
                 :rows="3" 
                 placeholder="请输入处理意见" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+                </el-form-item>
+              </el-col>
+            </el-row>
       </el-form>
     </el-card>
 
@@ -208,8 +208,8 @@ onMounted(async () => {
 
 // 加载工单信息
 const loadWorkOrderInfo = async () => {
-  // 优先从路由参数获取businessId，其次从query参数获取
-  const businessId = route.params.lubeInstanceId || routeParams.value.id;
+  // 从query参数获取businessId
+  const businessId = routeParams.value.id;
   
   if (!businessId) {
     proxy?.$modal.msgError('缺少工单ID参数');
@@ -225,8 +225,8 @@ const loadWorkOrderInfo = async () => {
 
 // 加载当前任务信息
 const loadCurrentTask = async () => {
-  // 优先从路由参数获取businessId，其次从query参数获取
-  const businessId = route.params.lubeInstanceId || routeParams.value.id;
+  // 从query参数获取businessId和taskId
+  const businessId = routeParams.value.id;
   const taskId = routeParams.value.taskId;
   
   // 通过taskId或businessId获取当前任务
@@ -300,8 +300,8 @@ const approvalVerifyOpen = async () => {
         }
       };
       
-      // 打开审批组件
-      submitVerifyRef.value?.openDialog(currentTask.value.id);
+      // 直接使用传入的taskId进行审批
+      submitVerifyRef.value?.openDialog(routeParams.value.taskId);
     }
   } catch (error) {
     proxy?.$modal.msgError('表单验证失败，请检查输入项');
@@ -346,7 +346,7 @@ const submitCallback = async () => {
 
 // 审批记录
 const handleApprovalRecord = () => {
-  approvalRecordRef.value?.init(workOrder.value.lubeInstanceId);
+  approvalRecordRef.value?.init(routeParams.value.id);
 };
 
 // 返回