diff --git a/src/router/routes/modules/dashboard.ts b/src/router/routes/modules/dashboard.ts index d09e816..c83a596 100644 --- a/src/router/routes/modules/dashboard.ts +++ b/src/router/routes/modules/dashboard.ts @@ -31,6 +31,14 @@ const dashboard: AppRouteModule = { title: t('routes.dashboard.workbench'), }, }, + { + path: 'processPortal', + name: 'ProcessPortal', + component: () => import('/@/views/dashboard/ProcessPortal/index.vue'), + meta: { + title: '流程门户', + }, + }, ], }; diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index 2052948..a2316c5 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -276,7 +276,7 @@ function createAxios(opt?: Partial) { // authenticationScheme: 'Bearer', authenticationScheme: '', //接口超时设置 - timeout: 10 * 1000, + timeout: 20 * 1000, // 基础接口地址 // baseURL: globSetting.apiUrl, headers: { 'Content-Type': ContentTypeEnum.JSON }, diff --git a/src/views/tasklist/TaskList.api.ts b/src/views/tasklist/TaskList.api.ts index 9d0648e..c7a2339 100644 --- a/src/views/tasklist/TaskList.api.ts +++ b/src/views/tasklist/TaskList.api.ts @@ -124,15 +124,15 @@ export const deleteTask = (params, handleSuccess) => { export const toggleTaskStatus = (params) => defHttp.post({ url: Api.toggleTaskStatus, params }); -export const getCollaborators = (params) => defHttp.get({ url: Api.getCollaborators, params }); +export const getCollaborators = (params, options?: Record) => defHttp.get({ url: Api.getCollaborators, params }, options); -export const addCollaborator = (params) => defHttp.post({ url: Api.addCollaborator, params }); +export const addCollaborator = (params, options?) => defHttp.post({ url: Api.addCollaborator, params }, options); -export const removeCollaborator = (params) => defHttp.post({ url: Api.removeCollaborator, params }); +export const removeCollaborator = (params, options?) => defHttp.post({ url: Api.removeCollaborator, params }, options); -export const updateCollaboratorPermission = (params) => defHttp.post({ url: Api.updateCollaboratorPermission, params }); +export const updateCollaboratorPermission = (params, options?) => defHttp.post({ url: Api.updateCollaboratorPermission, params }, options); -export const getMyPermission = (params) => defHttp.get({ url: Api.getMyPermission, params }); +export const getMyPermission = (params, options?) => defHttp.get({ url: Api.getMyPermission, params }, options); export const moveTask = (params) => defHttp.post({ url: Api.moveTask, params }); diff --git a/src/views/tasklist/TaskList.data.ts b/src/views/tasklist/TaskList.data.ts index 40c50d6..1975405 100644 --- a/src/views/tasklist/TaskList.data.ts +++ b/src/views/tasklist/TaskList.data.ts @@ -6,7 +6,7 @@ import { getAvailableSecretLevels } from './types'; export const columns: BasicColumn[] = [ { - title: '任务清单名称', + title: '计划名称', align: 'center', dataIndex: 'tasklistName', }, @@ -35,7 +35,7 @@ export const searchFormSchema: FormSchema[] = []; export const formSchema: FormSchema[] = [ { - label: '任务清单名称', + label: '计划名称', field: 'tasklistName', component: 'Input', }, @@ -93,7 +93,7 @@ export const taskListDetialColumns: JVxeColumn[] = [ defaultValue: '', }, { - title: '任务名称', + title: '事项名称', key: 'taskName', type: JVxeTypes.input, width: '200px', @@ -101,7 +101,7 @@ export const taskListDetialColumns: JVxeColumn[] = [ defaultValue: '', }, { - title: '任务描述', + title: '事项描述', key: 'taskDesc', type: JVxeTypes.input, width: '200px', @@ -183,7 +183,7 @@ export const taskListDetialColumns: JVxeColumn[] = [ defaultValue: '', }, { - title: '子任务数', + title: '子事项数', key: 'subTaskCount', type: JVxeTypes.inputNumber, width: '200px', @@ -191,7 +191,7 @@ export const taskListDetialColumns: JVxeColumn[] = [ defaultValue: '', }, { - title: '子任务完成数', + title: '子事项完成数', key: 'completedSubTaskCount', type: JVxeTypes.inputNumber, width: '200px', @@ -201,21 +201,21 @@ export const taskListDetialColumns: JVxeColumn[] = [ ]; export const superQuerySchema = { - tasklistName: { title: '任务清单名称', order: 0, view: 'text', type: 'string' }, + tasklistName: { title: '计划名称', order: 0, view: 'text', type: 'string' }, pid: { title: '父级节点', order: 1, view: 'text', type: 'string' }, hasChild: { title: '是否有子节点', order: 2, view: 'text', type: 'string' }, sortOrder: { title: '排序号', order: 3, view: 'number', type: 'number' }, type: { title: '类型', order: 4, view: 'text', type: 'string' }, taskListDetial: { - title: '工作任务清单详情', + title: '计划详情', view: 'table', fields: { mainId: { title: '外键', order: 0, view: 'text', type: 'string' }, pid: { title: '父节点ID', order: 1, view: 'text', type: 'string' }, hasChild: { title: '是否有子节点', order: 2, view: 'text', type: 'string' }, sortOrder: { title: '排序号', order: 3, view: 'number', type: 'number' }, - taskName: { title: '任务名称', order: 4, view: 'text', type: 'string' }, - taskDesc: { title: '任务描述', order: 5, view: 'text', type: 'string' }, + taskName: { title: '事项名称', order: 4, view: 'text', type: 'string' }, + taskDesc: { title: '事项描述', order: 5, view: 'text', type: 'string' }, priority: { title: '优先级', order: 6, view: 'list', type: 'string', dictCode: 'task_priority' }, taskStatus: { title: '完成状态', order: 7, view: 'number', type: 'number' }, assigneeId: { title: '负责人ID', order: 8, view: 'text', type: 'string' }, @@ -225,8 +225,8 @@ export const superQuerySchema = { endTime: { title: '结束时间', order: 12, view: 'datetime', type: 'string' }, completeTime: { title: '完成时间', order: 13, view: 'datetime', type: 'string' }, type: { title: '类型', order: 14, view: 'text', type: 'string' }, - subTaskCount: { title: '子任务数', order: 15, view: 'number', type: 'number' }, - completedSubTaskCount: { title: '子任务完成数', order: 16, view: 'number', type: 'number' }, + subTaskCount: { title: '子事项数', order: 15, view: 'number', type: 'number' }, + completedSubTaskCount: { title: '子事项完成数', order: 16, view: 'number', type: 'number' }, }, }, }; @@ -237,13 +237,13 @@ export function getBpmFormSchema(_formData): FormSchema[] { export const createTaskFormSchema: FormSchema[] = [ { - label: '任务标题', + label: '事项标题', field: 'taskName', component: 'Input', required: true, }, { - label: '任务描述', + label: '事项描述', field: 'taskDesc', component: 'InputTextArea', componentProps: { rows: 3 }, @@ -305,12 +305,12 @@ export function getCreateListFormSchema(userSecurityLevel: number): FormSchema[] if (!userSecurityLevel) userSecurityLevel = 3; return [ { - label: '清单名称', + label: '计划名称', field: 'tasklistName', component: 'Input', required: true, componentProps: { - placeholder: '请输入清单名称', + placeholder: '请输入计划名称', }, }, { @@ -331,7 +331,7 @@ export function getCreateListFormSchema(userSecurityLevel: number): FormSchema[] export const mockTaskListGroups: TaskListGroup[] = [ { id: 'tlg-1', - name: '任务清单', + name: '计划管理', pid: '0', hasChild: '1', type: 0, diff --git a/src/views/tasklist/components/CollaboratorModal.vue b/src/views/tasklist/components/CollaboratorModal.vue index a3f536b..d68a85b 100644 --- a/src/views/tasklist/components/CollaboratorModal.vue +++ b/src/views/tasklist/components/CollaboratorModal.vue @@ -103,7 +103,7 @@