From 6e6aa724814edc183fb997e5b12d23e4d8b46a82 Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Thu, 19 Sep 2024 14:31:20 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/administrative/appointmentBase.vue  |  4 +--
 .../administrative/appointmentDetail.vue      |  2 --
 src/views/administrative/deptFilter.vue       | 12 +++++----
 src/views/administrative/userFilter.vue       | 22 ++++++++--------
 src/views/enforce/assistUserFilter.vue        | 16 ++++++------
 src/views/enforce/evaluate.vue                |  6 +++--
 src/views/enforce/lawFilter.vue               |  8 +++---
 src/views/enforce/noScanFilter.vue            |  8 +++---
 src/views/enforce/scanQrCode.vue              |  2 +-
 src/views/enforce/sign.vue                    |  8 ++----
 src/views/enforce/userFilter.vue              | 22 ++++++++--------
 src/views/enforce/zqyjjdmFilter.vue           | 25 +++++++++++--------
 .../enterprise/compaint/selectDeptFilter.vue  |  6 +++--
 src/views/enterprise/compaint/uniteDept.vue   |  6 +++--
 src/views/enterprise/companyFilter.vue        |  6 +++--
 .../enterprise/enterpriseInspectionNotice.vue |  4 +--
 src/views/enterprise/registrationDetail.vue   |  2 +-
 src/views/enterprise/registrationEdit.vue     |  2 +-
 18 files changed, 89 insertions(+), 72 deletions(-)

diff --git a/src/views/administrative/appointmentBase.vue b/src/views/administrative/appointmentBase.vue
index c825804..f3b21c0 100644
--- a/src/views/administrative/appointmentBase.vue
+++ b/src/views/administrative/appointmentBase.vue
@@ -58,7 +58,7 @@
               value: '2'
             },
             {
-                title: '实时检查预告',
+                title: '检查预告',
                 value: '0'
             },
             {
@@ -70,7 +70,7 @@
     });
 
     const onClickTab = ({ title }) => {
-      if(title == '实时检查预告'){
+      if(title == '检查预告'){
         data.TabId = 1;
       }else if(title == '历史预告记录'){
         data.TabId = 2;
diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue
index 9022560..7b169d5 100644
--- a/src/views/administrative/appointmentDetail.vue
+++ b/src/views/administrative/appointmentDetail.vue
@@ -30,7 +30,6 @@
                 <div class="flex-div">
                   <van-field
                           v-model="submitData.checkTime"
-                          required
                           is-link
                           label="检查时间"
                           placeholder="日期"
@@ -39,7 +38,6 @@
                   />
                   <van-field
                       v-model="submitData.checkTimeOrderText"
-                      required
                       is-link
                       label=""
                       placeholder="时段"
diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue
index 10c6291..3425ce1 100644
--- a/src/views/administrative/deptFilter.vue
+++ b/src/views/administrative/deptFilter.vue
@@ -272,11 +272,11 @@
 
     .popup-content {
       margin: 0.25rem 0 0;
-      padding-bottom: 3rem;
+      padding-bottom: 1rem;
       width: 100%;
-      height: calc(100% - 1.6rem);
-      overflow-y: auto;
+      height: calc(100% - 2rem);
       font-size: 0.37rem;
+      overflow-y: hidden;
     }
 
     .subsearch {
@@ -390,8 +390,10 @@
     }
 
     .search-result {
-        width: 100%;
-        padding-bottom: 2rem;
+      width: 100%;
+      height: calc(100% - 3rem);
+      padding-bottom: 1rem;
+      overflow-y: auto;
     }
 
     .van-checkbox-group .van-cell-group {
diff --git a/src/views/administrative/userFilter.vue b/src/views/administrative/userFilter.vue
index e6be005..4198efa 100644
--- a/src/views/administrative/userFilter.vue
+++ b/src/views/administrative/userFilter.vue
@@ -175,20 +175,20 @@
     }
 
     .popup-content {
-        margin: 0.25rem 3% 0;
-        padding-bottom: 3rem;
-        width: 94%;
-        height: calc(100% - 1.6rem);
-        overflow-y: auto;
-        font-size: 0.37rem;
+      margin: 0.25rem 3% 0;
+      padding-bottom: 1rem;
+      width: 94%;
+      height: calc(100% - 2rem);
+      font-size: 0.37rem;
+      overflow-y: hidden;
     }
 
     .subsearch {
         display: flex;
         align-items: center;
         justify-content: space-between;
-        margin: 3%;
-        width: 94%;
+        margin: 3% 2%;
+        width: 96%;
         height: 1.25rem;
         font-size: 0.37rem;
     }
@@ -277,8 +277,10 @@
     }
 
     .search-result {
-        width: 100%;
-        padding-bottom: 2rem;
+      width: 100%;
+      height: calc(100% - 3rem);
+      padding-bottom: 1rem;
+      overflow-y: auto;
     }
 
     .case-item {
diff --git a/src/views/enforce/assistUserFilter.vue b/src/views/enforce/assistUserFilter.vue
index bc2400f..e9cb590 100644
--- a/src/views/enforce/assistUserFilter.vue
+++ b/src/views/enforce/assistUserFilter.vue
@@ -134,19 +134,19 @@ export default {
 
 .popup-content {
   margin: 0.25rem 3% 0;
-  padding-bottom: 3rem;
-  width: 94%;
-  height: calc(100% - 1.6rem);
-  overflow-y: auto;
+  padding-bottom: 1rem;
+  width: 96%;
+  height: calc(100% - 2rem);
   font-size: 0.37rem;
+  overflow-y: hidden;
 }
 
 .subsearch {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin: 3%;
-  width: 94%;
+  margin: 3% 2%;
+  width: 96%;
   height: 1.25rem;
   font-size: 0.37rem;
 }
@@ -236,7 +236,9 @@ export default {
 
 .search-result {
   width: 100%;
-  padding-bottom: 2rem;
+  height: calc(100% - 3rem);
+  padding-bottom: 1rem;
+  overflow-y: auto;
 }
 
 .case-item {
diff --git a/src/views/enforce/evaluate.vue b/src/views/enforce/evaluate.vue
index 39d5f65..4bf3b20 100644
--- a/src/views/enforce/evaluate.vue
+++ b/src/views/enforce/evaluate.vue
@@ -380,8 +380,10 @@
   }
 
   .search-result {
-      width: 100%;
-      padding-bottom: 2rem;
+    width: 100%;
+    height: calc(100% - 3rem);
+    padding-bottom: 1rem;
+    overflow-y: auto;
   }
 
   .case-item {
diff --git a/src/views/enforce/lawFilter.vue b/src/views/enforce/lawFilter.vue
index cadbe61..b5afc20 100644
--- a/src/views/enforce/lawFilter.vue
+++ b/src/views/enforce/lawFilter.vue
@@ -1,7 +1,7 @@
 <template>
     <div v-if="visible" class="van-overlay"></div>
     <div v-if="visible" class="popup">
-        <div class="popup-title">预约查询</div>
+        <div class="popup-title">预告查询</div>
         <!-- 关闭按钮 -->
         <label class="close-button" @click="closePopup"></label>
 
@@ -275,8 +275,10 @@
     }
 
     .search-result {
-        width: 100%;
-        padding-bottom: 2rem;
+      width: 100%;
+      height: calc(100% - 3rem);
+      padding-bottom: 1rem;
+      overflow-y: auto;
     }
 
     .case-item {
diff --git a/src/views/enforce/noScanFilter.vue b/src/views/enforce/noScanFilter.vue
index e3d6112..7dbd606 100644
--- a/src/views/enforce/noScanFilter.vue
+++ b/src/views/enforce/noScanFilter.vue
@@ -232,10 +232,10 @@ const props = defineProps( {
 
 .popup-content {
   margin: 0.25rem 3% 0;
-  padding-bottom: 3rem;
+  padding-bottom: 1rem;
   width: 94%;
   height: calc(100% - 1.6rem);
-  overflow-y: auto;
+  overflow: hidden;
   font-size: 0.37rem;
 }
 
@@ -332,7 +332,9 @@ const props = defineProps( {
 
 .search-result {
   width: 100%;
-  padding-bottom: 2rem;
+  height: calc(100% - 5.5rem);
+  padding-bottom: 1rem;
+  overflow-y: auto;
 }
 
 .case-item {
diff --git a/src/views/enforce/scanQrCode.vue b/src/views/enforce/scanQrCode.vue
index 9d3cdde..f5e28a5 100644
--- a/src/views/enforce/scanQrCode.vue
+++ b/src/views/enforce/scanQrCode.vue
@@ -34,7 +34,7 @@
                     </div>
                   <div class="scan-note">扫一扫企业二维码，即可查看企业信息</div>
                   <!--  <div class="nocode" @click="toNoScanView">扫码不成功？手动输入关键词查询 >></div>-->
-                  <div class="nocode" @click="showPopup()">扫码不成功？手动输入关键词查询 >></div>
+                  <div class="nocode" @click="showPopup()">手动登记，请输入关键字搜索企业 >></div>
 
 
 
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index 6d739c1..56c48da 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -22,6 +22,7 @@
                 <van-field v-if="submitData.checkCss == 3"
                     v-model="submitData.enterpriseName"
                     label="企业名称"
+                    required
                     :rules="[{ required: true, message: '必填项' }]"
                     placeholder="企业名称"
                     @click="data.popupCp = true"
@@ -41,7 +42,7 @@
                     <div class="zf-name">执法信息</div>
                     <van-field
                             v-model="submitData.lawText"
-                            label="是否关联预约"
+                            label="是否关联预告"
                             maxlength="100"
                             placeholder="请选择"
                             is-link
@@ -137,11 +138,6 @@
                         <van-field
                                    v-model="submitData.reason"
                                    label="原&nbsp; &nbsp; &nbsp; &nbsp;因"
-                                   rows="2"
-                                   autosize
-                                   type="textarea"
-                                   maxlength="100"
-                                   show-word-limit
                                    readonly="true"
                         />
                     </view>
diff --git a/src/views/enforce/userFilter.vue b/src/views/enforce/userFilter.vue
index 6f610a4..00d957b 100644
--- a/src/views/enforce/userFilter.vue
+++ b/src/views/enforce/userFilter.vue
@@ -181,20 +181,20 @@
     }
 
     .popup-content {
-        margin: 0.25rem 3% 0;
-        padding-bottom: 3rem;
-        width: 94%;
-        height: calc(100% - 1.6rem);
-        overflow-y: auto;
-        font-size: 0.37rem;
+      margin: 0.25rem 3% 0;
+      padding-bottom: 1rem;
+      width: 96%;
+      height: calc(100% - 2rem);
+      font-size: 0.37rem;
+      overflow-y: hidden;
     }
 
     .subsearch {
         display: flex;
         align-items: center;
         justify-content: space-between;
-        margin: 3%;
-        width: 94%;
+        margin: 3% 2%;
+        width: 96%;
         height: 1.25rem;
         font-size: 0.37rem;
     }
@@ -283,8 +283,10 @@
     }
 
     .search-result {
-        width: 100%;
-        padding-bottom: 2rem;
+      width: 100%;
+      height: calc(100% - 3rem);
+      padding-bottom: 1rem;
+      overflow-y: auto;
     }
 
     .case-item {
diff --git a/src/views/enforce/zqyjjdmFilter.vue b/src/views/enforce/zqyjjdmFilter.vue
index b06f5ef..2d392bf 100644
--- a/src/views/enforce/zqyjjdmFilter.vue
+++ b/src/views/enforce/zqyjjdmFilter.vue
@@ -199,20 +199,20 @@
     }
 
     .popup-content {
-        margin: 0.25rem 3% 0;
-        padding-bottom: 3rem;
-        width: 94%;
-        height: calc(100% - 1.6rem);
-        overflow-y: auto;
-        font-size: 0.37rem;
+      margin: 0.25rem 0 0;
+      padding-bottom: 1rem;
+      width: 100%;
+      height: calc(100% - 2rem);
+      font-size: 0.37rem;
+      overflow-y: hidden;
     }
 
     .subsearch {
       display: flex;
       align-items: center;
       justify-content: space-between;
-      margin: 3%;
-      width: 94%;
+      margin: 3% 0.43rem;
+      width: calc(100% - 0.86rem);
       height: 1.25rem;
       font-size: 0.37rem;
     }
@@ -301,8 +301,11 @@
     }
 
     .search-result {
-        width: 100%;
-        padding-bottom: 2rem;
+      padding: 3%;
+      width: 100%;
+      height: calc(100% - 2rem);
+      overflow-y: auto;
+      box-sizing: border-box;
     }
 
     .case-item {
@@ -317,7 +320,7 @@
 
     .case-title {
         margin: 2% 0;
-        font-size: 0.42rem;
+        font-size: 0.37rem;
         color: #333;
         line-height: 1.25;
     }
diff --git a/src/views/enterprise/compaint/selectDeptFilter.vue b/src/views/enterprise/compaint/selectDeptFilter.vue
index 55ffef8..f9dd834 100644
--- a/src/views/enterprise/compaint/selectDeptFilter.vue
+++ b/src/views/enterprise/compaint/selectDeptFilter.vue
@@ -357,8 +357,10 @@
     }
 
     .search-result {
-        width: 100%;
-        padding-bottom: 2rem;
+      width: 100%;
+      height: calc(100% - 3rem);
+      padding-bottom: 1rem;
+      overflow-y: auto;
     }
 
     .search-result .van-cell-group {
diff --git a/src/views/enterprise/compaint/uniteDept.vue b/src/views/enterprise/compaint/uniteDept.vue
index ed599d1..6b99e23 100644
--- a/src/views/enterprise/compaint/uniteDept.vue
+++ b/src/views/enterprise/compaint/uniteDept.vue
@@ -323,8 +323,10 @@
   }
 
   .search-result {
-      width: 100%;
-      padding-bottom: 2rem;
+    width: 100%;
+    height: calc(100% - 3rem);
+    padding-bottom: 1rem;
+    overflow-y: auto;
   }
 
   .case-item {
diff --git a/src/views/enterprise/companyFilter.vue b/src/views/enterprise/companyFilter.vue
index 3a388a1..04af33b 100644
--- a/src/views/enterprise/companyFilter.vue
+++ b/src/views/enterprise/companyFilter.vue
@@ -290,8 +290,10 @@
     }
 
     .search-result {
-        width: 100%;
-        padding-bottom: 2rem;
+      width: 100%;
+      height: calc(100% - 3rem);
+      padding-bottom: 1rem;
+      overflow-y: auto;
     }
 
     .case-item {
diff --git a/src/views/enterprise/enterpriseInspectionNotice.vue b/src/views/enterprise/enterpriseInspectionNotice.vue
index 6c82fb5..efc30e7 100644
--- a/src/views/enterprise/enterpriseInspectionNotice.vue
+++ b/src/views/enterprise/enterpriseInspectionNotice.vue
@@ -54,7 +54,7 @@
         TabId: 0,
         list: [
             {
-                title: '实时检查预告',
+                title: '检查预告',
                 value: '0'
             },
             {
@@ -69,7 +69,7 @@
         data.TabId = index;
     };
     const onClickTab = ({ title }) => {
-      if(title == "实时检查预告"){
+      if(title == "检查预告"){
         data.TabId = 0;
       }else{
         data.TabId = 1;
diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue
index d3a71d2..da6b7fa 100644
--- a/src/views/enterprise/registrationDetail.vue
+++ b/src/views/enterprise/registrationDetail.vue
@@ -39,7 +39,7 @@
                                 <van-field v-if="item.checkCategoryText != null" v-model="item.enforcementTime"
                                            label="检查时间" readonly/>
                                 <van-field v-if="item.checkCategoryText == null" v-model="item.enforcementTime"
-                                           label="预约时间" readonly/>
+                                           label="预告时间" readonly/>
 
                                 <div class="file-upload">
                                     <div class="file-upload-center"><label>附&nbsp; &nbsp; &nbsp; &nbsp;件</label></div>
diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue
index 817a1a1..83077e6 100644
--- a/src/views/enterprise/registrationEdit.vue
+++ b/src/views/enterprise/registrationEdit.vue
@@ -30,7 +30,7 @@
 <!--                    <div class="zf-name">执法信息</div>-->
                     <van-field
                             v-model="submitData.lawText"
-                            label="是否关联预约"
+                            label="是否关联预告"
                             maxlength="100"
                             placeholder="请选择"
                             is-link