feat: 完成多模块功能迭代与优化
本次提交包含多模块功能更新: 1. 权限系统重构:移除硬编码admin放行逻辑,新增精细化权限控制,完善权限树形结构与用户/角色保护 2. 新增物料导入导出接口,补充台账查询条件 3. 优化列表查询排序逻辑,新增区域编码大小写不敏感搜索 4. 修复帮助抽屉重复弹出问题,补充页面权限控制 5. 新增弱密码提示逻辑,优化MES/WMS用户/角色管理权限 6. 调整路由结构,新增权限校验脚本与前端权限树重构 7. 补充数据库字段与依赖包更新
This commit is contained in:
@@ -27,8 +27,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="140">
|
||||
<template #default="{row}">
|
||||
<el-button v-if="can('sys.rbac:user')" size="small" @click="openUser(row)">编辑</el-button>
|
||||
<el-button v-if="can('sys.rbac:user')" size="small" type="danger" @click="delUser(row)">删除</el-button>
|
||||
<el-button v-if="can('sys.rbac:user')" size="small" :disabled="isAdminUser(row)" @click="openUser(row)">编辑</el-button>
|
||||
<el-button v-if="can('sys.rbac:user')" size="small" type="danger" :disabled="isAdminUser(row)" @click="delUser(row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -65,17 +65,17 @@
|
||||
<!-- 用户编辑 -->
|
||||
<el-dialog v-model="u.show" :title="u.id?'编辑用户':'新增用户'" width="480px">
|
||||
<el-form :model="u" label-width="90px">
|
||||
<el-form-item label="用户名"><el-input v-model="u.username" :disabled="u.id===1" /></el-form-item>
|
||||
<el-form-item label="用户名"><el-input v-model="u.username" :disabled="u.username==='admin'" /></el-form-item>
|
||||
<el-form-item v-if="!u.id" label="密码"><el-input v-model="u.password" type="password" show-password placeholder="至少6位,不能纯数字" /></el-form-item>
|
||||
<el-form-item v-else label="重置密码"><el-input v-model="u.password" type="password" show-password placeholder="留空则不修改;至少6位,不能纯数字" /></el-form-item>
|
||||
<el-form-item label="姓名"><el-input v-model="u.name" /></el-form-item>
|
||||
<el-form-item label="角色">
|
||||
<el-select v-model="u.roleId" style="width:100%">
|
||||
<el-select v-model="u.roleId" :disabled="u.username==='admin'" style="width:100%">
|
||||
<el-option v-for="rl in roles" :key="rl.id" :label="rl.name" :value="rl.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-select v-model="u.status" style="width:100%">
|
||||
<el-select v-model="u.status" :disabled="u.username==='admin'" style="width:100%">
|
||||
<el-option label="启用" value="ENABLED" /><el-option label="禁用" value="DISABLED" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -113,6 +113,9 @@ const tab = ref('users')
|
||||
const users = ref([]), roles = ref([]), perms = ref([])
|
||||
const u = reactive({ show: false, id: 0, username: '', password: '', name: '', roleId: 0, status: 'ENABLED', canLoginWorkstation: false, workstationPassword: '', stations: [] })
|
||||
|
||||
// 系统内置管理员账号(username=admin / 角色 SUPER_ADMIN)不允许被修改或删除
|
||||
const isAdminUser = (row) => row && (row.username === 'admin' || row.roleCode === 'SUPER_ADMIN')
|
||||
|
||||
async function loadAll() {
|
||||
users.value = (await request.get('/users')) || []
|
||||
roles.value = (await request.get('/roles')) || []
|
||||
@@ -145,7 +148,7 @@ async function saveUser() {
|
||||
ElMessage.success('保存成功'); u.show = false; loadAll()
|
||||
}
|
||||
async function delUser(row) {
|
||||
if (row.id === 1) return ElMessage.warning('系统管理员不可删除')
|
||||
if (isAdminUser(row)) return ElMessage.warning('系统管理员账号不可删除')
|
||||
await ElMessageBox.confirm('确认删除该用户?', '提示', { type: 'warning' })
|
||||
await request.delete(`/users/${row.id}`); loadAll()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user