提交 91425094 authored 作者: whydesc's avatar whydesc

--计划管理流程处理url迁移

上级 478a7522
......@@ -12,5 +12,7 @@ export enum PageEnum {
//文件路由
SYS_FILES_PATH = '/file/share',
// 邮件中的跳转地址
TOKEN_LOGIN = '/tokenLogin'
TOKEN_LOGIN = '/tokenLogin',
StPlanManListRoute = '/project/plan/stPlanManListApi',
}
......@@ -24,10 +24,12 @@ const SYS_FILES_PATH = PageEnum.SYS_FILES_PATH;
// 邮件中的跳转地址,对应此路由,携带token免登录直接去办理页面
const TOKEN_LOGIN = PageEnum.TOKEN_LOGIN;
const StPlanManListRoute = PageEnum.StPlanManListRoute;
const ROOT_PATH = RootRoute.path;
// 代码逻辑说明: [VUEN-2472]分享免登录------------
const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH, TOKEN_LOGIN ];
const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH, TOKEN_LOGIN,StPlanManListRoute ];
export function createPermissionGuard(router: Router) {
const userStore = useUserStoreWithOut();
......
......@@ -64,5 +64,17 @@ export const TokenLoginRoute: AppRouteRecordRaw = {
ignoreAuth: true,
},
};
export const StPlanManListRoute: AppRouteRecordRaw = {
path: '/project/plan/stPlanManListApi',
name: 'StPlanManList',
component: () => import('/@/views/project/plan/components/StPlanManForm.vue'),
meta: {
title: '计划审批',
},
};
// Basic routing without permission
export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute];
export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute,StPlanManListRoute];
......@@ -270,16 +270,27 @@
try {
const formData = { dataId, dataName: 'id' };
const startResRaw = await definitionStartByDeployId(record.deployId, formData);
//console.log("definitionStartByDeployId 返回值",startResRaw);
/**definitionStartByDeployId 返回值
{procInsId: 'e962d600-1e88-11f1-8c5b-9a8d469af623',
executionId: 'e962fd16-1e88-11f1-8c5b-9a8d469af623',
instanceId: 'e962d600-1e88-11f1-8c5b-9a8d469af623',
deployId: '7fc9bc36-0591-11f1-9cb1-9a8d469af623',
taskId: 'e962fd1a-1e88-11f1-8c5b-9a8d469af623'}
*/
const startRes = pickStartResult(startResRaw);
let payload: any = Object.assign({}, record, startRes);
//console.log("definitionStartByDeployId 返回值-payload ",payload);
// 若启动接口未返回 taskId,则尝试通过 procInsId 从待办列表反查
if (!payload.taskId && payload.procInsId) {
//console.log("definitionStartByDeployId 返回值-payload -1");
const todoRow = await findTodoTaskByProcInsId(payload.procInsId);
if (todoRow?.taskId) {
payload = Object.assign({}, record, startRes, todoRow);
}
}else{
//console.log("definitionStartByDeployId 返回值-payload -2");
}
if (!payload.taskId) {
......@@ -298,9 +309,10 @@
console.error('启动流程或获取任务失败:', e);
message.error('操作失败,请重试');
}
//console.log("definitionStartByDeployId 返回值-payload- return");
return;
}
console.log("流程已启动:优先使用 record.taskId,否则尝试用 procInsId 从待办列表反查");
// 流程已启动:优先使用 record.taskId,否则尝试用 procInsId 从待办列表反查
try {
let payload: any = { ...record };
......@@ -360,14 +372,19 @@
*/
function getTableAction(record) {
return [
{
label: '修改',
onClick: handleEdit.bind(null, record),
label: '发起',
ifShow: () => {
if (record['bpmStatus'] == null || record['bpmStatus'] == '' || record['bpmStatus'] == '1') return true;
else return false;
},
{
label: '待办',
onClick: handleTodo.bind(null, record),
},
{
label: '修改',
onClick: handleEdit.bind(null, record),
},
{
label: '详情',
onClick: handleDetail.bind(null, record),
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论