From 118fc9912f8de785392069665f16e1aba456bb54 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Thu, 28 Mar 2024 10:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../footer-enforcement-nav/index.vue          | 19 +++++-----------
 src/views/Home.vue                            |  2 +-
 src/views/enforce/enforcementPlan.vue         |  6 +++--
 src/views/enforce/sign.vue                    |  1 +
 src/views/enterprise/complaint.vue            | 12 ++++++++++
 src/views/enterprise/complaintNoScan.vue      | 14 ++----------
 .../enterprise/enterpriseInspectionList.vue   |  2 +-
 src/views/enterprise/registrationList.vue     | 22 +++++++++++++------
 8 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/components/footer-enforcement-nav/index.vue b/src/components/footer-enforcement-nav/index.vue
index e0000d7..61b6c80 100644
--- a/src/components/footer-enforcement-nav/index.vue
+++ b/src/components/footer-enforcement-nav/index.vue
@@ -4,31 +4,22 @@
 			<van-tabbar-item name="Home" replace icon="wap-home-o" to="/enforceHome">{{
 				$t("common.lang_home")
 			}}</van-tabbar-item>
-			<van-tabbar-item name="Classify" replace icon="shop-o" to="/earlyWarning">
-        <span>预警</span>
-        <template #icon="props">
-          <img :src="props.active ? icon.warn : icon.warn" />
-        </template>
-			</van-tabbar-item>
+			<van-tabbar-item name="Classify" replace icon="warn-o" to="/earlyWarning">预警</van-tabbar-item>
 			<van-tabbar-item
-				name="Shop"
+				name="plan"
 				replace
-				icon="cart-o"
+				icon="clock-o"
 				to="/appointmentList"
-				:dot="data.dot"
-				:badge="goodsNum"
 				>预约</van-tabbar-item
 			>
       <van-tabbar-item
 				name="Shop"
 				replace
-				icon="cart-o"
+				icon="records-o"
 				to="/enforce/enforcementPlan"
-				:dot="data.dot"
-				:badge="goodsNum"
 				>计划</van-tabbar-item
 			>
-			<van-tabbar-item name="My" replace icon="manager-o" to="/my">{{
+			<van-tabbar-item name="My" replace icon="manager-o" to="">{{
 				$t("common.lang_my")
 			}}</van-tabbar-item>
 		</van-tabbar>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 0b6db69..ffc6768 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -22,7 +22,7 @@
           <div class="boutique_body">
 						<!-- <goodsCard :goodsList="boutique" :cardAttr="boutiqueAttr"></goodsCard> -->
             <div class="box-info" @click="toRegistrationListView">
-              <span class="box-info-text" >历史检查信息</span>
+              <span class="box-info-text" >执法记录查询</span>
             </div>
             <div class="box-complaint" @click="toComplaintView">
               <span class="box-complaint-text">执法投诉</span>
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index 9016b3a..8a7bd94 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -4,8 +4,7 @@
 		<!-- 导航栏 -->
 		<div class="header_body">
 			<header-nav
-				:slefBack="true"
-				@goBack="goBack"
+        :leftArrow="false"
 				:titelText="`公布执法检查计划`"
 			>
 			</header-nav>
@@ -71,6 +70,9 @@
                   <div class="card_box_span">
                     <p><span class="card_box_label">执法计划：</span> {{ item.fileObject.fileName }}</p>
                   </div>
+                  <!-- <div class="card_box_span">
+                    <p><span class="card_box_label">执法计划：</span> {{ item.fileObject.fileName }}</p>
+                  </div> -->
 								</div>
 							</van-swipe-cell>
 						</div>
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 47cbe98..4f3e435 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -187,6 +187,7 @@ const tapBad = () => {
     data.bad = "#7FFFD4";
     submitData.reslut = 1;
 }
+//3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
 //初始化参数，获取扫码的企业统一信用编码
 onMounted(() =>{
     //查询企业信息
diff --git a/src/views/enterprise/complaint.vue b/src/views/enterprise/complaint.vue
index 9ed188f..ebb4574 100644
--- a/src/views/enterprise/complaint.vue
+++ b/src/views/enterprise/complaint.vue
@@ -503,4 +503,16 @@ export default {
   color: #333;
   line-height: 1.25;
 }
+/* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
+.van-popup.van-toast{
+    background: var(--van-toast-background) !important;
+    box-sizing: content-box !important;
+    /* 下面3条css,影响不大 */
+    transition: all var(--van-duration-fast) !important;
+    width: var(--van-toast-default-width) !important;
+    max-width: var(--van-toast-max-width) !important;
+}
+.van-popup.van-toast .van-toast__icon{
+    font-size: var(--van-toast-icon-size) !important;
+}
 </style>
diff --git a/src/views/enterprise/complaintNoScan.vue b/src/views/enterprise/complaintNoScan.vue
index 83fc25d..9138a88 100644
--- a/src/views/enterprise/complaintNoScan.vue
+++ b/src/views/enterprise/complaintNoScan.vue
@@ -89,7 +89,7 @@
 
 <script setup name="register">
 
-import { showSuccessToast,showLoadingToast,closeToast  } from 'vant';
+import { showSuccessToast} from 'vant';
 import {addEnterpriseComplaint} from '../../api/enterprise'
 import {getDict} from '../../api/Home'
 import {uploadFile} from '../../util/fileUpload'
@@ -339,7 +339,7 @@ export default {
   border-radius: 1rem;
   font-size: 0.3rem;
 }
-  .popup {
+.popup {
   position: fixed;
   z-index: 999;
   top: 3rem;
@@ -496,14 +496,4 @@ export default {
 }
 
 
-.van-toast__text{
-  background:rgba(63, 196, 6, 0.7) !important;
-  // color: black !important;
-}
-.van-toast{
-  color:#333 !important;
-}
-.van-popup{
-  background: var(--van-gray-5) !important;
-}
 </style>
diff --git a/src/views/enterprise/enterpriseInspectionList.vue b/src/views/enterprise/enterpriseInspectionList.vue
index 92a4784..cc48972 100644
--- a/src/views/enterprise/enterpriseInspectionList.vue
+++ b/src/views/enterprise/enterpriseInspectionList.vue
@@ -115,7 +115,7 @@ let searchParam = reactive({
   //执法部门
   lawEnforcement:"",
   //搜索框
-    searchValue: ref(''),
+  searchText: ref(''),
   //时间类型 
   dateType: null,
   //是否投诉
diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index f5d0232..d4a4467 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -6,12 +6,12 @@
 			<header-nav
 				:slefBack="true"
 				@goBack="goBack"
-				:titelText="`历史检查信息`"
+				:titelText="`执法记录查询`"
 			>
 			</header-nav>
 		</div>
     <van-search
-    v-model="searchParam.searchText"
+    v-model="searchParam.searchValue"
     show-action
     placeholder="请输入关键字查询"
     @search="onSearch"
@@ -30,7 +30,7 @@
     <div class="search-button-date">
       <span class="date-select" @click="selectDate">{{  data.dateSearch }}</span>
       <div style="border-color: black;" class="van-hairline--bottom"></div>
-      <van-button class="search-button"  type="primary" size="mini">统计分析</van-button>
+      <!-- <van-button class="search-button"  type="primary" size="mini">统计分析</van-button> -->
       <van-popup v-model:show="data.showDatePicker" position="bottom">
         <van-date-picker
           title="选择日期"
@@ -61,7 +61,7 @@
                   <!-- <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" /> -->
                   <div  style="border-color: aqua; border: 2px;" class="van-hairline--bottom"></div>
                   <div class="card_box_span">
-                    <p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementIncident }}</p>
+                    <p style="font-size: 16px;font-weight: bold;">{{ item.lawEnforcementItem }}</p>
                   </div>
                   
                   <div class="card_box_span">
@@ -106,13 +106,15 @@ let searchParam = reactive({
   //执法部门
   lawEnforcement:"",
   //搜索框
-  searchText: ref(''),
+  searchValue: ref(''),
   //时间类型 
   dateType: null,
   //是否投诉
   isComplaint: null,
   //企业统一信用码
   enterpriseNumber: ref(useCommon.enterpriseNumber),
+  //时间搜索
+  dateSearch:""
 });
 
 const data = reactive({
@@ -147,7 +149,7 @@ const queryList = () =>{
 const onSearch = (val) => {
   queryRegistrationList(
     {
-      "searchText": searchParam.searchText
+      "searchValue": searchParam.searchText
     }
     ,success =>{
     console.log(success)
@@ -157,7 +159,7 @@ const onSearch = (val) => {
   })
 };
 const onClickButton = () =>{
-  console.log(searchParam.searchText)
+  console.log(searchParam.searchValue)
   queryList();
 }
 
@@ -251,6 +253,9 @@ const onDateConfirm = (value)=> {
       });
       data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1]
       data.showDatePicker = false;
+      //搜索数据
+      searchParam.dateSearch = value.selectedValues[0] + "-" + value.selectedValues[1]
+      queryList();
 }
 const nowDate = (time) => {
     var year = time.getFullYear(); // 年
@@ -268,6 +273,9 @@ const nowDate = (time) => {
 const searchDateType = (val) =>{
   searchParam.dateType =  val;
   searchParam.isComplaint =  null;
+  if(val == null){
+    searchParam.dateSearch = null;
+  }
   queryList();
 }
 const searchComplaint = (val) =>{