From 90acf999785786fb2b332c27a347bdbc2cad6dac Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 27 Dec 2023 16:30:43 +0800
Subject: [PATCH] fix: Optimize user

---
 src/api/platform/system/controller/user.ts    |  4 ---
 src/enums/permissionEnum.ts                   | 26 ++++++++++++++-----
 .../common/push/pushFriend/friend.data.ts     |  7 +++--
 src/views/system/user/user.data.ts            |  8 +++---
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/api/platform/system/controller/user.ts b/src/api/platform/system/controller/user.ts
index a843fae..6b981b4 100644
--- a/src/api/platform/system/controller/user.ts
+++ b/src/api/platform/system/controller/user.ts
@@ -17,7 +17,6 @@ enum Api {
   changeTenant='/system_proxy/system/user/changeTenant',
   resetTenant='/system_proxy/system/user/resetTenant',
   getCourierUserList= '/system_proxy/system/user/getCourierUserList',
-  getUserTypeList= '/system_proxy/system/user/getUserTypeList',
 }
 
 /** 查询用户列表 */
@@ -46,6 +45,3 @@ export const resetTenant = () => defHttp.get({ url: Api.resetTenant });
 
 /** 获取全部快递员集合 */
 export const getCourierUserList = () => defHttp.get<KiccUser[]>({ url: Api.getCourierUserList });
-
-/** 获取用户类型集合 */
-export const getUserTypeList = () => defHttp.get({ url: Api.getUserTypeList });
diff --git a/src/enums/permissionEnum.ts b/src/enums/permissionEnum.ts
index 44adee0..d14a7df 100644
--- a/src/enums/permissionEnum.ts
+++ b/src/enums/permissionEnum.ts
@@ -7,16 +7,30 @@
 
 /** 系统用户类型 */
 export enum SystemUserType {
-  // 系统管理员
   ADMIN = '0',
-  // 普通用户
   NORMAL_USER = '1',
-  // 企业用户
   ENTERPRISE_USER = '2',
-  // 收样员
   SAMPLE_COLLECTOR = '3',
-  // 客服
   CUSTOMER_SERVICE = '4',
-  // 企业内部用户
   INTERNAL_USER = '5',
 }
+
+export enum SystemUserTypeName {
+  ADMIN = '系统管理员',
+  NORMAL_USER = '普通用户',
+  ENTERPRISE_USER = '企业用户',
+  SAMPLE_COLLECTOR = '收样员',
+  CUSTOMER_SERVICE = '客服',
+  INTERNAL_USER = '企业内部用户',
+}
+
+export const SystemUserTypeMap: Map<SystemUserType, SystemUserTypeName> = (() => {
+  const map = new Map<SystemUserType, SystemUserTypeName>();
+  map.set(SystemUserType.ADMIN, SystemUserTypeName.ADMIN);
+  map.set(SystemUserType.NORMAL_USER, SystemUserTypeName.NORMAL_USER);
+  map.set(SystemUserType.ENTERPRISE_USER, SystemUserTypeName.ENTERPRISE_USER);
+  map.set(SystemUserType.SAMPLE_COLLECTOR, SystemUserTypeName.SAMPLE_COLLECTOR);
+  map.set(SystemUserType.CUSTOMER_SERVICE, SystemUserTypeName.CUSTOMER_SERVICE);
+  map.set(SystemUserType.INTERNAL_USER, SystemUserTypeName.INTERNAL_USER);
+  return map;
+})();
diff --git a/src/views/common/push/pushFriend/friend.data.ts b/src/views/common/push/pushFriend/friend.data.ts
index 8f94bfd..1928657 100644
--- a/src/views/common/push/pushFriend/friend.data.ts
+++ b/src/views/common/push/pushFriend/friend.data.ts
@@ -2,7 +2,7 @@ import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
-import { getUserTypeList } from '/@/api/platform/system/controller/user';
+import { SystemUserTypeMap } from '/@/enums/permissionEnum';
 
 /** 表格列配置 */
 export const columns: BasicColumn[] = [
@@ -117,11 +117,10 @@ export const userFormSchema: FormSchema[] = [
   {
     field: 'userType',
     label: '用户类型',
-    component: 'ApiSelect',
+    component: 'Select',
     required: true,
     componentProps: {
-      api: getUserTypeList,
-      resultField: 'data'
+      options: Array.from(SystemUserTypeMap, ([key, value]) => ({ label: value, value: key }))
     },
     colProps: {
       span: 12
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index 3f6db0d..6778e1d 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -12,8 +12,7 @@ import { Switch } from 'ant-design-vue';
 import { listRole } from '/@/api/platform/system/controller/role';
 import { changeStatus } from '/@/api/platform/system/controller/user';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { getUserTypeList } from '/@/api/platform/system/controller/user';
-import { SystemUserType } from '/@/enums/permissionEnum';
+import { SystemUserType, SystemUserTypeMap } from '/@/enums/permissionEnum';
 import { selectBindSsoUserList } from '/@/api/platform/system/controller/ssoUser';
 import {getDataByDictType} from '/@/api/platform/system/controller/dictdata';
 
@@ -183,11 +182,10 @@ export const userFormSchema: FormSchema[] = [
   {
     field: 'userType',
     label: '用户类型',
-    component: 'ApiSelect',
+    component: 'Select',
     required: true,
     componentProps: {
-      api: getUserTypeList,
-      resultField: 'data'
+      options: Array.from(SystemUserTypeMap, ([key, value]) => ({ label: value, value: key }))
     },
     colProps: {
       span: 12