xingyu4j 2 жил өмнө
parent
commit
dcd1b5fbba

+ 16 - 5
yudao-ui-admin-vue3/src/api/system/permission/index.ts

@@ -1,9 +1,20 @@
 import request from '@/config/axios'
-import type {
-  PermissionAssignRoleDataScopeReqVO,
-  PermissionAssignRoleMenuReqVO,
-  PermissionAssignUserRoleReqVO
-} from './types'
+
+export interface PermissionAssignUserRoleReqVO {
+  userId: number
+  roleIds: number[]
+}
+
+export interface PermissionAssignRoleMenuReqVO {
+  roleId: number
+  menuIds: number[]
+}
+
+export interface PermissionAssignRoleDataScopeReqVO {
+  roleId: number
+  dataScope: number
+  dataScopeDeptIds: number[]
+}
 
 // 查询角色拥有的菜单权限
 export const listRoleMenusApi = async (roleId: number) => {

+ 0 - 15
yudao-ui-admin-vue3/src/api/system/permission/types.ts

@@ -1,15 +0,0 @@
-export type PermissionAssignUserRoleReqVO = {
-  userId: number
-  roleIds: number[]
-}
-
-export type PermissionAssignRoleMenuReqVO = {
-  roleId: number
-  menuIds: number[]
-}
-
-export type PermissionAssignRoleDataScopeReqVO = {
-  roleId: number
-  dataScope: number
-  dataScopeDeptIds: number[]
-}

+ 14 - 12
yudao-ui-admin-vue3/src/views/system/user/index.vue

@@ -254,24 +254,26 @@ import {
   UploadInstance,
   UploadRawFile
 } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { VxeGridInstance } from 'vxe-table'
 import { handleTree } from '@/utils/tree'
-import { useI18n } from '@/hooks/web/useI18n'
-import { FormExpose } from '@/components/Form'
-import type { PostVO } from '@/api/system/post'
-import type { PermissionAssignUserRoleReqVO } from '@/api/system/permission/types'
-import { listSimpleDeptApi } from '@/api/system/dept'
-import { listSimplePostsApi } from '@/api/system/post'
-import { listSimpleRolesApi } from '@/api/system/role'
-import { aassignUserRoleApi, listUserRolesApi } from '@/api/system/permission'
-import { rules, allSchemas } from './user.data'
-import * as UserApi from '@/api/system/user'
 import download from '@/utils/download'
-import { useRouter } from 'vue-router'
 import { CommonStatusEnum } from '@/utils/constants'
 import { getAccessToken, getTenantId } from '@/utils/auth'
+import { useI18n } from '@/hooks/web/useI18n'
 import { useMessage } from '@/hooks/web/useMessage'
-import { VxeGridInstance } from 'vxe-table'
 import { useVxeGrid } from '@/hooks/web/useVxeGrid'
+import { FormExpose } from '@/components/Form'
+import { rules, allSchemas } from './user.data'
+import * as UserApi from '@/api/system/user'
+import { listSimpleDeptApi } from '@/api/system/dept'
+import { listSimplePostsApi, PostVO } from '@/api/system/post'
+import { listSimpleRolesApi } from '@/api/system/role'
+import {
+  aassignUserRoleApi,
+  listUserRolesApi,
+  PermissionAssignUserRoleReqVO
+} from '@/api/system/permission'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗