diff --git a/src/api/bpm/task/index.ts b/src/api/bpm/task/index.ts index d214d17548417c7415ed0ca38a92f03ce4db6a66..f6763720f6c3f48b252af634293fcaa0353f79bf 100644 --- a/src/api/bpm/task/index.ts +++ b/src/api/bpm/task/index.ts @@ -1,5 +1,9 @@ import request from '@/config/axios' +export type TaskVO = { + id: number +} + export const getTodoTaskPage = async (params) => { return await request.get({ url: '/bpm/task/todo-page', params }) } @@ -32,3 +36,8 @@ export const getTaskListByProcessInstanceId = async (processInstanceId) => { url: '/bpm/task/list-by-process-instance-id?processInstanceId=' + processInstanceId }) } + +// 导出任务 +export const exportTask = async (params) => { + return await request.download({ url: '/bpm/task/export', params }) +} diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 2dc9522d051c6e81eed15202a70248955f2ec498..92625cdcced1a198c6d1ab25fa4a9ab83169f773 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -317,6 +317,18 @@ const remainingRouter: AppRouteRecordRaw[] = [ title: '查看 OA 请假', activeMenu: 'bpm/oa/leave/detail' } + }, + { + path: '/bpm/task/done', + component: () => import('@/views/bpm/task/done/index.vue'), + name: 'TaskDone', + meta: { + noCache: true, + hidden: true, + canTo: true, + title: '已办任务', + activeMenu: 'bpm/task/done/index' + } } ] }, diff --git a/src/views/bpm/task/done/Taskdetail.vue b/src/views/bpm/task/done/Taskdetail.vue new file mode 100644 index 0000000000000000000000000000000000000000..cef57cb731593ad28618a40551c60e03675262eb --- /dev/null +++ b/src/views/bpm/task/done/Taskdetail.vue @@ -0,0 +1,47 @@ + + diff --git a/src/views/bpm/task/done/done.data.ts b/src/views/bpm/task/done/done.data.ts deleted file mode 100644 index 5944671fb4b25d0d8679a17738ef5ff415e3929d..0000000000000000000000000000000000000000 --- a/src/views/bpm/task/done/done.data.ts +++ /dev/null @@ -1,52 +0,0 @@ -import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas' - -const { t } = useI18n() // 国际化 - -// crudSchemas -const crudSchemas = reactive({ - primaryKey: 'id', - primaryType: null, - action: true, - columns: [ - { - title: '任务编号', - field: 'id', - table: { - width: 320 - } - }, - { - title: '任务名称', - field: 'name', - isSearch: true - }, - { - title: '所属流程', - field: 'processInstance.name' - }, - { - title: '流程发起人', - field: 'processInstance.startUserNickname' - }, - { - title: t('common.status'), - field: 'result', - dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, - dictClass: 'number', - isSearch: true - }, - { - title: '原因', - field: 'reason' - }, - { - title: t('common.createTime'), - field: 'createTime', - formatter: 'formatDate', - table: { - width: 180 - } - } - ] -}) -export const { allSchemas } = useVxeCrudSchemas(crudSchemas) diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue index da05549a8cd1ccf913273c9ec5c123b31d2db994..735f4edc73331f637852c0c6eb87a8d8c6c1755e 100644 --- a/src/views/bpm/task/done/index.vue +++ b/src/views/bpm/task/done/index.vue @@ -1,30 +1,147 @@ -