From b6dcc62f9ce7e6e1328c096661d99e1c2002f852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=BB=A3=E9=B9=8F?= <15891557205@163.com>
Date: Fri, 21 Jun 2024 12:07:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E6=94=B9=E4=B8=BA=E6=87=92?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/UserSelect/index.vue | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index f6e552e..8212489 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -29,16 +29,11 @@
-
+
搜索
- 重置
+ resetQuery()">重置
@@ -223,13 +218,13 @@ const handleQuery = () => {
getList();
};
/** 重置按钮操作 */
-const resetQuery = () => {
+const resetQuery = (refresh = true) => {
dateRange.value = ['', ''];
queryFormRef.value?.resetFields();
queryParams.value.pageNum = 1;
queryParams.value.deptId = undefined;
deptTreeRef.value?.setCurrentKey(undefined);
- handleQuery();
+ refresh && handleQuery();
};
const handleCheckboxChange = (checked) => {
@@ -290,21 +285,18 @@ watch(
() => userDialog.visible.value,
(newValue: boolean) => {
if (newValue) {
+ getTreeSelect(); // 初始化部门数据
+ getList(); // 初始化列表数据
initSelectUser();
} else {
tableRef.value.clearCheckboxReserve();
tableRef.value.clearCheckboxRow();
- resetQuery();
+ resetQuery(false);
selectUserList.value = [];
}
}
);
-onMounted(() => {
- getTreeSelect(); // 初始化部门数据
- getList(); // 初始化列表数据
-});
-
defineExpose({
open: userDialog.openDialog,
close: userDialog.closeDialog
From fbcc967b14c770a4487f8ab0cd11feb418d9ff5e Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Mon, 24 Jun 2024 08:21:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=94=B1=E4=BA=8E=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?await=20=E5=AF=BC=E8=87=B4=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F?=
=?UTF-8?q?=E4=B8=8D=E5=8F=AF=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/UserSelect/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index 8212489..e9865e5 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -283,11 +283,11 @@ const close = () => {
watch(
() => userDialog.visible.value,
- (newValue: boolean) => {
+ async (newValue: boolean) => {
if (newValue) {
- getTreeSelect(); // 初始化部门数据
- getList(); // 初始化列表数据
- initSelectUser();
+ await getTreeSelect(); // 初始化部门数据
+ await getList(); // 初始化列表数据
+ await initSelectUser();
} else {
tableRef.value.clearCheckboxReserve();
tableRef.value.clearCheckboxRow();