diff --git a/src/enums/workflowEnum.ts b/src/enums/workflowEnum.ts index 3aa7965..8864ba3 100644 --- a/src/enums/workflowEnum.ts +++ b/src/enums/workflowEnum.ts @@ -6,5 +6,7 @@ */ export enum PageEnum { - TODO_TASK_PAGE = '/workflow/task/index', + TODO_TASK_PAGE = '/workflow/transaction/todo', + TASK_FORM_PAGE = '/workflow/task/taskForm', + TASK_FORM_VIEW_PAGE = '/workflow/task/taskViewForm' } diff --git a/src/views/workflow/extension/form/FormCategoryModal.vue b/src/views/workflow/extension/form/FormCategoryModal.vue index 30cd2c0..3bf8734 100644 --- a/src/views/workflow/extension/form/FormCategoryModal.vue +++ b/src/views/workflow/extension/form/FormCategoryModal.vue @@ -10,81 +10,81 @@ diff --git a/src/views/workflow/extension/form/FormModal.vue b/src/views/workflow/extension/form/FormModal.vue index 3d0f52a..d31b258 100644 --- a/src/views/workflow/extension/form/FormModal.vue +++ b/src/views/workflow/extension/form/FormModal.vue @@ -10,71 +10,71 @@ diff --git a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue index 19d421c..cb38320 100644 --- a/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue +++ b/src/views/workflow/extension/form/helper/WorkflowFormDesign.vue @@ -90,7 +90,7 @@ }); function handleVisibleChange(visible: boolean) { - !visible && state.formDesignApp.unmount(); + !visible && state.formDesignApp?.unmount(); } /** 处理弹出框提交 */ diff --git a/src/views/workflow/extension/formJson/FormJsonModal.vue b/src/views/workflow/extension/formJson/FormJsonModal.vue index b4cf8e4..a1984d1 100644 --- a/src/views/workflow/extension/formJson/FormJsonModal.vue +++ b/src/views/workflow/extension/formJson/FormJsonModal.vue @@ -11,55 +11,55 @@ diff --git a/src/views/workflow/model/helper/WorkflowModelDesign.vue b/src/views/workflow/model/helper/WorkflowModelDesign.vue index d8e2d47..d389963 100644 --- a/src/views/workflow/model/helper/WorkflowModelDesign.vue +++ b/src/views/workflow/model/helper/WorkflowModelDesign.vue @@ -77,7 +77,7 @@ }, 100); }); function handleVisibleChange(visible: boolean) { - !visible && state.workflowDesignApp.unmount(); + !visible && state.workflowDesignApp?.unmount(); } + diff --git a/src/views/workflow/task/task.data.ts b/src/views/workflow/task/task.data.ts new file mode 100644 index 0000000..d0fbc01 --- /dev/null +++ b/src/views/workflow/task/task.data.ts @@ -0,0 +1,58 @@ +import { BasicColumn, FormSchema } from '/@/components/Table'; +import { h } from 'vue'; +import { Tag } from 'ant-design-vue'; + +export const columns: BasicColumn[] = [ + { + title: '流程标题', + dataIndex: ['vars', 'title'], + width: 200, + }, + { + title: '流程名称', + dataIndex: 'processDefName', + width: 200, + }, + { + title: '当前环节', + dataIndex: ['taskInfo', 'name'], + width: 150, + customRender: ({ record }) => { + const taskName = record.taskInfo?.name; + return h(Tag, { color: 'processing' }, () => taskName); + } + }, + { + title: '流程发起人', + dataIndex: ['vars', 'userName'], + width: 150 + }, + { + title: '创建时间', + dataIndex: ['taskInfo', 'createTime'], + width: 200 + } +]; + +export const searchFormSchema: FormSchema[] = [ + { + field: 'title', + label: '流程标题', + component: 'Input', + componentProps: { + placeholder: '请输入流程标题', + }, + colProps: { span: 8 } + }, + { + field: 'dateRange', + label: '创建时间', + component: 'RangePicker', + componentProps: { + style: { width:'100%' }, + valueFormat: 'YYYY-MM-DD', + placeholder: ['开始日期','结束日期'] + }, + colProps: { span: 8 } + } +];