Browse Source

bug 修复

dev-V1.10.2-temp
wangmingyong@163.com 3 months ago
parent
commit
7059edd39e
  1. 26
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_detail.vue
  2. 2
      zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/planNotice.js
  3. 8
      zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js
  4. 60
      zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue
  5. 24
      zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue
  6. 6
      zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/message/messageCenter.vue

26
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;加载中... <van-loading size="20" />&nbsp;加载中...
</div> </div>
<template v-else-if="detail"> <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-card">
<div class="info-row"> <div class="info-row">
<span class="info-label">企业名称</span> <span class="info-label">企业名称</span>
@ -42,7 +22,7 @@
</div> </div>
<div class="info-row"> <div class="info-row">
<span class="info-label">执法日期</span> <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>
<div class="info-row"> <div class="info-row">
<span class="info-label">执法事项</span> <span class="info-label">执法事项</span>
@ -101,7 +81,7 @@ const getTimeText = (time) => {
const formatDate = (dateStr) => { const formatDate = (dateStr) => {
if (!dateStr) return ''; if (!dateStr) return '';
return String(dateStr).substring(0, 16).replace('T', ' '); return String(dateStr).substring(0, 10).replace('T', ' ');
}; };
const onBack = () => { router.back(); }; const onBack = () => { router.back(); };

2
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 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); export const getPlanNoticeMessageList = (params, success, error) => _get(enterpriseAppBaseUrl +"/planNotice/message/list",params,success,error);

8
zdxt-web-client/zdxt-efcode-enterprise-app/src/router/enterprise-app/ent-main-router.js

@ -123,6 +123,14 @@ const routes = [
component: () => component: () =>
import("@/views/enterprise/plan/planNoticeList.vue"), import("@/views/enterprise/plan/planNoticeList.vue"),
}, },
// 执法预告详情
{
path: "/enterprise/planNoticeDetail",
name: "planNoticeDetail",
meta: { title: "预告详情" },
component: () =>
import("@/views/enterprise/plan/planNoticeDetail.vue"),
},
// 执法预告留言 // 执法预告留言
{ {
path: "/enterprise/planNoticeMessage", path: "/enterprise/planNoticeMessage",

60
zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue

@ -28,11 +28,9 @@
<div class="info-row"> <div class="info-row">
<span class="info-label">执法人员</span> <span class="info-label">执法人员</span>
<div class="info-value enforcer-value"> <div class="info-value enforcer-value">
<div> <div v-for="(person, index) in getEnforcers(detail)" :key="index" class="enforcer-item">
{{ detail.lawEnforcerDisplay }} <span class="enforcer-name">{{ person.name }}</span>
</div> <span class="enforcer-phone">{{ person.phone }}</span>
<div v-for="(item, index) in detail.lawEnforcer2List" :key="index">
{{ item }}
</div> </div>
</div> </div>
</div> </div>
@ -282,19 +280,33 @@ const pickFirst = (obj, keys, fallback = '') => {
return fallback; return fallback;
}; };
// 解析执法人员 // 解析执法人员(支持逗号分隔的多人)
const parseEnforcers = (data) => { const getEnforcers = (data) => {
const list = []; const list = [];
if (data.lawEnforcer) list.push({ name: data.lawEnforcer, phone: data.lawEnforcerId || '' }); // 第一名执法人员
if (data.lawEnforcerTwo) list.push({ name: data.lawEnforcerTwo, phone: data.lawEnforcerIdTwo || '' }); if (data.lawEnforcer) {
const raw = data.enforcers || data.enforcerList || []; 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) { if (Array.isArray(raw) && raw.length) {
raw.forEach(p => { raw.forEach(p => {
if (typeof p === 'string') list.push({ name: p, phone: '' }); if (typeof p === 'string') {
else list.push({ list.push({ name: p, phone: '' });
name: p.name || p.userName || p.realName || '', } else {
phone: p.phone || p.mobile || p.tel || '' 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); return list.filter(p => p.name);
@ -526,6 +538,24 @@ const onSubmit = () => {
.enforcer-value { .enforcer-value {
display: flex; display: flex;
flex-direction: column; 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 { .result-row {

24
zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue

@ -26,9 +26,7 @@
<div class="card-row"> <div class="card-row">
<span class="card-label">执法人员:</span> <span class="card-label">执法人员:</span>
<span class="enforcer-block"> <span class="enforcer-block">
<!-- <div v-for="(enforcer, idx) in getEnforcers(item)" :key="idx">{{ enforcer }}</div> --> <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>
</span> </span>
</div> </div>
<div class="card-row"> <div class="card-row">
@ -85,6 +83,26 @@ const formatDate = (dateStr) => {
const day = String(d.getDate()).padStart(2, '0'); const day = String(d.getDate()).padStart(2, '0');
return `${y}-${m}-${day}`; 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 fetchList = () => {
const params = { const params = {

6
zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/message/messageCenter.vue

@ -330,9 +330,9 @@ const onClickLeft = () => {
onMounted(() => { onMounted(() => {
// 设置深i企标题 // 设置深i企标题
w6s.ready(() => { // w6s.ready(() => {
w6s.header.setTitle('消息中心'); // w6s.header.setTitle('消息中心');
}); // });
// 优先从sessionStorage获取返回时要显示的tab页(用于页面返回时定位) // 优先从sessionStorage获取返回时要显示的tab页(用于页面返回时定位)
const returnTab = sessionStorage.getItem('messageReturnTab'); const returnTab = sessionStorage.getItem('messageReturnTab');
if (returnTab === '1') { if (returnTab === '1') {

Loading…
Cancel
Save