From 71627271d027193fd9c5db2eeaeca531d0799418 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Sat, 20 Jun 2026 10:26:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20[bpm]=20=E5=AE=A1=E6=89=B9=E4=BA=BA?=
 =?UTF-8?q?=E8=87=AA=E9=80=89=E6=97=B6=E4=B8=8B=E4=B8=80=E4=B8=AA=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=AE=A1=E6=89=B9=E4=BA=BA=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/processInstance/detail/modules/operation-button.vue   | 3 ++-
 .../views/bpm/processInstance/detail/modules/time-line.vue    | 4 +++-
 .../bpm/processInstance/detail/modules/operation-button.vue   | 3 ++-
 .../views/bpm/processInstance/detail/modules/time-line.vue    | 4 +++-
 .../bpm/processInstance/detail/modules/operation-button.vue   | 3 ++-
 .../views/bpm/processInstance/detail/modules/time-line.vue    | 4 +++-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
index e10a87ba6..2d1212660 100644
--- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -855,9 +855,10 @@ defineExpose({ loadTodoTask });
                 name="nextAssignees"
                 v-if="nextAssigneesActivityNode.length > 0"
               >
-                <div class="-mb-8 -mt-3.5 ml-2.5">
+                <div class="ml-2.5 mt-2.5">
                   <ProcessInstanceTimeline
                     ref="nextAssigneesTimelineRef"
+                    embedded
                     :activity-nodes="nextAssigneesActivityNode"
                     :show-status-icon="false"
                     :enable-approve-user-select="true"
diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue
index 0952993e6..72ccb56f5 100644
--- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue
@@ -23,12 +23,14 @@ defineOptions({ name: 'BpmProcessInstanceTimeline' });
 const props = withDefaults(
   defineProps<{
     activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // 审批节点信息
+    embedded?: boolean; // 是否嵌入表单使用（缩小顶部内边距，避免与表单项 label 间距过大）
     enableApproveUserSelect?: boolean; // 是否开启审批人自选功能
     showStatusIcon?: boolean; // 是否显示头像右下角状态图标
   }>(),
   {
     showStatusIcon: true, // 默认值为 true
     enableApproveUserSelect: false, // 默认值为 false
+    embedded: false, // 默认值为 false
   },
 );
 
@@ -240,7 +242,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
 
 <template>
   <div>
-    <Timeline class="pt-5">
+    <Timeline :class="embedded ? 'pt-2' : 'pt-5'">
       <!-- 遍历每个审批节点 -->
       <Timeline.Item
         v-for="(activity, index) in activityNodes"
diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
index 5ceef878c..be9e04603 100644
--- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -858,9 +858,10 @@ defineExpose({ loadTodoTask });
                 name="nextAssignees"
                 v-if="nextAssigneesActivityNode.length > 0"
               >
-                <div class="-mb-8 -mt-3.5 ml-2.5">
+                <div class="ml-2.5">
                   <ProcessInstanceTimeline
                     ref="nextAssigneesTimelineRef"
+                    embedded
                     :activity-nodes="nextAssigneesActivityNode"
                     :show-status-icon="false"
                     :enable-approve-user-select="true"
diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue
index 86c980e86..e33f24f54 100644
--- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue
+++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/time-line.vue
@@ -30,12 +30,14 @@ defineOptions({ name: 'BpmProcessInstanceTimeline' });
 const props = withDefaults(
   defineProps<{
     activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // 审批节点信息
+    embedded?: boolean; // 是否嵌入表单使用（缩小顶部内边距，避免与表单项 label 间距过大）
     enableApproveUserSelect?: boolean; // 是否开启审批人自选功能
     showStatusIcon?: boolean; // 是否显示头像右下角状态图标
   }>(),
   {
     showStatusIcon: true, // 默认值为 true
     enableApproveUserSelect: false, // 默认值为 false
+    embedded: false, // 默认值为 false
   },
 );
 
@@ -247,7 +249,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
 
 <template>
   <div>
-    <Timeline class="pt-5">
+    <Timeline :class="embedded ? 'pt-2' : 'pt-5'">
       <!-- 遍历每个审批节点 -->
       <TimelineItem
         v-for="(activity, index) in activityNodes"
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
index 3d5c04d5f..049fe6d09 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -861,9 +861,10 @@ defineExpose({ loadTodoTask });
               prop="nextAssignees"
               v-if="nextAssigneesActivityNode.length > 0"
             >
-              <div class="-mb-8 -mt-3.5 ml-2.5">
+              <div>
                 <ProcessInstanceTimeline
                   ref="nextAssigneesTimelineRef"
+                  embedded
                   :activity-nodes="nextAssigneesActivityNode"
                   :show-status-icon="false"
                   :enable-approve-user-select="true"
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue
index 905840c6e..533899e55 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/time-line.vue
@@ -30,12 +30,14 @@ defineOptions({ name: 'BpmProcessInstanceTimeline' });
 const props = withDefaults(
   defineProps<{
     activityNodes: BpmProcessInstanceApi.ApprovalNodeInfo[]; // 审批节点信息
+    embedded?: boolean; // 是否嵌入表单使用（缩小顶部内边距，避免与表单项 label 间距过大）
     enableApproveUserSelect?: boolean; // 是否开启审批人自选功能
     showStatusIcon?: boolean; // 是否显示头像右下角状态图标
   }>(),
   {
     showStatusIcon: true, // 默认值为 true
     enableApproveUserSelect: false, // 默认值为 false
+    embedded: false, // 默认值为 false
   },
 );
 
@@ -247,7 +249,7 @@ defineExpose({ setCustomApproveUsers, batchSetCustomApproveUsers });
 
 <template>
   <div>
-    <ElTimeline class="pt-5">
+    <ElTimeline :class="embedded ? 'pt-2' : 'pt-5'">
       <!-- 遍历每个审批节点 -->
       <ElTimelineItem
         v-for="(activity, index) in activityNodes"

From e2185793c3e362c3332f208d46b8dd513995e7ed Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Sat, 20 Jun 2026 13:45:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20[bpm]=20=E5=B9=B6=E8=A1=8C=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E5=90=8E=E7=9A=84=E5=AE=A1=E6=89=B9=E4=BA=BA=E8=87=AA?=
 =?UTF-8?q?=E9=80=89=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D,https://t.zsxq.co?=
 =?UTF-8?q?m/daxv1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bpm/processInstance/detail/modules/operation-button.vue  | 5 +++--
 .../bpm/processInstance/detail/modules/operation-button.vue  | 5 +++--
 .../bpm/processInstance/detail/modules/operation-button.vue  | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
index 85e8cac45..b955d7a24 100644
--- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -354,7 +354,8 @@ async function initNextAssigneesFormField() {
           BpmCandidateStrategyEnum.START_USER_SELECT ===
             node.candidateStrategy) ||
         // 情况二：当前节点是审批人自选
-        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy
+        (isEmpty(node.candidateUsers) &&
+        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy)
       ) {
         nextAssigneesActivityNode.value.push(node);
       }
@@ -396,7 +397,7 @@ function validateNextAssignees() {
   }
   // 如果需要自选审批人，则校验每个节点是否都已配置审批人
   for (const item of nextAssigneesActivityNode.value) {
-    if (isEmpty(approveReasonForm.nextAssignees[item.id])) {
+    if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) {
       message.warning('下一个节点的审批人不能为空!');
       return false;
     }
diff --git a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
index be9e04603..fe0c58ccf 100644
--- a/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-antdv-next/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -335,7 +335,8 @@ async function initNextAssigneesFormField() {
           BpmCandidateStrategyEnum.START_USER_SELECT ===
             node.candidateStrategy) ||
         // 情况二：当前节点是审批人自选
-        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy
+        (isEmpty(node.candidateUsers) &&
+        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy)
       ) {
         nextAssigneesActivityNode.value.push(node);
       }
@@ -377,7 +378,7 @@ function validateNextAssignees() {
   }
   // 如果需要自选审批人，则校验每个节点是否都已配置审批人
   for (const item of nextAssigneesActivityNode.value) {
-    if (isEmpty(approveReasonForm.nextAssignees[item.id])) {
+    if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) {
       message.warning('下一个节点的审批人不能为空!');
       return false;
     }
diff --git a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
index abad43576..e76cd6e54 100644
--- a/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-ele/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -364,7 +364,8 @@ async function initNextAssigneesFormField() {
           BpmCandidateStrategyEnum.START_USER_SELECT ===
             node.candidateStrategy) ||
         // 情况二：当前节点是审批人自选
-        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy
+        (isEmpty(node.candidateUsers) &&
+        BpmCandidateStrategyEnum.APPROVE_USER_SELECT === node.candidateStrategy)
       ) {
         nextAssigneesActivityNode.value.push(node);
       }
@@ -406,7 +407,7 @@ function validateNextAssignees() {
   }
   // 如果需要自选审批人，则校验每个节点是否都已配置审批人
   for (const item of nextAssigneesActivityNode.value) {
-    if (isEmpty(approveReasonForm.nextAssignees[item.id])) {
+    if (isEmpty(item.candidateUsers) && isEmpty(approveReasonForm.nextAssignees[item.id])) {
       ElMessage.warning('下一个节点的审批人不能为空!');
       return false;
     }