From b4d73d58e66220b6a5994e97794550b313f489c3 Mon Sep 17 00:00:00 2001
From: "wangmingyong@163.com" <wangmingyong@163.com>
Date: Wed, 19 Aug 2026 09:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8A=A0=E4=B8=8A=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E8=81=94=E5=90=88=EF=BC=8C=E6=97=B6=E9=97=B4=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/enforcement/my/task/cp_task_mine.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue
index f8918b73..5364b28e 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue
@@ -63,7 +63,7 @@
                     <div class="task-content-col">
                         <div class="task-title-row">
                             <span class="task-title">{{ item.enterpriseName || '-' }}</span>
-                            <span v-if="item.isUnion === 1" class="union-badge">联</span>
+                            <span v-if="item.isUnion === 1 && item.associatedPlans && item.associatedPlans.length" class="union-badge">联</span>
                         </div>
                         <div class="task-time-info">
                             <van-icon name="clock-o" size="14" color="#999" />
@@ -302,6 +302,7 @@ const getTimeStart = (item) => {
     const time = item.planActualTime || item.planTime;
     if (time === 1) return '09:00';
     if (time === 2) return '14:00';
+    if (time === 3) return '18:00';
     return '';
 };
 
@@ -309,12 +310,13 @@ const getTimeEnd = (item) => {
     const time = item.planActualTime || item.planTime;
     if (time === 1) return '12:00';
     if (time === 2) return '18:00';
+    if (time === 3) return '21:00';
     return '';
 };
 
 const getTimeRange = (item) => {
     const time = item.planActualTime || item.planTime;
-    if (time === 3) return '其他';
+    // if (time === 3) return '其他';
     return `${getTimeStart(item)}-${getTimeEnd(item)}`;
 };
 
@@ -371,6 +373,14 @@ const loadTaskList = () => {
             loading.value = false;
             if (res.code === 200 && res.data) {
                 taskList.value = res.data;
+                // 按时段固定排序：上午(1) → 下午(2) → 其他，同一时段的多条任务相邻
+                taskList.value.sort((a, b) => {
+                    const ta = a.planActualTime || a.planTime;
+                    const tb = b.planActualTime || b.planTime;
+                    const ra = ta === 1 ? 0 : ta === 2 ? 1 : 2;
+                    const rb = tb === 1 ? 0 : tb === 2 ? 1 : 2;
+                    return ra - rb;
+                });
                 // 第二次请求：加载联合执法任务的关联单位信息
                 loadAssociatedPlans();
             } else {