角色管理增删改查功能完善

src/api/role/index.ts

@@ -11,7 +11,7 @@ export function getRolePage(
   queryParams?: RoleQuery
 ): AxiosPromise<RolePageResult> {
   return request({
-    url: "/api/v1/roles/page",
+    url: '/system/role/list',
     method: "get",
     params: queryParams,
   });
@@ -43,7 +43,32 @@ export function getRoleMenuIds(roleId: number): AxiosPromise<number[]> {
     method: "get",
   });
 }
+/**
+ * 查询菜单下拉树结构
+ *
+ */
+export function treeSelect() {
+  return request({
+    url: '/system/menu/treeSelect',
+    method: 'get'
+  })
+}
 
+/**
+ * 用户状态修改
+ *
+ */
+export function changeRoleStatus(businessId: number,flag:string) {
+  const data = {
+    businessId,
+    flag
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    params: data
+  });
+}
 /**
  * 分配菜单权限给角色
  *
@@ -67,11 +92,21 @@ export function updateRoleMenus(
  */
 export function getRoleForm(id: number): AxiosPromise<RoleForm> {
   return request({
-    url: "/api/v1/roles/" + id + "/form",
+    url: '/system/role/detail/' + id,
     method: "get",
   });
 }
-
+/**
+ * 根据角色ID查询菜单下拉树结构
+ *
+ * @param id
+ */
+export function roleMenuTreeSelect(roleId) {
+  return request({
+    url: '/system/menu/roleMenuTreeSelect/' + roleId,
+    method: 'get'
+  })
+}
 /**
  * 添加角色
  *
@@ -79,7 +114,7 @@ export function getRoleForm(id: number): AxiosPromise<RoleForm> {
  */
 export function addRole(data: RoleForm) {
   return request({
-    url: "/api/v1/roles",
+    url: '/system/role/add',
     method: "post",
     data: data,
   });
@@ -93,7 +128,7 @@ export function addRole(data: RoleForm) {
  */
 export function updateRole(id: number, data: RoleForm) {
   return request({
-    url: "/api/v1/roles/" + id,
+    url: '/system/role/update/' + id,
     method: "put",
     data: data,
   });
@@ -104,9 +139,9 @@ export function updateRole(id: number, data: RoleForm) {
  *
  * @param ids
  */
-export function deleteRoles(ids: string) {
+export function deleteRoles(roleId: any) {
   return request({
-    url: "/api/v1/roles/" + ids,
+    url: '/system/role/deleteLogical/' + roleId,
     method: "delete",
   });
 }

src/api/role/types.ts

@@ -2,42 +2,48 @@
  * 角色查询参数
  */
 export interface RoleQuery extends PageQuery {
-  keywords?: string;
+  /**
+   * 角色名称
+   */
+  roleName?: string;
+  /**
+   * 权限字符
+   */
+  roleKey?: string;
+  /**
+   * 角色状态
+   */
+  flag?: string;
 }
 
 /**
  * 角色分页对象
  */
 export interface RolePageVO {
-  /**
-   * 角色编码
-   */
-  code?: string;
-
   /**
    * 角色ID
    */
-  id?: number;
+  businessId?: number;
   /**
-   * 角色名称
+   * 名称
    */
-  name?: string;
+  roleName?: string;
   /**
-   * 排序
+   * 权限字符
    */
-  sort?: number;
+  roleKey?: string;
   /**
-   * 角色状态
+   * 显示顺序
    */
-  status?: number;
+  roleSort?: number;
   /**
-   * 创建时间
+   * 状态
    */
-  createTime?: Date;
+  flag?: string;
   /**
-   * 修改时间
+   * 创建时间
    */
-  updateTime?: Date;
+  createDate?: Date;
 }
 
 /**
@@ -52,27 +58,29 @@ export interface RoleForm {
   /**
    * 角色ID
    */
-  id?: number;
-
+  businessId?: number | undefined;
   /**
-   * 角色编码
+   * 名称
    */
-  code: string;
+  roleName?: string;
   /**
-   * 数据权限
+   * 权限字符
    */
-  dataScope?: number;
-
+  roleKey?: string;
   /**
-   * 角色名称
+   * 排序
+   */
+  roleSort?: number;
+  /**
+   * 排序
    */
-  name: string;
+  flag?: string;
   /**
    * 排序
    */
-  sort?: number;
+  menuIds?: number[];
   /**
-   * 角色状态(1-正常；0-停用)
+   * 备注
    */
-  status?: number;
+  remarks?: string;
 }

src/api/user/types.ts

@@ -102,7 +102,7 @@ export interface UserPageVO {
   /**
    * 创建时间
    */
-  createTime?: Date;
+  createDate?: Date;
 }
 
 /**

src/utils/commonField.ts

-import {Plus, Delete, Edit, Search, Share, Upload } from '@element-plus/icons-vue'
+import {Plus, Delete, Edit, Search, Share, Upload,Download } from '@element-plus/icons-vue'
 /** 公共字段*/
 export const commonField = {
   typeParent: 'primary',  //   typeParent: 'text', type="text" 已在3.00移除，用了typeParent这个字段的需要在按钮用link设置链接按钮
@@ -32,7 +32,7 @@ export const commonField = {
   addIcon: Plus,
   delIcon: 'el-icon-delete',
   importIcon: Upload,
-  exportIcon: 'el-icon-download',
+  exportIcon: Download,
   deleteTypePrimary: 'danger',
   deleteSize: 'small',
   deleteDisabled: 'ids.length === 0',

src/views/system/user/index.vue

@@ -467,9 +467,15 @@ onMounted(() => {
                   :size="commonField.smallSize"
                   @click="openDialog('user-import')"
                 >{{ commonField.importName }}</el-button>
-                <el-button class="ml-3" @click="handleExport"
-                  ><template #icon><i-ep-download /></template>导出</el-button
-                >
+                <!--          //导出-->
+                <el-button
+                  v-hasPermi="hasExportPerm"
+                  :class="commonField.exportClass"
+                  :type="commonField.typeSuccess"
+                  :icon="commonField.exportIcon"
+                  :size="commonField.smallSize"
+                  @click="handleExport"
+                >{{ commonField.exportName }}</el-button>
               </div>
             </div>
           </template>