From 727affad2cd5818f791dd7b5bc99a205b032e175 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:55:18 +0800
Subject: [PATCH] fix(search): 用户搜索支持名称或昵称合并检索
---
src/views/wls/barcode/data.ts | 1 -
src/views/system/user/components/select-modal.vue | 10 +++++++---
src/views/system/user/components/select-dialog.vue | 15 +++------------
src/views/system/user/data.ts | 6 +++---
4 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/views/system/user/components/select-dialog.vue b/src/views/system/user/components/select-dialog.vue
index 0f09f6c..afc4267 100644
--- a/src/views/system/user/components/select-dialog.vue
+++ b/src/views/system/user/components/select-dialog.vue
@@ -30,21 +30,12 @@
function useUserSelectGridFormSchema(): VbenFormSchema[] {
return [
{
- fieldName: 'username',
- label: '鐢ㄦ埛鍚嶇О',
+ fieldName: 'keyword',
+ label: '鐢ㄦ埛鍚嶇О/鏄电О',
component: 'Input',
componentProps: {
allowClear: true,
- placeholder: '璇疯緭鍏ョ敤鎴峰悕绉�',
- },
- },
- {
- fieldName: 'nickname',
- label: '鐢ㄦ埛鏄电О',
- component: 'Input',
- componentProps: {
- allowClear: true,
- placeholder: '璇疯緭鍏ョ敤鎴锋樀绉�',
+ placeholder: '鎼滅储鍚嶇О鎴栨樀绉�',
},
},
{
diff --git a/src/views/system/user/components/select-modal.vue b/src/views/system/user/components/select-modal.vue
index 7553992..2c3b102 100644
--- a/src/views/system/user/components/select-modal.vue
+++ b/src/views/system/user/components/select-modal.vue
@@ -193,7 +193,7 @@
pageNo,
pageSize,
deptId: selectedDeptId.value,
- username: leftListState.value.searchValue || undefined,
+ keyword: leftListState.value.searchValue || undefined,
});
leftListState.value.dataSource = list;
@@ -309,9 +309,12 @@
};
}
-// TODO 鍚庣鎺ュ彛鐩墠浠呮敮鎸� username 妫�绱紝 绛涢�夋潯浠堕渶瑕佽窡鍚庣璇锋眰鍙傛暟淇濇寔涓�鑷淬��
function filterOption(inputValue: string, option: any) {
- return option.username.toLowerCase().includes(inputValue.toLowerCase());
+ const keyword = inputValue.toLowerCase();
+ return (
+ option.username?.toLowerCase().includes(keyword) ||
+ option.nickname?.toLowerCase().includes(keyword)
+ );
}
/** 澶勭悊閮ㄩ棬鏍戝睍寮�/鎶樺彔 */
@@ -427,6 +430,7 @@
v-model:target-keys="selectedUserIds"
:titles="['鏈��', '宸查��']"
:show-search="true"
+ search-placeholder="鎼滅储鍚嶇О鎴栨樀绉�"
:show-select-all="true"
:filter-option="filterOption"
@change="handleUserChange"
diff --git a/src/views/system/user/data.ts b/src/views/system/user/data.ts
index 1ab6e8a..83d4077 100644
--- a/src/views/system/user/data.ts
+++ b/src/views/system/user/data.ts
@@ -269,11 +269,11 @@
export function useGridFormSchema(): VbenFormSchema[] {
return [
{
- fieldName: 'username',
- label: '鐢ㄦ埛鍚嶇О',
+ fieldName: 'keyword',
+ label: '鐢ㄦ埛鍚嶇О/鏄电О',
component: 'Input',
componentProps: {
- placeholder: '璇疯緭鍏ョ敤鎴峰悕绉�',
+ placeholder: '鎼滅储鍚嶇О鎴栨樀绉�',
allowClear: true,
},
},
diff --git a/src/views/wls/barcode/data.ts b/src/views/wls/barcode/data.ts
index d53696a..7b0008f 100644
--- a/src/views/wls/barcode/data.ts
+++ b/src/views/wls/barcode/data.ts
@@ -664,7 +664,6 @@
cellRender: {
name: 'CellSwitch',
attrs: { beforeChange: onAutoGenerateChange },
- props: { checkedValue: true, unCheckedValue: false },
},
},
{
--
Gitblit v1.9.3