From 260f0d5027f22213f8377f7b9724250f93ac519f Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 3 Sep 2024 09:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=85=E6=B8=85=E9=99=A4=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/util/util.js                         |  7 +++++++
 src/views/administrative/appointment.vue |  3 +++
 src/views/administrative/deptFilter.vue  |  3 ++-
 src/views/administrative/userFilter.vue  |  2 +-
 src/views/enforce/earlyWarning.vue       | 23 ++++++++++++++++++++++-
 src/views/enforce/enforcementPlan.vue    | 22 ++++++++++++++++++++--
 6 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/util/util.js b/src/util/util.js
index 8929541..fcda374 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -91,4 +91,11 @@ const formattedTime = (dateTime) =>{
   return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
 }
 
+const alignNames = (name) =>{
+  if(name.length == 2){
+    name = name.substring(0,1) + "  " + name.substring(1,2);
+  }
+  return name;
+}
+
 export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTime};
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index 5a8f290..d75d56e 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -232,6 +232,7 @@
             <van-date-picker
                     type="time"
                     v-model="data.currentDate"
+                    :min-date="data.minDate"
                     @confirm="onConfirm"
                     @cancel="data.showTimePicker = false"
             />
@@ -312,6 +313,7 @@
         ga_columns: [],
         item_columns: [],
         currentDate: [],
+        minDate: [],
         checked: false,
         deptChecked: false,
         deptContent: '',
@@ -391,6 +393,7 @@
         const month = (now.getMonth() + 1).toString().padStart(2, '0');
         const day = now.getDate().toString().padStart(2, '0');
         data.currentDate = [year, month, day]
+        data.minDate = new Date(year, month-1, day);
     }
 
     const onConfirm = (time) => {
diff --git a/src/views/administrative/deptFilter.vue b/src/views/administrative/deptFilter.vue
index 00d3a0e..c2fd9e1 100644
--- a/src/views/administrative/deptFilter.vue
+++ b/src/views/administrative/deptFilter.vue
@@ -73,7 +73,7 @@
 
 <script>
     import {ref} from 'vue'
-    import {queryDepts, nextDeptByparentId, queryUsersNoPermission} from '../../api/user'
+    import {queryDepts, nextDeptByparentId, queryUsersNoPermission} from '@/api/user'
     import {Icon, showSuccessToast} from 'vant';
 
     const {useCommon} = $globalStore
@@ -159,6 +159,7 @@
             },
             cancel() {
                 this.searchParam.deptName = '';
+                this.searchKey = '';
                 this.queryList()
             },
             selectData() {
diff --git a/src/views/administrative/userFilter.vue b/src/views/administrative/userFilter.vue
index f061a69..e6be005 100644
--- a/src/views/administrative/userFilter.vue
+++ b/src/views/administrative/userFilter.vue
@@ -29,7 +29,7 @@
 
 <script>
     import {ref} from 'vue'
-    import {queryUsers} from '../../api/user'
+    import {queryUsers} from '@/api/user'
 
     const {useCommon} = $globalStore
     export default {
diff --git a/src/views/enforce/earlyWarning.vue b/src/views/enforce/earlyWarning.vue
index 1ba23bb..38f0f79 100644
--- a/src/views/enforce/earlyWarning.vue
+++ b/src/views/enforce/earlyWarning.vue
@@ -11,6 +11,7 @@
             clearable="true"
             clear-icon="clear"
             clear-trigger="always"
+            @clear="clearSearch"
         @search="onSearch">
             <template #action>
                 <div @click="onClickButton">搜索</div>
@@ -232,15 +233,35 @@
         listLoading: false, // 是否加载中
         listFinished: false, // 是否加载完成标识
     });
+    const clearSearch = () =>{
+      // 清空列表数据
+      data.dataList = [];
+        // data.finished = false;
+
+        // 重新加载数据
+        // 将 loading 设置为 true，表示处于加载状态
+        // data.loading = true;
+        searchParam.pageNum = 0;
+        data.curPage = 1;
+        data.refreshing = false;
+        data.finished = false;
+        data.loading = true;
+        onLoad();
+    }
 
     //下拉刷新
     const onRefresh = () => {
         // 清空列表数据
         data.dataList = [];
-        data.finished = false;
+        // data.finished = false;
 
         // 重新加载数据
         // 将 loading 设置为 true，表示处于加载状态
+        // data.loading = true;
+        searchParam.pageNum = 0;
+        data.curPage = 1;
+        data.refreshing = false;
+        data.finished = false;
         data.loading = true;
         onLoad();
     };
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index bfc0fe8..7fc0aa0 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -15,6 +15,7 @@
                 clearable="true"
                 clear-icon="clear"
                 clear-trigger="always"
+                @clear="clearSearch"
                 @search="onSearch"
         >
             <template #action>
@@ -157,7 +158,7 @@
         data.dateSearch = nowDate(new Date());
     });
     const queryList = () => {
-        searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
+        searchParam.pageNum = data.curPage;
         queryEnforcementInspectionProgramList(searchParam, success => {
             data.curPage++;
             data.loading = false;   // 查出结果停止加载
@@ -232,7 +233,7 @@
         // 清空列表数据
         data.dataList = [];
         data.finished = false;
-
+        data.curPage = 1;
         // 重新加载数据
         // 将 loading 设置为 true，表示处于加载状态
         data.loading = true;
@@ -247,6 +248,21 @@
             queryList();
         }, 1000);
     };
+    const clearSearch = () =>{
+      // 清空列表数据
+      data.dataList = [];
+        // data.finished = false;
+
+        // 重新加载数据
+        // 将 loading 设置为 true，表示处于加载状态
+        // data.loading = true;
+        searchParam.pageNum = 0;
+        data.curPage = 1;
+        data.refreshing = false;
+        data.finished = false;
+        data.loading = true;
+        onLoad();
+    }
 
 
     //获取分类下的商品列表
@@ -343,6 +359,8 @@
         flex-direction: column;
         overflow: hidden;
         background-color: #ebf3fb;
+        // padding-bottom: calc(2.67rem + constant(safe-area-inset-bottom));
+        // padding-bottom: calc(2.67rem + env(safe-area-inset-bottom));
 
         .header_body {
             height: 1.33rem;