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 @@ - - - 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({ pageNum: 1, pageSize: 10, }); +const dateTimeRange = ref(""); const total = ref(0); // 数据总数 const pageData = ref(); // 用户分页数据 const deptList = ref(); // 部门下拉数据源 const roleList = ref(); // 角色下拉数据源 +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(() => { + + + + 搜索