用户管理页面调整

src/api/dept/index.ts

@@ -20,7 +20,7 @@ export function listDepts(queryParams?: DeptQuery): AxiosPromise<DeptVO[]> {
  */
 export function getDeptOptions(): AxiosPromise<OptionType[]> {
   return request({
-    url: "/api/v1/dept/options",
+    url: '/system/dept/treeSelect',
     method: "get",
   });
 }

src/api/role/index.ts

@@ -26,7 +26,7 @@ export function getRoleOptions(
   queryParams?: RoleQuery
 ): AxiosPromise<OptionType[]> {
   return request({
-    url: "/api/v1/roles/options",
+    url: 'system/role/listAll',
     method: "get",
     params: queryParams,
   });

src/api/user/index.ts

 import request from "@/utils/request";
 import { AxiosPromise } from "axios";
 import { User, UserForm, UserInfo, UserPageVO, UserQuery } from "./types";
-
+import {praseStrEmpty} from '@/utils/common'
 /**
  * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合）
  */
@@ -17,11 +17,9 @@ export function getUserInfoApi() {
  *
  * @param queryParams
  */
-export function getUserPage(
-  queryParams: UserQuery
-): AxiosPromise<PageResult<UserPageVO[]>> {
+export function getUserPage(queryParams: UserQuery): AxiosPromise<PageResult<UserPageVO[]>> {
   return request({
-    url: "/api/v1/users/page",
+    url: '/system/user/list',
     method: "get",
     params: queryParams,
   });
@@ -34,7 +32,7 @@ export function getUserPage(
  */
 export function getUserForm(userId: number): AxiosPromise<UserForm> {
   return request({
-    url: "/api/v1/users/" + userId + "/form",
+    url: '/system/user/' + praseStrEmpty(userId),
     method: "get",
   });
 }
@@ -46,7 +44,7 @@ export function getUserForm(userId: number): AxiosPromise<UserForm> {
  */
 export function addUser(data: any) {
   return request({
-    url: "/api/v1/users",
+    url: '/system/user/add',
     method: "post",
     data: data,
   });
@@ -58,9 +56,9 @@ export function addUser(data: any) {
  * @param id
  * @param data
  */
-export function updateUser(id: number, data: UserForm) {
+export function updateUser( data: UserForm) {
   return request({
-    url: "/api/v1/users/" + id,
+    url: '/system/user/update',
     method: "put",
     data: data,
   });
@@ -72,11 +70,15 @@ export function updateUser(id: number, data: UserForm) {
  * @param id
  * @param password
  */
-export function updateUserPassword(id: number, password: string) {
+export function updateUserPassword(businessId: number, password: string) {
+  const data = {
+    businessId,
+    password
+  }
   return request({
-    url: "/api/v1/users/" + id + "/password",
-    method: "patch",
-    params: { password: password },
+    url: '/system/user/resetPassword',
+    method: 'put',
+    params: data
   });
 }
 
@@ -85,9 +87,9 @@ export function updateUserPassword(id: number, password: string) {
  *
  * @param ids
  */
-export function deleteUsers(ids: string) {
+export function deleteUsers(id: number) {
   return request({
-    url: "/api/v1/users/" + ids,
+    url: '/system/user/deleteLogical/' + id,
     method: "delete",
   });
 }
@@ -99,7 +101,7 @@ export function deleteUsers(ids: string) {
  */
 export function downloadTemplateApi() {
   return request({
-    url: "/api/v1/users/template",
+    url: '/system/user/importTemplate',
     method: "get",
     responseType: "arraybuffer",
   });
@@ -113,7 +115,7 @@ export function downloadTemplateApi() {
  */
 export function exportUser(queryParams: UserQuery) {
   return request({
-    url: "/api/v1/users/_export",
+    url: '/system/user/export',
     method: "get",
     params: queryParams,
     responseType: "arraybuffer",

src/api/user/types.ts

@@ -60,11 +60,19 @@ export interface UserInfo {
  * 用户查询对象类型
  */
 export interface UserQuery extends PageQuery {
-  keywords?: string;
-  status?: number;
-  deptId?: number;
-  startTime?: string;
-  endTime?: string;
+  /**
+   * 部门ID
+   */
+  deptId?: number | undefined;
+  /**
+   * 登录名
+   */
+  username?: string;
+  /**
+   * 状态
+   */
+  flag?: string;
+
 }
 
 /**
@@ -72,90 +80,89 @@ export interface UserQuery extends PageQuery {
  */
 export interface UserPageVO {
   /**
-   * 用户头像地址
+   * 用户ID
    */
-  avatar?: string;
+  businessId?: number;
   /**
-   * 创建时间
+   * 登录名
    */
-  createTime?: Date;
+  username?: string;
   /**
-   * 部门名称
+   * 姓名
    */
-  deptName?: string;
+  name?: string;
   /**
-   * 用户邮箱
+   * 手机号
    */
-  email?: string;
+  phone?: string;
   /**
-   * 性别
+   * 状态
    */
-  genderLabel?: string;
+  flag?: string;
+  /**
+   * 创建时间
+   */
+  createTime?: Date;
+}
+
+/**
+ * 用户表单类型
+ */
+export interface UserForm {
   /**
    * 用户ID
    */
-  id?: number;
+  businessId?: number | undefined;
   /**
-   * 手机号
+   * 登录名
    */
-  mobile?: string;
+  username?: string;
   /**
-   * 用户昵称
+   * 密码
    */
-  nickname?: string;
+  password?: string;
   /**
-   * 角色名称，多个使用英文逗号(,)分割
+   * 姓名
    */
-  roleNames?: string;
+  name?: string;
   /**
-   * 用户状态(1:启用;0:禁用)
+   * 昵称
    */
-  status?: number;
+  nickName?: string;
   /**
-   * 用户名
+   * 性别
    */
-  username?: string;
-}
-
-/**
- * 用户表单类型
- */
-export interface UserForm {
+  sex?: string;
   /**
-   * 用户头像
+   * 手机号码
    */
-  avatar?: string;
+  phone?: string;
   /**
-   * 部门ID
+   * 身份证号
    */
-  deptId?: number;
+  idNumber?: string;
   /**
    * 邮箱
    */
   email?: string;
   /**
-   * 性别
-   */
-  gender?: number;
-  /**
-   * 用户ID
+   * 状态(1:启用;0:停用)
    */
-  id?: number;
-  mobile?: string;
+  flag?: string;
   /**
-   * 昵称
+   * 部门ID
    */
-  nickname?: string;
+  deptId?: number | null;
   /**
-   * 角色ID集合
+   * 角色
    */
-  roleIds?: number[];
+  roleList?: number[];
   /**
-   * 用户状态(1:正常;0:禁用)
+   * 角色返参字符串
    */
-  status?: number;
+  roleIds?: string;
   /**
-   * 用户名
+   * 备注
    */
-  username?: string;
+  remarks?: string;
 }

src/utils/common.ts

@@ -22,4 +22,10 @@ export function handleTree(data, id, parentId, children, rootId) {
   })
   return treeData !== '' ? treeData : data
 }
-
+// 转换字符串，undefined,null等转化为""
+export function praseStrEmpty(str) {
+  if (!str || str === 'undefined' || str === 'null') {
+    return ''
+  }
+  return str
+}

src/views/system/user/components/dept-tree.vue

@@ -57,7 +57,7 @@ function handleFilter(value: string, data: any) {
 
 /** 部门树节点 Click */
 function handleNodeClick(data: { [key: string]: any }) {
-  deptId.value = data.value;
+  deptId.value = data.id;
   emits("node-click");
 }