From 34ad79e815254c0d7b29eff4283cf2e175793509 Mon Sep 17 00:00:00 2001 From: AN <1983933789@qq.com> Date: Mon, 8 Sep 2025 14:20:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(projects):=20=E8=A1=A5=E5=85=85=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E5=AD=97=E6=AE=B5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workflow/flow-intervene-modal.vue | 8 +++++++- src/components/workflow/form/leave-edit/index.vue | 5 +++++ src/typings/api/workflow.api.d.ts | 12 ++++++++++-- src/typings/components.d.ts | 8 -------- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/components/workflow/flow-intervene-modal.vue b/src/components/workflow/flow-intervene-modal.vue index 075cb03e..a3e06c53 100644 --- a/src/components/workflow/flow-intervene-modal.vue +++ b/src/components/workflow/flow-intervene-modal.vue @@ -150,7 +150,13 @@ watch(visible, () => { :native-scrollbar="false" > - + {{ taskInfo?.nodeName }} diff --git a/src/components/workflow/form/leave-edit/index.vue b/src/components/workflow/form/leave-edit/index.vue index 572dc953..00a504ef 100644 --- a/src/components/workflow/form/leave-edit/index.vue +++ b/src/components/workflow/form/leave-edit/index.vue @@ -112,6 +112,7 @@ function createDefaultStartWorkflowModel(): StartWorkflowModel { return { flowCode: null, businessId: null, + flowInstanceBizExtBo: null, variables: {} }; } @@ -205,6 +206,10 @@ async function handleSubmit() { // 提交流程 startWorkflowModel.businessId = respLeave.value?.id; startWorkflowModel.flowCode = model.flowCode; + startWorkflowModel.flowInstanceBizExtBo = { + businessCode: respLeave.value?.applyCode, + businessTitle: '请假申请' + }; taskVariables.value = { leaveDays: respLeave.value?.leaveDays, userList: ['1', '3', '4'] diff --git a/src/typings/api/workflow.api.d.ts b/src/typings/api/workflow.api.d.ts index 321ad147..febca3b5 100644 --- a/src/typings/api/workflow.api.d.ts +++ b/src/typings/api/workflow.api.d.ts @@ -22,8 +22,8 @@ declare namespace Api { type Leave = Common.CommonRecord<{ /** id */ id: CommonType.IdType; - /** 租户编号 */ - tenantId: CommonType.IdType; + /** 申请编码 */ + applyCode: string; /** 请假类型 */ leaveType: LeaveType; /** 开始时间 */ @@ -275,12 +275,20 @@ declare namespace Api { message: string; }>; + type BusinessInfo = CommonType.RecordNullable<{ + /** 业务编码 */ + businessCode: string; + /** 业务名称 */ + businessTitle: string; + }>; /** 启动流程操作参数 */ type StartWorkflowOperateParams = CommonType.RecordNullable<{ /** 流程定义ID */ flowCode: string; /** 业务ID */ businessId: CommonType.IdType; + /** 业务信息 */ + flowInstanceBizExtBo: BusinessInfo; /** 变量 */ variables: { [key: string]: any }; }>; diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts index e84cc533..8b351dc4 100644 --- a/src/typings/components.d.ts +++ b/src/typings/components.d.ts @@ -47,15 +47,10 @@ declare module 'vue' { 'IconMaterialSymbols:deleteOutline': typeof import('~icons/material-symbols/delete-outline')['default'] 'IconMaterialSymbols:downloadRounded': typeof import('~icons/material-symbols/download-rounded')['default'] 'IconMaterialSymbols:driveFileRenameOutlineOutline': typeof import('~icons/material-symbols/drive-file-rename-outline-outline')['default'] - 'IconMaterialSymbols:editDocument': typeof import('~icons/material-symbols/edit-document')['default'] 'IconMaterialSymbols:imageOutline': typeof import('~icons/material-symbols/image-outline')['default'] 'IconMaterialSymbols:refreshRounded': typeof import('~icons/material-symbols/refresh-rounded')['default'] - 'IconMaterialSymbols:syncOutline': typeof import('~icons/material-symbols/sync-outline')['default'] 'IconMaterialSymbols:uploadRounded': typeof import('~icons/material-symbols/upload-rounded')['default'] 'IconMaterialSymbols:warningOutlineRounded': typeof import('~icons/material-symbols/warning-outline-rounded')['default'] - IconMaterialSymbolsAddRounded: typeof import('~icons/material-symbols/add-rounded')['default'] - IconMaterialSymbolsDeleteOutline: typeof import('~icons/material-symbols/delete-outline')['default'] - IconMaterialSymbolsDriveFileRenameOutlineOutline: typeof import('~icons/material-symbols/drive-file-rename-outline-outline')['default'] 'IconMdi:github': typeof import('~icons/mdi/github')['default'] IconMdiArrowDownThin: typeof import('~icons/mdi/arrow-down-thin')['default'] IconMdiArrowUpThin: typeof import('~icons/mdi/arrow-up-thin')['default'] @@ -97,8 +92,6 @@ declare module 'vue' { NDrawer: typeof import('naive-ui')['NDrawer'] NDrawerContent: typeof import('naive-ui')['NDrawerContent'] NDropdown: typeof import('naive-ui')['NDropdown'] - NDynamicInput: typeof import('naive-ui')['NDynamicInput'] - NDynamicTags: typeof import('naive-ui')['NDynamicTags'] NEllipsis: typeof import('naive-ui')['NEllipsis'] NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] @@ -109,7 +102,6 @@ declare module 'vue' { NGridItem: typeof import('naive-ui')['NGridItem'] NInput: typeof import('naive-ui')['NInput'] NInputGroup: typeof import('naive-ui')['NInputGroup'] - NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel'] NInputNumber: typeof import('naive-ui')['NInputNumber'] NLayout: typeof import('naive-ui')['NLayout'] NLayoutContent: typeof import('naive-ui')['NLayoutContent']