From e5eeb40f3544aa7acce48b55532158006f155bb7 Mon Sep 17 00:00:00 2001 From: "wangmingyong@163.com" Date: Tue, 28 Jul 2026 15:42:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E5=9D=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/FooterBar.vue | 29 ++++---- .../src/api/enterprise/planNotice.js | 2 +- .../enforcement/enforcementChat.vue | 4 +- .../views/enterprise/plan/planNoticeList.vue | 73 +++++++------------ 4 files changed, 44 insertions(+), 64 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 dc69f70f..aa2b5b84 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 @@ -1,7 +1,7 @@ @@ -35,9 +35,11 @@ const tabs = [ { key: 'home', label: '首页', route: '/enforcement/enforcementHome', path: '' - }, - { key: 'query', label: '查询', route: '/enforcement/query', - path: '' }, + }, + { + key: 'query', label: '查询', route: '/enforcement/query', + path: '' + }, // { // key: 'program', label: '计划', route: '/enforcement/program', // path: '' @@ -63,7 +65,7 @@ const onTabClick = (item) => { if (item.key === props.active) return; if (router.currentRoute.value.path !== item.route) { router.replace(item.route); - } + } // console.log('获取消息未读数量2222'); // fetchMessageUnreadCount(); }; @@ -153,17 +155,16 @@ onMounted(() => { .footer-badge { position: absolute; top: -4px; - right: -10px; - min-width: 16px; - height: 16px; - line-height: 16px; - padding: 0 4px; + right: -8px; + // width: 16px; + // height: 16px; + padding: 0px 4px; background: #f5222d; color: #fff; font-size: 10px; text-align: center; - border-radius: 8px; + border-radius: 16px; border: 2px solid #fff; - box-sizing: content-box; + box-sizing: border-box; } 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 6b600caa..b21ee828 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 @@ -3,7 +3,7 @@ import { _get, _post, _put } from "../../http/index"; let enterpriseAppBaseUrl = "/app-ent"; //执法预告列表（计划预告-企业端） -export const getPlanNoticeList = (params, success, error) => _get(enterpriseAppBaseUrl +"/planNotice/list",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); diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementChat.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementChat.vue index dd482c45..fa0cdbdf 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementChat.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementChat.vue @@ -13,9 +13,9 @@ -
+
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/plan/planNoticeList.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/plan/planNoticeList.vue index cb0e0196..f13a53f6 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/plan/planNoticeList.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/plan/planNoticeList.vue @@ -14,12 +14,7 @@ - - - +
@@ -40,9 +35,9 @@ >
执法时间： - {{ item.checkTime }} + {{ item.enforceDate }}
-
{{ item.checkItemText }}
+
执法单位： {{ item.bureauDeptName }} @@ -65,8 +60,10 @@ import { ref } from 'vue'; import { useRouter } from 'vue-router'; import { showToast } from 'vant'; import 'vant/es/toast/style'; -import { getLawNoticeList } from '@/api/enterprise'; +import { getPlanNoticeList } from '@/api/enterprise/planNotice'; +import SearchFilterBar from '@/components/common/SearchFilterBar.vue'; +const { useCommon } = $globalStore; const router = useRouter(); // ========== 列表状态 ========== @@ -77,17 +74,26 @@ const refreshing = ref(false); const pageNum = ref(1); const pageSize = ref(10); const searchText = ref(''); +const dateType = ref(null); +const dateSearch = ref(null); // ========== 加载数据 ========== const fetchList = () => { const params = { pageNum: pageNum.value, pageSize: pageSize.value, + enterpriseNumber: useCommon.enterpriseNumber, }; if (searchText.value) { params.searchValue = searchText.value; } - getLawNoticeList(params, (res) => { + if (dateType.value != null && dateType.value !== 9) { + params.dateType = dateType.value; + } + if (dateSearch.value) { + params.dateSearch = dateSearch.value; + } + getPlanNoticeList(params, (res) => { if (res.code === 200) { const rows = res.rows || res.data?.rows || res.data?.list || res.data || []; const total = res.total ?? res.data?.total ?? 0; @@ -139,8 +145,11 @@ const onClickLeft = () => { router.back(); }; -// ========== 搜索 ========== -const onSearch = () => { +// ========== 搜索筛选 ========== +const onSearchFilter = ({ searchText: st, dateType: dt, dateSearch: ds }) => { + searchText.value = st; + dateType.value = dt; + dateSearch.value = ds; pageNum.value = 1; list.value = []; finished.value = false; @@ -148,26 +157,10 @@ const onSearch = () => { fetchList(); }; -// ========== 清空搜索 ========== -const onClear = () => { - searchText.value = ''; - onSearch(); -}; - -// ========== 筛选点击 ========== -const onFilterClick = () => { - showToast('筛选功能开发中'); -}; - -// ========== 搜索点击 ========== -const onSearchClick = () => { - showToast('搜索功能开发中'); -}; - // ========== 反馈点击 ========== const onFeedback = (item) => { router.push({ - path: '/enforcement/enforcementChat', + path: '/enterprise/enforcementChat', query: { title: item.title, bureauDeptName: item.bureauDeptName, @@ -218,6 +211,7 @@ const onFeedback = (item) => { padding: 0.3rem 0.35rem; margin-bottom: 0.27rem; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); + position: relative; } .card-row { @@ -250,6 +244,9 @@ const onFeedback = (item) => { display: flex; justify-content: flex-end; margin-top: 0.2rem; + // position: absolute; + // right: 10px; + // bottom:8px; } .feedback-btn { @@ -283,22 +280,4 @@ const onFeedback = (item) => { } } } -/* ===== Vant 搜索框样式覆盖 ===== */ -:deep(.van-search__content) { - height: 0.9rem; - border: 1px solid #ececec; - border-radius: 0.15rem 0 0 0.15rem; -} - -:deep(.van-search__action) { - margin: 0 3% 0 0; - width: 10%; - height: 0.9rem; - background: #1367fe; - border: 0.01rem solid #1367fe; - border-radius: 0 0.15rem 0.15rem 0; - color: #fff; - text-align: center; - line-height: 0.9rem; -}