From 812e5b5865a7292aab243b5a6c4b0861ad91150b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 31 Oct 2024 22:47:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=E5=B7=A5=E4=BD=9C=E6=B5=81=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A2=84=E6=B5=8B=E7=9A=84=20candidateUsers?=
 =?UTF-8?q?=20=E5=B1=95=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ProcessInstanceOperationButton.vue |  2 +-
 .../detail/ProcessInstanceTimeline.vue        | 47 +++++++++----------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
index 4233d05c..dfbd6928 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
@@ -334,7 +334,7 @@
     <div
       @click="openChildrenTask()"
       class="hover-bg-gray-100 rounded-xl p-6px"
-      v-if="runningTask?.children"
+      v-if="runningTask?.children.length > 0"
     >
       <Icon :size="14" icon="ep:semi-select" />&nbsp; 减签
     </div>
diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
index d2a7a357..0862f502 100644
--- a/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
@@ -81,30 +81,6 @@
                     />
                   </div>
                 </div>
-                <!-- 情况二：遍历每个审批节点下的【候选的】task 任务。例如说，1）依次审批，2）未来的审批任务等 -->
-                <div
-                  v-for="(user, idx1) in activity.candidateUsers"
-                  :key="idx1"
-                  class="bg-gray-100 h-35px rounded-3xl flex items-center p-8px gap-2 dark:color-gray-600 position-relative"
-                >
-                  <el-avatar :size="28" v-if="user.avatar" :src="user.avatar" />
-                  <el-avatar :size="28" v-else>
-                    {{ user.nickname.substring(0, 1) }}
-                  </el-avatar>
-                  {{ user.nickname }}
-
-                  <!-- 信息：任务 ICON -->
-                  <div
-                    v-if="onlyStatusIconShow.includes(task.status)"
-                    class="position-absolute top-22px left-26px bg-#fff rounded-full flex items-center p-2px"
-                  >
-                    <Icon
-                      :size="12"
-                      :icon="statusIconMap2['-1']?.icon"
-                      :color="statusIconMap2['-1']?.color"
-                    />
-                  </div>
-                </div>
               </div>
               <div
                 v-if="
@@ -117,6 +93,29 @@
               </div>
             </div>
           </div>
+          <!-- 情况二：遍历每个审批节点下的【候选的】task 任务。例如说，1）依次审批，2）未来的审批任务等 -->
+          <div
+            v-for="(user, idx1) in activity.candidateUsers"
+            :key="idx1"
+            class="bg-gray-100 h-35px rounded-3xl flex items-center p-8px gap-2 dark:color-gray-600 position-relative"
+          >
+            <el-avatar :size="28" v-if="user.avatar" :src="user.avatar" />
+            <el-avatar :size="28" v-else>
+              {{ user.nickname.substring(0, 1) }}
+            </el-avatar>
+            {{ user.nickname }}
+
+            <!-- 信息：任务 ICON -->
+            <div
+              class="position-absolute top-22px left-26px bg-#fff rounded-full flex items-center p-2px"
+            >
+              <Icon
+                :size="12"
+                :icon="statusIconMap2['-1']?.icon"
+                :color="statusIconMap2['-1']?.color"
+              />
+            </div>
+          </div>
         </div>
       </div>
     </el-timeline-item>