This commit is contained in:
2026-02-11 15:16:11 +08:00
parent 2720de7f44
commit 1bfe30651e
18 changed files with 444 additions and 689 deletions

View File

@@ -4,7 +4,7 @@
<a-form :model="form" :rules="rules" :disabled="mode === 'show'" ref="dialogForm" :label-col="{ span: 5 }"
:wrapper-col="{ span: 18 }">
<a-form-item label="上级部门" name="parent_id">
<a-tree-select v-model:value="form.parent_id" :tree-data="departments"
<a-tree-select v-model:value="form.parent_id" :tree-data="filteredDepartments"
:field-names="departmentFieldNames" :tree-default-expand-all="false" placeholder="请选择上级部门"
allow-clear tree-node-filter-prop="name"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" />
@@ -21,6 +21,12 @@
<a-form-item label="排序" name="sort">
<a-input-number v-model:value="form.sort" :min="0" :max="10000" style="width: 100%" placeholder="请输入排序" />
</a-form-item>
<a-form-item label="状态" name="status">
<a-radio-group v-model:value="form.status">
<a-radio :value="1">正常</a-radio>
<a-radio :value="0">禁用</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item :wrapper-col="{ offset: 5 }">
<div style="display: flex; gap: 10px">
<a-button v-if="mode !== 'show'" type="primary" :loading="isSaveing" @click="submit"> </a-button>
@@ -32,12 +38,12 @@
</template>
<script setup>
import { ref, reactive } from 'vue'
import { ref, reactive, computed } from 'vue'
import { message } from 'ant-design-vue'
import authApi from '@/api/auth'
defineOptions({
name: 'DepartmentSave'
name: 'DepartmentSaveDialog'
})
const emit = defineEmits(['success', 'closed'])
@@ -82,6 +88,27 @@ const departmentFieldNames = {
children: 'children'
}
// ID
const currentEditId = ref(null)
//
const filteredDepartments = computed(() => {
if (mode.value === 'add') {
return departments.value
}
return filterDepartments(departments.value, currentEditId.value)
})
//
const filterDepartments = (tree, excludeId) => {
return tree
.filter(item => item.id !== excludeId)
.map(item => ({
...item,
children: item.children ? filterDepartments(item.children, excludeId) : undefined
}))
}
//
const open = (openMode = 'add') => {
mode.value = openMode
@@ -148,6 +175,7 @@ const loadDepartments = async () => {
//
const setData = (data) => {
form.id = data.id
currentEditId.value = data.id
form.name = data.name
form.leader = data.leader || ''
form.phone = data.phone || ''

View File

@@ -1,42 +1,107 @@
<template>
<div class="pages department-page">
<div class="pages-base-layout department-page">
<!-- 工具栏区域 -->
<div class="tool-bar">
<div class="left-panel">
<a-form layout="inline" :model="searchForm">
<a-form-item>
<a-form-item label="部门名称">
<a-input v-model:value="searchForm.keyword" placeholder="请输入部门名称" allow-clear style="width: 200px" />
</a-form-item>
<a-form-item label="状态">
<a-select v-model:value="searchForm.status" placeholder="请选择状态" allow-clear style="width: 120px">
<a-select-option :value="1">正常</a-select-option>
<a-select-option :value="0">禁用</a-select-option>
</a-select>
</a-form-item>
<a-form-item>
<a-space>
<a-button type="primary" @click="handleSearch">
<template #icon><search-outlined /></template>
搜索
</a-button>
<a-button @click="handleReset">
<template #icon><redo-outlined /></template>
重置
</a-button>
</a-space>
</a-form-item>
</a-form>
</div>
<div class="right-panel">
<a-button type="primary" @click="handleAdd">
<template #icon><plus-outlined /></template>
</a-button>
<a-button danger :disabled="selectedRows.length === 0" @click="handleBatchDelete">
<template #icon><delete-outlined /></template>
</a-button>
<a-space>
<a-button type="primary" @click="handleAdd">
<template #icon><plus-outlined /></template>
新增
</a-button>
<a-button :disabled="selectedRows.length === 0" @click="handleBatchStatus(1)">
<template #icon><check-circle-outlined /></template>
启用
</a-button>
<a-button :disabled="selectedRows.length === 0" @click="handleBatchStatus(0)">
<template #icon><stop-outlined /></template>
禁用
</a-button>
<a-dropdown>
<a-button :disabled="selectedRows.length === 0">
<template #icon><more-outlined /></template>
更多
</a-button>
<template #overlay>
<a-menu>
<a-menu-item @click="handleExport">
<template #icon><download-outlined /></template>
导出
</a-menu-item>
<a-menu-item @click="handleImport">
<template #icon><upload-outlined /></template>
导入
</a-menu-item>
<a-menu-divider />
<a-menu-item danger @click="handleBatchDelete">
<template #icon><delete-outlined /></template>
批量删除
</a-menu-item>
</a-menu>
</template>
</a-dropdown>
</a-space>
</div>
</div>
<!-- 表格内容区域 -->
<div class="table-content">
<scTable ref="tableRef" :columns="columns" :data-source="tableData" :loading="loading" :pagination="false"
:row-key="rowKey" :row-selection="rowSelection" @refresh="refreshTable" @select="handleSelectChange"
@selectAll="handleSelectAll">
<scTable
ref="tableRef"
:columns="columns"
:data-source="tableData"
:loading="loading"
:pagination="false"
:row-key="rowKey"
:row-selection="rowSelection"
@refresh="refreshTable"
@select="handleSelectChange"
@selectAll="handleSelectAll"
>
<template #status="{ record }">
<a-tag :color="record.status === 1 ? 'green' : 'red'">
{{ record.status === 1 ? '正常' : '禁用' }}
</a-tag>
</template>
<template #action="{ record }">
<a-space>
<a-button type="link" size="small" @click="handleView(record)">查看</a-button>
<a-button type="link" size="small" @click="handleEdit(record)">编辑</a-button>
<a-popconfirm title="确定删除该部门吗?" @confirm="handleDelete(record)">
<a-button type="link" size="small" danger>删除</a-button>
<a-button type="link" size="small" @click="handleView(record)">
<template #icon><eye-outlined /></template>
查看
</a-button>
<a-button type="link" size="small" @click="handleEdit(record)">
<template #icon><edit-outlined /></template>
编辑
</a-button>
<a-popconfirm title="确定删除该部门吗?如果该部门下有子部门或用户,将无法删除" @confirm="handleDelete(record)">
<a-button type="link" size="small" danger>
<template #icon><delete-outlined /></template>
删除
</a-button>
</a-popconfirm>
</a-space>
</template>
@@ -44,15 +109,38 @@
</div>
</div>
<!-- 新增/编辑部门弹窗 -->
<!-- 新增/编辑/查看部门弹窗 -->
<save-dialog v-if="dialog.save" ref="saveDialogRef" @success="handleSaveSuccess" @closed="dialog.save = false" />
<!-- 导入弹窗 -->
<a-modal v-model:open="dialog.import" title="导入部门" :width="500" :footer="null">
<a-space direction="vertical" style="width: 100%">
<a-alert message="导入说明" description="请先下载模板,按照模板格式填写数据后上传。如果部门名称已存在则跳过。" type="info" show-icon />
<a-button @click="handleDownloadTemplate" style="width: 100%">
<template #icon><download-outlined /></template>
下载导入模板
</a-button>
<a-upload
:file-list="importFileList"
:before-upload="handleImportUpload"
@remove="() => importFileList = []"
accept=".xlsx,.xls"
:max-count="1"
>
<a-button>
<template #icon><upload-outlined /></template>
选择文件
</a-button>
</a-upload>
</a-space>
</a-modal>
</template>
<script setup>
import { ref, reactive, onMounted } from 'vue'
import { message, Modal } from 'ant-design-vue'
import scTable from '@/components/scTable/index.vue'
import saveDialog from './save.vue'
import saveDialog from './components/SaveDialog.vue'
import authApi from '@/api/auth'
import { useTable } from '@/hooks/useTable'
@@ -76,7 +164,8 @@ const {
} = useTable({
api: authApi.departments.tree.get,
searchForm: {
keyword: ''
keyword: '',
status: null
},
columns: [],
needPagination: false,
@@ -86,12 +175,16 @@ const {
// 对话框状态
const dialog = reactive({
save: false
save: false,
import: false
})
// 弹窗引用
const saveDialogRef = ref(null)
// 导入文件列表
const importFileList = ref([])
// 行key
const rowKey = 'id'
@@ -99,11 +192,13 @@ const rowKey = 'id'
const columns = [
{ title: '#', dataIndex: '_index', key: '_index', width: 60, align: 'center' },
{ title: '部门名称', dataIndex: 'name', key: 'name', width: 300 },
{ title: '负责人', dataIndex: 'leader', key: 'leader', width: 120 },
{ title: '联系电话', dataIndex: 'phone', key: 'phone', width: 150 },
{ title: '排序', dataIndex: 'sort', key: 'sort', width: 100, align: 'center' },
{ title: '状态', dataIndex: 'status', key: 'status', width: 100, align: 'center', slot: 'status' },
{ title: '操作', dataIndex: 'action', key: 'action', width: 220, align: 'center', slot: 'action', fixed: 'right' }
]
// 新增部门
const handleAdd = () => {
dialog.save = true
@@ -140,7 +235,12 @@ const handleDelete = async (record) => {
}
} catch (error) {
console.error('删除部门失败:', error)
message.error('删除失败')
// 如果是验证错误,显示具体错误信息
if (error.response?.data?.message) {
message.error(error.response.data.message)
} else {
message.error('删除失败')
}
}
}
@@ -153,7 +253,7 @@ const handleBatchDelete = () => {
Modal.confirm({
title: '确认删除',
content: `确定删除选中的 ${selectedRows.value.length} 个部门吗?如果删除项中含有子集将会被一并删除`,
content: `确定删除选中的 ${selectedRows.value.length} 个部门吗?如果删除项中含有子集或用户,将会被一并删除`,
okText: '确定',
cancelText: '取消',
okType: 'danger',
@@ -162,7 +262,7 @@ const handleBatchDelete = () => {
const ids = selectedRows.value.map(item => item.id)
const res = await authApi.departments.batchDelete.post({ ids })
if (res.code === 200) {
message.success('删除成功')
message.success(res.message || '删除成功')
selectedRows.value = []
refreshTable()
} else {
@@ -170,12 +270,127 @@ const handleBatchDelete = () => {
}
} catch (error) {
console.error('批量删除部门失败:', error)
message.error('删除失败')
if (error.response?.data?.message) {
message.error(error.response.data.message)
} else {
message.error('删除失败')
}
}
}
})
}
// 批量更新状态
const handleBatchStatus = (status) => {
if (selectedRows.value.length === 0) {
message.warning('请选择要操作的部门')
return
}
Modal.confirm({
title: '确认操作',
content: `确定${status === 1 ? '启用' : '禁用'}选中的 ${selectedRows.value.length} 个部门吗?`,
okText: '确定',
cancelText: '取消',
onOk: async () => {
try {
const ids = selectedRows.value.map(item => item.id)
const res = await authApi.departments.batchStatus.post({ ids, status })
if (res.code === 200) {
message.success(res.message || '操作成功')
selectedRows.value = []
refreshTable()
} else {
message.error(res.message || '操作失败')
}
} catch (error) {
console.error('批量更新状态失败:', error)
message.error('操作失败')
}
}
})
}
// 导出部门
const handleExport = async () => {
try {
let ids = []
if (selectedRows.value.length > 0) {
ids = selectedRows.value.map(item => item.id)
}
const res = await authApi.departments.export.post({ ids }, { responseType: 'blob' })
// 创建下载链接
const url = window.URL.createObjectURL(new Blob([res]))
const link = document.createElement('a')
link.href = url
link.setAttribute('download', `部门列表_${new Date().getTime()}.xlsx`)
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
window.URL.revokeObjectURL(url)
message.success('导出成功')
selectedRows.value = []
} catch (error) {
console.error('导出失败:', error)
message.error('导出失败')
}
}
// 导入部门
const handleImport = () => {
importFileList.value = []
dialog.import = true
}
// 上传导入文件
const handleImportUpload = async (file) => {
const formData = new FormData()
formData.append('file', file)
try {
importFileList.value = [{ uid: file.uid, name: file.name, status: 'uploading' }]
const res = await authApi.departments.import.post(formData)
importFileList.value = []
dialog.import = false
if (res.code === 200) {
message.success(res.message || '导入成功')
refreshTable()
} else {
message.error(res.message || '导入失败')
}
} catch (error) {
console.error('导入失败:', error)
importFileList.value = []
message.error(error.response?.data?.message || '导入失败')
}
return false // 阻止自动上传
}
// 下载导入模板
const handleDownloadTemplate = async () => {
try {
const res = await authApi.departments.downloadTemplate.get({ responseType: 'blob' })
// 创建下载链接
const url = window.URL.createObjectURL(new Blob([res]))
const link = document.createElement('a')
link.href = url
link.setAttribute('download', '部门导入模板.xlsx')
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
window.URL.revokeObjectURL(url)
} catch (error) {
console.error('下载模板失败:', error)
message.error('下载模板失败')
}
}
// 保存成功回调
const handleSaveSuccess = () => {
refreshTable()
@@ -186,18 +401,3 @@ onMounted(() => {
refreshTable()
})
</script>
<style scoped lang="scss">
.department-page {
display: flex;
flex-direction: column;
height: 100%;
padding: 0;
.table-content {
flex: 1;
overflow: hidden;
background: #f5f5f5;
}
}
</style>

View File

@@ -365,7 +365,7 @@ defineExpose({
.form-tip {
font-size: 12px;
color: #8c8c8;
color: #8c8c8c;
margin-top: 4px;
line-height: 1.5;
}

View File

@@ -263,9 +263,3 @@ onMounted(() => {
loadMenuTree()
})
</script>
<style scoped lang="scss">
.permission-page {
@extend .pages-sidebar-layout;
}
</style>

View File

@@ -1,379 +0,0 @@
<template>
<div class="save-form">
<a-form :model="form" :rules="rules" ref="dialogForm" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
<!-- 第一行权限名称和类型 -->
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="权限名称" name="title">
<a-input v-model:value="form.title" placeholder="权限名称" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="类型" name="type" :label-col="{ span: 6 }" :wrapper-col="{ span: 16 }">
<a-radio-group v-model:value="form.type" button-style="solid">
<a-radio-button value="menu">菜单</a-radio-button>
<a-radio-button value="api">接口</a-radio-button>
<a-radio-button value="button">按钮</a-radio-button>
</a-radio-group>
</a-form-item>
</a-col>
</a-row>
<!-- 第二行上级菜单和权限编码 -->
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="上级权限" name="parent_id">
<a-tree-select v-model:value="form.parent_id" :tree-data="menuOptions"
:field-names="menuFieldNames" :tree-default-expand-all="false" show-icon placeholder="顶级权限"
allow-clear tree-node-filter-prop="title" :disabled="!!menuId" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="权限编码" name="name">
<a-input v-model:value="form.name" placeholder="如: system.user.list" allow-clear />
<div class="form-item-msg">格式模块.功能.操作系统唯一标识</div>
</a-form-item>
</a-col>
</a-row>
<!-- 第三行路由地址和组件路径 -->
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="路由地址" name="path">
<a-input v-model:value="form.path" placeholder="/system/users" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="组件路径" name="component">
<a-input v-model:value="form.component" placeholder="system/users/index" allow-clear>
<template #addonBefore>pages/</template>
</a-input>
<div class="form-item-msg">顶级菜单或有子菜单的父节点不需要填写</div>
</a-form-item>
</a-col>
</a-row>
<!-- 第四行菜单图标和排序 -->
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="菜单图标" name="icon">
<sc-icon-picker v-model:value="form.icon" placeholder="请选择图标" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="排序" name="sort">
<a-input-number v-model:value="form.sort" :min="0" :max="10000" style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
<!-- 分隔线 -->
<a-divider />
<!-- 选项设置区域 -->
<div class="options-section">
<h4>选项设置</h4>
<a-row :gutter="16">
<a-col :span="8">
<a-form-item label="是否隐藏" name="hidden" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
<a-checkbox v-model:checked="form.hidden">隐藏菜单</a-checkbox>
<a-checkbox v-model:checked="form.hiddenBreadcrumb">隐藏面包屑</a-checkbox>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="是否缓存" name="keepAlive" :label-col="{ span: 8 }" :wrapper-col="{ span: 14 }">
<a-switch v-model:checked="form.keepAlive" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="是否固定" name="affix" :label-col="{ span: 8 }" :wrapper-col="{ span: 14 }">
<a-switch v-model:checked="form.affix" />
</a-form-item>
</a-col>
</a-row>
</div>
<!-- 状态 -->
<a-divider />
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="状态" name="status" :label-col="{ span: 6 }" :wrapper-col="{ span: 16 }">
<a-switch v-model:checked="statusChecked" checked-children="启用" un-checked-children="禁用" />
</a-form-item>
</a-col>
</a-row>
<!-- 操作按钮 -->
<a-form-item :wrapper-col="{ span: 18, offset: 4 }" style="margin-top: 32px">
<a-space>
<a-button type="primary" @click="handleSave" :loading="loading" size="large">保存</a-button>
<a-button @click="$emit('cancel')" size="large">取消</a-button>
</a-space>
</a-form-item>
</a-form>
</div>
</template>
<script setup>
import { ref, reactive, watch, computed, onMounted } from 'vue'
import { message } from 'ant-design-vue'
import authApi from '@/api/auth'
import ScIconPicker from '@/components/scIconPicker/index.vue'
defineOptions({
name: 'PermissionSave'
})
const props = defineProps({
menu: { type: [Object, Array], default: () => [] },
menuId: { type: [Number, String], default: null },
parentId: { type: [Number, String], default: null }
})
const emit = defineEmits(['success', 'cancel'])
// 表单数据
const form = reactive({
id: '',
parent_id: 0,
name: '',
title: '',
path: '',
component: '',
icon: '',
sort: 0,
type: 'menu',
status: 1,
// meta 字段内容
hidden: false,
hiddenBreadcrumb: false,
keepAlive: false,
affix: false
})
// 状态开关计算属性
const statusChecked = computed({
get: () => form.status === 1,
set: (val) => {
form.status = val ? 1 : 0
}
})
// 表单引用
const dialogForm = ref()
const loading = ref(false)
// 验证规则
const rules = {
name: [{ required: true, message: '请输入权限名称', trigger: 'blur' }],
code: [{ required: true, message: '请输入权限编码', trigger: 'blur' }],
type: [{ required: true, message: '请选择类型', trigger: 'change' }]
}
// 菜单选项
const menuOptions = ref([])
const menuFieldNames = {
value: 'id',
label: 'title',
children: 'children'
}
// 简单化菜单树,排除自己和子节点
const treeToMap = (tree, excludeId = null) => {
const map = []
tree.forEach(item => {
if (item.id === excludeId) return // 排除自己
const obj = {
id: item.id,
parent_id: item.parent_id,
title: item.title,
children: item.children && item.children.length > 0 ? treeToMap(item.children, excludeId) : null
}
map.push(obj)
})
return map
}
// 查找权限节点
const findMenuNode = (tree, id) => {
for (const node of tree) {
if (node.id === id) {
return node
}
if (node.children && node.children.length > 0) {
const found = findMenuNode(node.children, id)
if (found) return found
}
}
return null
}
// 监听菜单树变化
watch(
() => props.menu,
(newVal) => {
if (newVal) {
// 排除当前编辑的节点,避免选择自己作为父节点
menuOptions.value = treeToMap(newVal, props.menuId)
}
},
{ deep: true, immediate: true }
)
// 监听 menuId 变化,从菜单树中查找并赋值
watch(
() => props.menuId,
(newVal) => {
if (newVal && props.menu && props.menu.length > 0) {
const menuNode = findMenuNode(props.menu, newVal)
if (menuNode) {
setData(menuNode, props.parentId)
}
} else if (!newVal) {
// 清空表单
setData({
id: '',
parent_id: props.parentId || 0,
name: '',
title: '',
route: '',
component: '',
icon: '',
sort: 0,
type: 'menu',
status: 1,
hidden: false,
hiddenBreadcrumb: false,
keepAlive: false,
affix: false
})
}
}
)
// 加载权限详情
const loadMenuDetail = async (id) => {
try {
const res = await authApi.permissions.detail.get(id)
if (res.code === 200 && res.data) {
setData(res.data, props.parentId)
}
} catch (error) {
console.error('加载权限详情失败:', error)
}
}
// 保存
const handleSave = async () => {
try {
await dialogForm.value.validate()
loading.value = true
// 构建提交数据
const submitData = {
id: form.id || undefined,
parent_id: form.parent_id || 0,
name: form.name,
title: form.title,
path: form.path,
component: form.component,
icon: form.icon,
sort: form.sort,
type: form.type,
status: form.status,
meta: {
hidden: form.hidden,
hiddenBreadcrumb: form.hiddenBreadcrumb,
keepAlive: form.keepAlive,
affix: form.affix
}
}
let res = {}
if (form.id) {
res = await authApi.permissions.edit.put(form.id, submitData)
} else {
res = await authApi.permissions.add.post(submitData)
}
loading.value = false
if (res.code === 200) {
message.success('保存成功')
emit('success')
} else {
message.error(res.message || '保存失败')
}
} catch (error) {
console.error('表单验证失败', error)
loading.value = false
}
}
// 表单注入数据
const setData = (data, pid) => {
form.id = data.id || ''
form.parent_id = data.parent_id !== undefined ? data.parent_id : (pid || 0)
form.name = data.name || ''
form.title = data.title || ''
form.path = data.path || ''
form.component = data.component || ''
form.icon = data.icon || ''
form.sort = data.sort || 0
form.type = data.type || 'menu'
form.status = data.status !== undefined ? data.status : 1
// 解析 meta 字段
const meta = data.meta && typeof data.meta === 'string' ? JSON.parse(data.meta) : (data.meta || {})
form.hidden = meta.hidden || false
form.hiddenBreadcrumb = meta.hiddenBreadcrumb || false
form.keepAlive = meta.keepAlive || false
form.affix = meta.affix || false
}
// 初始化
onMounted(() => {
if (props.menuId) {
loadMenuDetail(props.menuId)
} else if (props.parentId) {
form.parent_id = props.parentId
}
})
// 暴露方法给父组件
defineExpose({
setData
})
</script>
<style scoped lang="scss">
.save-form {
padding: 24px;
background: #fff;
.form-item-msg {
font-size: 12px;
color: #8c8c8c;
margin-top: 4px;
line-height: 1.5;
}
.options-section {
margin-top: 16px;
h4 {
font-size: 16px;
font-weight: 500;
color: #262626;
margin-bottom: 24px;
}
}
:deep(.ant-divider) {
margin: 32px 0;
}
:deep(.ant-form-item) {
margin-bottom: 24px;
}
}
</style>

View File

@@ -303,9 +303,3 @@ const permissionSuccess = () => {
refreshTable()
}
</script>
<style scoped lang="scss">
.role-page {
@extend .pages-base-layout;
}
</style>

View File

@@ -503,9 +503,3 @@ onMounted(() => {
loadDepartmentTree()
})
</script>
<style scoped lang="scss">
.user-page {
@extend .pages-sidebar-layout;
}
</style>