From b89d209141d567d267b82352736a7f8f048b2bf6 Mon Sep 17 00:00:00 2001
From: "wangmingyong@163.com" <wangmingyong@163.com>
Date: Thu, 30 Jul 2026 14:11:59 +0800
Subject: [PATCH] =?UTF-8?q?UI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/FooterBar.vue              |   2 -
 .../router/enforcement-app/enf-main-router.js |  10 +-
 .../enforcement/enforce/enforcementChat.vue   |  68 +++--
 .../enforce/enforcementNoticeList.vue         |  38 ++-
 .../message/enforcementTaskList.vue           |   1 +
 .../enforcement/message/messageCenter.vue     |  20 +-
 .../views/enforcement/my/enforcementMy.vue    |  54 +---
 .../my/notice/cp_notice_detail.vue            |   6 +-
 .../enforcement/my/notice/cp_notice_edit.vue  |   6 +-
 .../enforcement/my/notice/cp_notice_list.vue  |   6 +-
 .../my/notice/cp_notice_tab_content.vue       |   4 +-
 .../enforcement/my/plan/cp_plan_edit.vue      |   2 +-
 .../enforcement/my/plan/cp_plan_list.vue      |   6 +-
 .../enforcement/my/plan/cp_plan_mine.vue      | 265 +++---------------
 .../enforcement/my/plan/cp_plan_other.vue     |   6 +-
 15 files changed, 142 insertions(+), 352 deletions(-)

diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue
index aa2b5b84..abff4e9d 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/FooterBar.vue
@@ -156,8 +156,6 @@ onMounted(() => {
     position: absolute;
     top: -4px;
     right: -8px;
-    // width: 16px;
-    // height: 16px;
     padding: 0px 4px;
     background: #f5222d;
     color: #fff;
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js
index 3ff82f11..500f23a7 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/router/enforcement-app/enf-main-router.js
@@ -76,7 +76,7 @@ const routes = [
         name: "enforcementQuery",
         component: () => import("@/views/enforcement/query/enforcementQuery.vue"),
         meta: {
-            isKeepAlive: true,
+            isKeepAlive: false,
         },
     },
     // 执法端-消息中心（tabbar）
@@ -85,7 +85,7 @@ const routes = [
         name: "enforcementMessage",
         component: () => import("@/views/enforcement/message/messageCenter.vue"),
         meta: {
-            isKeepAlive: true,
+            isKeepAlive: false,
         },
     },
     // 执法端-通知列表（tabbar）
@@ -94,7 +94,7 @@ const routes = [
         name: "enforcementNoticeList",
         component: () => import("@/views/enforcement/enforce/enforcementNoticeList.vue"),
         meta: {
-            isKeepAlive: true,
+            isKeepAlive: false,
         },
     },
     // 执法端-执法预告反馈聊天
@@ -148,7 +148,7 @@ const routes = [
         name: "enforcementMy",
         component: () => import("@/views/enforcement/my/enforcementMy.vue"),
         meta: {
-            isKeepAlive: true,
+            isKeepAlive: false,
         },
     },
     // 执法端-计划（tabbar）
@@ -157,7 +157,7 @@ const routes = [
         name: "enforcementProgram",
         component: () => import("@/views/enforcement/program"),
         meta: {
-            isKeepAlive: true,
+            isKeepAlive: false,
         },
     },
     // 执法端-计划列表（嵌套路由：我的计划 / 其他计划）
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementChat.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementChat.vue
index e3e0c490..2d34bfb0 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementChat.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementChat.vue
@@ -122,15 +122,17 @@
 </template>
 
 <script setup name="enforcementChat">
-import { ref, nextTick } from 'vue';
+import { ref, nextTick, onMounted } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { showToast } from 'vant';
 import 'vant/es/toast/style';
+import { getNoticeMessages, addNoticeMessage } from '@/api/enforcement/notice';
 
 const router = useRouter();
 const route = useRoute();
 
 // ========== 从路由参数获取信息 ==========
+const noticeId = route.query.id|| '';
 const bureauDeptName = ref(route.query.bureauDeptName || '深圳司法局');
 const contactPerson = ref(route.query.contactPerson || '付明明 周昂');
 const noticeTitle = ref(route.query.title || '安全生产检查');
@@ -138,26 +140,27 @@ const noticeTitle = ref(route.query.title || '安全生产检查');
 // ========== 头像占位 ==========
 const selfAvatar = 'https://placehold.co/40x40/447bf5/fff?text=我';
 const otherAvatar = 'https://placehold.co/40x40/999/fff?text=企';
-
 // ========== 消息列表 ==========
-const messageList = ref([
-    {
-        id: 1,
-        sender: 'other',
-        content: `您好，我司将于${route.query.enforcementTime || '2026-04-07'}进行执法检查，特此告知。`,
-        time: '2026-03-31 10:20',
-        avatar: otherAvatar,
-        isRecalled: false,
-    },
-    {
-        id: 2,
-        sender: 'self',
-        content: '收到，我们会做好准备工作。',
-        time: '2026-03-31 18:32',
-        avatar: selfAvatar,
-        isRecalled: false,
-    },
-]);
+const messageList = ref([]);
+// ========== 加载留言列表 ==========
+const loadMessageList = () => {
+    if (!noticeId) return;
+    getNoticeMessages(noticeId, (res) => {
+        if (res && res.code === 200 && res.data) {
+            messageList.value = res.data.map(item => ({
+                id: item.id,
+                sender: item.sender === 'self' ? 'self' : 'other',
+                content: item.content || item.message || '',
+                time: item.createTime || item.time || '',
+                avatar: item.sender === 'self' ? selfAvatar : otherAvatar,
+                isRecalled: item.isRecalled || false,
+            }));
+            nextTick(() => scrollToBottom());
+        }
+    }, () => {
+        showToast('加载消息失败');
+    });
+};
 
 const inputMessage = ref('');
 const messageListRef = ref(null);
@@ -315,23 +318,44 @@ const sendMessage = () => {
     const now = new Date();
     const timeStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} ${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
 
-    messageList.value.push({
+    const newMsg = {
         id: Date.now(),
         sender: 'self',
         content: text,
         time: timeStr,
         avatar: selfAvatar,
         isRecalled: false,
-    });
+    };
 
+    messageList.value.push(newMsg);
     inputMessage.value = '';
 
+    // 调用新增留言接口
+    if (noticeId) {
+        addNoticeMessage({
+            noticeId,
+            content: text,
+        }, (res) => {
+            if (res && res.code === 200) {
+                newMsg.id = res.data?.id || newMsg.id;
+            }
+        }, () => {
+            showToast('发送失败');
+            messageList.value.pop();
+        });
+    }
+
     // 滚动到底部
     nextTick(() => {
         scrollToBottom();
     });
 };
 
+// ========== 页面挂载加载数据 ==========
+onMounted(() => {
+    loadMessageList();
+});
+
 // ========== 滚动到底部 ==========
 const scrollToBottom = () => {
     const el = messageListRef.value;
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementNoticeList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementNoticeList.vue
index 8dda32c2..a180a299 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementNoticeList.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementNoticeList.vue
@@ -1,17 +1,17 @@
 <template>
     <div class="notice-list-page">
         <!-- 顶部导航栏 -->
-        <van-nav-bar
+        <!-- <van-nav-bar
             title="执法预告"
             left-text="关闭"
             left-arrow
             @click-left="onClickLeft"
-        >
-            <!-- <template #right>
+        > -->
+        <!-- <template #right>
                 <van-icon name="filter-o" size="20" @click="onFilterClick" />
                 <van-icon name="search" size="20" style="margin-left: 12px;" @click="onSearchClick" />
             </template> -->
-        </van-nav-bar>
+        <!-- </van-nav-bar> -->
 
         <!-- 搜索栏 -->
         <SearchFilterBar :search-value="searchText" @search="onSearch" @clear="onClear" />
@@ -19,20 +19,10 @@
         <!-- 列表区域 -->
         <div class="list-container">
             <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-                <van-list
-                    v-model:loading="loading"
-                    :finished="finished"
-                    finished-text=""
-                    @load="onLoad"
-                    :offset="50"
-                >
+                <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="onLoad" :offset="50">
                     <van-empty v-if="finished && list.length === 0" description="暂无数据" />
 
-                    <div
-                        class="notice-card"
-                        v-for="item in list"
-                        :key="item.id"
-                    >
+                    <div class="notice-card" v-for="item in list" :key="item.id">
                         <div class="card-row time-row">
                             <span class="label">执法时间：</span>
                             <span class="value">{{ item.checkTime }}</span>
@@ -43,7 +33,8 @@
                             <span class="value">{{ item.bureauDeptName }}</span>
                         </div>
                         <div class="card-action">
-                            <span class="feedback-btn" :class="{ 'has-dot': item.hasFeedback }" @click="onFeedback(item)">
+                            <span class="feedback-btn" :class="{ 'has-dot': item.hasFeedback }"
+                                @click="onFeedback(item)">
                                 <van-icon name="chat-o" size="14" />
                                 反馈
                             </span>
@@ -56,7 +47,7 @@
 </template>
 
 <script setup name="enforcementNoticeList">
-import { ref } from 'vue';
+import { ref, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { showToast } from 'vant';
 import 'vant/es/toast/style';
@@ -117,7 +108,7 @@ const fetchList = () => {
 
 // ========== 触底加载 ==========
 const onLoad = () => {
-    if (refreshing.value) return;
+     if (loading.value || finished.value) return;
     fetchList();
 };
 
@@ -168,12 +159,15 @@ const onFeedback = (item) => {
     router.push({
         path: '/enforcement/enforcementChat',
         query: {
-            title: item.title,
-            bureauDeptName: item.bureauDeptName,
-            enforcementTime: item.enforcementTime,
+            noticeId: item.id,
         }
     });
 };
+
+// ========== 页面挂载加载数据 ==========
+onMounted(() => {
+    fetchList();
+});
 </script>
 
 <style lang="less" scoped>
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue
index f0e3a508..4ee5fd33 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue
@@ -147,6 +147,7 @@ const onDateChange = ({ dateType: type, dateSearch: search }) => {
 };
 
 onMounted(() => {
+    console.log('enforcementTaskList mounted');
     fetchTaskList();
 });
 </script>
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue
index 1bc80efb..e56df254 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/messageCenter.vue
@@ -125,15 +125,17 @@ const initMessageList = () => {
             icon: 'law',
             iconBg: 'icon-blue',
             unreadCount: pffwCount.value,
-        },{
-            id: 2,
-            title: '计划通知',
-            desc: '',
-            time: '',
-            icon: 'law',
-            iconBg: 'icon-blue',
-            unreadCount: jhtzcount.value,
-        },{
+        },
+        // {
+        //     id: 2,
+        //     title: '计划通知',
+        //     desc: '',
+        //     time: '',
+        //     icon: 'law',
+        //     iconBg: 'icon-blue',
+        //     unreadCount: jhtzcount.value,
+        // },
+        {
             id: 3,
             title: '执法反馈',
             desc: '',
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue
index 7f65208e..0a4366db 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue
@@ -2,7 +2,6 @@
     <div class="my-page app_content">
         <!-- 顶部蓝色背景（含城市天际线 + 用户信息） -->
         <div class="header-bg">
-            <div class="cityscape"></div>
 
             <div class="user-wrap">
                 <div class="avatar">
@@ -40,7 +39,7 @@
             </div>
 
             <!-- 设置单独一组卡片 -->
-            <div class="menu-card menu-card--split">
+            <!-- <div class="menu-card menu-card--split">
                 <div class="menu-item menu-item--last" @click="onMenuClick(settingItem)">
                     <div class="menu-icon" :class="settingItem.iconClass">
                         <component :is="settingItem.iconComp"/>
@@ -52,7 +51,7 @@
                         </svg>
                     </div>
                 </div>
-            </div>
+            </div> -->
         </div>
 
         <!-- 底部导航栏 -->
@@ -147,58 +146,18 @@ const onMenuClick = (item) => {
     flex-direction: column;
     height: 100%;
     background: #fbfdff;
-    font-family: none;
     overflow: hidden;
 }
 
 /* ===== 顶部蓝色背景 ===== */
 .header-bg {
     position: relative;
-    background: linear-gradient(180deg, #2b7de9 0%, #5ba3f5 60%, #a0cdf8 100%);
+    background: url('@/assets/images/bg_msg_2.jpg') no-repeat center center / cover;
     padding: 24px 20px 70px;
     overflow: hidden;
     flex-shrink: 0;
 }
 
-.cityscape {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    height: 110px;
-    opacity: 0.2;
-    pointer-events: none;
-
-    &::before {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        left: 6%;
-        width: 8%;
-        height: 60px;
-        background: rgba(255, 255, 255, 0.5);
-        border-radius: 2px 2px 0 0;
-        box-shadow:
-            22px 18px 0 rgba(255, 255, 255, 0.4),
-            48px 30px 0 rgba(255, 255, 255, 0.35),
-            75px 12px 0 rgba(255, 255, 255, 0.3);
-    }
-
-    &::after {
-        content: '';
-        position: absolute;
-        bottom: 0;
-        right: 10%;
-        width: 6%;
-        height: 80px;
-        background: rgba(255, 255, 255, 0.4);
-        border-radius: 2px 2px 0 0;
-        box-shadow:
-            -30px 20px 0 rgba(255, 255, 255, 0.35),
-            -55px 35px 0 rgba(255, 255, 255, 0.28),
-            -80px 18px 0 rgba(255, 255, 255, 0.22);
-    }
-}
 
 .user-wrap {
     position: relative;
@@ -248,10 +207,13 @@ const onMenuClick = (item) => {
 .menu-wrap {
     flex: 1;
     overflow-y: auto;
-    padding: 0 16px 16px;
-    margin-top: -48px;
+    padding:10px;
+    margin-top: -42px;
     position: relative;
     z-index: 2;
+    background: #fbfdff;
+    border-top-left-radius: 14px;
+    border-top-right-radius: 14px;
 }
 
 .menu-card {
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_detail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_detail.vue
index 0f672e2f..f5389777 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_detail.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_detail.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="notice-detail-page app_content">
         <!-- 顶部导航 -->
-        <van-nav-bar
+        <!-- <van-nav-bar
             title="预告详情"
             left-arrow
             @click-left="onBack"
-        />
+        /> -->
 
         <div class="content">
             <div v-if="loading" class="loading-wrap">
@@ -133,7 +133,7 @@ onMounted(() => {
     display: flex;
     flex-direction: column;
     height: 100%;
-    background: #eaf4ff;
+    background: #fbfdff;
     overflow: hidden;
 }
 
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_edit.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_edit.vue
index e51ada36..40aafb48 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_edit.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_edit.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="notice-edit-page app_content">
         <!-- 顶部导航 -->
-        <van-nav-bar
+        <!-- <van-nav-bar
             :title="pageTitle"
             left-arrow
             @click-left="onBack"
-        />
+        /> -->
 
         <div class="content">
             <!-- 表单 -->
@@ -687,7 +687,7 @@ const doSubmit = (isDraft) => {
     display: flex;
     flex-direction: column;
     height: 100%;
-    background: #eaf4ff;
+    background: #fbfdff;
     overflow: hidden;
 }
 
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue
index 9428f047..91fca3f3 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_list.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="notice-page app_content">
         <!-- 顶部导航 -->
-        <van-nav-bar
+        <!-- <van-nav-bar
             title="预告"
             left-arrow
             @click-left="onBack"
-        />
+        /> -->
 
         <!-- Tab 切换 -->
         <van-tabs
@@ -165,7 +165,7 @@ const onPublish = (item) => {
     display: flex;
     flex-direction: column;
     height: 100%;
-    background: #eaf4ff;
+    background: #fbfdff;
     position: relative;
     overflow: hidden;
 }
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue
index 74aeaafe..87b64857 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue
@@ -43,7 +43,7 @@
                             <div class="value">{{ item.enforceUserNames || '-' }}</div>
                         </div>
 
-                        <div class="info-row">
+                        <!-- <div class="info-row">
                             <div class="label">联系人：</div>
                             <div class="value">{{ item.contactPerson || '-' }}</div>
                         </div>
@@ -51,7 +51,7 @@
                         <div class="info-row">
                             <div class="label">联系电话：</div>
                             <div class="value">{{ item.contactPhone || '-' }}</div>
-                        </div>
+                        </div> -->
 
                         <!-- 操作按钮 -->
                         <div class="card-actions" v-if="canPublish || canEdit || canDelete || canMessage || canReinitiate" @click.stop>
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_edit.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_edit.vue
index 6ec09f21..85864092 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_edit.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_edit.vue
@@ -805,7 +805,7 @@ const doSubmit = () => {
     display: flex;
     flex-direction: column;
     height: 100%;
-    background: #eaf4ff;
+    background: #fbfdff;
     overflow: hidden;
 }
 
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_list.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_list.vue
index b58dac8d..ef8c8247 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_list.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_list.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="plan-page app_content">
         <!-- 顶部导航 -->
-        <van-nav-bar
+        <!-- <van-nav-bar
             title="计划"
             left-arrow
             @click-left="onBack"
-        />
+        /> -->
 
         <!-- Tab 切换（通过路由切换） -->
         <van-tabs
@@ -71,7 +71,7 @@ const onAdd = () => {
     display: flex;
     flex-direction: column;
     height: 100%;
-    background: #eaf4ff;
+    background: #fbfdff;
     position: relative;
     overflow: hidden;
 }
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_mine.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_mine.vue
index 19c08e5b..46228dbf 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_mine.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_mine.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="plan-mine">
         <!-- 状态过滤栏 -->
-        <div class="filter-bar">
+        <!-- <div class="filter-bar">
             <div
                 v-for="opt in filterOptions"
                 :key="opt.label"
@@ -11,34 +11,11 @@
             >
                 {{ opt.label }}
             </div>
-        </div>
+        </div> -->
 
-        <!-- 搜索触发栏 -->
-        <div class="search-trigger" @click="showSearchPopup = true">
-            <van-icon name="search" size="16" color="#666" />
-            <span class="search-trigger-text">{{ searchSummary || '点击筛选查询' }}</span>
-            <van-icon v-if="hasSearchCondition" name="clear" size="14" color="#999" @click.stop="onResetSearch" />
-        </div>
-
-        <!-- 排序栏 -->
-        <div class="sort-bar">
-            <div
-                class="sort-item"
-                :class="{ active: sortField === 'createTime' }"
-                @click="onToggleSort('createTime')"
-            >
-                <span>创建时间</span>
-                <van-icon v-if="sortField === 'createTime'" :name="sortOrder === 'desc' ? 'arrow-down' : 'arrow-up'" size="12" />
-            </div>
-            <div
-                class="sort-item"
-                :class="{ active: sortField === 'planDate' }"
-                @click="onToggleSort('planDate')"
-            >
-                <span>执行日期</span>
-                <van-icon v-if="sortField === 'planDate'" :name="sortOrder === 'desc' ? 'arrow-down' : 'arrow-up'" size="12" />
-            </div>
-        </div>
+        <!-- 统一搜索和时间筛选组件 -->
+        <SearchFilterBar :search-value="searchText" :date-type="dateType" :date-search="dateSearch"
+            @search="onSearch" @clear="onClear" @date-change="onDateChange" />
 
         <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
             <van-list
@@ -58,12 +35,12 @@
                         }"
                         @click="onToggleExpand(item)"
                     >
-                        <div class="card-header">
+                        <!-- <div class="card-header">
                             <div class="card-type">{{ item.isUnion === 1 ? '联合执法' : '非联合执法' }} / {{ item.isPublic === 1 ? '公开' : '非公开' }}</div>
                             <div class="status blue" style="display: none">
                                 {{ getStatusText(item.reserveStatus) }}
                             </div>
-                        </div>
+                        </div> -->
 
                         <div class="plan-title">{{ item.enforceContent }}</div>
 
@@ -158,58 +135,15 @@
                 <van-empty v-if="!loading && planList.length === 0" description="暂无计划" />
             </van-list>
         </van-pull-refresh>
-
-        <!-- 搜索弹窗 -->
-        <van-popup v-model:show="showSearchPopup" position="bottom" round :style="{ maxHeight: '70%' }">
-            <div class="search-popup">
-                <div class="search-popup-title">筛选查询</div>
-                <van-field
-                    v-model="tempSearchForm.planDate"
-                    label="执法日期"
-                    placeholder="请选择"
-                    readonly
-                    is-link
-                    @click="showSearchDate = true"
-                >
-                    <template #right-icon>
-                        <van-icon v-if="tempSearchForm.planDate" name="clear" @click.stop="tempSearchForm.planDate = ''" />
-                    </template>
-                </van-field>
-                <van-field
-                    v-model="tempSearchForm.enterpriseName"
-                    label="企业名称"
-                    placeholder="输入企业名称"
-                    clearable
-                />
-                <van-field
-                    v-model="tempSearchForm.enforceContent"
-                    label="执法事项"
-                    placeholder="输入执法事项"
-                    clearable
-                />
-                <div class="search-popup-actions">
-                    <van-button plain type="default" size="small" @click="onResetSearch">重置</van-button>
-                    <van-button type="primary" size="small" @click="onConfirmSearch">查询</van-button>
-                </div>
-            </div>
-        </van-popup>
-
-        <!-- 日期选择器 -->
-        <van-popup v-model:show="showSearchDate" position="bottom" round :style="{ zIndex: 3000 }">
-            <van-date-picker
-                v-model="searchDateValue"
-                title="选择执法日期"
-                @confirm="onSearchDateConfirm"
-                @cancel="showSearchDate = false"
-            />
-        </van-popup>
     </div>
 </template>
 
 <script setup name="cpPlanMine">
+import { ref, onMounted } from 'vue';
 import { showConfirmDialog, showToast } from 'vant';
 import { useRouter } from 'vue-router';
 import { getPlanList, deletePlan } from '@/api/enforcement/plan';
+import SearchFilterBar from '@/components/common/SearchFilterBar.vue';
 
 const router = useRouter();
 
@@ -227,75 +161,28 @@ const onFilterChange = (val) => {
     doSearch();
 };
 
-// 排序相关
-const sortField = ref('createTime'); // createTime | planDate
-const sortOrder = ref('desc');       // desc | asc
-
-const onToggleSort = (field) => {
-    if (sortField.value === field) {
-        // 同一字段切换升降序
-        sortOrder.value = sortOrder.value === 'desc' ? 'asc' : 'desc';
-    } else {
-        // 切换字段，默认降序
-        sortField.value = field;
-        sortOrder.value = 'desc';
+// 搜索和日期筛选相关
+const searchText = ref('');
+const dateType = ref(null);
+const dateSearch = ref(null);
+
+const onSearch = ({ searchValue } = {}) => {
+    if (searchValue !== undefined) {
+        searchText.value = searchValue;
     }
     doSearch();
 };
 
-// 搜索相关
-const searchForm = ref({
-    planDate: '',
-    enterpriseName: '',
-    enforceContent: '',
-});
-const tempSearchForm = ref({
-    planDate: '',
-    enterpriseName: '',
-    enforceContent: '',
-});
-const showSearchPopup = ref(false);
-const showSearchDate = ref(false);
-const searchDateValue = ref([
-    String(new Date().getFullYear()),
-    String(new Date().getMonth() + 1).padStart(2, '0'),
-    String(new Date().getDate()).padStart(2, '0'),
-]);
-
-// 是否有搜索条件
-const hasSearchCondition = computed(() => {
-    const f = searchForm.value;
-    return !!(f.planDate || f.enterpriseName || f.enforceContent);
-});
-
-// 搜索摘要
-const searchSummary = computed(() => {
-    const f = searchForm.value;
-    const parts = [];
-    if (f.planDate) parts.push(f.planDate);
-    if (f.enterpriseName) parts.push(f.enterpriseName);
-    if (f.enforceContent) parts.push(f.enforceContent);
-    return parts.join(' | ');
-});
-
-// 日期确认
-const onSearchDateConfirm = ({ selectedValues }) => {
-    tempSearchForm.value.planDate = selectedValues.join('-');
-    showSearchDate.value = false;
-};
-
-// 确认搜索
-const onConfirmSearch = () => {
-    searchForm.value = { ...tempSearchForm.value };
-    showSearchPopup.value = false;
+const onClear = () => {
+    searchText.value = '';
+    dateType.value = null;
+    dateSearch.value = null;
     doSearch();
 };
 
-// 重置搜索
-const onResetSearch = () => {
-    tempSearchForm.value = { planDate: '', enterpriseName: '', enforceContent: '' };
-    searchForm.value = { planDate: '', enterpriseName: '', enforceContent: '' };
-    showSearchPopup.value = false;
+const onDateChange = ({ dateType: dt, dateSearch: ds }) => {
+    dateType.value = dt;
+    dateSearch.value = ds;
     doSearch();
 };
 
@@ -313,7 +200,7 @@ const finished = ref(false);
 const refreshing = ref(false);
 const pageNum = ref(1);
 const pageSize = 10;
-const expandedId = ref(null); // 当前展开的卡片ID
+const expandedId = ref(null);
 
 // 切换展开/收起
 const onToggleExpand = (item) => {
@@ -368,12 +255,9 @@ const fetchList = () => {
     loading.value = true;
     const params = { pageNum: pageNum.value, pageSize };
     // 携带搜索条件
-    if (searchForm.value.planDate) params.planDate = searchForm.value.planDate;
-    if (searchForm.value.enterpriseName) params.enterpriseName = searchForm.value.enterpriseName;
-    if (searchForm.value.enforceContent) params.enforceContent = searchForm.value.enforceContent;
-    // 携带排序条件
-    params.orderByColumn = sortField.value;
-    params.isAsc = sortOrder.value;
+    if (searchText.value) params.searchValue = searchText.value;
+    // 携带日期筛选条件
+    if (dateSearch.value) params.planDate = dateSearch.value;
     // 携带状态过滤
     if (filterStatus.value) {
         params['params[reserveStatusList]'] = filterStatus.value;
@@ -428,15 +312,19 @@ const onDeletePlan = (item) => {
         });
     }).catch(() => {});
 };
+
+// 页面挂载加载数据
+onMounted(() => {
+    loading.value = true;
+    fetchList();
+});
 </script>
 
 <style lang="less" scoped>
 .plan-mine {
     height: 100%;
     overflow-y: auto;
-    padding: 12px;
     padding-top: 0;
-    box-sizing: border-box;
 }
 
 .filter-bar {
@@ -464,91 +352,11 @@ const onDeletePlan = (item) => {
     }
 }
 
-.search-trigger {
-    margin-top: 8px;
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    background: #fff;
-    border-radius: 20px;
-    padding: 10px 14px;
-    margin-bottom: 8px;
-    box-shadow: 0 2px 8px rgba(44, 116, 190, 0.06);
-    cursor: pointer;
-
-    .search-trigger-text {
-        flex: 1;
-        font-size: 13px;
-        color: #999;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-}
-
-.sort-bar {
-    display: flex;
-    align-items: center;
-    gap: 16px;
-    margin-bottom: 12px;
-    padding: 0 4px;
-
-    .sort-item {
-        display: flex;
-        align-items: center;
-        gap: 3px;
-        font-size: 13px;
-        color: #999;
-        cursor: pointer;
-        padding: 4px 10px;
-        border-radius: 14px;
-        transition: all 0.2s;
-
-        &.active {
-            color: #2382cf;
-            font-weight: 500;
-            background: rgba(35, 130, 207, 0.08);
-        }
-    }
-}
-
-.search-popup {
-    padding: 16px;
-
-    .search-popup-title {
-        font-size: 16px;
-        font-weight: 600;
-        text-align: center;
-        margin-bottom: 16px;
-        color: #333;
-    }
-
-    :deep(.van-field) {
-        padding: 10px 0;
-    }
-
-    :deep(.van-field__label) {
-        width: 65px;
-        font-size: 14px;
-        color: #666;
-    }
-
-    .search-popup-actions {
-        display: flex;
-        gap: 12px;
-        margin-top: 20px;
-        padding: 0 10px;
-
-        .van-button {
-            flex: 1;
-        }
-    }
-}
-
 .plan-list {
     display: flex;
     flex-direction: column;
-    gap: 14px;
+    padding:10px 12px;
+    box-sizing: border-box;
 }
 
 /* 卡片通用 */
@@ -556,6 +364,7 @@ const onDeletePlan = (item) => {
     border-radius: 14px;
     padding: 16px;
     overflow: hidden;
+    margin-bottom: 14px;
 }
 
 .card-header {
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_other.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_other.vue
index 5b355d7d..24366dc5 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_other.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_other.vue
@@ -20,10 +20,10 @@
                         :key="item.id"
                         class="plan-card normal-card pending-card"
                     >
-                        <div class="card-header">
+                        <!-- <div class="card-header">
                             <div class="card-type">{{ item.isUnion === 1 ? '联合执法' : '非联合执法' }}</div>
                             <div class="status blue">待预约</div>
-                        </div>
+                        </div> -->
 
                         <div class="plan-title">{{ item.enforceContent }}</div>
 
@@ -323,7 +323,7 @@ const onReservePlan = (item) => {
 
 // 提示无法预约：仅当服务端返回500且消息为"请先添加我的计划再进行预约"时，才显示"添加计划"按钮
 const showCannotReserveDialog = (item, code, msg) => {
-    const needAddPlanBtn = code === 500 && msg === '请先添加我的计划再进行预约';
+    const needAddPlanBtn = code === 500 && msg === '请先添加计划再进行预约';
     if (needAddPlanBtn) {
         showDialog({
             title: '提示',