Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client
This commit is contained in:
@@ -51,7 +51,7 @@
|
|||||||
} from '@/api/role/role'
|
} from '@/api/role/role'
|
||||||
|
|
||||||
const dictStore = useDictStore()
|
const dictStore = useDictStore()
|
||||||
const {dialogVisible,title,data,openType,updataList} = defineProps<{
|
const {dialogVisible,title,data,openType} = defineProps<{
|
||||||
dialogVisible:boolean;
|
dialogVisible:boolean;
|
||||||
title:string;
|
title:string;
|
||||||
openType:string;
|
openType:string;
|
||||||
@@ -62,7 +62,6 @@
|
|||||||
type: number;
|
type: number;
|
||||||
remark:string; //角色描述
|
remark:string; //角色描述
|
||||||
}
|
}
|
||||||
updataList:Function
|
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
//定义规则
|
//定义规则
|
||||||
|
|||||||
@@ -3,13 +3,14 @@
|
|||||||
<ProTable
|
<ProTable
|
||||||
ref='proTable'
|
ref='proTable'
|
||||||
:columns='columns'
|
:columns='columns'
|
||||||
:data='roleData'
|
:request-api="getTableList"
|
||||||
|
:data-callback="dataCallback"
|
||||||
>
|
>
|
||||||
<!-- :requestApi="getRoleList" -->
|
<!-- :requestApi="getRoleList" -->
|
||||||
<!-- 表格 header 按钮 -->
|
<!-- 表格 header 按钮 -->
|
||||||
<template #tableHeader='scope'>
|
<template #tableHeader='scope'>
|
||||||
<el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
|
<el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
|
||||||
<el-button type='primary' :icon='Download' plain >导出数据</el-button>
|
<el-button type='primary' :icon='Download' plain>导出数据</el-button>
|
||||||
<el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
|
<el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
|
||||||
@click='batchDelete(scope.selectedListIds)'>
|
@click='batchDelete(scope.selectedListIds)'>
|
||||||
批量删除
|
批量删除
|
||||||
@@ -25,45 +26,45 @@
|
|||||||
</ProTable>
|
</ProTable>
|
||||||
</div>
|
</div>
|
||||||
<rolePopup
|
<rolePopup
|
||||||
:dialogVisible = rolePopupVisible
|
:dialogVisible=rolePopupVisible
|
||||||
:title = rolePopupTitle
|
:title=rolePopupTitle
|
||||||
:data = rolePopupData
|
:data=rolePopupData
|
||||||
:openType = openType
|
:openType=openType
|
||||||
:updataList = "updataList"
|
@update:visible='rolePopupVisible = $event'
|
||||||
@update:visible="rolePopupVisible = $event"
|
|
||||||
/>
|
/>
|
||||||
<permissionUnit
|
<permissionUnit
|
||||||
:dialogVisible = permissionUnitVisible
|
:dialogVisible=permissionUnitVisible
|
||||||
:title = permissionUnitTitle
|
:title=permissionUnitTitle
|
||||||
:data = permissionUnitData
|
:data=permissionUnitData
|
||||||
@update:visible="permissionUnitVisible = $event"
|
@update:visible='permissionUnitVisible = $event'
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang='tsx' name='useRole'>
|
<script setup lang='tsx' name='useRole'>
|
||||||
import { Role } from '@/api/role/interface'
|
import { Role } from '@/api/role/interface'
|
||||||
import { useHandleData } from '@/hooks/useHandleData'
|
import { useHandleData } from '@/hooks/useHandleData'
|
||||||
import { useDownload } from '@/hooks/useDownload'
|
import { useDownload } from '@/hooks/useDownload'
|
||||||
import { useAuthButtons } from '@/hooks/useAuthButtons'
|
import { useAuthButtons } from '@/hooks/useAuthButtons'
|
||||||
import ProTable from '@/components/ProTable/index.vue'
|
import ProTable from '@/components/ProTable/index.vue'
|
||||||
import rolePopup from './components/rolePopup.vue'
|
import rolePopup from './components/rolePopup.vue'
|
||||||
import permissionUnit from './components/permissionUnit.vue'
|
import permissionUnit from './components/permissionUnit.vue'
|
||||||
import ImportExcel from '@/components/ImportExcel/index.vue'
|
import ImportExcel from '@/components/ImportExcel/index.vue'
|
||||||
import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
|
import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
|
||||||
|
|
||||||
import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
|
import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
|
||||||
import roleDataList from '@/api/role/roleData'
|
import { useDictStore } from '@/stores/modules/dict'
|
||||||
import { useDictStore } from '@/stores/modules/dict'
|
import {
|
||||||
import {
|
|
||||||
getRoleList,
|
getRoleList,
|
||||||
addRole,
|
addRole,
|
||||||
editRole,
|
editRole,
|
||||||
deleteRole,
|
deleteRole,
|
||||||
} from '@/api/role/role'
|
} from '@/api/role/role'
|
||||||
|
import { deleteUser } from '@/api/user/user'
|
||||||
|
|
||||||
|
|
||||||
const {rolePopupVisible,permissionUnitVisible,rolePopupTitle,permissionUnitTitle,rolePopupData,permissionUnitData} = useCount();
|
const { rolePopupVisible, permissionUnitVisible, rolePopupTitle, permissionUnitTitle, rolePopupData, permissionUnitData } = useCount()
|
||||||
function useCount() {
|
|
||||||
|
function useCount() {
|
||||||
const rolePopupVisible = ref(false)
|
const rolePopupVisible = ref(false)
|
||||||
const permissionUnitVisible = ref(false)
|
const permissionUnitVisible = ref(false)
|
||||||
const rolePopupTitle = ref()
|
const rolePopupTitle = ref()
|
||||||
@@ -71,66 +72,44 @@
|
|||||||
const rolePopupData = ref<Role.RoleBO>({} as Role.RoleBO)
|
const rolePopupData = ref<Role.RoleBO>({} as Role.RoleBO)
|
||||||
const permissionUnitData = ref<Role.RoleBO>({} as Role.RoleBO)
|
const permissionUnitData = ref<Role.RoleBO>({} as Role.RoleBO)
|
||||||
// const permissionUnitData = ref<Role.Permission[]>([])
|
// const permissionUnitData = ref<Role.Permission[]>([])
|
||||||
return {rolePopupVisible,permissionUnitVisible,rolePopupTitle,permissionUnitTitle,rolePopupData,permissionUnitData};
|
return { rolePopupVisible, permissionUnitVisible, rolePopupTitle, permissionUnitTitle, rolePopupData, permissionUnitData }
|
||||||
}
|
}
|
||||||
|
|
||||||
const dictStore = useDictStore()
|
const dictStore = useDictStore()
|
||||||
let openType = ''
|
let openType = ''
|
||||||
|
|
||||||
//const roleData = roleDataList
|
|
||||||
const roleData = ref<Role.RoleBO[]>([])
|
|
||||||
|
|
||||||
function updataList() {
|
// ProTable 实例
|
||||||
getRoleList({
|
const proTable = ref<ProTableInstance>()
|
||||||
id: '',
|
|
||||||
name: '',
|
|
||||||
code: '',
|
|
||||||
type: 0,
|
|
||||||
remark: '',
|
|
||||||
pageNum: 1,
|
|
||||||
pageSize: 10,
|
|
||||||
}).then(res => {
|
|
||||||
|
|
||||||
if(res.code == '200') {
|
|
||||||
roleData.value = res.data.list
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
ElMessage.error(res.message)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
updataList()
|
|
||||||
|
|
||||||
// ProTable 实例
|
|
||||||
const proTable = ref<ProTableInstance>()
|
|
||||||
|
|
||||||
// 如果表格需要初始化请求参数,直接定义传给 ProTable (之后每次请求都会自动带上该参数,此参数更改之后也会一直带上,改变此参数会自动刷新表格数据)
|
// dataCallback 是对于返回的表格数据做处理,如果你后台返回的数据不是 list && total 这些字段,可以在这里进行处理成这些字段
|
||||||
const initParam = reactive({ type: 1 })
|
// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
|
||||||
|
const dataCallback = (data: any) => {
|
||||||
// dataCallback 是对于返回的表格数据做处理,如果你后台返回的数据不是 list && total 这些字段,可以在这里进行处理成这些字段
|
|
||||||
// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
|
|
||||||
const dataCallback = (data: any) => {
|
|
||||||
return {
|
return {
|
||||||
list: data.list,
|
list: data.list,
|
||||||
total: data.total,
|
total: Number(data.total),
|
||||||
}
|
pageNum: Number(data.pageNum),
|
||||||
|
pageSize: Number(data.pageSize),
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 如果你想在请求之前对当前请求参数做一些操作,可以自定义如下函数:params 为当前所有的请求参数(包括分页),最后返回请求列表接口
|
// 如果你想在请求之前对当前请求参数做一些操作,可以自定义如下函数:params 为当前所有的请求参数(包括分页),最后返回请求列表接口
|
||||||
// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList"
|
// 默认不做操作就直接在 ProTable 组件上绑定 :requestApi="getUserList"
|
||||||
const getTableList = (params: any) => {
|
const getTableList = (params: any) => {
|
||||||
let newParams = JSON.parse(JSON.stringify(params))
|
let newParams = JSON.parse(JSON.stringify(params))
|
||||||
newParams.createTime && (newParams.startTime = newParams.createTime[0])
|
newParams.createTime && (newParams.startTime = newParams.createTime[0])
|
||||||
newParams.createTime && (newParams.endTime = newParams.createTime[1])
|
newParams.createTime && (newParams.endTime = newParams.createTime[1])
|
||||||
delete newParams.createTime
|
delete newParams.createTime
|
||||||
return getRoleList(newParams)
|
return getRoleList(newParams)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 页面按钮权限(按钮权限既可以使用 hooks,也可以直接使用 v-auth 指令,指令适合直接绑定在按钮上,hooks 适合根据按钮权限显示不同的内容)
|
// 页面按钮权限(按钮权限既可以使用 hooks,也可以直接使用 v-auth 指令,指令适合直接绑定在按钮上,hooks 适合根据按钮权限显示不同的内容)
|
||||||
const { BUTTONS } = useAuthButtons()
|
const { BUTTONS } = useAuthButtons()
|
||||||
|
|
||||||
// 表格配置项
|
// 表格配置项
|
||||||
const columns = reactive<ColumnProps<Role.RoleBO>[]>([
|
const columns = reactive<ColumnProps<Role.RoleBO>[]>([
|
||||||
{ type: 'selection', fixed: 'left', width: 70 },
|
{ type: 'selection', fixed: 'left', width: 70 },
|
||||||
{ type: 'index', fixed: 'left', width: 70, label: '序号' },
|
{ type: 'index', fixed: 'left', width: 70, label: '序号' },
|
||||||
{
|
{
|
||||||
@@ -158,73 +137,50 @@
|
|||||||
label: '描述',
|
label: '描述',
|
||||||
minWidth: 380,
|
minWidth: 380,
|
||||||
},
|
},
|
||||||
// {
|
|
||||||
// prop: 'status',
|
|
||||||
|
|
||||||
// label: '状态',
|
|
||||||
// enum: dictStore.getDictData('status'),
|
|
||||||
// search: { el: 'tree-select', props: { filterable: true } },
|
|
||||||
|
|
||||||
// minWidth: 100,
|
|
||||||
// fieldNames: { label: 'label', value: 'code' },
|
|
||||||
// render: scope => {
|
|
||||||
// return (
|
|
||||||
// <el-tag type={scope.row.state ? 'success' : 'danger'}>{scope.row.state ? '启用' : '禁用'}</el-tag>
|
|
||||||
// )
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
{ prop: 'operation', label: '操作', fixed: 'right', width: 330 },
|
{ prop: 'operation', label: '操作', fixed: 'right', width: 330 },
|
||||||
])
|
])
|
||||||
|
|
||||||
// 删除角色信息
|
|
||||||
const deleteAccount = async (params: Role.RoleBO) => {
|
|
||||||
if(params.id)
|
|
||||||
{
|
|
||||||
let deleteData = {id:[params.id]}
|
|
||||||
|
|
||||||
|
// 删除角色信息
|
||||||
|
const deleteAccount = async (params: Role.RoleBO) => {
|
||||||
|
if (params.id) {
|
||||||
|
let deleteData = { id: [params.id] }
|
||||||
deleteRole(deleteData).then(res => {
|
deleteRole(deleteData).then(res => {
|
||||||
if(res.code === "200")
|
if (res.code === '200') {
|
||||||
{
|
|
||||||
ElMessage.success(res.message)
|
ElMessage.success(res.message)
|
||||||
updataList()
|
proTable.value?.getTableList();
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
ElMessage.error(res.message)
|
ElMessage.error(res.message)
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// await useHandleData(deleteRole, { id: [params.id] }, `删除【${params.name}】角色`)
|
}
|
||||||
// proTable.value?.getTableList()
|
|
||||||
updataList()
|
|
||||||
}
|
|
||||||
|
|
||||||
// 批量删除角色信息
|
// 批量删除角色信息
|
||||||
const batchDelete = async (id: string[]) => {
|
const batchDelete = async (id: string[]) => {
|
||||||
await useHandleData(deleteRole, { id }, '删除所选角色信息')
|
await useHandleData(deleteRole, { id }, '删除所选角色信息')
|
||||||
proTable.value?.clearSelection()
|
proTable.value?.clearSelection()
|
||||||
proTable.value?.getTableList()
|
proTable.value?.getTableList()
|
||||||
}
|
}
|
||||||
|
|
||||||
// 切换角色状态
|
// 切换角色状态
|
||||||
const changeStatus = async (row: Role.RoleBO) => {
|
const changeStatus = async (row: Role.RoleBO) => {
|
||||||
// await useHandleData(changeRoleStatus, {
|
// await useHandleData(changeRoleStatus, {
|
||||||
// id: row.id,
|
// id: row.id,
|
||||||
// status: row.status == 1 ? 0 : 1,
|
// status: row.status == 1 ? 0 : 1,
|
||||||
// }, `切换【${row.rolename}】角色状态`)
|
// }, `切换【${row.rolename}】角色状态`)
|
||||||
// proTable.value?.getTableList()
|
// proTable.value?.getTableList()
|
||||||
}
|
}
|
||||||
|
|
||||||
// 导出角色列表
|
// 导出角色列表
|
||||||
//const downloadFile = async () => {
|
//const downloadFile = async () => {
|
||||||
// ElMessageBox.confirm('确认导出角色数据?', '温馨提示', { type: 'warning' }).then(() =>
|
// ElMessageBox.confirm('确认导出角色数据?', '温馨提示', { type: 'warning' }).then(() =>
|
||||||
// useDownload(exportRoleInfo, '角色列表', proTable.value?.searchParam),
|
// useDownload(exportRoleInfo, '角色列表', proTable.value?.searchParam),
|
||||||
// )
|
// )
|
||||||
//}
|
//}
|
||||||
|
|
||||||
// 批量添加角色
|
// 批量添加角色
|
||||||
const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
|
const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
|
||||||
const batchAdd = () => {
|
const batchAdd = () => {
|
||||||
// const params = {
|
// const params = {
|
||||||
// title: '角色',
|
// title: '角色',
|
||||||
// tempApi: exportRoleInfo,
|
// tempApi: exportRoleInfo,
|
||||||
@@ -232,16 +188,15 @@
|
|||||||
// getTableList: proTable.value?.getTableList,
|
// getTableList: proTable.value?.getTableList,
|
||||||
// }
|
// }
|
||||||
// dialogRef.value?.acceptParams(params)
|
// dialogRef.value?.acceptParams(params)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 打开 drawer(新增、查看、编辑)
|
// 打开 drawer(新增、查看、编辑)
|
||||||
const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
|
const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
|
||||||
if(title === "新增角色" || title === '编辑角色' )
|
if (title === '新增角色' || title === '编辑角色') {
|
||||||
{
|
if (title === '新增角色')
|
||||||
if(title === "新增角色")
|
openType = 'add'
|
||||||
openType = "add"
|
else if (title === '编辑角色')
|
||||||
else if(title === '编辑角色')
|
openType = 'edit'
|
||||||
openType = "edit"
|
|
||||||
|
|
||||||
rolePopupVisible.value = true
|
rolePopupVisible.value = true
|
||||||
rolePopupTitle.value = title
|
rolePopupTitle.value = title
|
||||||
@@ -252,12 +207,10 @@
|
|||||||
code: row.code || '',
|
code: row.code || '',
|
||||||
type: row.type || 0,
|
type: row.type || 0,
|
||||||
remark: row.remark || '',
|
remark: row.remark || '',
|
||||||
};
|
|
||||||
|
|
||||||
rolePopupData.value = safeRow;
|
|
||||||
}
|
}
|
||||||
else if(title === "设置权限")
|
|
||||||
{
|
rolePopupData.value = safeRow
|
||||||
|
} else if (title === '设置权限') {
|
||||||
permissionUnitVisible.value = true
|
permissionUnitVisible.value = true
|
||||||
permissionUnitTitle.value = title
|
permissionUnitTitle.value = title
|
||||||
|
|
||||||
@@ -267,15 +220,15 @@
|
|||||||
code: row.code || '',
|
code: row.code || '',
|
||||||
type: row.type || 0,
|
type: row.type || 0,
|
||||||
remark: row.remark || '',
|
remark: row.remark || '',
|
||||||
};
|
}
|
||||||
|
|
||||||
permissionUnitData.value = safeRow;
|
permissionUnitData.value = safeRow
|
||||||
|
|
||||||
// if (row.permissionList)
|
// if (row.permissionList)
|
||||||
// {
|
// {
|
||||||
// permissionUnitData.value = row.permissionList;
|
// permissionUnitData.value = row.permissionList;
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
Reference in New Issue
Block a user