From 0a034f25219d258771f48291665e70875f92b65a Mon Sep 17 00:00:00 2001 From: "wangmingyong@163.com" Date: Fri, 7 Aug 2026 11:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=A0=E6=89=A7=E6=B3=95?= =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enforcement/nos/RegisterPopups.vue | 5 +- .../register/EnforcementInfoSection.vue | 36 ++- .../register/EnterpriseInfoSection.vue | 5 + .../register/EnterpriseSelector.vue | 3 +- .../enforcement/register/RegisterPopups.vue | 2 +- .../src/store/Common.js | 8 +- .../enforce/enforcementNoticeList.vue | 15 +- .../enforcement/home/enforcementHome.vue | 1 + .../src/views/enforcement/loginByPassword.vue | 1 + .../my/notice/cp_notice_detail.vue | 286 ++++++++---------- .../enforcement/my/notice/cp_notice_edit.vue | 2 +- .../enforcement/my/plan/cp_plan_edit.vue | 2 +- 12 files changed, 191 insertions(+), 175 deletions(-) diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue index 5c825c63..2f6bc8f8 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue @@ -49,7 +49,7 @@
{{ person.userName }}
-
执法证件号：{{ person.lawEnforcerIdCard ?? person.lawEnforcerPhone }}
+
执法证件号：{{ person.lawCertificateNum || person.phonenumber || person.mobileNumber }}
@@ -302,7 +302,10 @@ const loadPersonList = () => { lawEnforcerId: item.userId, lawEnforcerName: item.userName, lawEnforcerPhone: item.phonenumber, + lawCertificateNum: item.lawCertificateNum, + mobileNumber: item.mobileNumber, })) + console.log(data) const total = res.total || res.count || 0 if (personPageNum.value === 1) { diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue index 4fc4fa11..b75604e9 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnforcementInfoSection.vue @@ -15,7 +15,7 @@
*执法人员
- {{ defaultPerson?.name }} {{ defaultPerson?.phonenumber }} + {{ defaultPerson?.name }} {{ defaultPerson?.lawCertificateNum || defaultPerson?.phonenumber }}
@@ -396,14 +396,16 @@ const onAfterReadImage = (file) => { .required-mark { color: #ee0a24; - font-size: 0.32rem; - margin-right: 0.08rem; + font-size: 15px; font-weight: bold; + position: absolute; + left: -4px; + top: 2px; } .form-label { font-size: 14px; - color: #333; + color: #000; flex: none; width: 2.4rem; font-weight: 500; @@ -467,12 +469,10 @@ const onAfterReadImage = (file) => { } .basis-container { - margin-bottom: 0.12rem; - margin-left: 6px; } .basis-row { - padding: 0.24rem 0.32rem; + padding: 0.26rem 0.42667rem; } .basis-wrapper { @@ -554,7 +554,10 @@ const onAfterReadImage = (file) => { justify-content: flex-end; color: #000; } - + :deep(.van-field__label) { + font-size: 14px; + color: #000; + } :deep(.van-checkbox__label) { font-size: 14px; color: #333; @@ -575,7 +578,7 @@ const onAfterReadImage = (file) => { :deep(.van-field__label) { font-size: 14px; - color: #333; + color: #000; } } @@ -624,11 +627,11 @@ const onAfterReadImage = (file) => { } .file-upload-row { - padding: 0px 20px 20px 20px; + padding: 0px 20px 20px 16px; .file-upload-label { font-size: 14px; - color: #333; + color: #000; margin-bottom: 0.16rem; } } @@ -639,4 +642,15 @@ const onAfterReadImage = (file) => { border-radius: 0.1rem; } } +.entrusted-options{ + :deep(.van-field__label){ + width:100px; + color: #000; + } +} +:deep(.van-field__label--required:before){ + position: absolute; + left: 8px; + top: 10px; +} diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnterpriseInfoSection.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnterpriseInfoSection.vue index 291fa14e..38d2a975 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnterpriseInfoSection.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnterpriseInfoSection.vue @@ -87,4 +87,9 @@ const handleClick = () => { color: #000; } +:deep(.van-field__label--required:before){ + position: absolute; + left: 8px; + top: 10px; +} \ No newline at end of file diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnterpriseSelector.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnterpriseSelector.vue index 068b36d4..e58cd063 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnterpriseSelector.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/EnterpriseSelector.vue @@ -17,7 +17,8 @@
- + +
{{ item.enterpriseName }}
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue index 20e26966..3ca0108f 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue @@ -58,7 +58,7 @@
{{ person.userName }}
-
执法证件号：{{ person.mobileNumber }}
+
执法证件号：{{ person.lawCertificateNum || person.phonenumber || person.mobileNumber }}
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/Common.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/Common.js index 5e727ed2..6c1e98a4 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/Common.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/store/Common.js @@ -36,6 +36,8 @@ export default defineStore('useCommon', { firstLoad: true, // 是否执法人员 hasLaw: false, + // 执法证件号 + lawCertificateNum: "", }), getters: {}, actions: { @@ -115,6 +117,10 @@ export default defineStore('useCommon', { SET_HAS_LAW(data){ this.hasLaw = data; }, + //设置执法证件号 + SET_LAW_CERTIFICATE_NUM(data){ + this.lawCertificateNum = data; + }, // 获取多语言数据 /*async getLang(params) { let url = $globalRequestUrl({ @@ -157,6 +163,6 @@ export default defineStore('useCommon', { }, persist: { storage: sessionStorage, - pick: ['token', 'userId', 'userName', 'nickName', 'enterpriseNumber', 'enterpriseName', 'enterpriseId', 'phonenumber', 'deptId', 'deptName', 'organId', 'organName', 'bureauUnitId', 'bureauUnitName', 'hasLaw'], + pick: ['token', 'userId', 'userName', 'nickName', 'enterpriseNumber', 'enterpriseName', 'enterpriseId', 'phonenumber', 'deptId', 'deptName', 'organId', 'organName', 'bureauUnitId', 'bureauUnitName', 'hasLaw', 'lawCertificateNum'], }, }); 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 aae3a9da..a873d2a8 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 @@ -22,7 +22,7 @@ -
+
执法时间： {{ item.enforceDate }} @@ -34,7 +34,7 @@
@@ -164,6 +164,16 @@ const onFeedback = (item) => { }); }; +// ========== 查看预告详情 ========== +const onViewDetail = (item) => { + router.push({ + path: '/enforcement/notice/detail', + query: { + id: item.id, + } + }); +}; + // ========== 页面挂载加载数据 ========== onMounted(() => { fetchList(); @@ -211,6 +221,7 @@ onMounted(() => { padding: 0.3rem 0.35rem; margin-bottom: 0.27rem; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); + cursor: pointer; } .card-row { diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue index 13345c3e..1326666b 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue @@ -233,6 +233,7 @@ onMounted(() => { useCommon.SET_BUREAU_UNIT_ID(success.data.bureauUnitId); useCommon.SET_BUREAU_UNIT_NAME(success.data.bureauUnitName || ""); useCommon.SET_HAS_LAW(success.data.lawOfficer || ""); + useCommon.SET_LAW_CERTIFICATE_NUM(success.data.lawCertificateNum || ""); isLoading.value = false; fetchNoticeList(); fetchBannerList(); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue index 83f9735e..984077a4 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/loginByPassword.vue @@ -135,6 +135,7 @@ const doLogin = (secretName, secretKey) => { useCommon.SET_BUREAU_UNIT_ID(response.data.bureauUnitId); useCommon.SET_BUREAU_UNIT_NAME(response.data.bureauUnitName || ""); useCommon.SET_HAS_LAW(response.data.lawOfficer || ""); + useCommon.SET_LAW_CERTIFICATE_NUM(response.data.lawCertificateNum || ""); useCommon.SET_IS_FIRST_LOAD(false); console.log("bureauUnitName", response.data.bureauUnitName); console.log("enforcement login success", useCommon.userId); 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 f5389777..caa42442 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,76 +1,80 @@ @@ -102,6 +106,17 @@ const formatDate = (dateStr) => { const onBack = () => { router.back(); }; +const goFeedback = () => { + const id = route.query.id; + router.push({ + path: '/enforcement/notice/message', + query: { + id: id, + readonly: 0 + } + }); +}; + onMounted(() => { const id = route.query.id; if (!id) { @@ -134,28 +149,13 @@ onMounted(() => { flex-direction: column; height: 100%; background: #fbfdff; - overflow: hidden; } -:deep(.van-nav-bar) { - background: #347bc3; - flex-shrink: 0; - - .van-nav-bar__title { - color: #fff; - font-size: 18px; - font-weight: 600; - } - - .van-icon { - color: #fff; - } -} - -.content { +.content-area { flex: 1; overflow-y: auto; - padding: 12px; + padding: 0.27rem; + padding-bottom: 1.8rem; } .loading-wrap { @@ -167,127 +167,101 @@ onMounted(() => { font-size: 14px; } -.form-card { +/* ===== 信息卡片 ===== */ +.info-card { background: #fff; - border-radius: 14px; - padding: 16px; - margin-bottom: 12px; - box-shadow: 0 4px 14px rgba(44, 116, 190, 0.08); + border-radius: 4px; + padding: 0.3rem 0.35rem; + margin-bottom: 0.27rem; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); } -.card-header { +.card-title { + font-size: 0.4rem; + font-weight: bold; + color: #333; + margin-bottom: 0.25rem; + padding-bottom: 0.15rem; + border-bottom: 1px solid #f0f0f0; display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 12px; -} - -.status-tag { - font-size: 12px; - font-weight: 500; - padding: 3px 10px; - border-radius: 10px; -} - -.status-0 { - background: #f0f0f0; - color: #666; -} - -.status-1 { - background: #e6f7ff; - color: #1890ff; -} - -.status-2 { - background: #fff2e8; - color: #fa8c16; -} - -.status-3 { - background: #f6ffed; - color: #52c41a; -} - -.card-date { - font-size: 12px; - color: #999; -} - -.notice-title { - font-size: 16px; - font-weight: 700; - color: #111; - line-height: 1.5; - margin-bottom: 14px; + align-items: baseline; } .info-row { display: flex; align-items: flex-start; - margin-bottom: 8px; - font-size: 14px; - line-height: 1.5; - - &:last-child { - margin-bottom: 0; + font-size: 0.32rem; + line-height: 1.8; + padding: 6px 0px; + + .info-label { + color: #333; + margin-right: 18px; + font-size: 14px; + width: 70px; + flex-shrink: 0; + } + .info-value { + color: #999; + flex: 1; + word-break: break-all; + font-size: 14px; } } -.label { - width: 80px; - flex-shrink: 0; - color: #333; - font-weight: 500; -} - -.value { - flex: 1; - color: #8a8a8a; +.content-text { + color: #555; + line-height: 1.6; word-break: break-all; + white-space: pre-wrap; } -.section-title { - font-size: 15px; - font-weight: 600; - color: #333; - margin-bottom: 10px; - padding-bottom: 8px; - border-bottom: 1px solid #f0f0f0; -} - -.person-list { +/* ===== 执法人员 ===== */ +.enforcer-list { display: flex; flex-direction: column; gap: 8px; + padding: 6px 0px; } -.person-line { +.enforcer-item { display: flex; align-items: center; font-size: 14px; color: #666; gap: 12px; - .person-name { + .enforcer-name { font-weight: 500; + color: #999; } - .person-phone { + .enforcer-phone { color: #999; } } +.detail_content{ + height: 100px; +} -.empty-text { - font-size: 14px; - color: #ccc; +/* ===== 底部反馈按钮 ===== */ +.footer-bar { + position: fixed; + bottom: 0; + left: 0; + right: 0; + padding: 0.2rem 0.4rem; + padding-bottom: calc(0.2rem + env(safe-area-inset-bottom)); + background: #fff; + box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05); + z-index: 10; } -.content-text { - font-size: 14px; - color: #555; - line-height: 1.6; - word-break: break-all; - white-space: pre-wrap; +.feedback-btn { + background: #2b7de9; + border: none; + border-radius: 0.3rem; + font-size: 0.34rem; + height: 0.88rem; } 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 40aafb48..19a2c211 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 @@ -232,7 +232,7 @@ >
{{ user.fullname || user.userName }}
- {{ user.mobileNumber }} + {{ user.lawCertificateNum || user.phonenumber || user.mobileNumber }}
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 11ad4308..e19e4217 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 @@ -194,7 +194,7 @@ >
{{ user.fullname || user.userName }}
- {{ user.mobileNumber }} + {{ user.lawCertificateNum || user.phonenumber || user.mobileNumber }}