From 37df504f7a838c7afc7ed3a33aa941c98b40b058 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Thu, 19 Oct 2023 00:06:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 6da9927ae97a8cfff103874c88a0cdc9e59f1486
---
 src/api/user/types.ts              |  2 +
 src/components/DateRange/index.vue | 69 ------------------------------
 src/views/system/user/index.vue    | 18 ++++++++
 3 files changed, 20 insertions(+), 69 deletions(-)
 delete mode 100644 src/components/DateRange/index.vue

diff --git a/src/api/user/types.ts b/src/api/user/types.ts
index ba38dabf..c0060f27 100644
--- a/src/api/user/types.ts
+++ b/src/api/user/types.ts
@@ -17,6 +17,8 @@ export interface UserQuery extends PageQuery {
   keywords?: string;
   status?: number;
   deptId?: number;
+  startTime?: string;
+  endTime?: string;
 }
 
 /**
diff --git a/src/components/DateRange/index.vue b/src/components/DateRange/index.vue
deleted file mode 100644
index e0b62692..00000000
--- a/src/components/DateRange/index.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <div>
-    <el-date-picker
-      v-model="startDate"
-      type="date"
-      placeholder="开始日期"
-      :picker-options="startPickerOptions"
-    />
-    <el-date-picker
-      v-model="endDate"
-      type="date"
-      placeholder="结束日期"
-      :picker-options="endPickerOptions"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-const props = defineProps({
-  modelValue: {
-    type: Object,
-    default: () => ({}),
-  },
-  format: {
-    type: String,
-    default: "yyyy-MM-dd",
-  },
-  valueFormat: {
-    type: String,
-    default: "yyyy-MM-dd",
-  },
-});
-const emit = defineEmits(["update:modelValue"]);
-
-let startDate = computed({
-  get: () => props.modelValue.startDate,
-  set: (val) =>
-    emit("update:modelValue", { ...props.modelValue, startDate: val }),
-});
-
-let endDate = computed({
-  get: () => props.modelValue.endDate,
-  set: (val) =>
-    emit("update:modelValue", { ...props.modelValue, endDate: val }),
-});
-
-watch(
-  [startDate, endDate],
-  () => {
-    if (startDate.value > endDate.value) {
-      // 在这里可以添加提示代码，提醒用户开始时间不能大于结束时间
-      console.log("开始时间不能大于结束时间");
-    }
-  },
-  { immediate: true }
-);
-
-let startPickerOptions = computed(() => ({
-  disabledDate: (time: any) => {
-    return endDate.value ? time.getTime() > endDate.value : false;
-  },
-}));
-
-let endPickerOptions = computed(() => ({
-  disabledDate: (time: any) => {
-    return startDate.value ? time.getTime() < startDate.value : false;
-  },
-}));
-</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index efa240b7..849f0c7b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -33,11 +33,17 @@ const queryParams = reactive<UserQuery>({
   pageNum: 1,
   pageSize: 10,
 });
+const dateTimeRange = ref("");
 const total = ref(0); // 数据总数
 const pageData = ref<UserPageVO[]>(); // 用户分页数据
 const deptList = ref<OptionType[]>(); // 部门下拉数据源
 const roleList = ref<OptionType[]>(); // 角色下拉数据源
 
+watch(dateTimeRange, (newVal) => {
+  queryParams.startTime = newVal[0];
+  queryParams.endTime = newVal[1];
+});
+
 // 弹窗对象
 const dialog = reactive({
   visible: false,
@@ -96,6 +102,7 @@ function handleQuery() {
 /** 重置查询 */
 function resetQuery() {
   queryFormRef.value.resetFields();
+  dateTimeRange.value = "";
   queryParams.pageNum = 1;
   queryParams.deptId = undefined;
   handleQuery();
@@ -356,6 +363,17 @@ onMounted(() => {
               </el-select>
             </el-form-item>
 
+            <el-form-item label="创建时间">
+              <el-date-picker
+                v-model="dateTimeRange"
+                type="daterange"
+                range-separator="~"
+                start-placeholder="开始时间"
+                end-placeholder="截止时间"
+                value-format="YYYY-MM-DD"
+              />
+            </el-form-item>
+
             <el-form-item>
               <el-button type="primary" @click="handleQuery"
                 ><i-ep-search />搜索</el-button