From 1be1eaf7b45e8690ac1e6f6321afc044f8a3018f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 24 六月 2024 08:37:32 +0800
Subject: [PATCH] !128 fix: 选人无法回显 Merge pull request !128 from 玲娜贝er/dev
---
src/components/UserSelect/index.vue | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index 7f8b185..e9865e5 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -24,22 +24,16 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
- <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 200px" @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
- <el-input
- v-model="queryParams.phonenumber"
- placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
+ <el-input v-model="queryParams.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ <el-button icon="Refresh" @click="() => resetQuery()">閲嶇疆</el-button>
</el-form-item>
</el-form>
</el-card>
@@ -171,7 +165,7 @@
};
const computedIds = (data) => {
- if (data instanceof Array) {
+ if (data instanceof Array) {
return [...data];
} else if (typeof data === 'string') {
return data.split(',');
@@ -224,13 +218,13 @@
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) => {
@@ -289,24 +283,19 @@
watch(
() => userDialog.visible.value,
- (newValue: boolean) => {
- console.log(selectUserList.value)
-
+ async (newValue: boolean) => {
if (newValue) {
- initSelectUser();
+ await getTreeSelect(); // 鍒濆鍖栭儴闂ㄦ暟鎹�
+ await getList(); // 鍒濆鍖栧垪琛ㄦ暟鎹�
+ await initSelectUser();
} else {
tableRef.value.clearCheckboxReserve();
tableRef.value.clearCheckboxRow();
- resetQuery();
+ resetQuery(false);
selectUserList.value = [];
}
}
);
-
-onMounted(() => {
- getTreeSelect(); // 鍒濆鍖栭儴闂ㄦ暟鎹�
- getList(); // 鍒濆鍖栧垪琛ㄦ暟鎹�
-});
defineExpose({
open: userDialog.openDialog,
--
Gitblit v1.9.3