feat: 更新 BPM API 接口和组件,调整 VO 命名为 V0,优化表单和任务管理功能

pull/106/head
ziye 2025-05-17 01:40:54 +08:00
parent 0178088a2a
commit 7bda0b33d7
28 changed files with 265 additions and 1507 deletions

View File

@ -3,7 +3,7 @@ import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmCategoryApi { export namespace BpmCategoryApi {
/** BPM 流程分类 VO */ /** BPM 流程分类 V0 */
export interface CategoryVO { export interface CategoryVO {
id: number; id: number;
name: string; name: string;

View File

@ -3,12 +3,12 @@ import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmFormApi { export namespace BpmFormApi {
// TODO @siye注释加一个。。嘿嘿 // 表单VO
export interface FormVO { export interface FormVO {
id?: number | undefined; id?: number | undefined;
name: string; name: string;
conf: string; conf: string;
fields: string[]; fields: string;
status: number; status: number;
remark: string; remark: string;
createTime: string; createTime: string;

View File

@ -11,7 +11,7 @@ export namespace BpmModelApi {
deptName?: string; deptName?: string;
} }
/** 流程定义 VO */ /** 流程定义 V0 */
export interface ProcessDefinitionVO { export interface ProcessDefinitionVO {
id: string; id: string;
version: number; version: number;
@ -21,7 +21,7 @@ export namespace BpmModelApi {
formCustomViewPath?: string; formCustomViewPath?: string;
} }
/** 流程模型 VO */ /** 流程模型 V0 */
export interface ModelVO { export interface ModelVO {
id: number; id: number;
key: string; key: string;

View File

@ -3,7 +3,7 @@ import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmProcessExpressionApi { export namespace BpmProcessExpressionApi {
/** BPM 流程表达式 VO */ /** BPM 流程表达式 V0 */
export interface ProcessExpressionVO { export interface ProcessExpressionVO {
id: number; // 编号 id: number; // 编号
name: string; // 表达式名字 name: string; // 表达式名字

View File

@ -40,6 +40,7 @@ export namespace BpmProcessInstanceApi {
tasks: ApprovalTaskInfo[]; tasks: ApprovalTaskInfo[];
}; };
// 流程实例 V0
export type ProcessInstanceVO = { export type ProcessInstanceVO = {
businessKey: string; businessKey: string;
category: string; category: string;
@ -56,9 +57,11 @@ export namespace BpmProcessInstanceApi {
startTime?: Date; startTime?: Date;
startUser?: User; startUser?: User;
status: number; status: number;
summary?: null | Record<string, any>[];
tasks?: BpmProcessInstanceApi.Task[]; tasks?: BpmProcessInstanceApi.Task[];
}; };
// 审批详情
export type ApprovalDetail = { export type ApprovalDetail = {
activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[];
formFieldsPermission: any; formFieldsPermission: any;
@ -66,6 +69,26 @@ export namespace BpmProcessInstanceApi {
processInstance: BpmProcessInstanceApi.ProcessInstanceVO; processInstance: BpmProcessInstanceApi.ProcessInstanceVO;
status: number; status: number;
}; };
export type ProcessInstanceCopyV0 = {
activityId: string;
activityName: string;
createTime: number;
createUser: User;
id: number;
processInstanceId: string;
processInstanceName: string;
processInstanceStartTime: number;
reason: string;
startUser: User;
summary: null | Record<string, any>[];
taskId: string;
taskName: string;
taskStartTime: number;
taskStatus: number;
taskType: string;
taskVariables: Record<string, any>;
};
} }
/** 查询我的流程实例分页 */ /** 查询我的流程实例分页 */
@ -126,10 +149,9 @@ export async function getProcessInstance(id: number) {
/** 查询复制流程实例分页 */ /** 查询复制流程实例分页 */
export async function getProcessInstanceCopyPage(params: PageParam) { export async function getProcessInstanceCopyPage(params: PageParam) {
return requestClient.get<PageResult<BpmProcessInstanceApi.ProcessInstanceVO>>( return requestClient.get<
'/bpm/process-instance/copy/page', PageResult<BpmProcessInstanceApi.ProcessInstanceCopyV0>
{ params }, >('/bpm/process-instance/copy/page', { params });
);
} }
/** 更新流程实例 */ /** 更新流程实例 */

View File

@ -3,7 +3,7 @@ import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmProcessListenerApi { export namespace BpmProcessListenerApi {
/** BPM 流程监听器 VO */ /** BPM 流程监听器 V0 */
export interface ProcessListenerVO { export interface ProcessListenerVO {
id: number; // 编号 id: number; // 编号
name: string; // 监听器名字 name: string; // 监听器名字

View File

@ -1,10 +1,12 @@
import type { PageParam, PageResult } from '@vben/request'; import type { PageParam, PageResult } from '@vben/request';
import type { BpmProcessInstanceApi } from '../processInstance';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmTaskApi { export namespace BpmTaskApi {
/** BPM 流程监听器 VO */ /** BPM 流程监听器 */
export interface TaskVO { export interface Task {
id: number; // 编号 id: number; // 编号
name: string; // 监听器名字 name: string; // 监听器名字
type: string; // 监听器类型 type: string; // 监听器类型
@ -12,24 +14,67 @@ export namespace BpmTaskApi {
event: string; // 监听事件 event: string; // 监听事件
valueType: string; // 监听器值类型 valueType: string; // 监听器值类型
value: string; // 监听器值 value: string; // 监听器值
processInstanceId: number; // 流程实例ID
activityId: string; // 活动ID
} }
/** 流程实例任务 VO */ /** 任务基础信息 */
export interface ProcessInstanceTaskVO { export interface BaseTaskInfo {
id: number; // 编号 id: string; // 任务ID
name: string; // 任务名称 name: string; // 任务名称
assigneeUser: any; // 审批人 assigneeUser: Record<string, any>; // 审批人
ownerUser: any; // 创建人 ownerUser: Record<string, any>; // 创建人
createTime: number; // 创建时间
endTime: number; // 结束时间
durationInMillis: number; // 耗时 durationInMillis: number; // 耗时
formConf?: any; // 表单配置 status: number; // 状态
formFields?: any; // 表单字段 nodeType: string; // 节点类型
formVariables?: any; // 表单变量 taskDefinitionKey: string; // 任务定义Key
parentTaskId: null | string; // 父任务ID
children: Record<string, any>[]; // 子任务
} }
/** 任务表单信息 */
export interface TaskFormInfo {
formId: null | string; // 表单ID
formName: null | string; // 表单名称
formConf: null | Record<string, any>; // 表单配置
formFields: null | Record<string, any>; // 表单字段
formVariables: null | Record<string, any>; // 表单变量
}
/** 任务设置信息 */
export interface TaskSettings {
buttonsSetting: Record<string, any>; // 按钮设置
signEnable: boolean; // 签章启用
reasonRequire: boolean; // 原因要求
reason: string; // 原因
}
/** 任务详情 */
export interface TaskDetail extends BaseTaskInfo, TaskFormInfo, TaskSettings {
processInstance: BpmProcessInstanceApi.ProcessInstanceVO; // 流程实例
}
/** 流程实例任务 */
export interface ProcessInstanceTask
extends BaseTaskInfo,
TaskFormInfo,
TaskSettings {
processInstance: BpmProcessInstanceApi.ProcessInstanceVO; // 流程实例
summary: null | Record<string, any>; // 流程实例摘要
}
// 导出类型别名以保持向后兼容
export type TaskV0 = Task;
export type TaskDownV0 = TaskDetail;
export type TaskManagerV0 = TaskDetail;
export type ProcessInstanceTaskV0 = ProcessInstanceTask;
} }
/** 查询待办任务分页 */ /** 查询待办任务分页 */
export async function getTaskTodoPage(params: PageParam) { export async function getTaskTodoPage(params: PageParam) {
return requestClient.get<PageResult<BpmTaskApi.TaskVO>>( return requestClient.get<PageResult<BpmTaskApi.TaskV0>>(
'/bpm/task/todo-page', '/bpm/task/todo-page',
{ {
params, params,
@ -39,7 +84,7 @@ export async function getTaskTodoPage(params: PageParam) {
/** 查询已办任务分页 */ /** 查询已办任务分页 */
export async function getTaskDonePage(params: PageParam) { export async function getTaskDonePage(params: PageParam) {
return requestClient.get<PageResult<BpmTaskApi.TaskVO>>( return requestClient.get<PageResult<BpmTaskApi.TaskV0>>(
'/bpm/task/done-page', '/bpm/task/done-page',
{ {
params, params,
@ -49,7 +94,7 @@ export async function getTaskDonePage(params: PageParam) {
/** 查询任务管理分页 */ /** 查询任务管理分页 */
export async function getTaskManagerPage(params: PageParam) { export async function getTaskManagerPage(params: PageParam) {
return requestClient.get<PageResult<BpmTaskApi.TaskVO>>( return requestClient.get<PageResult<BpmTaskApi.TaskManagerV0>>(
'/bpm/task/manager-page', '/bpm/task/manager-page',
{ params }, { params },
); );
@ -69,56 +114,77 @@ export const rejectTask = async (data: any) => {
export const getTaskListByProcessInstanceId = async ( export const getTaskListByProcessInstanceId = async (
processInstanceId: string, processInstanceId: string,
) => { ) => {
return await requestClient.get( return await requestClient.get<BpmTaskApi.ProcessInstanceTaskV0[]>(
`/bpm/task/list-by-process-instance-id?processInstanceId=${processInstanceId}`, `/bpm/task/list-by-process-instance-id?processInstanceId=${processInstanceId}`,
); );
}; };
/** 获取所有可退回的节点 */ /** 获取所有可退回的节点 */
export const getTaskListByReturn = async (data: any) => { export const getTaskListByReturn = async (data: any) => {
return await requestClient.get('/bpm/task/list-by-return', data); return await requestClient.get<BpmTaskApi.ProcessInstanceTaskV0[]>(
'/bpm/task/list-by-return',
data,
);
}; };
/** 退回 */ /** 退回 */
export const returnTask = async (data: any) => { export const returnTask = async (data: any) => {
return await requestClient.put('/bpm/task/return', data); return await requestClient.put<BpmTaskApi.ProcessInstanceTaskV0[]>(
'/bpm/task/return',
data,
);
}; };
// 委派 // 委派
export const delegateTask = async (data: any) => { export const delegateTask = async (data: any) => {
return await requestClient.put('/bpm/task/delegate', data); return await requestClient.put<BpmTaskApi.ProcessInstanceTaskV0[]>(
'/bpm/task/delegate',
data,
);
}; };
// 转派 // 转派
export const transferTask = async (data: any) => { export const transferTask = async (data: any) => {
return await requestClient.put('/bpm/task/transfer', data); return await requestClient.put<BpmTaskApi.ProcessInstanceTaskV0[]>(
'/bpm/task/transfer',
data,
);
}; };
// 加签 // 加签
export const signCreateTask = async (data: any) => { export const signCreateTask = async (data: any) => {
return await requestClient.put('/bpm/task/create-sign', data); return await requestClient.put<BpmTaskApi.ProcessInstanceTaskV0[]>(
'/bpm/task/create-sign',
data,
);
}; };
// 减签 // 减签
export const signDeleteTask = async (data: any) => { export const signDeleteTask = async (data: any) => {
return await requestClient.delete('/bpm/task/delete-sign', data); return await requestClient.delete<BpmTaskApi.ProcessInstanceTaskV0[]>(
'/bpm/task/delete-sign',
data,
);
}; };
// 抄送 // 抄送
export const copyTask = async (data: any) => { export const copyTask = async (data: any) => {
return await requestClient.put('/bpm/task/copy', data); return await requestClient.put<BpmTaskApi.ProcessInstanceTaskV0[]>(
'/bpm/task/copy',
data,
);
}; };
// 获取我的待办任务 // 获取我的待办任务
export const myTodoTask = async (processInstanceId: string) => { export const myTodoTask = async (processInstanceId: string) => {
return await requestClient.get( return await requestClient.get<BpmTaskApi.ProcessInstanceTaskV0[]>(
`/bpm/task/my-todo?processInstanceId=${processInstanceId}`, `/bpm/task/my-todo?processInstanceId=${processInstanceId}`,
); );
}; };
// 获取加签任务列表 // 获取加签任务列表
export const getChildrenTaskList = async (id: string) => { export const getChildrenTaskList = async (id: string) => {
return await requestClient.get( return await requestClient.get<BpmTaskApi.ProcessInstanceTaskV0[]>(
`/bpm/task/list-by-parent-task-id?parentTaskId=${id}`, `/bpm/task/list-by-parent-task-id?parentTaskId=${id}`,
); );
}; };

View File

@ -3,7 +3,7 @@ import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
export namespace BpmUserGroupApi { export namespace BpmUserGroupApi {
/** BPM 用户组 VO */ /** BPM 用户组 V0 */
export interface UserGroupVO { export interface UserGroupVO {
id: number; id: number;
name: string; name: string;

View File

@ -49,7 +49,7 @@ const routes: RouteRecordRaw[] = [
{ {
path: '/bpm/manager/form/edit', path: '/bpm/manager/form/edit',
name: 'BpmFormEditor', name: 'BpmFormEditor',
component: () => import('#/views/bpm/form/editor.vue'), component: () => import('#/views/bpm/form/designer/index.vue'),
meta: { meta: {
title: '编辑流程表单', title: '编辑流程表单',
activePath: '/bpm/manager/form', activePath: '/bpm/manager/form',

View File

@ -11,6 +11,7 @@ import { Button, message } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { deleteCategory, getCategoryPage } from '#/api/bpm/category'; import { deleteCategory, getCategoryPage } from '#/api/bpm/category';
import { DocAlert } from '#/components/doc-alert';
import { $t } from '#/locales'; import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data'; import { useGridColumns, useGridFormSchema } from './data';
@ -100,6 +101,10 @@ async function onDelete(row: BpmCategoryApi.CategoryVO) {
<template> <template>
<Page auto-content-height> <Page auto-content-height>
<template #doc>
<DocAlert title="工作流手册" url="https://doc.iocoder.cn/bpm" />
</template>
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="">
<template #toolbar-tools> <template #toolbar-tools>

View File

@ -1,5 +1,4 @@
<script lang="ts" setup> <script lang="ts" setup>
// TODO @siyeeditor form/designer
import { computed, onMounted, ref } from 'vue'; import { computed, onMounted, ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui'; import { Page, useVbenModal } from '@vben/common-ui';
@ -12,19 +11,15 @@ import { getFormDetail } from '#/api/bpm/form';
import { useFormCreateDesigner } from '#/components/form-create'; import { useFormCreateDesigner } from '#/components/form-create';
import { router } from '#/router'; import { router } from '#/router';
import { setConfAndFields } from '#/utils'; import { setConfAndFields } from '#/utils';
import Form from '#/views/bpm/form/modules/form.vue';
import Form from './modules/form.vue';
defineOptions({ name: 'BpmFormEditor' }); defineOptions({ name: 'BpmFormEditor' });
// TODO @siye lint const props = defineProps<{
const props = defineProps<Props>();
interface Props {
copyId?: number; copyId?: number;
id?: number; id?: number;
type: 'copy' | 'create' | 'edit'; type: 'copy' | 'create' | 'edit';
} }>();
// //
const flowFormConfig = ref(); const flowFormConfig = ref();
@ -121,7 +116,7 @@ function handleSave() {
.open(); .open();
} }
// TODO @siye /** 返回 */
function onBack() { function onBack() {
router.push({ router.push({
path: '/bpm/manager/form', path: '/bpm/manager/form',

View File

@ -77,6 +77,7 @@ function onActionClick({ code, row }: OnActionClickParams<BpmFormApi.FormVO>) {
} }
} }
} }
/** 复制 */ /** 复制 */
function onCopy(row: BpmFormApi.FormVO) { function onCopy(row: BpmFormApi.FormVO) {
router.push({ router.push({
@ -109,6 +110,7 @@ const formConfig = ref<any>({});
async function onDetail(row: BpmFormApi.FormVO) { async function onDetail(row: BpmFormApi.FormVO) {
formConfig.value = await getFormDetail(row.id as number); formConfig.value = await getFormDetail(row.id as number);
//
setConfAndFields2( setConfAndFields2(
formConfig.value, formConfig.value,
formConfig.value.conf, formConfig.value.conf,
@ -165,10 +167,13 @@ watch(
<template> <template>
<Page auto-content-height> <Page auto-content-height>
<DocAlert <template #doc>
title="审批接入(流程表单)" <DocAlert
url="https://doc.iocoder.cn/bpm/use-bpm-form/" title="审批接入(流程表单)"
/> url="https://doc.iocoder.cn/bpm/use-bpm-form/"
/>
</template>
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="">
<template #toolbar-tools> <template #toolbar-tools>
@ -177,28 +182,6 @@ watch(
{{ $t('ui.actionTitle.create', ['流程表单']) }} {{ $t('ui.actionTitle.create', ['流程表单']) }}
</Button> </Button>
</template> </template>
<!-- 摘要 -->
<!-- TODO @siye这个是不是不应该有呀 -->
<template #slot-summary="{ row }">
<div
class="flex flex-col py-2"
v-if="
row.processInstance.summary &&
row.processInstance.summary.length > 0
"
>
<div
v-for="(item, index) in row.processInstance.summary"
:key="index"
>
<span class="text-gray-500">
{{ item.key }} : {{ item.value }}
</span>
</div>
</div>
<div v-else>-</div>
</template>
</Grid> </Grid>
<DetailModal <DetailModal

View File

@ -39,28 +39,29 @@ const [Form, formApi] = useVbenForm({
const [Modal, modalApi] = useVbenModal({ const [Modal, modalApi] = useVbenModal({
async onConfirm() { async onConfirm() {
// TODO @siye= = //
const { valid } = await formApi.validate(); const { valid } = await formApi.validate();
if (!valid) return; if (!valid) return;
modalApi.lock(); modalApi.lock();
try { try {
//
const data = (await formApi.getValues()) as BpmFormApi.FormVO; const data = (await formApi.getValues()) as BpmFormApi.FormVO;
//
data.conf = encodeConf(designerComponent); data.conf = encodeConf(designerComponent);
data.fields = encodeFields(designerComponent); data.fields = encodeFields(designerComponent);
// TODO @siye //
const saveForm = async () => { if (formData.value?.id) {
if (!formData.value?.id) { await (editorAction.value === 'copy'
return createForm(data);
}
return editorAction.value === 'copy'
? createForm(data) ? createForm(data)
: updateForm(data); : updateForm(data));
}; } else {
await createForm(data);
}
await saveForm();
await modalApi.close(); await modalApi.close();
emit('success'); emit('success');
message.success($t('ui.actionMessage.operationSuccess')); message.success($t('ui.actionMessage.operationSuccess'));
@ -69,6 +70,7 @@ const [Modal, modalApi] = useVbenModal({
} }
}, },
//
async onOpenChange(isOpen: boolean) { async onOpenChange(isOpen: boolean) {
if (!isOpen) { if (!isOpen) {
formData.value = undefined; formData.value = undefined;
@ -76,22 +78,25 @@ const [Modal, modalApi] = useVbenModal({
return; return;
} }
// TODO @siye= = //
const data = modalApi.getData<any>(); const data = modalApi.getData<any>();
if (!data) return; if (!data) return;
//
designerComponent.value = data.designer; designerComponent.value = data.designer;
formData.value = data.formConfig; formData.value = data.formConfig;
editorAction.value = data.action; editorAction.value = data.action;
//
if (editorAction.value === 'copy' && formData.value) { if (editorAction.value === 'copy' && formData.value) {
formData.value = { formData.value = {
...formData.value, ...formData.value,
name: `${formData.value.name}_copy`, name: `${formData.value.name}_copy`,
id: undefined, id: undefined, // id undefined
}; };
} }
//
try { try {
if (formData.value) { if (formData.value) {
await formApi.setValues(formData.value); await formApi.setValues(formData.value);

View File

@ -101,6 +101,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
/** 列表的字段 */ /** 列表的字段 */
export function useGridColumns<T = BpmCategoryApi.CategoryVO>( export function useGridColumns<T = BpmCategoryApi.CategoryVO>(
onActionClick: OnActionClickFn<T>, onActionClick: OnActionClickFn<T>,
getMemberName: (userIds: number[]) => string,
): VxeTableGridOptions['columns'] { ): VxeTableGridOptions['columns'] {
return [ return [
{ {
@ -122,9 +123,7 @@ export function useGridColumns<T = BpmCategoryApi.CategoryVO>(
field: 'userIds', field: 'userIds',
title: '成员', title: '成员',
minWidth: 200, minWidth: 200,
slots: { formatter: (row) => getMemberName(row.cellValue) || '-',
default: 'userIds-cell',
},
}, },
{ {
field: 'status', field: 'status',

View File

@ -21,16 +21,30 @@ import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data'; import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue'; import Form from './modules/form.vue';
//
const userList = ref<SystemUserApi.User[]>([]);
//
const getMemberName = (userIds: number[]) => {
return userIds
.map(
(userId) => userList.value.find((user) => user.id === userId)?.nickname,
)
.filter(Boolean)
.join('、');
};
const [FormModal, formModalApi] = useVbenModal({ const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form, connectedComponent: Form,
destroyOnClose: true, destroyOnClose: true,
}); });
const [Grid, gridApi] = useVbenVxeGrid({ const [Grid, gridApi] = useVbenVxeGrid({
formOptions: { formOptions: {
schema: useGridFormSchema(), schema: useGridFormSchema(),
}, },
gridOptions: { gridOptions: {
columns: useGridColumns(onActionClick), columns: useGridColumns(onActionClick, getMemberName),
height: 'auto', height: 'auto',
keepSource: true, keepSource: true,
proxyConfig: { proxyConfig: {
@ -42,21 +56,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
...formValues, ...formValues,
}); });
}, },
querySuccess: (params) => {
// TODO @siyegetLeaderName?: (userId: number) => string | undefined,
const { list } = params.response;
const userMap = new Map(
userList.value.map((user) => [user.id, user.nickname]),
);
list.forEach(
(item: BpmUserGroupApi.UserGroupVO & { nicknames?: string }) => {
item.nicknames = item.userIds
.map((userId) => userMap.get(userId))
.filter(Boolean)
.join('、');
},
);
},
}, },
}, },
rowConfig: { rowConfig: {
@ -117,8 +116,6 @@ async function onDelete(row: BpmUserGroupApi.UserGroupVO) {
} }
} }
//
const userList = ref<SystemUserApi.User[]>([]);
/** 初始化 */ /** 初始化 */
onMounted(async () => { onMounted(async () => {
// //

View File

@ -106,7 +106,12 @@ async function onDelete(row: BpmProcessExpressionApi.ProcessExpressionVO) {
<template> <template>
<Page auto-content-height> <Page auto-content-height>
<DocAlert title="流程表达式" url="https://doc.iocoder.cn/bpm/expression/" /> <template #doc>
<DocAlert
title="流程表达式"
url="https://doc.iocoder.cn/bpm/expression/"
/>
</template>
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="">

View File

@ -36,7 +36,7 @@ const columns = shallowRef([
field: 'approver', field: 'approver',
title: '审批人', title: '审批人',
slots: { slots: {
default: ({ row }: { row: BpmTaskApi.ProcessInstanceTaskVO }) => { default: ({ row }: { row: BpmTaskApi.ProcessInstanceTaskV0 }) => {
return row.assigneeUser?.nickname || row.ownerUser?.nickname; return row.assigneeUser?.nickname || row.ownerUser?.nickname;
}, },
}, },
@ -76,7 +76,7 @@ const columns = shallowRef([
title: '耗时', title: '耗时',
minWidth: 180, minWidth: 180,
slots: { slots: {
default: ({ row }: { row: BpmTaskApi.ProcessInstanceTaskVO }) => { default: ({ row }: { row: BpmTaskApi.ProcessInstanceTaskV0 }) => {
return formatPast2(row.durationInMillis); return formatPast2(row.durationInMillis);
}, },
}, },
@ -110,7 +110,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 60, height: 60,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskVO>, } as VxeTableGridOptions<BpmTaskApi.TaskV0>,
}); });
/** /**
@ -142,7 +142,7 @@ const taskForm = ref<TaskForm>({
* @param row 任务数据 * @param row 任务数据
*/ */
async function showFormDetail( async function showFormDetail(
row: BpmTaskApi.ProcessInstanceTaskVO, row: BpmTaskApi.ProcessInstanceTaskV0,
): Promise<void> { ): Promise<void> {
// //
taskForm.value = { taskForm.value = {

View File

@ -54,11 +54,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskVO>, } as VxeTableGridOptions<BpmTaskApi.TaskV0>,
}); });
/** 表格操作按钮的回调函数 */ /** 表格操作按钮的回调函数 */
function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskVO>) { function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskV0>) {
switch (code) { switch (code) {
case 'cancel': { case 'cancel': {
onCancel(row); onCancel(row);
@ -72,7 +72,7 @@ function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskVO>) {
} }
/** 取消流程实例 */ /** 取消流程实例 */
function onCancel(row: BpmTaskApi.TaskVO) { function onCancel(row: BpmTaskApi.TaskV0) {
prompt({ prompt({
async beforeClose(scope) { async beforeClose(scope) {
if (scope.isConfirm) { if (scope.isConfirm) {
@ -105,7 +105,7 @@ function onCancel(row: BpmTaskApi.TaskVO) {
} }
/** 查看流程实例 */ /** 查看流程实例 */
function onDetail(row: BpmTaskApi.TaskVO) { function onDetail(row: BpmTaskApi.TaskV0) {
console.warn(row); console.warn(row);
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
@ -121,10 +121,12 @@ function onRefresh() {
<template> <template>
<Page auto-content-height> <Page auto-content-height>
<DocAlert <template #doc>
title="流程发起、取消、重新发起" <DocAlert
url="https://doc.iocoder.cn/bpm/process-instance" title="流程发起、取消、重新发起"
/> url="https://doc.iocoder.cn/bpm/process-instance"
/>
</template>
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="">

View File

@ -108,10 +108,13 @@ async function onDelete(row: BpmProcessListenerApi.ProcessListenerVO) {
<template> <template>
<Page auto-content-height> <Page auto-content-height>
<DocAlert <template #doc>
title="执行监听器、任务监听器" <DocAlert
url="https://doc.iocoder.cn/bpm/listener/" title="执行监听器、任务监听器"
/> url="https://doc.iocoder.cn/bpm/listener/"
/>
</template>
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="">
<template #toolbar-tools> <template #toolbar-tools>

View File

@ -32,7 +32,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
} }
/** 列表的字段 */ /** 列表的字段 */
export function useGridColumns<T = BpmTaskApi.TaskVO>( export function useGridColumns<T = BpmTaskApi.TaskV0>(
onActionClick: OnActionClickFn<T>, onActionClick: OnActionClickFn<T>,
): VxeTableGridOptions['columns'] { ): VxeTableGridOptions['columns'] {
return [ return [

View File

@ -45,14 +45,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmProcessInstanceApi.ProcessInstanceVO>, } as VxeTableGridOptions<BpmProcessInstanceApi.ProcessInstanceCopyV0>,
}); });
/** 表格操作按钮的回调函数 */ /** 表格操作按钮的回调函数 */
function onActionClick({ function onActionClick({
code, code,
row, row,
}: OnActionClickParams<BpmProcessInstanceApi.ProcessInstanceVO>) { }: OnActionClickParams<BpmProcessInstanceApi.ProcessInstanceCopyV0>) {
switch (code) { switch (code) {
case 'detail': { case 'detail': {
onDetail(row); onDetail(row);
@ -62,8 +62,7 @@ function onActionClick({
} }
/** 办理任务 */ /** 办理任务 */
function onDetail(row: BpmProcessInstanceApi.ProcessInstanceVO) { function onDetail(row: BpmProcessInstanceApi.ProcessInstanceCopyV0) {
// TODO @siyerow copyvo
const query = { const query = {
id: row.processInstanceId, id: row.processInstanceId,
...(row.activityId && { activityId: row.activityId }), ...(row.activityId && { activityId: row.activityId }),
@ -82,11 +81,12 @@ function onRefresh() {
<template> <template>
<Page auto-content-height> <Page auto-content-height>
<!-- TODO @siye应该用 <template #doc>这样高度可以被用进去哈 --> <template #doc>
<DocAlert <DocAlert
title="审批转办、委派、抄送" title="审批转办、委派、抄送"
url="https://doc.iocoder.cn/bpm/task-delegation-and-cc/" url="https://doc.iocoder.cn/bpm/task-delegation-and-cc/"
/> />
</template>
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="">

View File

@ -2,8 +2,6 @@ import type { VbenFormSchema } from '#/adapter/form';
import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
import type { BpmTaskApi } from '#/api/bpm/task'; import type { BpmTaskApi } from '#/api/bpm/task';
import { useAccess } from '@vben/access';
import { getCategorySimpleList } from '#/api/bpm/category'; import { getCategorySimpleList } from '#/api/bpm/category';
import { import {
DICT_TYPE, DICT_TYPE,
@ -12,9 +10,6 @@ import {
getRangePickerDefaultProps, getRangePickerDefaultProps,
} from '#/utils'; } from '#/utils';
// TODO @siye这个要去掉么没用到
const { hasAccessByCodes } = useAccess();
/** 列表的搜索表单 */ /** 列表的搜索表单 */
export function useGridFormSchema(): VbenFormSchema[] { export function useGridFormSchema(): VbenFormSchema[] {
return [ return [
@ -74,7 +69,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
} }
/** 列表的字段 */ /** 列表的字段 */
export function useGridColumns<T = BpmTaskApi.TaskVO>( export function useGridColumns<T = BpmTaskApi.TaskV0>(
onActionClick: OnActionClickFn<T>, onActionClick: OnActionClickFn<T>,
): VxeTableGridOptions['columns'] { ): VxeTableGridOptions['columns'] {
return [ return [

View File

@ -45,11 +45,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskVO>, } as VxeTableGridOptions<BpmTaskApi.TaskV0>,
}); });
/** 表格操作按钮的回调函数 */ /** 表格操作按钮的回调函数 */
function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskVO>) { function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskV0>) {
switch (code) { switch (code) {
case 'history': { case 'history': {
onHistory(row); onHistory(row);
@ -59,7 +59,7 @@ function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskVO>) {
} }
/** 查看历史 */ /** 查看历史 */
function onHistory(row: BpmTaskApi.TaskVO) { function onHistory(row: BpmTaskApi.TaskV0) {
console.warn(row); console.warn(row);
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
@ -78,16 +78,18 @@ function onRefresh() {
<template> <template>
<Page auto-content-height> <Page auto-content-height>
<DocAlert <template #doc>
title="审批通过、不通过、驳回" <DocAlert
url="https://doc.iocoder.cn/bpm/task-todo-done/" title="审批通过、不通过、驳回"
/> url="https://doc.iocoder.cn/bpm/task-todo-done/"
<DocAlert title="审批加签、减签" url="https://doc.iocoder.cn/bpm/sign/" /> />
<DocAlert <DocAlert title="审批加签、减签" url="https://doc.iocoder.cn/bpm/sign/" />
title="审批转办、委派、抄送" <DocAlert
url="https://doc.iocoder.cn/bpm/task-delegation-and-cc/" title="审批转办、委派、抄送"
/> url="https://doc.iocoder.cn/bpm/task-delegation-and-cc/"
<DocAlert title="审批加签、减签" url="https://doc.iocoder.cn/bpm/sign/" /> />
<DocAlert title="审批加签、减签" url="https://doc.iocoder.cn/bpm/sign/" />
</template>
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="">

View File

@ -28,24 +28,16 @@ export function useGridFormSchema(): VbenFormSchema[] {
} }
/** 列表的字段 */ /** 列表的字段 */
export function useGridColumns<T = BpmTaskApi.TaskVO>( export function useGridColumns<T = BpmTaskApi.TaskV0>(
onActionClick: OnActionClickFn<T>, onActionClick: OnActionClickFn<T>,
): VxeTableGridOptions['columns'] { ): VxeTableGridOptions['columns'] {
return [ return [
{ {
field: 'name', field: 'processInstance.name',
title: '流程名称', title: '流程',
minWidth: 200, minWidth: 200,
fixed: 'left', fixed: 'left',
}, },
{
field: 'processInstance.summary',
title: '摘要',
minWidth: 200,
slots: {
default: 'slot-summary',
},
},
{ {
field: 'processInstance.startUser.nickname', field: 'processInstance.startUser.nickname',
title: '发起人', title: '发起人',
@ -61,9 +53,12 @@ export function useGridColumns<T = BpmTaskApi.TaskVO>(
field: 'name', field: 'name',
title: '当前任务', title: '当前任务',
minWidth: 180, minWidth: 180,
formatter: ({ row }) => {
return row.name || '-';
},
}, },
{ {
field: 'createTime', field: 'startTime',
title: '任务开始时间', title: '任务开始时间',
minWidth: 180, minWidth: 180,
formatter: 'formatDateTime', formatter: 'formatDateTime',

View File

@ -45,11 +45,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskVO>, } as VxeTableGridOptions<BpmTaskApi.TaskV0>,
}); });
/** 表格操作按钮的回调函数 */ /** 表格操作按钮的回调函数 */
function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskVO>) { function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskV0>) {
switch (code) { switch (code) {
case 'history': { case 'history': {
onHistory(row); onHistory(row);
@ -59,13 +59,12 @@ function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskVO>) {
} }
/** 查看历史 */ /** 查看历史 */
function onHistory(row: BpmTaskApi.TaskVO) { function onHistory(row: BpmTaskApi.TaskV0) {
console.warn(row); console.warn(row);
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
query: { query: {
// TODO @siye id: row.processInstanceId,
id: row.processInstance.id,
}, },
}); });
} }
@ -78,31 +77,11 @@ function onRefresh() {
<template> <template>
<Page auto-content-height> <Page auto-content-height>
<DocAlert title="工作流手册" url="https://doc.iocoder.cn/bpm/" /> <template #doc>
<DocAlert title="工作流手册" url="https://doc.iocoder.cn/bpm/" />
</template>
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="" />
<!-- 摘要 -->
<!-- TODO siye这个要不要也放到 data.ts 处理掉 -->
<template #slot-summary="{ row }">
<div
class="flex flex-col py-2"
v-if="
row.processInstance.summary &&
row.processInstance.summary.length > 0
"
>
<div
v-for="(item, index) in row.processInstance.summary"
:key="index"
>
<span class="text-gray-500">
{{ item.key }} : {{ item.value }}
</span>
</div>
</div>
<div v-else>-</div>
</template>
</Grid>
</Page> </Page>
</template> </template>

View File

@ -67,7 +67,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
} }
/** 列表的字段 */ /** 列表的字段 */
export function useGridColumns<T = BpmTaskApi.TaskVO>( export function useGridColumns<T = BpmTaskApi.TaskV0>(
onActionClick: OnActionClickFn<T>, onActionClick: OnActionClickFn<T>,
): VxeTableGridOptions['columns'] { ): VxeTableGridOptions['columns'] {
return [ return [

View File

@ -45,11 +45,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
cellConfig: { cellConfig: {
height: 64, height: 64,
}, },
} as VxeTableGridOptions<BpmTaskApi.TaskVO>, } as VxeTableGridOptions<BpmTaskApi.TaskV0>,
}); });
/** 表格操作按钮的回调函数 */ /** 表格操作按钮的回调函数 */
function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskVO>) { function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskV0>) {
switch (code) { switch (code) {
case 'audit': { case 'audit': {
onAudit(row); onAudit(row);
@ -59,7 +59,7 @@ function onActionClick({ code, row }: OnActionClickParams<BpmTaskApi.TaskVO>) {
} }
/** 办理任务 */ /** 办理任务 */
function onAudit(row: BpmTaskApi.TaskVO) { function onAudit(row: BpmTaskApi.TaskV0) {
console.warn(row); console.warn(row);
router.push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
@ -78,16 +78,18 @@ function onRefresh() {
<template> <template>
<Page auto-content-height> <Page auto-content-height>
<DocAlert <template #doc>
title="审批通过、不通过、驳回" <DocAlert
url="https://doc.iocoder.cn/bpm/task-todo-done/" title="审批通过、不通过、驳回"
/> url="https://doc.iocoder.cn/bpm/task-todo-done/"
<DocAlert title="审批加签、减签" url="https://doc.iocoder.cn/bpm/sign/" /> />
<DocAlert <DocAlert title="审批加签、减签" url="https://doc.iocoder.cn/bpm/sign/" />
title="审批转办、委派、抄送" <DocAlert
url="https://doc.iocoder.cn/bpm/task-delegation-and-cc/" title="审批转办、委派、抄送"
/> url="https://doc.iocoder.cn/bpm/task-delegation-and-cc/"
<DocAlert title="审批加签、减签" url="https://doc.iocoder.cn/bpm/sign/" /> />
<DocAlert title="审批加签、减签" url="https://doc.iocoder.cn/bpm/sign/" />
</template>
<FormModal @success="onRefresh" /> <FormModal @success="onRefresh" />
<Grid table-title=""> <Grid table-title="">