update: 修复角色管理系列问题,解决页面打不开按钮功能失效等问题!!

This commit is contained in:
puhui999 2023-03-27 12:02:43 +08:00
parent e08dcc9d8d
commit 581b301eed
5 changed files with 20 additions and 15 deletions

View File

@ -23,7 +23,7 @@ export interface UpdateStatusReqVO {
} }
// 查询角色列表 // 查询角色列表
export const getRolePageApi = async (params: RolePageReqVO) => { export const getRolePage = async (params: RolePageReqVO) => {
return await request.get({ url: '/system/role/page', params }) return await request.get({ url: '/system/role/page', params })
} }
@ -33,26 +33,33 @@ export const getSimpleRoleList = async (): Promise<RoleVO[]> => {
} }
// 查询角色详情 // 查询角色详情
export const getRoleApi = async (id: number) => { export const getRole = async (id: number) => {
return await request.get({ url: '/system/role/get?id=' + id }) return await request.get({ url: '/system/role/get?id=' + id })
} }
// 新增角色 // 新增角色
export const createRoleApi = async (data: RoleVO) => { export const createRole = async (data: RoleVO) => {
return await request.post({ url: '/system/role/create', data }) return await request.post({ url: '/system/role/create', data })
} }
// 修改角色 // 修改角色
export const updateRoleApi = async (data: RoleVO) => { export const updateRole = async (data: RoleVO) => {
return await request.put({ url: '/system/role/update', data }) return await request.put({ url: '/system/role/update', data })
} }
// 修改角色状态 // 修改角色状态
export const updateRoleStatusApi = async (data: UpdateStatusReqVO) => { export const updateRoleStatus = async (data: UpdateStatusReqVO) => {
return await request.put({ url: '/system/role/update-status', data }) return await request.put({ url: '/system/role/update-status', data })
} }
// 删除角色 // 删除角色
export const deleteRoleApi = async (id: number) => { export const deleteRole = async (id: number) => {
return await request.delete({ url: '/system/role/delete?id=' + id }) return await request.delete({ url: '/system/role/delete?id=' + id })
} }
// 导出角色
export const exportRole = (params) => {
return request.download({
url: '/system/role/export-excel',
params
})
}

View File

@ -52,7 +52,6 @@ declare module '@vue/runtime-core' {
ElForm: typeof import('element-plus/es')['ElForm'] ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon'] ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
ElInput: typeof import('element-plus/es')['ElInput'] ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
@ -100,7 +99,6 @@ declare module '@vue/runtime-core' {
ScriptTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue')['default'] ScriptTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue')['default']
Search: typeof import('./../components/Search/src/Search.vue')['default'] Search: typeof import('./../components/Search/src/Search.vue')['default']
SignalAndMessage: typeof import('./../components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue')['default'] SignalAndMessage: typeof import('./../components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue')['default']
Src: typeof import('./../components/RightToolbar/src/index.vue')['default']
Sticky: typeof import('./../components/Sticky/src/Sticky.vue')['default'] Sticky: typeof import('./../components/Sticky/src/Sticky.vue')['default']
Table: typeof import('./../components/Table/src/Table.vue')['default'] Table: typeof import('./../components/Table/src/Table.vue')['default']
Tooltip: typeof import('./../components/Tooltip/src/Tooltip.vue')['default'] Tooltip: typeof import('./../components/Tooltip/src/Tooltip.vue')['default']

View File

@ -96,8 +96,8 @@ import type { FormExpose } from '@/components/Form'
import { handleTree, defaultProps } from '@/utils/tree' import { handleTree, defaultProps } from '@/utils/tree'
import { SystemDataScopeEnum } from '@/utils/constants' import { SystemDataScopeEnum } from '@/utils/constants'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { listSimpleMenusApi } from '@/api/system/menu' import * as MenuApi from '@/api/system/menu'
import { listSimpleDeptApi } from '@/api/system/dept' import * as DeptApi from '@/api/system/dept'
import * as PermissionApi from '@/api/system/permission' import * as PermissionApi from '@/api/system/permission'
// ========== CRUD ========== // ========== CRUD ==========
const actionLoading = ref(false) // const actionLoading = ref(false) //
@ -131,7 +131,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => {
actionScopeType.value = type actionScopeType.value = type
dialogScopeVisible.value = true dialogScopeVisible.value = true
if (type === 'menu') { if (type === 'menu') {
const menuRes = await listSimpleMenusApi() const menuRes = await MenuApi.getSimpleMenusList()
treeOptions.value = handleTree(menuRes) treeOptions.value = handleTree(menuRes)
const role = await PermissionApi.listRoleMenusApi(row.id) const role = await PermissionApi.listRoleMenusApi(row.id)
if (role) { if (role) {
@ -140,7 +140,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => {
}) })
} }
} else if (type === 'data') { } else if (type === 'data') {
const deptRes = await listSimpleDeptApi() const deptRes = await DeptApi.getSimpleDeptList()
treeOptions.value = handleTree(deptRes) treeOptions.value = handleTree(deptRes)
const role = await RoleApi.getRole(row.id) const role = await RoleApi.getRole(row.id)
dataScopeForm.dataScope = role.dataScope dataScopeForm.dataScope = role.dataScope

View File

@ -44,12 +44,11 @@
<script setup lang="ts"> <script setup lang="ts">
import { getDictOptions } from '@/utils/dict' import { getDictOptions } from '@/utils/dict'
import { CommonStatusEnum } from '@/utils/constants' import { CommonStatusEnum } from '@/utils/constants'
import type { FormExpose } from '@/components/Form'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as RoleApi from '@/api/system/role' import * as RoleApi from '@/api/system/role'
// ========== CRUD ========== // ========== CRUD ==========
const dialogTitle = ref('edit') // const dialogTitle = ref('edit') //
const formRef = ref<FormExpose>() // Ref const formRef = ref() // Ref
const { t } = useI18n() // const { t } = useI18n() //
const dataScopeDictDatas = ref() const dataScopeDictDatas = ref()
const message = useMessage() // const message = useMessage() //
@ -97,6 +96,7 @@ const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,
name: '', name: '',
type: '',
code: '', code: '',
sort: undefined, sort: undefined,
status: CommonStatusEnum.ENABLE, status: CommonStatusEnum.ENABLE,

View File

@ -228,7 +228,7 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const data = await RoleApi.exportPostApi(queryParams) const data = await RoleApi.exportRole(queryParams)
download.excel(data, '角色列表.xls') download.excel(data, '角色列表.xls')
} catch { } catch {
} finally { } finally {