From 1446fb6d000fb8c078d1d595afe2df41a3acf325 Mon Sep 17 00:00:00 2001
From: "wangmingyong@163.com" <wangmingyong@163.com>
Date: Fri, 24 Jul 2026 10:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/enforcement/index.js              |  2 +-
 .../enforcement/enforce/enforcementList.vue   | 12 +---
 .../message/enforcementTaskList.vue           | 72 +++++++++++--------
 .../src/views/enforcement/scanEntQRCode.vue   |  2 +-
 4 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
index 0f7ff5b4..401bd76d 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
@@ -75,7 +75,7 @@ export const addNonRegistration = (params, success, error) => _post(baseUrl + "/
 export const queryEnforcementNoticeList = (params, success, error) => _post(baseUrl + "/enforcement/queryList", params, success, error);
 
 // 执法预告列表
-export const getLawNoticeList = (params, success, error) => _post(baseUrl + "/enforcement/queryList", params, success, error);
+export const getLawNoticeList = (params, success, error) => _get(baseUrl + "/cpNotice/myList", params, success, error);
 
 //计划通知列表
 export const queryListNoPermission = (params, success, error) => _get(baseUrl + "/inspectionProgram/queryListNoPermission", params, success, error);
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
index f3c92ab5..82a8c9cf 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementList.vue
@@ -1,13 +1,7 @@
 <template>
     <div class="registration-list-page">
-        <SearchFilterBar 
-            :search-value="searchText" 
-            :date-type="dateType" 
-            :date-search="dateSearch"
-            @search="onSearch" 
-            @clear="onClear" 
-            @date-change="onDateChange" 
-        />
+        <SearchFilterBar :search-value="searchText" :date-type="dateType" :date-search="dateSearch" @search="onSearch"
+            @clear="onClear" @date-change="onDateChange" />
 
         <!-- 可滚动列表区域 -->
         <div class="list-container">
@@ -112,7 +106,6 @@ const fetchList = () => {
     if (dateSearch.value) {
         params.dateSearch = dateSearch.value;
     }
-
     queryEnforcementRegistrationPageList(params, (res) => {
         if (res.code === 200 || res.code === 0) {
             const rows = res.data || res.rows || [];
@@ -320,5 +313,4 @@ onMounted(() => {
         padding: 6px;
     }
 }
-
 </style>
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 9cbd1c13..6faad011 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
@@ -46,7 +46,9 @@
 <script setup name="enforcementTaskList">
 import { ref, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
+import { showToast } from 'vant';
 import SearchFilterBar from '@/components/common/SearchFilterBar.vue';
+import { getMyTaskList } from '@/api/enforcement/task';
 
 const router = useRouter();
 
@@ -66,40 +68,50 @@ const goBack = () => {
 
 const fetchTaskList = () => {
     loading.value = true;
-    setTimeout(() => {
-        const mockData = [
-            {
-                time: '2026-02-19 16:20',
-                enterpriseName: '深圳市新粤云有限公司',
-                checkTime: '2026-02-20 上午',
-                enforcementItem: '日常检查'
-            },
-            {
-                time: '2026-03-20 14:20',
-                enterpriseName: '深圳市新粤云有限公司',
-                checkTime: '2026-03-21 上午',
-                enforcementItem: '日常检查'
-            },
-            {
-                time: '2026-4-19 15:20',
-                enterpriseName: '深圳市新粤云有限公司',
-                checkTime: '2026-04-20 上午',
-                enforcementItem: '日常检查'
+    const params = {
+        pageNum: pageNum.value,
+        pageSize: pageSize.value,
+    };
+    console.log(searchText.value);
+    if (searchText.value) {
+        params.searchValue = searchText.value;
+    }
+    if (dateType.value !== null && dateType.value !== undefined) {
+        params.dateType = dateType.value;
+    }
+    if (dateSearch.value) {
+        params.dateSearch = dateSearch.value;
+    }
+    getMyTaskList(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;
+
+            if (refreshing.value) {
+                taskList.value = Array.isArray(rows) ? rows : [];
+                refreshing.value = false;
+            } else {
+                taskList.value = [...taskList.value, ...(Array.isArray(rows) ? rows : [])];
             }
-        ];
-        let filteredData = mockData;
-        if (searchText.value) {
-            const keyword = searchText.value.toLowerCase();
-            filteredData = filteredData.filter(item => 
-                item.enterpriseName.toLowerCase().includes(keyword) ||
-                item.enforcementItem.toLowerCase().includes(keyword)
-            );
+
+            if (!Array.isArray(rows) || rows.length === 0 || taskList.value.length >= total) {
+                finished.value = true;
+            } else {
+                pageNum.value++;
+            }
+            loading.value = false;
+        } else {
+            finished.value = true;
+            loading.value = false;
+            refreshing.value = false;
+            showToast(res.msg || '加载失败');
         }
-        taskList.value = filteredData;
-        loading.value = false;
+    }, () => {
         finished.value = true;
+        loading.value = false;
         refreshing.value = false;
-    }, 500);
+        showToast('网络请求失败');
+    });
 };
 
 const onLoad = () => {
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue
index 937b298a..346fef58 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/scanEntQRCode.vue
@@ -442,7 +442,7 @@ const selectEnterprise = (item) => {
 
 // 市外注册企业信息录入
 const handleOutOfCityEnterprise = () => {
-    const selectedReasonText = reasonOptions[selectedReason.value]?.text || '';
+    const selectedReasonText = reasonOptions.value[selectedReason.value]?.text || '';
     sessionStorage.setItem('scanReason', selectedReasonText);
     showSearchModal.value = false;
     router.push({