diff --git a/src/api/workflow/workflowCommon/index.ts b/src/api/workflow/workflowCommon/index.ts index a90216a..63ce318 100644 --- a/src/api/workflow/workflowCommon/index.ts +++ b/src/api/workflow/workflowCommon/index.ts @@ -1,29 +1,29 @@ import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; export default { - routerJump(routerJumpVo: RouterJumpVo,proxy){ - if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'static' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) { - proxy.$tab.closePage(proxy.$route); - proxy.$router.push({ - path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`, - query: { - id: routerJumpVo.businessKey, - type: routerJumpVo.type, - taskId: routerJumpVo.taskId - } - }); - } else if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'dynamic' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) { - proxy.$tab.closePage(proxy.$route); - proxy.$router.push({ - path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`, - query: { - id: routerJumpVo.businessKey, - type: routerJumpVo.type, - taskId: routerJumpVo.taskId - } - }); - }else { - proxy?.$modal.msgError('请到模型配置菜单!'); + routerJump(routerJumpVo: RouterJumpVo, proxy) { + if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'static' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) { + proxy.$tab.closePage(proxy.$route); + proxy.$router.push({ + path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`, + query: { + id: routerJumpVo.businessKey, + type: routerJumpVo.type, + taskId: routerJumpVo.taskId } + }); + } else if (routerJumpVo.wfNodeConfigVo && routerJumpVo.wfNodeConfigVo.formType === 'dynamic' && routerJumpVo.wfNodeConfigVo.wfFormManageVo) { + proxy.$tab.closePage(proxy.$route); + proxy.$router.push({ + path: `${routerJumpVo.wfNodeConfigVo.wfFormManageVo.router}`, + query: { + id: routerJumpVo.businessKey, + type: routerJumpVo.type, + taskId: routerJumpVo.taskId + } + }); + } else { + proxy?.$modal.msgError('请到模型配置菜单!'); } -} \ No newline at end of file + } +}; diff --git a/src/router/index.ts b/src/router/index.ts index 2343685..b020b4c 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -164,7 +164,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [ ] }, { - path: '/demo/leaveEdit', + path: '/workflow/leaveEdit', component: Layout, hidden: true, permissions: ['demo:leave:edit'], @@ -173,7 +173,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [ path: 'index', component: () => import('@/views/workflow/leave/leaveEdit.vue'), name: 'leaveEdit', - meta: { title: '请假申请', activeMenu: '/demo/leave', noCache: true } + meta: { title: '请假申请', activeMenu: '/workflow/leave', noCache: true } } ] } diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue index e47768d..56ccb2c 100644 --- a/src/views/workflow/leave/index.vue +++ b/src/views/workflow/leave/index.vue @@ -184,9 +184,9 @@ const handleSelectionChange = (selection: LeaveVO[]) => { /** 新增按钮操作 */ const handleAdd = () => { proxy.$tab.closePage(proxy.$route); - proxy.$router.push(`/demo/leaveEdit/index/add/add`); + proxy.$router.push(`/workflow/leaveEdit/index/add/add`); proxy.$router.push({ - path: `/demo/leaveEdit/index`, + path: `/workflow/leaveEdit/index`, query: { type: 'add' } @@ -197,7 +197,7 @@ const handleAdd = () => { const handleUpdate = (row?: LeaveVO) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/demo/leaveEdit/index`, + path: `/workflow/leaveEdit/index`, query: { id: row.id, type: 'update' @@ -209,7 +209,7 @@ const handleUpdate = (row?: LeaveVO) => { const handleView = (row?: LeaveVO) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/demo/leaveEdit/index`, + path: `/workflow/leaveEdit/index`, query: { id: row.id, type: 'view' @@ -229,7 +229,7 @@ const handleDelete = async (row?: LeaveVO) => { /** 导出按钮操作 */ const handleExport = () => { proxy?.download( - 'demo/leave/export', + 'workflow/leave/export', { ...queryParams.value },