From 7059edd39ee5f2d3bae61d2f1704900825281244 Mon Sep 17 00:00:00 2001
From: "wangmingyong@163.com" <wangmingyong@163.com>
Date: Fri, 7 Aug 2026 17:07:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../my/notice/cp_notice_detail.vue            | 26 +-------
 .../src/api/enterprise/planNotice.js          |  2 +-
 .../router/enterprise-app/ent-main-router.js  |  8 +++
 .../enforcement/enforcementEvaluateDetail.vue | 60 ++++++++++++++-----
 .../enforcementRegistrationList.vue           | 24 +++++++-
 .../enterprise/message/messageCenter.vue      |  6 +-
 6 files changed, 81 insertions(+), 45 deletions(-)

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 caa42442..1b8482d2 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
@@ -6,27 +6,7 @@
                 <van-loading size="20" />&nbsp;加载中...
             </div>
             <template v-else-if="detail">
-                <!-- 基本信息卡片
-                <div class="info-card">
-                    <div class="card-title">预告信息</div>
-                    <div class="info-row">
-                        <span class="info-label">状态</span>
-                        <span class="info-value">{{ getStatusText(detail.status) }}</span>
-                    </div>
-                    <div class="info-row">
-                        <span class="info-label">发布时间</span>
-                        <span class="info-value">{{ formatDate(detail.createTime) }}</span>
-                    </div>
-                    <div class="info-row">
-                        <span class="info-label">执法日期</span>
-                        <span class="info-value">{{ detail.enforceDate || '-' }} {{ getTimeText(detail.enforceTime) }}</span>
-                    </div>
-                    <div class="info-row">
-                        <span class="info-label">执法单位</span>
-                        <span class="info-value">{{ detail.bureauDeptName || '-' }}</span>
-                    </div>
-                </div> -->
-
+                <!-- 基本信息卡片 -->
                 <div class="info-card">
                     <div class="info-row">
                         <span class="info-label">企业名称</span>
@@ -42,7 +22,7 @@
                     </div>
                       <div class="info-row">
                         <span class="info-label">执法日期</span>
-                        <span class="info-value">{{ detail.enforceDate || '-' }} {{ getTimeText(detail.enforceTime) }}</span>
+                        <span class="info-value">{{ formatDate(detail.enforceDate) || '-' }} {{ getTimeText(detail.enforceTime) }}</span>
                     </div>
                       <div class="info-row">
                         <span class="info-label">执法事项</span>
@@ -101,7 +81,7 @@ const getTimeText = (time) => {
 
 const formatDate = (dateStr) => {
     if (!dateStr) return '';
-    return String(dateStr).substring(0, 16).replace('T', ' ');
+    return String(dateStr).substring(0, 10).replace('T', ' ');
 };
 
 const onBack = () => { router.back(); };
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/planNotice.js b/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/planNotice.js
index 34745f04..f7c32dd0 100644
--- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/planNotice.js
+++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/planNotice.js
@@ -6,7 +6,7 @@ let enterpriseAppBaseUrl = "/app-ent";
 export const getPlanNoticeList = (params, success, error) => _get(enterpriseAppBaseUrl +"/enterprise/lawNotice/myList",params,success,error);
 
 //执法预告详情
-export const getPlanNoticeDetail = (params, success, error) => _get(enterpriseAppBaseUrl +"/planNotice/" + params.id,{},success,error);
+export const getPlanNoticeDetail = (params, success, error) => _get(enterpriseAppBaseUrl +"/enterprise/lawNotice/noticeDetails",params,success,error);
 
 //执法预告留言列表
 export const getPlanNoticeMessageList = (params, success, error) => _get(enterpriseAppBaseUrl +"/planNotice/message/list",params,success,error);
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js b/zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js
index f892816c..771a3e23 100644
--- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js
+++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js
@@ -123,6 +123,14 @@ const routes = [
         component: () =>
             import("@/views/enterprise/plan/planNoticeList.vue"),
     },
+    // 执法预告详情
+    {
+        path: "/enterprise/planNoticeDetail",
+        name: "planNoticeDetail",
+        meta: { title: "预告详情" },
+        component: () =>
+            import("@/views/enterprise/plan/planNoticeDetail.vue"),
+    },
     // 执法预告留言
     {
         path: "/enterprise/planNoticeMessage",
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue
index 49edec92..d6d860c6 100644
--- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue
+++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue
@@ -28,11 +28,9 @@
                 <div class="info-row">
                     <span class="info-label">执法人员</span>
                     <div class="info-value enforcer-value">
-                        <div>
-                            {{ detail.lawEnforcerDisplay }}
-                        </div>
-                        <div v-for="(item, index) in detail.lawEnforcer2List" :key="index">
-                            {{ item }}
+                        <div v-for="(person, index) in getEnforcers(detail)" :key="index" class="enforcer-item">
+                            <span class="enforcer-name">{{ person.name }}</span>
+                            <span class="enforcer-phone">{{ person.phone }}</span>
                         </div>
                     </div>
                 </div>
@@ -282,19 +280,33 @@ const pickFirst = (obj, keys, fallback = '') => {
     return fallback;
 };
 
-// 解析执法人员
-const parseEnforcers = (data) => {
+// 解析执法人员（支持逗号分隔的多人）
+const getEnforcers = (data) => {
     const list = [];
-    if (data.lawEnforcer) list.push({ name: data.lawEnforcer, phone: data.lawEnforcerId || '' });
-    if (data.lawEnforcerTwo) list.push({ name: data.lawEnforcerTwo, phone: data.lawEnforcerIdTwo || '' });
-    const raw = data.enforcers || data.enforcerList || [];
+    // 第一名执法人员
+    if (data.lawEnforcer) {
+        list.push({ name: data.lawEnforcer, phone: data.lawEnforcerId || '' });
+    }
+    // 第二名及之后：lawEnforcerTwo 和 lawEnforcerIdTwo 均为逗号分隔字符串
+    if (data.lawEnforcerTwo) {
+        const names = String(data.lawEnforcerTwo).split(',');
+        const phones = data.lawEnforcerIdTwo ? String(data.lawEnforcerIdTwo).split(',') : [];
+        names.forEach((name, i) => {
+            const trimmed = name.trim();
+            if (trimmed) list.push({ name: trimmed, phone: phones[i] ? phones[i].trim() : '' });
+        });
+    }
+    // 数组形式（兼容其他字段名）
+    const raw = data.enforcers || data.enforcerList || data.lawEnforcer2List || [];
     if (Array.isArray(raw) && raw.length) {
         raw.forEach(p => {
-            if (typeof p === 'string') list.push({ name: p, phone: '' });
-            else list.push({
-                name: p.name || p.userName || p.realName || '',
-                phone: p.phone || p.mobile || p.tel || ''
-            });
+            if (typeof p === 'string') {
+                list.push({ name: p, phone: '' });
+            } else {
+                const name = p.name || p.userName || p.realName || '';
+                const phone = p.phone || p.mobile || p.tel || '';
+                if (name) list.push({ name, phone });
+            }
         });
     }
     return list.filter(p => p.name);
@@ -526,6 +538,24 @@ const onSubmit = () => {
 .enforcer-value {
     display: flex;
     flex-direction: column;
+    gap: 4px;
+}
+
+.enforcer-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 14px;
+    line-height: 1.6;
+
+    .enforcer-name {
+        color: #666;
+        font-weight: 500;
+    }
+
+    .enforcer-phone {
+        color: #999;
+    }
 }
 
 .result-row {
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue
index 0836986f..8837d785 100644
--- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue
+++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue
@@ -26,9 +26,7 @@
                             <div class="card-row">
                                 <span class="card-label">执法人员：</span>
                                 <span class="enforcer-block">
-                                    <!-- <div v-for="(enforcer, idx) in getEnforcers(item)" :key="idx">{{ enforcer }}</div> -->
-                                     <div>{{ item.lawEnforcerDisplay || '-' }}</div>
-                                     <div v-for="value in item.lawEnforcer2List" :key="value">{{ value || '-' }}</div>
+                                    <div v-for="(enforcer, idx) in getEnforcers(item)" :key="idx">{{ enforcer }}</div>
                                 </span>
                             </div>
                             <div class="card-row">
@@ -85,6 +83,26 @@ const formatDate = (dateStr) => {
     const day = String(d.getDate()).padStart(2, '0');
     return `${y}-${m}-${day}`;
 };
+
+// ========== 执法人员展示（姓名 + 空格 + 手机号，支持逗号分隔的多人）==========
+const getEnforcers = (item) => {
+    const list = [];
+    // 第一名执法人员：lawEnforcer + lawEnforcerId
+    if (item.lawEnforcer) {
+        list.push(`${item.lawEnforcer} ${item.lawEnforcerId || ''}`);
+    }
+    // 第二名及之后：lawEnforcerTwo 和 lawEnforcerIdTwo 均为逗号分隔字符串
+    if (item.lawEnforcerTwo) {
+        const names = String(item.lawEnforcerTwo).split(',');
+        const phones = item.lawEnforcerIdTwo ? String(item.lawEnforcerIdTwo).split(',') : [];
+        names.forEach((name, i) => {
+            const trimmed = name.trim();
+            if (trimmed) list.push(`${trimmed} ${phones[i] ? phones[i].trim() : ''}`);
+        });
+    }
+    return list.length ? list : ['-'];
+};
+
 // ========== 加载数据 ==========
 const fetchList = () => {
     const params = {
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/message/messageCenter.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/message/messageCenter.vue
index b8545336..b146e39b 100644
--- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/message/messageCenter.vue
+++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/message/messageCenter.vue
@@ -330,9 +330,9 @@ const onClickLeft = () => {
 
 onMounted(() => {
     // 设置深i企标题
-    w6s.ready(() => {
-        w6s.header.setTitle('消息中心');
-    });
+    // w6s.ready(() => {
+    //     w6s.header.setTitle('消息中心');
+    // });
     // 优先从sessionStorage获取返回时要显示的tab页（用于页面返回时定位）
     const returnTab = sessionStorage.getItem('messageReturnTab');
     if (returnTab === '1') {