This commit is contained in:
yin 2026-04-02 18:21:21 +08:00
parent 43649f696e
commit 1ed76337c9
16 changed files with 4531 additions and 562 deletions

124
package-lock.json generated
View File

@ -15,6 +15,7 @@
"dayjs": "^1.11.19",
"echarts": "^6.0.0",
"element-plus": "^2.13.3",
"file-saver": "^2.0.5",
"js-cookie": "^3.0.5",
"jsbarcode": "^3.12.3",
"nprogress": "^0.2.0",
@ -28,13 +29,15 @@
"vue": "^3.5.29",
"vue-draggable-plus": "^0.6.1",
"vue-i18n": "^11.2.8",
"vue-router": "^5.0.3"
"vue-router": "^5.0.3",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@tsconfig/node24": "^24.0.4",
"@types/js-cookie": "^3.0.6",
"@types/node": "^24.11.0",
"@types/path-browserify": "^1.0.3",
"@types/qrcode": "^1.5.6",
"@types/spark-md5": "^3.0.5",
"@types/three": "^0.183.1",
"@vitejs/plugin-vue": "^6.0.4",
@ -2062,6 +2065,16 @@
"dev": true,
"license": "MIT"
},
"node_modules/@types/qrcode": {
"version": "1.5.6",
"resolved": "https://registry.npmjs.org/@types/qrcode/-/qrcode-1.5.6.tgz",
"integrity": "sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/sortablejs": {
"version": "1.15.9",
"resolved": "https://registry.npmjs.org/@types/sortablejs/-/sortablejs-1.15.9.tgz",
@ -2524,6 +2537,15 @@
"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
}
},
"node_modules/adler-32": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
"integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
"license": "Apache-2.0",
"engines": {
"node": ">=0.8"
}
},
"node_modules/ajv": {
"version": "6.14.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
@ -3036,6 +3058,19 @@
],
"license": "CC-BY-4.0"
},
"node_modules/cfb": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
"integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
"license": "Apache-2.0",
"dependencies": {
"adler-32": "~1.3.0",
"crc-32": "~1.2.0"
},
"engines": {
"node": ">=0.8"
}
},
"node_modules/chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
@ -3183,6 +3218,15 @@
"node": ">=0.8"
}
},
"node_modules/codepage": {
"version": "1.15.0",
"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
"integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
"license": "Apache-2.0",
"engines": {
"node": ">=0.8"
}
},
"node_modules/collection-visit": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@ -3303,6 +3347,18 @@
"url": "https://opencollective.com/express"
}
},
"node_modules/crc-32": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
"integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
"license": "Apache-2.0",
"bin": {
"crc32": "bin/crc32.njs"
},
"engines": {
"node": ">=0.8"
}
},
"node_modules/cross-spawn": {
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@ -4579,6 +4635,12 @@
"node": ">=16.0.0"
}
},
"node_modules/file-saver": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
"integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==",
"license": "MIT"
},
"node_modules/fill-range": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@ -4692,6 +4754,15 @@
"node": ">= 6"
}
},
"node_modules/frac": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
"integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
"license": "Apache-2.0",
"engines": {
"node": ">=0.8"
}
},
"node_modules/fragment-cache": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@ -7944,6 +8015,18 @@
"node": ">=0.10.0"
}
},
"node_modules/ssf": {
"version": "0.11.2",
"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
"integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
"license": "Apache-2.0",
"dependencies": {
"frac": "~1.1.2"
},
"engines": {
"node": ">=0.8"
}
},
"node_modules/stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
@ -9441,6 +9524,24 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/wmf": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
"integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
"license": "Apache-2.0",
"engines": {
"node": ">=0.8"
}
},
"node_modules/word": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
"integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
"license": "Apache-2.0",
"engines": {
"node": ">=0.8"
}
},
"node_modules/word-wrap": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
@ -9517,6 +9618,27 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/xlsx": {
"version": "0.18.5",
"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
"integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
"license": "Apache-2.0",
"dependencies": {
"adler-32": "~1.3.0",
"cfb": "~1.2.1",
"codepage": "~1.15.0",
"crc-32": "~1.2.1",
"ssf": "~0.11.2",
"wmf": "~1.0.1",
"word": "~0.3.0"
},
"bin": {
"xlsx": "bin/xlsx.njs"
},
"engines": {
"node": ">=0.8"
}
},
"node_modules/xml-name-validator": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",

View File

@ -20,6 +20,7 @@
"dayjs": "^1.11.19",
"echarts": "^6.0.0",
"element-plus": "^2.13.3",
"file-saver": "^2.0.5",
"js-cookie": "^3.0.5",
"jsbarcode": "^3.12.3",
"nprogress": "^0.2.0",
@ -33,13 +34,15 @@
"vue": "^3.5.29",
"vue-draggable-plus": "^0.6.1",
"vue-i18n": "^11.2.8",
"vue-router": "^5.0.3"
"vue-router": "^5.0.3",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@tsconfig/node24": "^24.0.4",
"@types/js-cookie": "^3.0.6",
"@types/node": "^24.11.0",
"@types/path-browserify": "^1.0.3",
"@types/qrcode": "^1.5.6",
"@types/spark-md5": "^3.0.5",
"@types/three": "^0.183.1",
"@vitejs/plugin-vue": "^6.0.4",

View File

@ -19,6 +19,21 @@ export function roleList(data: { includeDisabled?: boolean, includeSystem?: bool
})
}
export function permissionroleList(data: { role_id?: number, includeDisabled?: boolean, includeSystem?: boolean, employee_id?: number }) {
return request({
url: '/system',
method: 'post',
params: {
method: 'setting.role.permission',
v,
timestamp: new Date().getTime(),
},
data
})
}
/**
* 新增角色并一次性提交权限集
*/

View File

@ -272,7 +272,7 @@ onMounted(() => {
display: flex;
justify-content: center;
align-items: center;
background: #fff;
background: #d8d7d7;
border-bottom: 1px solid #f0f2f5;
cursor: pointer;
font-size: 14px;
@ -289,7 +289,8 @@ onMounted(() => {
height: 35px;
width: 100%;
background: #f0f2f5;
border-bottom: 1px solid #d8dce5;
padding-top: 2px;
// border-bottom: 1px solid #d8dce5;
.tags-view-item {
display: inline-block;
@ -340,11 +341,11 @@ onMounted(() => {
height: 16px;
line-height: 14px;
vertical-align: middle;
border-radius: 50%;
// border-radius: 50%;
text-align: center;
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
transform-origin: 100% 50%;
margin-left: 5px;
// margin-left: 5px;
font-size: 12px;
&:hover {
@ -352,6 +353,29 @@ onMounted(() => {
color: #fff;
}
}
.close-icon {
display: inline-flex;
align-items: center;
justify-content: center;
width: 16px;
height: 16px;
line-height: 16px;
vertical-align: middle;
// border-radius: 50%;
text-align: center;
transition: all 0.18s ease;
transform-origin: 100% 50%;
// margin-left: 5px;
font-size: 12px;
cursor: pointer;
box-sizing: border-box;
&:hover {
background-color: #c7cedb;
color: #fff;
}
}
}
}

View File

@ -331,6 +331,22 @@ const auditResultType = computed(() => {
})
// 方法
const flattenRoles = (rawRoles: any[]) => {
const tempMap = new Map<number, any>()
const buildFlat = (arr: any[]) => {
arr.forEach(item => {
const id = item.role_id || item.id
if (!tempMap.has(id)) {
const { children, ...rest } = item
tempMap.set(id, { ...rest, id, children: [] })
}
if (item.children && item.children.length) buildFlat(item.children)
})
}
buildFlat(rawRoles)
return Array.from(tempMap.values())
}
const getData = async (code: string) => {
if (!code) return
loading.value = true
@ -338,7 +354,7 @@ const getData = async (code: string) => {
const response: any = await getStoreRoles({ code })
if (response.code === 200) {
info.value = response.data.info
roles.value = response.data.roles || []
roles.value = flattenRoles(response.data.roles || [])
storeInfo.value = response.data.store || {}
} else {
ElMessage.error(response.msg || '获取数据失败')

View File

@ -19,7 +19,7 @@
<div class="app-error" v-if="pdaError">获取版本信息失败</div>
</div>
<div class="app-action">
<el-button type="primary" size="small" :disabled="!pdaData?.downloadUrl" @click="download(pdaData?.downloadUrl)">
<el-button type="primary" size="small" :disabled="!pdaData?.downloadUrl" @click="showQrCode">
下载
</el-button>
</div>
@ -45,14 +45,31 @@
</div>
</div>
</div>
<!-- 二维码下载弹窗 -->
<el-dialog
v-model="qrCodeVisible"
title="扫描二维码下载 PDA"
width="300px"
align-center
>
<div class="qrcode-container">
<canvas ref="qrCanvas"></canvas>
<div class="qrcode-tip">请使用 PDA 或手机扫描</div>
<div class="qrcode-link" v-if="pdaData" @click="download(pdaData.downloadUrl)">
无法扫描?点击直接下载
</div>
</div>
</el-dialog>
</el-card>
</template>
<script setup lang="ts">
import { ref, onMounted } from 'vue'
import { ref, onMounted, nextTick } from 'vue'
import { Cellphone, Monitor } from '@element-plus/icons-vue'
import dayjs from 'dayjs'
import axios from 'axios'
import QRCode from 'qrcode'
interface PdaVersionInfo {
version: string
@ -78,11 +95,32 @@ const loadingPrint = ref(true)
const pdaError = ref(false)
const printError = ref(false)
const qrCodeVisible = ref(false)
const qrCanvas = ref<HTMLCanvasElement | null>(null)
const formatDate = (dateString: string) => {
if (!dateString) return ''
return dayjs(dateString).format('YYYY-MM-DD HH:mm')
}
const showQrCode = async () => {
if (!pdaData.value?.downloadUrl) return
qrCodeVisible.value = true
await nextTick()
if (qrCanvas.value) {
QRCode.toCanvas(qrCanvas.value, pdaData.value.downloadUrl, {
width: 200,
margin: 2,
color: {
dark: '#409eff',
light: '#ffffff'
}
}, (error) => {
if (error) console.error('Failed to generate QR code', error)
})
}
}
const fetchPdaInfo = async () => {
try {
loadingPda.value = true
@ -194,4 +232,34 @@ onMounted(() => {
margin: 12px 0;
}
}
.qrcode-container {
display: flex;
flex-direction: column;
align-items: center;
padding: 10px;
canvas {
border: 1px solid #ebeef5;
border-radius: 4px;
margin-bottom: 12px;
}
.qrcode-tip {
font-size: 14px;
color: #606266;
margin-bottom: 8px;
}
.qrcode-link {
font-size: 12px;
color: #409eff;
cursor: pointer;
text-decoration: underline;
&:hover {
color: #79bbff;
}
}
}
</style>

View File

@ -103,6 +103,7 @@
v-model="createDialogVisible"
title="新建入库单"
width="600px"
align-center
@closed="handleCreateDialogClosed"
>
<el-form :model="createForm" label-width="100px" size="small">
@ -133,6 +134,7 @@ import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'
import * as indexApi from '@/api/index'
import * as entryApi from '@/api/storage/entry'
import * as XLSX from 'xlsx'
import {
availableFields,
@ -531,11 +533,46 @@ async function confirmBatchCancel() {
}
async function handleExport() {
if (list.value.length === 0) {
ElMessage.warning('当前无数据可导出')
return
}
exportLoading.value = true
setTimeout(() => {
exportLoading.value = false
try {
// 1. 过滤掉 prop 为主的空列
const exportColumns = columns.value.filter(col => col.prop && col.label)
const headers = exportColumns.map(col => col.label)
// 2. 准备数据行,应用翻译逻辑
const data = list.value.map(row => {
return exportColumns.map(col => {
const val = row[col.prop]
// 尝试使用页面已有的 translateField 函数
if (['order_status', 'order_type', 'sync_status'].includes(col.prop)) {
return translateField(col.prop, val)
}
return val === null || val === undefined ? '' : val
})
})
// 3. 创建工作簿和工作表
const ws = XLSX.utils.aoa_to_sheet([headers, ...data])
const wb = XLSX.utils.book_new()
XLSX.utils.book_append_sheet(wb, ws, '入库单列表')
// 4. 导出文件
const fileName = `入库单列表_${new Date().getTime()}.xlsx`
XLSX.writeFile(wb, fileName)
ElMessage.success('导出成功')
}, 1000)
} catch (e) {
console.error('导出 Excel 失败:', e)
ElMessage.error('导出失败')
} finally {
exportLoading.value = false
}
}
function handleImport() {

View File

@ -243,6 +243,7 @@
v-model="createDialogVisible"
title="新建收货单"
width="600px"
align-center
@closed="handleCreateDialogClosed"
>
<el-form :model="createForm" label-width="100px" size="small">
@ -293,6 +294,7 @@ import * as printerApi from '@/api/printer'
import * as templateApi from '@/api/printTemplate'
import * as stationApi from '@/api/print/station'
import JsBarcode from 'jsbarcode'
import * as XLSX from 'xlsx'
const scanBox = ref<any>(null)
const upperTable = ref<any>(null)
@ -980,21 +982,57 @@ function printReceiving() {
}
async function handleExport() {
if (list.value.length === 0) {
ElMessage.warning('当前无数据可导出')
return
}
exportLoading.value = true
try {
const params: any = { ...(scanBox.value?.getConditions?.() || {}), pageSize: 10000 }
const res: any = await receivingApi.exportReceiving(params)
if (res && res.code === 200 && res.data?.url) {
const a = document.createElement('a')
a.href = res.data.url
a.download = `收货单列表_${new Date().toISOString().slice(0, 10)}.xlsx`
a.click()
ElMessage.success('导出成功')
} else {
ElMessage.error(res?.message || '导出失败')
}
// 1. 准备表头
const headers = columns.value.map(col => col.label)
// 2. 准备数据行,应用配置中的 formatter(如果有)
const data = list.value.map(row => {
return columns.value.map(col => {
if (col.formatter && typeof col.formatter === 'function') {
return col.formatter(row)
}
const val = row[col.prop]
// 针对特定字段进行硬编码翻译(如果 formatter 没处理)
if (col.prop === 'status') {
return statusConfig[val as keyof typeof statusConfig]?.text || val
}
if (col.prop === 'detail_status') {
return detailStatusConfig[val as keyof typeof detailStatusConfig]?.text || val
}
if (col.prop === 'storage_status') {
return storageStatusConfig[val as keyof typeof storageStatusConfig]?.text || val
}
if (col.prop === 'delivery_method') {
return deliveryMethodConfig[val]?.text || val
}
if (col.prop === 'loading_method') {
return loadingMethodConfig[val]?.text || val
}
return val === null || val === undefined ? '' : val
})
})
// 3. 创建工作簿和工作表
const ws = XLSX.utils.aoa_to_sheet([headers, ...data])
const wb = XLSX.utils.book_new()
XLSX.utils.book_append_sheet(wb, ws, '收货单列表')
// 4. 导出文件
const fileName = `收货单列表_${new Date().getTime()}.xlsx`
XLSX.writeFile(wb, fileName)
ElMessage.success('导出成功')
} catch (e) {
console.error(e)
console.error('导出 Excel 失败:', e)
ElMessage.error('导出失败')
} finally {
exportLoading.value = false
@ -1005,7 +1043,7 @@ async function handleExport() {
<style scoped lang="scss">
.storage-receiving-container {
display: flex;
height: calc(100vh - 130px);
height: calc(100vh - 100px);
width: 100%;
background-color: #f0f2f5;

View File

@ -31,3 +31,10 @@ export const accountRules = {
email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }],
role_ids: [{ required: true, type: 'array', min: 1, message: '请至少选择一个角色', trigger: 'change' }]
}
export const roleTagMap: Record<string, string> = {
'超级管理员': 'danger',
'仓库经理': 'warning',
'仓库管理员': 'success',
'客服身份': 'primary'
}

View File

@ -36,7 +36,15 @@
</template>
<template #column-roles="{ row }">
<template v-if="row.roles && row.roles.length">
<el-tag v-for="r in row.roles" :key="r.role_id" size="small" style="margin:2px">{{ r.role_name }}</el-tag>
<el-tag
v-for="r in row.roles"
:key="r.role_id"
size="small"
style="margin:2px"
:type="roleTagMap[r.role_name] || 'info'"
>
{{ r.role_name }}
</el-tag>
</template>
<el-text v-else type="info" size="small">未分配</el-text>
</template>
@ -52,86 +60,93 @@
</upper-table>
<!-- 新增/编辑弹窗 -->
<el-dialog :title="textMap[dialogStatus]" v-model="dialogFormVisible" width="1300px" top="2vh" custom-class="account-dialog" @close="handleDialogClose">
<el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="80px">
<!-- 上部:基础信息 -->
<div class="form-section base-info">
<div class="section-title">基础信息</div>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="手机号" prop="phone">
<el-input v-model="temp.phone" :disabled="dialogStatus==='update'" placeholder="请输入手机号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="姓名" prop="real_name">
<el-input v-model="temp.real_name" placeholder="请输入工号姓名" />
</el-form-item>
</el-col>
<template v-if="dialogStatus === 'create'">
<el-col :span="8">
<el-form-item label="用户名" prop="username">
<el-input v-model="temp.username" placeholder="系统自动生成" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="密码" prop="password">
<el-input v-model="temp.password" type="password" placeholder="默认 111111" />
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="邮箱" prop="email">
<el-input v-model="temp.email" placeholder="请输入邮箱" />
</el-form-item>
</el-col>
</template>
<el-col :span="24">
<el-form-item label="角色组" prop="role_ids">
<el-select
v-model="temp.role_ids"
multiple
collapse-tags
collapse-tags-tooltip
placeholder="请选择角色(必选)"
style="width:100%"
v-loading="rolesForFormLoading"
>
<el-option
v-for="r in availableRoles"
:key="r.role_id"
:label="r.role_name"
:value="r.role_id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div>
<!-- 下部:头像管理 -->
<div v-if="dialogStatus === 'update'" class="form-section avatar-section">
<div class="section-title">工号头像 (支持本地上传及摄像头拍摄)</div>
<div class="avatar-upload-container">
<images-upload
v-if="temp.employee_id"
ref="imagesUploadRef"
:id="temp.employee_id"
type="avatar"
@refresh="getList"
/>
</div>
</div>
<el-dialog :title="textMap[dialogStatus]" v-model="dialogFormVisible" width="1000px" align-center custom-class="account-dialog" @close="handleDialogClose">
<el-form ref="dataForm" :rules="rules" :model="temp" label-position="top" class="custom-form">
<el-tabs v-model="activeTab" class="form-tabs">
<el-tab-pane label="基本信息" name="base">
<div class="form-section no-shadow">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="手机号" prop="phone">
<el-input v-model="temp.phone" :disabled="dialogStatus==='update'" placeholder="请输入手机号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="姓名" prop="real_name">
<el-input v-model="temp.real_name" placeholder="请输入工号姓名" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" v-if="dialogStatus === 'create'">
<el-col :span="12">
<el-form-item label="用户名" prop="username">
<el-input v-model="temp.username" placeholder="系统自动生成" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="密码" prop="password">
<el-input v-model="temp.password" type="password" show-password placeholder="默认 111111" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="temp.email" placeholder="请输入邮箱" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色配置" prop="role_ids">
<el-select
v-model="temp.role_ids"
multiple
collapse-tags
collapse-tags-tooltip
placeholder="请选择角色(必填)"
style="width:100%"
v-loading="rolesForFormLoading"
>
<el-option
v-for="r in availableRoles"
:key="r.role_id"
:label="r.role_name"
:value="r.role_id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div>
</el-tab-pane>
<el-tab-pane v-if="dialogStatus === 'update'" label="工号头像" name="avatar">
<div class="form-section no-shadow">
<div class="avatar-upload-wrapper full-width">
<images-upload
v-if="temp.employee_id"
ref="imagesUploadRef"
:id="temp.employee_id"
type="avatar"
@refresh="getList"
/>
</div>
<div class="upload-tip">支持本地上传及摄像头拍摄</div>
</div>
</el-tab-pane>
</el-tabs>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogFormVisible = false">取消</el-button>
<el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
<el-button type="primary" :loading="listLoading" @click="dialogStatus==='create'?createData():updateData()">确认保存</el-button>
</div>
</template>
</el-dialog>
<!-- 角色分配弹窗 -->
<el-dialog title="分配角色" v-model="roleDialogVisible" width="900px" top="5vh">
<el-dialog title="分配角色" v-model="roleDialogVisible" width="900px" align-center>
<div v-loading="roleLoading">
<el-alert
:title="`正在为工号「${currentEmployeeRow?.real_name || currentEmployeeId}」分配角色。已勾选项为当前已绑定角色,修改后点击确认分配即整体替换。`"
@ -178,7 +193,7 @@
</el-dialog>
<!-- 重置密码弹窗 -->
<el-dialog title="重置密码" v-model="resetPwdDialogVisible" width="400px" top="20vh">
<el-dialog title="重置密码" v-model="resetPwdDialogVisible" width="400px" align-center>
<el-form ref="resetPwdFormRef" :model="resetPwdTemp" label-width="80px">
<el-form-item label="工号" >
<el-input :value="resetPwdTemp.real_name || resetPwdTemp.phone" disabled />
@ -200,7 +215,7 @@
</el-dialog>
<!-- 绑定微信弹窗 -->
<el-dialog title="绑定微信" v-model="bindWechatDialogVisible" width="400px" top="15vh" @close="handleBindWechatDialogClose">
<el-dialog title="绑定微信" v-model="bindWechatDialogVisible" width="400px" align-center @close="handleBindWechatDialogClose">
<div class="bind-wechat-body">
<!-- 已绑定状态 -->
<div v-if="bindWechatIsBound" class="bound-info">
@ -251,8 +266,8 @@ import { roleList } from '@/api/setting/role'
import UpperTable from '@/components/UpperTable/index.vue'
import ImagesUpload from '@/components/ImagesUpload/index.vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { CircleCheckFilled, Loading, RefreshRight } from '@element-plus/icons-vue'
import { accountColumns, defaultTemp, accountRules } from './account-config'
import { CircleCheckFilled, Loading, RefreshRight, User, Picture } from '@element-plus/icons-vue'
import { accountColumns, defaultTemp, accountRules, roleTagMap } from './account-config'
const list = ref([])
const listLoading = ref(true)
@ -282,6 +297,7 @@ const temp = reactive<{
const availableRoles = ref<any[]>([])
const rolesForFormLoading = ref(false)
const activeTab = ref('base')
const dialogFormVisible = ref(false)
const dialogStatus = ref('')
const textMap: Record<string, string> = {
@ -291,6 +307,21 @@ const textMap: Record<string, string> = {
const rules = accountRules
const flattenRoles = (rawRoles: any[]) => {
const tempMap = new Map<number, any>()
const buildFlat = (arr: any[]) => {
arr.forEach(item => {
if (!tempMap.has(item.role_id)) {
const { children, ...rest } = item
tempMap.set(item.role_id, { ...rest, children: [] })
}
if (item.children && item.children.length) buildFlat(item.children)
})
}
buildFlat(rawRoles)
return Array.from(tempMap.values())
}
const getList = async () => {
listLoading.value = true
try {
@ -315,7 +346,7 @@ const loadAvailableRoles = async () => {
rolesForFormLoading.value = true
try {
const res = await roleList({ includeDisabled: false })
availableRoles.value = res.data?.roles || []
availableRoles.value = flattenRoles(res.data?.roles || [])
} catch (e) {
console.error(e)
} finally {
@ -325,6 +356,7 @@ const loadAvailableRoles = async () => {
const handleCreate = () => {
resetTemp()
activeTab.value = 'base'
dialogStatus.value = 'create'
dialogFormVisible.value = true
loadAvailableRoles()
@ -349,6 +381,7 @@ const createData = async () => {
const handleUpdate = (row: any) => {
Object.assign(temp, { ...row, role_ids: row.role_ids ? [...row.role_ids] : [] })
activeTab.value = 'base'
dialogStatus.value = 'update'
dialogFormVisible.value = true
loadAvailableRoles()
@ -503,7 +536,7 @@ const handleAssignRole = async (row: any) => {
// 目标工号的已绑定角色从 account list 中的 role_ids 字段获取
const res = await roleList({ includeDisabled: false })
if (res.data && res.data.roles) {
allRoles.value = res.data.roles
allRoles.value = flattenRoles(res.data.roles)
filteredRoles.value = [...allRoles.value]
// 使用 row.role_ids 作为预选状态(目标工号的角色)
selectedRoleIds.value = row.role_ids ? [...row.role_ids] : []
@ -699,40 +732,76 @@ const handleUnbindWechat = (row: any) => {
<style scoped lang="scss">
.account-container {
height: 100%;
height: calc(100vh - 130px);
display: flex;
flex-direction: column;
overflow: hidden;
}
.form-section {
margin-bottom: 20px;
padding: 15px;
border: 1px solid #ebeef5;
border-radius: 4px;
background-color: #fafafa;
padding: 24px;
border: 1px solid var(--el-border-color-lighter);
border-radius: 8px;
background-color: var(--el-fill-color-blank);
box-shadow: 0 2px 12px 0 rgba(0,0,0,0.05);
height: 100%;
&.no-shadow {
box-shadow: none;
border: none;
padding: 20px 0;
}
.section-title {
font-size: 14px;
font-weight: bold;
color: #606266;
margin-bottom: 15px;
padding-bottom: 10px;
border-bottom: 1px solid #ebeef5;
font-size: 16px;
font-weight: 600;
color: var(--el-text-color-primary);
margin-bottom: 24px;
padding-bottom: 12px;
border-bottom: 1px solid var(--el-border-color-lighter);
display: flex;
align-items: center;
gap: 8px;
.el-icon {
color: var(--el-color-primary);
}
}
}
.avatar-upload-container {
.avatar-upload-wrapper {
background: #fff;
min-height: 500px;
min-height: 400px;
border-radius: 4px;
overflow: hidden;
border: 1px dashed var(--el-border-color);
margin-bottom: 12px;
&.full-width {
min-height: 500px;
}
}
.upload-tip {
font-size: 12px;
color: var(--el-text-color-secondary);
text-align: center;
}
.custom-form {
:deep(.el-form-item__label) {
font-weight: 600;
padding-bottom: 4px;
}
}
:deep(.account-dialog) {
.el-dialog__body {
padding: 20px 25px;
max-height: 85vh;
padding: 24px;
max-height: 80vh;
overflow-y: auto;
background-color: #f8fafc;
}
}

View File

@ -1,69 +1,77 @@
<template>
<div class="permission-container app-container">
<div class="filter-container">
<el-form :inline="true" :model="listQuery" class="demo-form-inline">
<el-form-item label="类型">
<el-select v-model="listQuery.type" placeholder="全部" clearable style="width: 150px">
<el-option label="Web页面" value="web_pages" />
<el-option label="API" value="api" />
<el-option label="PDA页面" value="pda_pages" />
<el-option label="按钮" value="btns" />
<el-option label="区块" value="block" />
<el-option label="小程序页面" value="miniprogram_pages" />
</el-select>
</el-form-item>
<el-form-item label="关键词">
<el-input v-model="listQuery.keyword" placeholder="路径/名称/标题" clearable @keyup.enter="handleFilter" style="width: 200px" />
</el-form-item>
<el-form-item label="包含已禁用">
<el-switch v-model="listQuery.includeDisabled" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleFilter">搜索</el-button>
<el-button type="success" icon="Plus" @click="handleCreate">新增权限</el-button>
<el-button type="danger" icon="Delete" :disabled="selectedIds.length === 0" @click="handleBatchDelete">批量删除</el-button>
</el-form-item>
</el-form>
<div class="permission-container">
<!-- 左侧树 -->
<div class="left-panel">
<div class="panel-header">权限类型</div>
<div class="panel-body">
<el-tree
:data="typeTreeData"
:props="{ label: 'label' }"
node-key="value"
:current-node-key="currentType"
highlight-current
@node-click="handleNodeClick"
/>
</div>
</div>
<!-- 列表视图(树形展示) -->
<el-table
v-loading="listLoading"
:data="treeData"
row-key="permission_id"
border
height="calc(100vh - 250px)"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="标题" prop="meta_title" min-width="160" show-overflow-tooltip />
<el-table-column label="名称" prop="name" min-width="140" show-overflow-tooltip />
<el-table-column label="路径 (Path)" prop="path" min-width="220" show-overflow-tooltip />
<el-table-column label="类型" prop="type" width="120" align="center">
<template #default="{ row }">
<el-tag :type="typeTagMap[row.type] || 'info'" size="small">{{ typeNameMap[row.type] || row.type }}</el-tag>
</template>
</el-table-column>
<el-table-column label="排序" prop="sort" width="80" align="center" />
<el-table-column label="状态" prop="status" width="90" align="center">
<template #default="{ row }">
<el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">
{{ row.status === 1 ? '启用' : '禁用' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="220" align="center" fixed="right">
<template #default="{ row }">
<el-button size="small" type="primary" link icon="Plus" @click="handleCreateChild(row)">下级</el-button>
<el-button size="small" type="primary" link icon="Edit" @click="handleUpdate(row)">编辑</el-button>
<el-button size="small" type="danger" link icon="Delete" @click="handleDelete(row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 右侧容器 -->
<div class="right-panel">
<div class="filter-container">
<el-form :inline="true" :model="listQuery" class="demo-form-inline" style="display: flex; flex-wrap: wrap; gap: 10px; margin-bottom: 0;">
<el-form-item label="关键词" style="margin-bottom: 0;">
<el-input v-model="listQuery.keyword" placeholder="路径/名称/标题" clearable @keyup.enter="handleFilter" style="width: 200px" />
</el-form-item>
<el-form-item label="包含已禁用" style="margin-bottom: 0;">
<el-switch v-model="listQuery.includeDisabled" @change="handleFilter" />
</el-form-item>
<el-form-item style="margin-bottom: 0; margin-left: auto;">
<el-button type="primary" icon="Search" @click="handleFilter">搜索</el-button>
<el-button type="success" icon="Plus" @click="handleCreate">新增权限</el-button>
<el-button type="danger" icon="Delete" :disabled="selectedIds.length === 0" @click="handleBatchDelete">批量删除</el-button>
</el-form-item>
</el-form>
</div>
<!-- 列表视图(树形展示) -->
<el-table
v-loading="listLoading"
:data="filteredTreeData"
row-key="permission_id"
border
height="calc(100vh - 180px)"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="标题" prop="meta_title" min-width="160" show-overflow-tooltip />
<el-table-column label="名称" prop="name" min-width="140" show-overflow-tooltip />
<el-table-column label="路径 (Path)" prop="path" min-width="220" show-overflow-tooltip />
<el-table-column label="类型" prop="type" width="120" align="center">
<template #default="{ row }">
<el-tag :type="permissionTypeTagMap[row.type] || 'info'" size="small">{{ permissionTypeNameMap[row.type] || row.type }}</el-tag>
</template>
</el-table-column>
<el-table-column label="排序" prop="sort" width="80" align="center" />
<el-table-column label="状态" prop="status" width="90" align="center">
<template #default="{ row }">
<el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">
{{ row.status === 1 ? '启用' : '禁用' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="220" align="center" fixed="right">
<template #default="{ row }">
<el-button size="small" type="primary" link icon="Plus" @click="handleCreateChild(row)">下级</el-button>
<el-button size="small" type="primary" link icon="Edit" @click="handleUpdate(row)">编辑</el-button>
<el-button size="small" type="danger" link icon="Delete" @click="handleDelete(row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- 新增权限弹窗 -->
<el-dialog title="新增权限" v-model="createDialogVisible" width="600px" top="8vh">
<el-dialog title="新增权限" v-model="createDialogVisible" width="600px" align-center>
<el-form ref="createFormRef" :rules="rules" :model="tempCreate" label-width="100px" label-position="right">
<el-form-item label="上级权限" prop="parent_id">
<el-tree-select
@ -78,12 +86,12 @@
</el-form-item>
<el-form-item label="权限类型" prop="type">
<el-select v-model="tempCreate.type" placeholder="请选择类型" style="width: 100%">
<el-option label="Web页面 (web_pages)" value="web_pages" />
<el-option label="API接口 (api)" value="api" />
<el-option label="PDA页面 (pda_pages)" value="pda_pages" />
<el-option label="按钮 (btns)" value="btns" />
<el-option label="区块 (block)" value="block" />
<el-option label="小程序页面 (miniprogram_pages)" value="miniprogram_pages" />
<el-option
v-for="item in permissionTypeOptions"
:key="item.value"
:label="item.fullLabel || item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="权限路径" prop="path">
@ -108,7 +116,7 @@
</el-dialog>
<!-- 编辑权限弹窗 -->
<el-dialog title="编辑权限" v-model="updateDialogVisible" width="600px" top="8vh">
<el-dialog title="编辑权限" v-model="updateDialogVisible" width="620px" align-center>
<el-form ref="updateFormRef" :rules="rules" :model="tempUpdate" label-width="100px" label-position="right">
<el-form-item label="上级权限" prop="parent_id">
<el-tree-select
@ -123,12 +131,12 @@
</el-form-item>
<el-form-item label="权限类型" prop="type">
<el-select v-model="tempUpdate.type" placeholder="请选择类型" style="width: 100%">
<el-option label="Web页面 (web_pages)" value="web_pages" />
<el-option label="API接口 (api)" value="api" />
<el-option label="PDA页面 (pda_pages)" value="pda_pages" />
<el-option label="按钮 (btns)" value="btns" />
<el-option label="区块 (block)" value="block" />
<el-option label="小程序页面 (miniprogram_pages)" value="miniprogram_pages" />
<el-option
v-for="item in permissionTypeOptions"
:key="item.value"
:label="item.fullLabel || item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="权限路径" prop="path">
@ -161,43 +169,66 @@
import { ref, reactive, computed, onMounted } from 'vue'
import { permissionList, permissionAdd, permissionUpdate, permissionDelete } from '@/api/setting/permission'
import { ElMessage, ElMessageBox } from 'element-plus'
import {
permissionRules,
defaultCreateTemp,
defaultUpdateTemp,
permissionTypeTagMap,
permissionTypeNameMap,
permissionTypeOptions
} from './permission-config'
const listLoading = ref(false)
const rawList = ref<any[]>([])
const treeData = ref<any[]>([])
const listQuery = reactive({
type: '',
keyword: '',
includeDisabled: false
})
const selectedIds = ref<number[]>([])
const typeTagMap: Record<string, string> = {
web_pages: 'success',
api: '',
pda_pages: 'warning',
btns: 'danger',
block: 'info',
miniprogram_pages: 'primary'
// 左侧树数据
const typeTreeData = ref([
{ label: '全部类型', value: '' },
...permissionTypeOptions.map(p => ({ label: p.label, value: p.value }))
])
const currentType = ref<string>('')
const handleNodeClick = (data: any) => {
currentType.value = data.value
}
const typeNameMap: Record<string, string> = {
web_pages: 'Web页面',
api: 'API',
pda_pages: 'PDA',
btns: '按钮',
block: '区块',
miniprogram_pages: '小程序'
}
const filteredTreeData = computed(() => {
let result = [...treeData.value]
if (currentType.value) {
const filterNodes = (nodes: any[]): any[] => {
let filtered: any[] = []
for (const node of nodes) {
const isMatch = node.type === currentType.value
let matchedChildren = []
if (node.children && node.children.length > 0) {
matchedChildren = filterNodes(node.children)
}
if (isMatch || matchedChildren.length > 0) {
filtered.push({ ...node, children: matchedChildren.length > 0 ? matchedChildren : undefined })
}
}
return filtered
}
result = filterNodes(result)
}
return result
})
// 获取并构建树形结构
const getList = async () => {
listLoading.value = true
try {
const res = await permissionList({
type: listQuery.type || undefined,
keyword: listQuery.keyword || undefined,
includeDisabled: listQuery.includeDisabled
})
@ -305,40 +336,15 @@ const submitLoading = ref(false)
const createFormRef = ref()
const updateFormRef = ref()
const tempCreate = reactive({
parent_id: undefined as number | undefined,
type: 'web_pages',
path: '',
meta_title: '',
name: '',
sort: 0
})
const tempCreate = reactive({ ...defaultCreateTemp })
const tempUpdate = reactive({
permission_id: undefined as number | undefined,
parent_id: undefined as number | undefined,
type: 'web_pages',
path: '',
name: '',
sort: 0,
status: 1
})
const tempUpdate = reactive({ ...defaultUpdateTemp })
const rules = {
path: [{ required: true, message: '请输入权限路径', trigger: 'blur' }],
type: [{ required: true, message: '请选择权限类型', trigger: 'change' }]
}
const rules = permissionRules
const handleCreate = () => {
getParentOptions()
Object.assign(tempCreate, {
parent_id: undefined,
type: 'web_pages',
path: '',
meta_title: '',
name: '',
sort: 0
})
Object.assign(tempCreate, defaultCreateTemp)
createDialogVisible.value = true
if (createFormRef.value) {
createFormRef.value.clearValidate()
@ -348,12 +354,8 @@ const handleCreate = () => {
const handleCreateChild = (row: any) => {
getParentOptions()
Object.assign(tempCreate, {
parent_id: row.permission_id,
type: 'web_pages',
path: '',
meta_title: '',
name: '',
sort: 0
...defaultCreateTemp,
parent_id: row.permission_id
})
createDialogVisible.value = true
if (createFormRef.value) {
@ -438,8 +440,53 @@ onMounted(() => {
})
</script>
<style scoped>
.filter-container {
margin-bottom: 20px;
<style scoped lang="scss">
.permission-container {
height: calc(100vh - 84px);
display: flex;
flex-direction: row;
gap: 16px;
background-color: #f0f2f5;
padding: 16px;
box-sizing: border-box;
.left-panel {
width: 250px;
background: #fff;
border-radius: 4px;
display: flex;
flex-direction: column;
border: 1px solid #ebeef5;
.panel-header {
padding: 12px 16px;
border-bottom: 1px solid #ebeef5;
font-weight: 600;
font-size: 15px;
color: #303133;
flex-shrink: 0;
}
.panel-body {
flex: 1;
overflow-y: auto;
padding: 12px;
}
}
.right-panel {
flex: 1;
background: #fff;
border-radius: 4px;
display: flex;
flex-direction: column;
border: 1px solid #ebeef5;
padding: 16px;
min-width: 0;
.filter-container {
margin-bottom: 16px;
}
}
}
</style>

View File

@ -0,0 +1,50 @@
export const permissionRules = {
path: [{ required: true, message: '请输入权限路径', trigger: 'blur' }],
type: [{ required: true, message: '请选择权限类型', trigger: 'change' }]
}
export const defaultCreateTemp = {
parent_id: undefined as number | undefined,
type: 'web_pages',
path: '',
meta_title: '',
name: '',
sort: 0
}
export const defaultUpdateTemp = {
permission_id: undefined as number | undefined,
parent_id: undefined as number | undefined,
type: 'web_pages',
path: '',
name: '',
sort: 0,
status: 1
}
export const permissionTypeTagMap: Record<string, string> = {
web_pages: 'success',
api: '',
pda_pages: 'warning',
btns: 'danger',
block: 'info',
miniprogram_pages: 'primary'
}
export const permissionTypeNameMap: Record<string, string> = {
web_pages: 'Web页面',
api: 'API',
pda_pages: 'PDA',
btns: '按钮',
block: '区块',
miniprogram_pages: '小程序'
}
export const permissionTypeOptions = [
{ label: 'Web页面', value: 'web_pages', fullLabel: 'Web页面 (web_pages)' },
{ label: 'API', value: 'api', fullLabel: 'API接口 (api)' },
{ label: 'PDA页面', value: 'pda_pages', fullLabel: 'PDA页面 (pda_pages)' },
{ label: '按钮', value: 'btns', fullLabel: '按钮 (btns)' },
{ label: '区块', value: 'block', fullLabel: '区块 (block)' },
{ label: '小程序页面', value: 'miniprogram_pages', fullLabel: '小程序页面 (miniprogram_pages)' }
]

View File

@ -1,63 +1,84 @@
<template>
<div class="role-container app-container">
<!-- 搜索栏 -->
<div class="filter-container">
<el-form :inline="true" :model="listQuery" class="demo-form-inline">
<el-form-item label="关键词">
<el-input v-model="listQuery.keyword" placeholder="角色名称/编码/描述" clearable style="width: 220px" @keyup.enter="handleFilter" />
</el-form-item>
<el-form-item label="包含已停用">
<el-switch v-model="listQuery.includeDisabled" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleFilter">搜索</el-button>
<el-button type="success" icon="Plus" @click="handleCreate">新增角色</el-button>
<el-button type="danger" icon="Delete" :disabled="selectedIds.length === 0" @click="handleBatchDelete">批量删除</el-button>
</el-form-item>
</el-form>
<div class="role-container">
<!-- 左侧树 -->
<div class="left-panel">
<div class="panel-header">角色架构</div>
<div class="panel-body">
<el-tree
:data="[{role_id: 0, role_name: '全部角色'}, ...treeRoles]"
:props="{ label: 'role_name', children: 'children' }"
node-key="role_id"
:current-node-key="currentNodeId"
highlight-current
@node-click="handleNodeClick"
/>
</div>
</div>
<!-- 列表 -->
<el-table
v-loading="listLoading"
:data="filteredList"
row-key="role_id"
border
height="calc(100vh - 250px)"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="角色名称" prop="role_name" min-width="140" show-overflow-tooltip />
<el-table-column label="角色编码" prop="role_code" min-width="160" show-overflow-tooltip />
<el-table-column label="描述" prop="description" min-width="180" show-overflow-tooltip />
<el-table-column label="父级" prop="pid" width="100" align="center">
<!-- 右侧容器 -->
<div class="right-panel">
<!-- 搜索栏 -->
<div class="filter-container">
<el-form :inline="true" :model="listQuery" class="demo-form-inline" style="display: flex; flex-wrap: wrap; gap: 10px; margin-bottom: 0;">
<el-form-item label="关键词" style="margin-bottom: 0;">
<el-input v-model="listQuery.keyword" placeholder="角色名称/编码/描述" clearable style="width: 220px" @keyup.enter="handleFilter" />
</el-form-item>
<el-form-item label="包含已停用" style="margin-bottom: 0;">
<el-switch v-model="listQuery.includeDisabled" @change="handleFilter" />
</el-form-item>
<el-form-item style="margin-bottom: 0; margin-left: auto;">
<el-button type="primary" icon="Search" @click="handleFilter">搜索</el-button>
<el-button type="success" icon="Plus" @click="handleCreate">新增角色</el-button>
<el-button type="danger" icon="Delete" :disabled="selectedIds.length === 0" @click="handleBatchDelete">批量</el-button>
</el-form-item>
</el-form>
</div>
<!-- 列表 -->
<el-table
v-loading="listLoading"
:data="filteredList"
row-key="role_id"
border
height="calc(100vh - 180px)"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="角色名称" prop="role_name" min-width="140" show-overflow-tooltip />
<el-table-column label="归属层级" prop="pid" min-width="180" show-overflow-tooltip>
<template #default="{ row }">
<span style="color: #909399; font-size: 13px;">{{ getRolePath(row.pid) }}</span>
</template>
</el-table-column>
<el-table-column label="角色编码" prop="role_code" min-width="140" show-overflow-tooltip />
<el-table-column label="描述" prop="description" min-width="160" show-overflow-tooltip />
<el-table-column label="状态" prop="status" width="80" align="center">
<template #default="{ row }">
<el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="210" align="center" fixed="right">
<template #default="{ row }">
<span v-if="row.pid && row.pid !== 0">{{ getRoleName(row.pid) }}</span>
<el-text v-else type="info" size="small">—</el-text>
<div class="table-actions">
<el-button size="small" type="primary" link icon="Edit" @click="handleUpdate(row)">编辑</el-button>
<el-divider direction="vertical" />
<el-button size="small" type="warning" link icon="Key" @click="handleAssignPermission(row)">权限</el-button>
<el-divider direction="vertical" />
<el-button size="small" type="danger" link icon="Delete" @click="handleDelete(row)">删除</el-button>
</div>
</template>
</el-table-column>
<el-table-column label="状态" prop="status" width="90" align="center">
<template #default="{ row }">
<el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center" fixed="right">
<template #default="{ row }">
<el-button size="small" type="primary" link icon="Edit" @click="handleUpdate(row)">编辑</el-button>
<el-button size="small" type="warning" link icon="Setting" @click="handleAssignPermission(row)">配置权限</el-button>
<el-button size="small" type="danger" link icon="Delete" @click="handleDelete(row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table>
</div>
<!-- 新增/编辑弹窗 -->
<el-dialog
:title="dialogStatus === 'create' ? '新增角色' : '编辑角色'"
v-model="dialogVisible"
width="560px"
top="8vh"
align-center
@close="handleDialogClose"
>
<el-form ref="dataFormRef" :model="temp" :rules="rules" label-width="90px">
@ -71,14 +92,15 @@
<el-input v-model="temp.description" type="textarea" :rows="2" placeholder="角色描述(可选)" />
</el-form-item>
<el-form-item label="父级角色">
<el-select v-model="temp.pid" placeholder="无(顶级)" clearable style="width: 100%">
<el-option
v-for="r in allRoles.filter(r => r.role_id !== temp.role_id)"
:key="r.role_id"
:label="r.role_name"
:value="r.role_id"
/>
</el-select>
<el-tree-select
v-model="temp.pid"
:data="treeRoles"
:props="{ label: 'role_name', value: 'role_id' }"
check-strictly
placeholder="无 (顶级角色)"
clearable
style="width: 100%"
/>
</el-form-item>
<el-form-item v-if="dialogStatus === 'update'" label="状态">
<el-radio-group v-model="temp.status">
@ -98,7 +120,7 @@
title="配置角色权限"
v-model="permDialogVisible"
width="860px"
top="5vh"
align-center
@close="handlePermDialogClose"
>
<div class="perm-dialog-body">
@ -107,12 +129,12 @@
<el-form :inline="true" :model="permFilter" style="margin-bottom: 10px">
<el-form-item label="类型">
<el-select v-model="permFilter.type" placeholder="全部" clearable style="width: 130px" @change="applyPermFilter">
<el-option label="Web页面" value="web_pages" />
<el-option label="API" value="api" />
<el-option label="PDA页面" value="pda_pages" />
<el-option label="按钮" value="btns" />
<el-option label="区块" value="block" />
<el-option label="小程序页面" value="miniprogram_pages" />
<el-option
v-for="item in permissionTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
@ -146,7 +168,7 @@
<el-table-column label="路径" prop="path" min-width="180" show-overflow-tooltip />
<el-table-column label="类型" prop="type" width="100" align="center">
<template #default="{ row }">
<el-tag :type="typeTagMap[row.type] || 'info'" size="small">{{ typeNameMap[row.type] || row.type }}</el-tag>
<el-tag :type="permissionTypeTagMap[row.type] || 'info'" size="small">{{ permissionTypeNameMap[row.type] || row.type }}</el-tag>
</template>
</el-table-column>
</el-table>
@ -163,46 +185,83 @@
<script setup lang="ts">
import { ref, reactive, computed, onMounted, nextTick } from 'vue'
import { roleList, roleAdd, roleDelete, roleUpdate } from '@/api/setting/role'
import { roleList, roleAdd, roleDelete, roleUpdate,permissionroleList } from '@/api/setting/role'
import { permissionList } from '@/api/setting/permission'
import { ElMessage, ElMessageBox } from 'element-plus'
import {
roleRules,
defaultRoleTemp,
permissionTypeTagMap,
permissionTypeNameMap,
permissionTypeOptions
} from './role-config'
// --------------- 列表 ---------------
const listLoading = ref(false)
const rawRoles = ref<any[]>([])
const allRoles = ref<any[]>([])
const allRoles = ref<any[]>([]) // Flatten array of pure roles
const treeRoles = ref<any[]>([]) // Deduplicated clean tree
const flatRoleMap = ref<Map<number, any>>(new Map()) // Map to lookup parents
const selectedIds = ref<number[]>([])
const currentNodeId = ref<number | null>(null) // Tree selection state; null 表示未选中任何节点
const listQuery = reactive({
keyword: '',
includeDisabled: false
})
const handleNodeClick = (data: any) => {
currentNodeId.value = data.role_id
}
const filteredList = computed(() => {
const kw = listQuery.keyword.trim().toLowerCase()
// Use map instead of recursive tree filtering
let result = allRoles.value.map(r => ({ ...r }))
result.forEach(r => delete r.children) // Ensure el-table handles it nicely as flat rows
const filterTree = (nodes: any[]): any[] => {
return nodes.map(node => ({ ...node })).filter(node => {
if (!listQuery.includeDisabled && node.status !== 1) return false
let childrenMatch = false
if (node.children && node.children.length) {
node.children = filterTree(node.children)
childrenMatch = node.children.length > 0
}
const selfMatch = !kw || [node.role_name, node.role_code, node.description].some(v => v && v.toLowerCase().includes(kw))
return selfMatch || childrenMatch
})
// 1. Filter by Tree Selection Context
// 首次访问:若未选中任何节点且未输入关键词,则不主动显示右侧数据
if (currentNodeId.value == null) {
const kw0 = listQuery.keyword.trim()
if (!kw0) return []
// 如果有关键词,则继续进行关键词/状态过滤(不按树上下文限制)
} else if (currentNodeId.value !== 0) {
// 只收集所选节点及其一级子节点(不递归展开所有后代)
const allowedIds = new Set<number>()
const node = flatRoleMap.value.get(currentNodeId.value)
allowedIds.add(currentNodeId.value)
if (node && node.children) {
node.children.forEach((c: any) => allowedIds.add(c.role_id))
}
result = result.filter(r => allowedIds.has(r.role_id))
}
return filterTree(rawRoles.value)
// 2. Filter by Keyword
const kw = listQuery.keyword.trim().toLowerCase()
if (kw) {
result = result.filter(r =>
(r.role_name && r.role_name.toLowerCase().includes(kw)) ||
(r.role_code && r.role_code.toLowerCase().includes(kw)) ||
(r.description && r.description.toLowerCase().includes(kw))
)
}
// 3. Filter by Status
if (!listQuery.includeDisabled) {
result = result.filter(r => r.status === 1)
}
return result
})
const getRoleName = (pid: number) => {
const r = allRoles.value.find(r => r.role_id === pid)
return r ? r.role_name : pid
const getRolePath = (pid: number) => {
if (!pid || pid === 0) return '顶级层级'
const path: string[] = []
let current = flatRoleMap.value.get(pid)
while(current) {
path.unshift(current.role_name)
current = flatRoleMap.value.get(current.pid)
}
return path.length > 0 ? path.join(' / ') : '顶级层级'
}
const getList = async () => {
@ -213,17 +272,38 @@ const getList = async () => {
includeSystem: true,
keyword: listQuery.keyword
} as any)
rawRoles.value = res.data?.roles || []
// 将嵌套 children 展平,用于下拉框选择父级和名称转换
const flat: any[] = []
const flatten = (arr: any[]) => {
const raw = res.data?.roles || []
// 1. Flatten directly and remove duplicates created by backend nesting logic
const tempMap = new Map<number, any>()
const buildFlat = (arr: any[]) => {
arr.forEach(item => {
flat.push(item)
if (item.children && item.children.length) flatten(item.children)
if (!tempMap.has(item.role_id)) {
const { children, ...rest } = item
tempMap.set(item.role_id, { ...rest, children: [] })
}
if (item.children && item.children.length) buildFlat(item.children)
})
}
flatten(rawRoles.value)
allRoles.value = flat
buildFlat(raw)
flatRoleMap.value = tempMap
allRoles.value = Array.from(tempMap.values())
// 2. Re-assemble pure tree without duplicated paths
const roots: any[] = []
tempMap.forEach(item => {
// Create children array if it doesn't exist
if(!item.children) item.children = []
if (item.pid && tempMap.has(item.pid)) {
const parent = tempMap.get(item.pid)
if(!parent.children) parent.children = []
parent.children.push(item)
} else {
roots.push(item)
}
})
treeRoles.value = roots
} catch (err) {
console.error(err)
} finally {
@ -262,28 +342,20 @@ const dialogStatus = ref('create')
const submitLoading = ref(false)
const dataFormRef = ref()
const defaultTemp = {
role_id: undefined as number | undefined,
role_code: '',
role_name: '',
description: '',
pid: undefined as number | undefined,
status: 1,
permission_ids: [] as number[]
}
const temp = reactive({ ...defaultRoleTemp })
const temp = reactive({ ...defaultTemp })
const rules = roleRules
const rules = {
role_code: [{ required: true, message: '请输入角色编码', trigger: 'blur' }],
role_name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }]
}
const resetTemp = () => { Object.assign(temp, defaultTemp) }
const resetTemp = () => { Object.assign(temp, defaultRoleTemp) }
const handleCreate = () => {
resetTemp()
dialogStatus.value = 'create'
if (currentNodeId.value !== 0) {
temp.pid = currentNodeId.value ?? undefined
} else {
temp.pid = undefined
}
dialogVisible.value = true
nextTick(() => dataFormRef.value?.clearValidate())
}
@ -369,15 +441,6 @@ const permTableRef = ref()
const permFilter = reactive({ type: '', keyword: '' })
const typeTagMap: Record<string, string> = {
web_pages: 'success', api: '', pda_pages: 'warning',
btns: 'danger', block: 'info', miniprogram_pages: 'primary'
}
const typeNameMap: Record<string, string> = {
web_pages: 'Web页面', api: 'API', pda_pages: 'PDA',
btns: '按钮', block: '区块', miniprogram_pages: '小程序'
}
const buildPermTree = (data: any[]): any[] => {
const map = new Map<number, any>()
data.forEach(item => { map.set(item.permission_id, { ...item, children: [] }) })
@ -460,8 +523,8 @@ const handleAssignPermission = async (row: any) => {
permDialogVisible.value = true
permLoading.value = true
try {
// 获取所有权限列表(含当前角色 selected 状态)
const res = await permissionList({ role_id: row.role_id, includeDisabled: false })
// 获取所有权限列表
const res = await permissionroleList({ role_id: currentRoleId.value ?? undefined })
allPerms.value = res.data?.permissions || []
// 记录已选权限 ID
currentRolePermIds.value = allPerms.value.filter((p: any) => p.selected).map((p: any) => p.permission_id)
@ -489,6 +552,10 @@ const submitPermUpdate = async () => {
const role = allRoles.value.find(r => r.role_id === currentRoleId.value)
await roleUpdate({
role_id: currentRoleId.value,
role_name: role.role_name,
description: role.description || undefined,
pid: role.pid,
status: role.status,
permission_ids: selectedPermIds.value
})
ElMessage.success('权限保存成功')
@ -508,13 +575,59 @@ onMounted(() => {
<style scoped lang="scss">
.role-container {
height: 100%;
height: calc(100vh - 84px);
display: flex;
flex-direction: column;
flex-direction: row;
gap: 16px;
background-color: #f0f2f5;
padding: 16px;
box-sizing: border-box;
.left-panel {
width: 250px;
background: #fff;
border-radius: 4px;
display: flex;
flex-direction: column;
border: 1px solid #ebeef5;
.panel-header {
padding: 12px 16px;
border-bottom: 1px solid #ebeef5;
font-weight: 600;
font-size: 15px;
color: #303133;
flex-shrink: 0;
}
.panel-body {
flex: 1;
overflow-y: auto;
padding: 12px;
}
}
.right-panel {
flex: 1;
background: #fff;
border-radius: 4px;
display: flex;
flex-direction: column;
border: 1px solid #ebeef5;
padding: 16px;
min-width: 0;
.filter-container {
margin-bottom: 16px;
}
}
}
.filter-container {
margin-bottom: 16px;
.table-actions {
display: flex;
align-items: center;
justify-content: center;
gap: 4px;
}
.perm-dialog-body {

View File

@ -0,0 +1,41 @@
export const roleRules = {
role_code: [{ required: true, message: '请输入角色编码', trigger: 'blur' }],
role_name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }]
}
export const defaultRoleTemp = {
role_id: undefined as number | undefined,
role_code: '',
role_name: '',
description: '',
pid: undefined as number | undefined,
status: 1,
permission_ids: [] as number[]
}
export const permissionTypeTagMap: Record<string, string> = {
web_pages: 'success',
api: '',
pda_pages: 'warning',
btns: 'danger',
block: 'info',
miniprogram_pages: 'primary'
}
export const permissionTypeNameMap: Record<string, string> = {
web_pages: 'Web页面',
api: 'API',
pda_pages: 'PDA',
btns: '按钮',
block: '区块',
miniprogram_pages: '小程序'
}
export const permissionTypeOptions = [
{ label: 'Web页面', value: 'web_pages' },
{ label: 'API', value: 'api' },
{ label: 'PDA页面', value: 'pda_pages' },
{ label: '按钮', value: 'btns' },
{ label: '区块', value: 'block' },
{ label: '小程序页面', value: 'miniprogram_pages' }
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff