From 3afcac7c712daadded9e7900635f2409c14f3888 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Wed, 27 Sep 2023 16:31:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.ts                        |  4 +++-
 .../Dictionary/components/Right/index.vue     | 10 +++++---
 src/views/system/User/index.vue               | 23 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b3d32490..53eefcc4 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -36,4 +36,6 @@ export const updatePassword_api = (data: { id: string, password: string }) => se
 // 修改用户状态
 export const changeUserStatus_api = (data: object) => server.patch(`/user`,data);
 // 删除用户
-export const deleteUser_api = (id: string) => server.remove(`/user/${id}`);
\ No newline at end of file
+export const deleteUser_api = (id: string) => server.remove(`/user/${id}`);
+// 查询角色不分页
+export const queryRole_api = (data: any): Promise<any> => server.post(`/role/_query/no-paging`, data)
\ No newline at end of file
diff --git a/src/views/system/Dictionary/components/Right/index.vue b/src/views/system/Dictionary/components/Right/index.vue
index 9a559edb..f2f41042 100644
--- a/src/views/system/Dictionary/components/Right/index.vue
+++ b/src/views/system/Dictionary/components/Right/index.vue
@@ -12,7 +12,7 @@
             }}</span></div>
         </div>
         <div class="contain">
-            <pro-search :columns="columns" @search="handleSearch" target="system_dictionary"/>
+            <pro-search :columns="columns" @search="handleSearch" target="system_dictionary" />
             <JProTable :columns="columns" model="TABLE" :request="queryItem" :params="params" ref="tableRef">
                 <template #headerTitle>
                     <PermissionButton type="primary" @click="add" hasPermission="system/Dictionary:add">
@@ -65,8 +65,13 @@ const columns = [
         title: '序号',
         dataIndex: 'ordinal',
         key: 'ordinal',
+    },
+    {
+        title: '检索码',
+        dataIndex: '',
+        hideInTable: true,
         search: {
-            type: 'number'
+            type: 'string'
         }
     },
     {
@@ -209,7 +214,6 @@ watch(() => props?.data?.id, () => {
 })  
 </script>
 <style lang="less" scoped>
-
 .des_head {
     padding: 10px 20px;
     background-color: rgb(242, 242, 242);
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index d9e11509..28542da6 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -134,6 +134,7 @@ import {
     getUserList_api,
     changeUserStatus_api,
     deleteUser_api,
+    queryRole_api
 } from '@/api/system/user';
 import { onlyMessage } from '@/utils/comm';
 
@@ -184,7 +185,27 @@ const columns = [
         dataIndex: 'roleList',
         key: 'roleList',
         search:{
-            type:'string'
+            type:'select',
+            rename:'id$in-dimension$role',
+            options:() => 
+            new Promise((resolve)=>{
+                queryRole_api(
+                    {   
+                        paging:false,
+                        sorts: [
+                            { name: 'createTime', order: 'desc' },
+                            { name: 'id', order: 'desc' },
+                        ]
+                    }
+                ).then((resp:any)=>{
+                    resolve(
+                            resp.result.map((item: dictType) => ({
+                                label: item.name,
+                                value: item.id,
+                            })),
+                        );
+                })
+            })
         },
          scopedSlots: true,
     },