字典

src/api/dict/index.ts

@@ -18,20 +18,56 @@ export function getDictTypePage(
   queryParams: DictTypeQuery
 ): AxiosPromise<DictTypePageResult> {
   return request({
-    url: "/api/v1/dict/types/page",
+    url: "/system/dict/type/list",
     method: "get",
     params: queryParams,
   });
 }
+/** 获取字典选择框列表*/
+export function selectDictType(dictType) {
+  return request({
+    url: "/system/dict/data/type/" + dictType,
+    method: "get",
+  });
+}
+/**  导出字典类型*/
+export function exportType(queryParams: DictTypeQuery) {
+  return request({
+    url: "/system/dict/type/export",
+    method: "get",
+    params: queryParams,
+    responseType: "arraybuffer",
+  });
+}
+
+/** 修改字典类型*/
+export function updateType(data) {
+  const businessId = data.businessId;
+  return request({
+    url: "/system/dict/type/update/" + businessId,
+    method: "put",
+    data: data,
+    headers: {},
+  });
+}
+/** 新增字典类型*/
+export function addType(data) {
+  return request({
+    url: "/system/dict/type/add",
+    method: "post",
+    data: data,
+    headers: {},
+  });
+}
 
 /**
  * 字典类型表单数据
  *
  * @param id
  */
-export function getDictTypeForm(id: number): AxiosPromise<DictTypeForm> {
+export function getDictTypeForm(dictId: number): AxiosPromise<DictTypeForm> {
   return request({
-    url: "/api/v1/dict/types/" + id + "/form",
+    url: "/system/dict/type/detail/" + dictId,
     method: "get",
   });
 }
@@ -66,9 +102,9 @@ export function updateDictType(id: number, data: DictTypeForm) {
 /**
  * 删除字典类型
  */
-export function deleteDictTypes(ids: string) {
+export function deleteDictTypes(dictId: string) {
   return request({
-    url: "/api/v1/dict/types/" + ids,
+    url: "/system/dict/type/deleteLogical/" + dictId,
     method: "delete",
   });
 }

src/api/dict/types.ts

@@ -3,9 +3,25 @@
  */
 export interface DictTypeQuery extends PageQuery {
   /**
-   * 关键字(字典类型名称/编码)
+   * 字典名称
+   */
+  dictName?: string;
+  /**
+   * 字典类型
+   */
+  dictType?: string;
+  /**
+   * 状态
+   */
+  flag?: string;
+  /**
+   * 开始时间
    */
-  keywords?: string;
+  beginTime?: string | null;
+  /**
+   * 结束时间
+   */
+  endTime?: string | null;
 }
 
 /**
@@ -15,23 +31,27 @@ export interface DictTypePageVO {
   /**
    * 字典类型ID
    */
-  id: number;
+  businessId: number;
   /**
-   * 类型编码
+   * 字典名称
    */
-  code: string;
+  dictName: string;
   /**
-   * 类型名称
+   * 字典类型
    */
-  name: string;
+  dictType: string;
   /**
-   * 状态(1:启用;0:禁用)
+   * 状态
    */
-  status?: number;
+  flag: string;
   /**
    * 备注
    */
-  remark?: string;
+  remarks: string;
+  /**
+   * 创建时间
+   */
+  createDate: Date;
 }
 
 /**
@@ -46,23 +66,31 @@ export interface DictTypeForm {
   /**
    * 字典类型ID
    */
-  id?: number;
+  businessId?: number | undefined;
   /**
-   * 类型名称
+   * 字典名称
    */
-  name?: string;
+  dictName?: string;
   /**
-   * 类型编码
+   * 字典类型
+   */
+  dictType?: string;
+  /**
+   * 父字典名称
    */
-  code?: string;
+  parentId?: number | undefined;
   /**
-   * 类型状态：1:启用;0:禁用
+   * 父字典数据
    */
-  status: number;
+  dataId?: number | undefined;
   /**
    * 备注
    */
-  remark?: string;
+  remarks?: string;
+
+  status?: string | number;
+
+  flag?: string | number;
 }
 
 /**

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'
+import { praseStrEmpty } from "@/utils/common";
 /**
  * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合）
  */
@@ -17,9 +17,11 @@ export function getUserInfoApi() {
  *
  * @param queryParams
  */
-export function getUserPage(queryParams: UserQuery): AxiosPromise<PageResult<UserPageVO[]>> {
+export function getUserPage(
+  queryParams: UserQuery
+): AxiosPromise<PageResult<UserPageVO[]>> {
   return request({
-    url: '/system/user/list',
+    url: "/system/user/list",
     method: "get",
     params: queryParams,
   });
@@ -32,7 +34,7 @@ export function getUserPage(queryParams: UserQuery): AxiosPromise<PageResult<Use
  */
 export function getUserForm(userId: number): AxiosPromise<UserForm> {
   return request({
-    url: '/system/user/' + praseStrEmpty(userId),
+    url: "/system/user/" + praseStrEmpty(userId),
     method: "get",
   });
 }
@@ -44,7 +46,7 @@ export function getUserForm(userId: number): AxiosPromise<UserForm> {
  */
 export function addUser(data: any) {
   return request({
-    url: '/system/user/add',
+    url: "/system/user/add",
     method: "post",
     data: data,
   });
@@ -56,9 +58,9 @@ export function addUser(data: any) {
  * @param id
  * @param data
  */
-export function updateUser( data: UserForm) {
+export function updateUser(data: UserForm) {
   return request({
-    url: '/system/user/update',
+    url: "/system/user/update",
     method: "put",
     data: data,
   });
@@ -73,27 +75,27 @@ export function updateUser( data: UserForm) {
 export function updateUserPassword(businessId: number, password: string) {
   const data = {
     businessId,
-    password
-  }
+    password,
+  };
   return request({
-    url: '/system/user/resetPassword',
-    method: 'put',
-    params: data
+    url: "/system/user/resetPassword",
+    method: "put",
+    params: data,
   });
 }
 /**
  * 用户状态修改
  *
  */
-export function changeUserStatus(businessId: number,flag:string) {
+export function changeUserStatus(businessId: number, flag: string) {
   const data = {
     businessId,
-    flag
-  }
+    flag,
+  };
   return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    params: data
+    url: "/system/user/changeStatus",
+    method: "put",
+    params: data,
   });
 }
 /**
@@ -103,7 +105,7 @@ export function changeUserStatus(businessId: number,flag:string) {
  */
 export function deleteUsers(id: number) {
   return request({
-    url: '/system/user/deleteLogical/' + id,
+    url: "/system/user/deleteLogical/" + id,
     method: "delete",
   });
 }
@@ -115,7 +117,7 @@ export function deleteUsers(id: number) {
  */
 export function downloadTemplateApi() {
   return request({
-    url: '/system/user/importTemplate',
+    url: "/system/user/importTemplate",
     method: "get",
     responseType: "arraybuffer",
   });
@@ -129,7 +131,7 @@ export function downloadTemplateApi() {
  */
 export function exportUser(queryParams: UserQuery) {
   return request({
-    url: '/system/user/export',
+    url: "/system/user/export",
     method: "get",
     params: queryParams,
     responseType: "arraybuffer",
@@ -141,16 +143,18 @@ export function exportUser(queryParams: UserQuery) {
  *
  * @param file
  */
-export function importUser( data: any) {
+export function importUser(data: any) {
   return request({
-    url: '/system/user/importExcel',
+    url: "/system/user/importExcel",
     method: "post",
     headers: {
-      'Content-Type': 'multipart/form-data'
+      "Content-Type": "multipart/form-data",
     },
-    transformRequest: [(data) => {
-      return data
-    }],
+    transformRequest: [
+      (data) => {
+        return data;
+      },
+    ],
     data,
   });
 }

src/api/user/types.ts

@@ -72,7 +72,6 @@ export interface UserQuery extends PageQuery {
    * 状态
    */
   flag?: string;
-
 }
 
 /**

src/router/index.ts

@@ -41,6 +41,19 @@ export const constantRoutes: RouteRecordRaw[] = [
           alwaysShow: false,
         },
       },
+      {
+        path: "dict/type/data/:dictId(\\d+)",
+        component: () => import("@/views/system/dict/data.vue"),
+        name: "Data",
+        meta: {
+          title: "字典数据",
+          icon: "",
+          affix: true,
+          keepAlive: true,
+          alwaysShow: false,
+          hidden: true,
+        },
+      },
       {
         path: "/401",
         component: () => import("@/views/error-page/401.vue"),

src/utils/commonField.ts

@@ -4,6 +4,7 @@ import {
   Edit,
   Search,
   Share,
+  Refresh,
   Upload,
   Download,
 } from "@element-plus/icons-vue";
@@ -34,9 +35,9 @@ export const commonField = {
   cleanName: "清空",
   viewName: "查看",
   size: "default",
-  smallSize: "small",
-  queryIcon: "el-icon-search",
-  resetIcon: "el-icon-refresh",
+  smallSize: "default",
+  queryIcon: Search,
+  resetIcon: Refresh,
   addIcon: Plus,
   delIcon: "el-icon-delete",
   importIcon: Upload,

src/views/system/role/index.vue

@@ -445,7 +445,6 @@ onMounted(() => {
             placeholder="角色名称"
             clearable
             :maxlength="30"
-            size="small"
             style="width: 150px"
             @keyup.enter="handleQuery"
           />
@@ -455,7 +454,6 @@ onMounted(() => {
             v-model="queryParams.roleKey"
             placeholder="请输入权限字符"
             clearable
-            size="small"
             style="width: 150px"
             @keyup.enter="handleQuery"
           />
@@ -465,7 +463,6 @@ onMounted(() => {
             v-model="queryParams.flag"
             placeholder="请选择角色状态"
             clearable
-            size="small"
             style="width: 150px"
           >
             <el-option
@@ -504,7 +501,6 @@ onMounted(() => {
         v-loading="loading"
         :data="roleList"
         highlight-current-row
-        border
       >
         <el-table-column type="index" label="序号" width="90" />
         <el-table-column