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="请输入处理意见" /> - - - + + + @@ -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); }; // 返回