mirror of
				https://gitee.com/hhyykk/ipms-sjy-ui.git
				synced 2025-11-04 20:28:45 +08:00 
			
		
		
		
	update: 修复角色管理系列问题,解决页面打不开按钮功能失效等问题!!
This commit is contained in:
		@@ -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 })
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -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 })
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 新增角色
 | 
			
		||||
export const createRoleApi = async (data: RoleVO) => {
 | 
			
		||||
export const createRole = async (data: RoleVO) => {
 | 
			
		||||
  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 })
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 修改角色状态
 | 
			
		||||
export const updateRoleStatusApi = async (data: UpdateStatusReqVO) => {
 | 
			
		||||
export const updateRoleStatus = async (data: UpdateStatusReqVO) => {
 | 
			
		||||
  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 })
 | 
			
		||||
}
 | 
			
		||||
// 导出角色
 | 
			
		||||
export const exportRole = (params) => {
 | 
			
		||||
  return request.download({
 | 
			
		||||
    url: '/system/role/export-excel',
 | 
			
		||||
    params
 | 
			
		||||
  })
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								src/types/auto-components.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								src/types/auto-components.d.ts
									
									
									
									
										vendored
									
									
								
							@@ -52,7 +52,6 @@ declare module '@vue/runtime-core' {
 | 
			
		||||
    ElForm: typeof import('element-plus/es')['ElForm']
 | 
			
		||||
    ElFormItem: typeof import('element-plus/es')['ElFormItem']
 | 
			
		||||
    ElIcon: typeof import('element-plus/es')['ElIcon']
 | 
			
		||||
    ElImage: typeof import('element-plus/es')['ElImage']
 | 
			
		||||
    ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
 | 
			
		||||
    ElInput: typeof import('element-plus/es')['ElInput']
 | 
			
		||||
    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']
 | 
			
		||||
    Search: typeof import('./../components/Search/src/Search.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']
 | 
			
		||||
    Table: typeof import('./../components/Table/src/Table.vue')['default']
 | 
			
		||||
    Tooltip: typeof import('./../components/Tooltip/src/Tooltip.vue')['default']
 | 
			
		||||
 
 | 
			
		||||
@@ -96,8 +96,8 @@ import type { FormExpose } from '@/components/Form'
 | 
			
		||||
import { handleTree, defaultProps } from '@/utils/tree'
 | 
			
		||||
import { SystemDataScopeEnum } from '@/utils/constants'
 | 
			
		||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 | 
			
		||||
import { listSimpleMenusApi } from '@/api/system/menu'
 | 
			
		||||
import { listSimpleDeptApi } from '@/api/system/dept'
 | 
			
		||||
import * as MenuApi from '@/api/system/menu'
 | 
			
		||||
import * as DeptApi from '@/api/system/dept'
 | 
			
		||||
import * as PermissionApi from '@/api/system/permission'
 | 
			
		||||
// ========== CRUD 相关 ==========
 | 
			
		||||
const actionLoading = ref(false) // 遮罩层
 | 
			
		||||
@@ -131,7 +131,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => {
 | 
			
		||||
  actionScopeType.value = type
 | 
			
		||||
  dialogScopeVisible.value = true
 | 
			
		||||
  if (type === 'menu') {
 | 
			
		||||
    const menuRes = await listSimpleMenusApi()
 | 
			
		||||
    const menuRes = await MenuApi.getSimpleMenusList()
 | 
			
		||||
    treeOptions.value = handleTree(menuRes)
 | 
			
		||||
    const role = await PermissionApi.listRoleMenusApi(row.id)
 | 
			
		||||
    if (role) {
 | 
			
		||||
@@ -140,7 +140,7 @@ const openModal = async (type: string, row: RoleApi.RoleVO) => {
 | 
			
		||||
      })
 | 
			
		||||
    }
 | 
			
		||||
  } else if (type === 'data') {
 | 
			
		||||
    const deptRes = await listSimpleDeptApi()
 | 
			
		||||
    const deptRes = await DeptApi.getSimpleDeptList()
 | 
			
		||||
    treeOptions.value = handleTree(deptRes)
 | 
			
		||||
    const role = await RoleApi.getRole(row.id)
 | 
			
		||||
    dataScopeForm.dataScope = role.dataScope
 | 
			
		||||
 
 | 
			
		||||
@@ -44,12 +44,11 @@
 | 
			
		||||
<script setup lang="ts">
 | 
			
		||||
import { getDictOptions } from '@/utils/dict'
 | 
			
		||||
import { CommonStatusEnum } from '@/utils/constants'
 | 
			
		||||
import type { FormExpose } from '@/components/Form'
 | 
			
		||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 | 
			
		||||
import * as RoleApi from '@/api/system/role'
 | 
			
		||||
// ========== CRUD 相关 ==========
 | 
			
		||||
const dialogTitle = ref('edit') // 弹出层标题
 | 
			
		||||
const formRef = ref<FormExpose>() // 表单 Ref
 | 
			
		||||
const formRef = ref() // 表单 Ref
 | 
			
		||||
const { t } = useI18n() // 国际化
 | 
			
		||||
const dataScopeDictDatas = ref()
 | 
			
		||||
const message = useMessage() // 消息弹窗
 | 
			
		||||
@@ -97,6 +96,7 @@ const resetForm = () => {
 | 
			
		||||
  formData.value = {
 | 
			
		||||
    id: undefined,
 | 
			
		||||
    name: '',
 | 
			
		||||
    type: '',
 | 
			
		||||
    code: '',
 | 
			
		||||
    sort: undefined,
 | 
			
		||||
    status: CommonStatusEnum.ENABLE,
 | 
			
		||||
 
 | 
			
		||||
@@ -228,7 +228,7 @@ const handleExport = async () => {
 | 
			
		||||
    await message.exportConfirm()
 | 
			
		||||
    // 发起导出
 | 
			
		||||
    exportLoading.value = true
 | 
			
		||||
    const data = await RoleApi.exportPostApi(queryParams)
 | 
			
		||||
    const data = await RoleApi.exportRole(queryParams)
 | 
			
		||||
    download.excel(data, '角色列表.xls')
 | 
			
		||||
  } catch {
 | 
			
		||||
  } finally {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user