From e3d9742e7c9865543234acf234f69837498ad222 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Fri, 23 May 2025 16:56:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=BD=AE=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enforce/enforceNoticeBase.vue     | 13 ++++++++++---
 src/views/enforce/enterpriseWarningInfo.vue | 14 +++++++++++---
 src/views/enforceHome.vue                   | 17 +++++++++--------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/views/enforce/enforceNoticeBase.vue b/src/views/enforce/enforceNoticeBase.vue
index 36f5fd7..b9caa67 100644
--- a/src/views/enforce/enforceNoticeBase.vue
+++ b/src/views/enforce/enforceNoticeBase.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="home app_content">
 
-    <van-tabs v-model:active="active" sticky @click-tab="onClickTab">
+    <van-tabs v-model:active="data.TabId" sticky @click-tab="onClickTab">
       <van-tab v-for="(item, index) in data.list" :title="item.title">
         <div v-if="data.TabId == 0" style="height: calc(100vh - 1.2rem);">
           <enforcementPlanAdd :isReg="0" />
@@ -17,14 +17,16 @@
 <script setup name="enforceNoticeBase">
 import enforcementPlanAdd from '@/views/enforce/enforceNotice.vue';
 import enforcementPlanList from '@/views/enforce/enforceNoticeSystem.vue';
+import {detail} from "@/api/enforce.js";
 
 const {useCommon} = $globalStore;
 //路由参数
 const router = useRouter();
 const route = useRoute();
 
+
 //tab切换
-const active = ref(0);
+let active = ref(0);
 const data = reactive({
   status: 0,
   TabId: 0,
@@ -50,7 +52,12 @@ const onClickTab = ({ title }) => {
 
 
 onMounted(() => {
-
+  let type = route.query?.type;
+  if (type!=null && type =='0') {
+    data.TabId = 0;
+  }else if (type!=null && type =='1'){
+    data.TabId = 1;
+  }
 })
 
 </script>
diff --git a/src/views/enforce/enterpriseWarningInfo.vue b/src/views/enforce/enterpriseWarningInfo.vue
index de9a82c..2c99819 100644
--- a/src/views/enforce/enterpriseWarningInfo.vue
+++ b/src/views/enforce/enterpriseWarningInfo.vue
@@ -78,13 +78,15 @@
 		//搜索框
 		searchValue: ref(''),
 		//时间类型
-		dateType: 1,
+		dateType: 4,
 		//是否投诉
 		isComplaint: null,
 		//企业统一信用码
 		enterpriseNumber: ref(useCommon.enterpriseNumber),
     //搜索时间
     searchDate: ref(),
+    beginTime: null,
+    endTime: null,
     warnType: 1,
     //用户ID
     userId: useCommon.userId,
@@ -120,6 +122,12 @@ const warnListInfoList = ref([])
 		data.dateSearch = nowDate(new Date());
 	});
 	const queryList = () =>{
+    //默认展示前30个自然日
+    const formatDate = (date) =>
+        `${date.getFullYear()}-${date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1)
+            : date.getMonth()+1}-${date.getDate() < 10 ? '0'+date.getDate() : date.getDate()}`;
+    searchParam.beginTime = formatDate(new Date(new Date().setDate(new Date().getDate() - 30)));
+    searchParam.endTime = formatDate(new Date());
     queryRegistrationListNew(searchParam,success =>{
 			data.dataList = success.rows;
 		},error =>{
@@ -242,7 +250,7 @@ const warnListInfoList = ref([])
 
 
 	const searchWarnType = (val) =>{
-		searchParam.dateType =  1;
+		searchParam.dateType =  4;
 		searchParam.isComplaint =  null;
     searchParam.warnType =  val;
 		queryList();
@@ -254,7 +262,7 @@ const warnListInfoList = ref([])
 	}
 	const searchComplaint = (val) =>{
 		searchParam.isComplaint =  val;
-		searchParam.dateType =  1;
+		searchParam.dateType =  4;
 		queryList();
 	}
   const selectByEnterpriseNumber = (val,id,show) =>{
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 4ba2432..d603307 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -54,7 +54,7 @@
     import Vconsolefrom from 'vconsole';
     import {Loading, showFailToast,showToast} from 'vant';
     import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home';
-    import {queryEnforcementInspectionProgramListNoPermissionNoPaging} from "@/api/enforce";
+    import {queryEnforcementNotice} from "@/api/enforce";
 
     const isLoading = ref(true);
     const {useCommon} = $globalStore;
@@ -155,9 +155,9 @@
         if (null != item) {
             router.push(
                 {
-                    path: "/enforce/enforcementPlanDetailed",
+                    path: "/enforce/enforceNotice",
                     query: {
-                        id:item.id
+                        type:item.type
                     }
                 });
         } else {
@@ -165,7 +165,7 @@
         }
     }
     const queryList = () => {
-        queryEnforcementInspectionProgramListNoPermissionNoPaging({isPublish:1,dateType:4}, success => {
+      queryEnforcementNotice({isPublish:1,dateType:4}, success => {
 /*             if (success.rows.length > 4) {
                 for (let i = 0; i < 5; i++) {
                     carouselList.push(success.rows[i]);
@@ -181,12 +181,12 @@
                 }
                 noticeStr += success.rows[0].planName != null ? success.rows[0].planName + "" : "";
             } else { */
-                carouselList = success.data;
+                carouselList = success.rows;
                 if(carouselList.length==0){
                     data.notNull=false
                 }
-                for (let index = 0; index < success.data.length; index++) {
-                    const element = success.data[index];
+                for (let index = 0; index < success.rows.length; index++) {
+                    const element = success.rows[index];
                     console.log(element);
                     // element.planName = element.planYear + element.planName;
                     if(element.timeType == 'quarter'){
@@ -204,7 +204,8 @@
                     noticeObj.noticeList.push(element.planName);
                           var obj = {
                               content: element.planName,
-                              id:element.id
+                              id:element.id,
+                              type:element.type
                           }
                           data.noticeList.push(obj)
               }