diff --git a/apps/web-antd/src/views/bpm/processInstance/data.ts b/apps/web-antd/src/views/bpm/processInstance/data.ts
index 214c58b0b..35f7e0cae 100644
--- a/apps/web-antd/src/views/bpm/processInstance/data.ts
+++ b/apps/web-antd/src/views/bpm/processInstance/data.ts
@@ -5,23 +5,12 @@ import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { getCategorySimpleList } from '#/api/bpm/category';
+import { getSimpleProcessDefinitionList } from '#/api/bpm/definition';
import { getRangePickerDefaultProps } from '#/utils';
/** 列表的搜索表单 */
export function useGridFormSchema(): VbenFormSchema[] {
return [
- // {
- // fieldName: 'startUserId',
- // label: '发起人',
- // component: 'ApiSelect',
- // componentProps: {
- // placeholder: '请选择发起人',
- // allowClear: true,
- // api: getSimpleUserList,
- // labelField: 'nickname',
- // valueField: 'id',
- // },
- // },
{
fieldName: 'name',
label: '流程名称',
@@ -34,13 +23,15 @@ export function useGridFormSchema(): VbenFormSchema[] {
{
fieldName: 'processDefinitionId',
label: '所属流程',
- component: 'Input',
+ component: 'ApiSelect',
componentProps: {
- placeholder: '请输入流程定义的编号',
+ placeholder: '请选择流程定义',
allowClear: true,
+ api: getSimpleProcessDefinitionList,
+ labelField: 'name',
+ valueField: 'id',
},
},
- // 流程分类
{
fieldName: 'category',
label: '流程分类',
@@ -53,7 +44,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
valueField: 'code',
},
},
- // 流程状态
{
fieldName: 'status',
label: '流程状态',
@@ -67,7 +57,6 @@ export function useGridFormSchema(): VbenFormSchema[] {
allowClear: true,
},
},
- // 发起时间
{
fieldName: 'createTime',
label: '发起时间',
diff --git a/apps/web-antd/src/views/bpm/processInstance/manager/data.ts b/apps/web-antd/src/views/bpm/processInstance/manager/data.ts
index 46025b6f5..a356cd076 100644
--- a/apps/web-antd/src/views/bpm/processInstance/manager/data.ts
+++ b/apps/web-antd/src/views/bpm/processInstance/manager/data.ts
@@ -5,6 +5,7 @@ import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
import { getCategorySimpleList } from '#/api/bpm/category';
+import { getSimpleProcessDefinitionList } from '#/api/bpm/definition';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
@@ -35,10 +36,13 @@ export function useGridFormSchema(): VbenFormSchema[] {
{
fieldName: 'processDefinitionId',
label: '所属流程',
- component: 'Input',
+ component: 'ApiSelect',
componentProps: {
- placeholder: '请输入流程定义的编号',
+ placeholder: '请选择流程定义',
allowClear: true,
+ api: getSimpleProcessDefinitionList,
+ labelField: 'name',
+ valueField: 'id',
},
},
{
diff --git a/apps/web-ele/src/views/bpm/processInstance/manager/data.ts b/apps/web-ele/src/views/bpm/processInstance/manager/data.ts
new file mode 100644
index 000000000..a356cd076
--- /dev/null
+++ b/apps/web-ele/src/views/bpm/processInstance/manager/data.ts
@@ -0,0 +1,156 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { getCategorySimpleList } from '#/api/bpm/category';
+import { getSimpleProcessDefinitionList } from '#/api/bpm/definition';
+import { getSimpleUserList } from '#/api/system/user';
+import { getRangePickerDefaultProps } from '#/utils';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+ return [
+ {
+ fieldName: 'startUserId',
+ label: '发起人',
+ component: 'ApiSelect',
+ componentProps: {
+ placeholder: '请选择发起人',
+ allowClear: true,
+ api: getSimpleUserList,
+ labelField: 'nickname',
+ valueField: 'id',
+ },
+ },
+ {
+ fieldName: 'name',
+ label: '流程名称',
+ component: 'Input',
+ componentProps: {
+ placeholder: '请输入流程名称',
+ allowClear: true,
+ },
+ },
+ {
+ fieldName: 'processDefinitionId',
+ label: '所属流程',
+ component: 'ApiSelect',
+ componentProps: {
+ placeholder: '请选择流程定义',
+ allowClear: true,
+ api: getSimpleProcessDefinitionList,
+ labelField: 'name',
+ valueField: 'id',
+ },
+ },
+ {
+ fieldName: 'category',
+ label: '流程分类',
+ component: 'ApiSelect',
+ componentProps: {
+ placeholder: '请输入流程分类',
+ allowClear: true,
+ api: getCategorySimpleList,
+ labelField: 'name',
+ valueField: 'code',
+ },
+ },
+ {
+ fieldName: 'status',
+ label: '流程状态',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(
+ DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS,
+ 'number',
+ ),
+ placeholder: '请选择流程状态',
+ allowClear: true,
+ },
+ },
+ {
+ fieldName: 'createTime',
+ label: '发起时间',
+ component: 'RangePicker',
+ componentProps: {
+ ...getRangePickerDefaultProps(),
+ allowClear: true,
+ },
+ },
+ ];
+}
+
+/** 列表的字段 */
+export function useGridColumns(): VxeTableGridOptions['columns'] {
+ return [
+ {
+ field: 'id',
+ title: '流程编号',
+ minWidth: 320,
+ fixed: 'left',
+ },
+ {
+ field: 'name',
+ title: '流程名称',
+ minWidth: 200,
+ fixed: 'left',
+ },
+ {
+ field: 'categoryName',
+ title: '流程分类',
+ minWidth: 120,
+ fixed: 'left',
+ },
+ {
+ field: 'startUser.nickname',
+ title: '流程发起人',
+ minWidth: 120,
+ },
+ {
+ field: 'startUser.deptName',
+ title: '发起部门',
+ minWidth: 120,
+ },
+ {
+ field: 'status',
+ title: '流程状态',
+ minWidth: 120,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS },
+ },
+ },
+ {
+ field: 'startTime',
+ title: '发起时间',
+ minWidth: 180,
+ formatter: 'formatDateTime',
+ },
+ {
+ field: 'endTime',
+ title: '结束时间',
+ minWidth: 180,
+ formatter: 'formatDateTime',
+ },
+ {
+ field: 'durationInMillis',
+ title: '流程耗时',
+ minWidth: 180,
+ formatter: 'formatPast2',
+ },
+ {
+ field: 'tasks',
+ title: '当前审批任务',
+ minWidth: 320,
+ slots: { default: 'tasks' },
+ },
+ {
+ title: '操作',
+ width: 180,
+ fixed: 'right',
+ slots: { default: 'actions' },
+ },
+ ];
+}
diff --git a/apps/web-ele/src/views/bpm/processInstance/manager/index.vue b/apps/web-ele/src/views/bpm/processInstance/manager/index.vue
new file mode 100644
index 000000000..0afcbc425
--- /dev/null
+++ b/apps/web-ele/src/views/bpm/processInstance/manager/index.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ task.name }}
+
+
+ -
+
+
+
+
+
+
+