From e15dbb255cf086f330c8a97e3ebd623b4e8b6f57 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 3 Aug 2024 11:09:08 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts                 |  5 +----
 src/views/system/user/index.vue | 18 ++----------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index e4d29d55..a2a5c095 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -175,10 +175,7 @@ export interface UserPageQuery extends PageQuery {
   deptId?: number;
 
   /** 开始时间 */
-  startTime?: string;
-
-  /** 结束时间 */
-  endTime?: string;
+  createTimeRange?: [string, string];
 }
 
 /** 用户分页对象 */
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e70856b0..1ce59526 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -36,7 +36,7 @@
             <el-form-item label="创建时间">
               <el-date-picker
                 class="!w-[240px]"
-                v-model="dateTimeRange"
+                v-model="queryParams.createTimeRange"
                 type="daterange"
                 range-separator="~"
                 start-placeholder="开始时间"
@@ -318,17 +318,6 @@ const queryParams = reactive<UserPageQuery>({
   pageSize: 10,
 });
 
-const dateTimeRange = ref("");
-watch(dateTimeRange, (newVal) => {
-  if (newVal) {
-    queryParams.startTime = newVal[0];
-    queryParams.endTime = newVal[1];
-  } else {
-    queryParams.startTime = undefined;
-    queryParams.endTime = undefined;
-  }
-});
-
 /**  用户弹窗对象  */
 const dialog = reactive({
   visible: false,
@@ -370,7 +359,6 @@ function handleQuery() {
   loading.value = true;
   UserAPI.getPage(queryParams)
     .then((data) => {
-      console.log("handleQuery", data);
       pageData.value = data.list;
       total.value = data.total;
     })
@@ -382,11 +370,9 @@ function handleQuery() {
 /** 重置查询 */
 function handleResetQuery() {
   queryFormRef.value.resetFields();
-  dateTimeRange.value = "";
   queryParams.pageNum = 1;
   queryParams.deptId = undefined;
-  queryParams.startTime = undefined;
-  queryParams.endTime = undefined;
+  queryParams.createTimeRange = undefined;
   handleQuery();
 }