From 370c257cf54b0ab25ac289607d1ff13587e6be7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=90=E5=A4=9C?= <278898052@qq.com>
Date: Sat, 24 May 2025 16:07:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90BPM=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E3=80=91=E9=80=89=E6=8B=A9=E5=8F=91=E8=B5=B7=E4=BA=BA?=
 =?UTF-8?q?=E6=97=B6=20activityId=20=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=8F=91=E8=B5=B7=E4=BA=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/bpm/processInstance/index.ts      |  4 +--
 .../processInstance/create/modules/form.vue   | 35 +++++++++++--------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/apps/web-antd/src/api/bpm/processInstance/index.ts b/apps/web-antd/src/api/bpm/processInstance/index.ts
index 4e8329c9..4f9b7795 100644
--- a/apps/web-antd/src/api/bpm/processInstance/index.ts
+++ b/apps/web-antd/src/api/bpm/processInstance/index.ts
@@ -109,9 +109,7 @@ export async function getProcessInstanceManagerPage(params: PageParam) {
 }
 
 /** 新增流程实例 */
-export async function createProcessInstance(
-  data: BpmProcessInstanceApi.ProcessInstanceVO,
-) {
+export async function createProcessInstance(data: any) {
   return requestClient.post<BpmProcessInstanceApi.ProcessInstanceVO>(
     '/bpm/process-instance/create',
     data,
diff --git a/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue b/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue
index 0d1ef863..8f776f0e 100644
--- a/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/create/modules/form.vue
@@ -20,13 +20,14 @@ import {
   BpmCandidateStrategyEnum,
   BpmFieldPermissionType,
   BpmModelFormType,
+  BpmModelType,
   BpmNodeIdEnum,
   BpmNodeTypeEnum,
   decodeFields,
   setConfAndFields2,
 } from '#/utils';
+import ProcessInstanceSimpleViewer from '#/views/bpm/processInstance/detail/modules/simple-bpm-viewer.vue';
 import ProcessInstanceTimeline from '#/views/bpm/processInstance/detail/modules/time-line.vue';
-
 // 类型定义
 interface ProcessFormData {
   rule: any[];
@@ -80,8 +81,8 @@ const detailForm = ref<ProcessFormData>({
 
 const fApi = ref<ApiAttrs>();
 const startUserSelectTasks = ref<UserTask[]>([]);
-const startUserSelectAssignees = ref<Record<number, string[]>>({});
-const tempStartUserSelectAssignees = ref<Record<number, string[]>>({});
+const startUserSelectAssignees = ref<Record<string, string[]>>({});
+const tempStartUserSelectAssignees = ref<Record<string, string[]>>({});
 const bpmnXML = ref<string | undefined>(undefined);
 const simpleJson = ref<string | undefined>(undefined);
 const timelineRef = ref<any>();
@@ -273,9 +274,7 @@ const handleCancel = () => {
 /** 选择发起人 */
 const selectUserConfirm = (activityId: string, userList: any[]) => {
   if (!activityId || !Array.isArray(userList)) return;
-  startUserSelectAssignees.value[Number(activityId)] = userList.map(
-    (item) => item.id,
-  );
+  startUserSelectAssignees.value[activityId] = userList.map((item) => item.id);
 };
 
 defineExpose({ initProcessInfo });
@@ -284,12 +283,11 @@ defineExpose({ initProcessInfo });
 <template>
   <Card
     :title="getTitle"
+    class="h-full overflow-hidden"
     :body-style="{
-      padding: '12px',
-      height: '100%',
-      display: 'flex',
-      flexDirection: 'column',
-      paddingBottom: '62px', // 预留 actions 区域高度
+      height: 'calc(100% - 112px)',
+      paddingTop: '12px',
+      overflowY: 'auto',
     }"
   >
     <template #extra>
@@ -334,18 +332,25 @@ defineExpose({ initProcessInfo });
       </Tabs.TabPane>
 
       <Tabs.TabPane tab="流程图" key="flow" class="flex flex-1 overflow-hidden">
-        <div>待开发</div>
+        <div class="w-full">
+          <ProcessInstanceSimpleViewer
+            :simple-json="simpleJson"
+            v-if="selectProcessDefinition.modelType === BpmModelType.SIMPLE"
+          />
+        </div>
       </Tabs.TabPane>
     </Tabs>
 
     <template #actions>
       <template v-if="activeTab === 'form'">
-        <Space wrap class="flex h-[50px] w-full justify-center">
+        <Space wrap class="flex w-full justify-center">
           <Button plain type="primary" @click="submitForm">
-            <IconifyIcon icon="mdi:check" />&nbsp; 发起
+            <IconifyIcon icon="icon-park-outline:check" />
+            发起
           </Button>
           <Button plain type="default" @click="handleCancel">
-            <IconifyIcon icon="mdi:close" />&nbsp; 取消
+            <IconifyIcon icon="icon-park-outline:close" />
+            取消
           </Button>
         </Space>
       </template>