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 @@ ({ 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(); }