3月31日更新

This commit is contained in:
yin 2026-03-31 17:57:27 +08:00
parent 884cee76e7
commit 28fae29f89
13 changed files with 1119 additions and 277 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 436 KiB

View File

@ -15,7 +15,18 @@ export function accountList(query: any) {
})
}
export function accountAdd(data: any) {
/**
* 新增工号,按手机号复用或创建账号后绑定到当前主体
* 接口文档:ids(角色组ID数组)为必填项
*/
export function accountAdd(data: {
phone: string
real_name: string
ids: number[]
username?: string
password?: string
email?: string
}) {
return request({
url: '/system',
method: 'post',
@ -28,6 +39,10 @@ export function accountAdd(data: any) {
})
}
/**
* 停用工号(不删除账号)
* 接口文档:参数为 employee_id(单个)
*/
export function accountdelete(data: { employee_id: number }) {
return request({
url: '/system',
@ -41,7 +56,11 @@ export function accountdelete(data: { employee_id: number }) {
})
}
export function accountUpdate(data: { employee_id: number, real_name?: string, file_id?: number }) {
/**
* 更新工号姓名、头像引用和角色组 ids
* 接口文档:ids 为必填项,整体替换角色组
*/
export function accountUpdate(data: { employee_id: number, real_name?: string, file_id?: number, status?: number, email?: string, ids: number[] }) {
return request({
url: '/system',
method: 'post',
@ -52,4 +71,51 @@ export function accountUpdate(data: { employee_id: number, real_name?: string, f
},
data
})
}
export function accountResetPassword(data: { employee_id: number, password: string }) {
return request({
url: '/system',
method: 'post',
params: {
method: 'setting.account.resetPassword',
v,
timestamp: new Date().getTime()
},
data
})
}
export function getBindWechatCode(data: {
user_id: number
longPoll?: boolean
waitForChange?: boolean
waitTimeoutMs?: number
init?: boolean
forceRefresh?: boolean
}, config?: any) {
return request({
url: '/system',
method: 'post',
params: {
method: 'setting.account.getBindWechatCode',
v,
timestamp: new Date().getTime()
},
data,
...config
})
}
export function unbindWechat(data: { user_id: number }) {
return request({
url: '/system',
method: 'post',
params: {
method: 'setting.account.unbindWechat',
v,
timestamp: new Date().getTime()
},
data
})
}

View File

@ -0,0 +1,88 @@
import request from '@/utils/request'
const v = '1.0'
/**
* 查询当前登录工号实际可用权限集合
* 可选按角色返回已绑定权限选中状态
*/
export function permissionList(data: {
role_id?: number
type?: string
keyword?: string
includeDisabled?: boolean
} = {}) {
return request({
url: '/system',
method: 'post',
params: {
method: 'setting.permission.list',
v,
timestamp: new Date().getTime()
},
data
})
}
/**
* 新增权限
*/
export function permissionAdd(data: {
path: string
type: string
name?: string
parent_id?: number
meta_title?: string
sort?: number
}) {
return request({
url: '/system',
method: 'post',
params: {
method: 'setting.permission.add',
v,
timestamp: new Date().getTime()
},
data
})
}
/**
* 批量删除权限(软删除)
*/
export function permissionDelete(data: { ids: number[] }) {
return request({
url: '/system',
method: 'post',
params: {
method: 'setting.permission.delete',
v,
timestamp: new Date().getTime()
},
data
})
}
/**
* 更新权限
*/
export function permissionUpdate(data: {
permission_id: number
path?: string
type?: string
name?: string
parent_id?: number
sort?: number
status?: number
}) {
return request({
url: '/system',
method: 'post',
params: {
method: 'setting.permission.update',
v,
timestamp: new Date().getTime()
},
data
})
}

View File

@ -3,9 +3,10 @@ import request from '@/utils/request'
const v = "1.0";
/**
* 查询当前主体可分配角色列表,可选返回指定工号已选角色
* 查询当前主体可分配角色列表,按当前登录工号返回角色选中状态
* 文档:includeDisabled / includeSystem,不支持 employee_id
*/
export function roleList(data: { employee_id?: number, includeDisabled?: boolean, includeSystem?: boolean }) {
export function roleList(data: { includeDisabled?: boolean, includeSystem?: boolean, employee_id?: number }) {
return request({
url: '/system',
method: 'post',
@ -19,9 +20,15 @@ export function roleList(data: { employee_id?: number, includeDisabled?: boolean
}
/**
* 给工号新增单个角色绑定
* 新增角色并一次性提交权限集
*/
export function roleAdd(data: { employee_id: number, role_id: number }) {
export function roleAdd(data: {
role_code: string
role_name: string
description?: string
pid?: number
permission_ids: number[]
}) {
return request({
url: '/system',
method: 'post',
@ -35,9 +42,9 @@ export function roleAdd(data: { employee_id: number, role_id: number }) {
}
/**
* 删除工号单个角色绑定
* 批量删除角色(软删除),并清理对应角色权限关联
*/
export function roleDelete(data: { employee_id: number, role_id: number }) {
export function roleDelete(data: { ids: number[] }) {
return request({
url: '/system',
method: 'post',
@ -51,9 +58,16 @@ export function roleDelete(data: { employee_id: number, role_id: number }) {
}
/**
* 批量重置工号角色绑定
* 更新角色信息并一次性重置角色权限
*/
export function roleUpdate(data: { employee_id: number, role_ids: number[] }) {
export function roleUpdate(data: {
role_id: number
role_name?: string
description?: string
status?: number
pid?: number
permission_ids: number[]
}) {
return request({
url: '/system',
method: 'post',

View File

@ -52,7 +52,8 @@ export default {
"Video": "Video",
"Message": "Message",
"Profile": "Profile",
"printTemplate": "Print Template"
"printTemplate": "Print Template",
'Permission': 'Permission',
},
"login": {
"title": "Login",

View File

@ -52,7 +52,8 @@ export default {
"Video": "录像",
"Message": "消息",
"Profile": "个人中心",
"printTemplate": "打印模板"
"printTemplate": "打印模板",
'Permission': '权限管理',
},
"login": {
"title": "登录",

View File

@ -71,7 +71,7 @@ const activeMenu = computed(() => {
margin: 0px 4px;
border-radius: 4px;
font-size: 14px;
padding: 0 15px !important;
padding: 0 8px !important;
display: inline-flex;
white-space: nowrap;

View File

@ -1,11 +1,12 @@
export const componentMap: Record<string, any> = {
'dashboard/index': () => import('@/views/dashboard/index.vue'),
'login/index': () => import('@/views/login/index.vue'),
'permission/index': () => import('@/views/permission/index.vue'),
'system/setting/permission/index': () => import('@/views/system/setting/permission/index.vue'),
// 'system/setting/index': () => import('@/views/system/setting/index.vue'),
'order/index': () => import('@/views/order/orderManagement/index.vue'),
'auth/approve': () => import('@/views/auth/approve.vue'),
'account/index': () => import('@/views/system/setting/account/index.vue'),
// 'permission/index': () => import('@/views/system/setting/permission/index.vue'),
'warehouse/index': () => import('@/views/warehouse/index.vue'),
'stock/index': () => import('@/views/stock/stock/index.vue'),
'stock/storestock/index': () => import('@/views/stock/storestock/index.vue'),

View File

@ -4,24 +4,30 @@ export const accountColumns = [
{ label: '姓名', prop: 'real_name', width: 120 },
{ label: '手机号', prop: 'phone', width: 120 },
{ label: '用户名', prop: 'username', width: 120 },
{ label: '邮箱', prop: 'email', minWidth: 150 },
{ label: '邮箱', prop: 'email', minWidth: 120 },
{ label: '角色', prop: 'roles', minWidth: 140 },
{ label: '状态', prop: 'status', width: 100 },
{ label: '操作', prop: 'actions', width: 280, fixed: 'right' }
{ label: '操作', prop: 'actions', width: 480, fixed: 'right' }
]
export const defaultTemp = {
employee_id: undefined,
employee_id: undefined as number | undefined,
phone: '',
real_name: '',
username: '',
password: '',
role_id: undefined,
role_ids: [] as number[],
email: '',
file_id: undefined,
file_id: undefined as number | undefined,
avatar_url: ''
}
export const accountRules = {
phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
real_name: [{ required: true, message: '请输入工号姓名', trigger: 'blur' }]
phone: [
{ required: true, message: '请输入手机号', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
],
real_name: [{ required: true, message: '请输入工号姓名', trigger: 'blur' }],
email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }],
role_ids: [{ required: true, type: 'array', min: 1, message: '请至少选择一个角色', trigger: 'change' }]
}

View File

@ -34,10 +34,20 @@
{{ row.status === 1 ? '启用' : '停用' }}
</el-tag>
</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>
</template>
<el-text v-else type="info" size="small">未分配</el-text>
</template>
<template #column-actions="{ row }">
<el-button type="primary" size="small" icon="Edit" @click="handleUpdate(row)">编辑</el-button>
<el-button type="success" size="small" icon="User" @click="handleAssignRole(row)">分配角色</el-button>
<el-button v-if="row.status === 1" type="danger" size="small" icon="Delete" @click="handleDelete(row)">停用</el-button>
<el-button type="warning" size="small" icon="Lock" @click="handleAssignRole(row)">分配角色</el-button>
<el-button size="small" icon="Key" @click="handleResetPassword(row)">重置密码</el-button>
<el-button v-if="row.status === 1" type="danger" size="small" icon="CircleClose" @click="handleDelete(row)">停用</el-button>
<el-button v-else type="success" size="small" icon="CircleCheck" @click="handleEnable(row)">启用</el-button>
<el-button v-if="row.is_wechat_bound" type="danger" plain size="small" icon="CircleClose" @click="handleUnbindWechat(row)">解除绑定</el-button>
<el-button v-else type="info" size="small" icon="Link" @click="handleBindWechat(row)">绑定微信</el-button>
</template>
</upper-table>
@ -75,6 +85,26 @@
</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>
@ -101,56 +131,127 @@
</el-dialog>
<!-- 角色分配弹窗 -->
<el-dialog title="分配角色" v-model="roleDialogVisible" width="600px" top="10vh">
<div v-loading="roleLoading" class="role-tree-container">
<el-tree
ref="roleTreeRef"
:data="allRoles"
:props="defaultProps"
show-checkbox
node-key="role_id"
default-expand-all
:default-checked-keys="selectedRoleIds"
check-strictly
<el-dialog title="分配角色" v-model="roleDialogVisible" width="900px" top="5vh">
<div v-loading="roleLoading">
<el-alert
:title="`正在为工号「${currentEmployeeRow?.real_name || currentEmployeeId}」分配角色。已勾选项为当前已绑定角色,修改后点击确认分配即整体替换。`"
type="info"
:closable="false"
style="margin-bottom:12px"
/>
<!-- 过滤栏 -->
<el-form :inline="true" :model="roleFilter" style="margin-bottom:10px">
<el-form-item label="关键词">
<el-input v-model="roleFilter.keyword" placeholder="角色名称" clearable style="width:200px" @input="applyRoleFilter" />
</el-form-item>
<el-form-item>
<el-button @click="toggleSelectAll">{{ isAllSelected ? '取消全选' : '全选当前页' }}</el-button>
</el-form-item>
</el-form>
<!-- 角色表格 -->
<el-table
ref="roleTableRef"
:data="filteredRoles"
border
size="small"
max-height="450"
row-key="role_id"
@selection-change="handleRoleSelectionChange"
>
<template #default="{ node, data }">
<span class="custom-tree-node">
<span>{{ node.label }}</span>
<span class="role-desc">
({{ data.description || (data.is_system === 1 ? '系统默认' : '停用') }})
</span>
<el-button
v-if="data.selected"
type="danger"
link
size="small"
icon="Delete"
class="delete-role-btn"
@click.stop="handleRemoveSingleRole(data)"
>
移除
</el-button>
</span>
</template>
</el-tree>
<el-table-column type="selection" width="45" />
<el-table-column label="角色名称" prop="role_name" min-width="130" />
<el-table-column label="描述" prop="description" min-width="220" show-overflow-tooltip />
<el-table-column label="初始状态" width="90">
<template #default="{ row }">
<el-tag v-if="row.selected" type="success" size="small">已分配</el-tag>
</template>
</el-table-column>
</el-table>
<div style="margin-top:8px;color:#999;font-size:12px">已选 {{ selectedRoleIds.length }} 项</div>
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="roleDialogVisible = false">取消</el-button>
<el-button type="primary" :loading="roleSubmitting" @click="submitRoleUpdate">确认改动</el-button>
<el-button @click="roleDialogVisible = false">关闭</el-button>
<el-button type="primary" :loading="roleSubmitting" @click="submitRoleUpdate">确认分配</el-button>
</div>
</template>
</el-dialog>
<!-- 重置密码弹窗 -->
<el-dialog title="重置密码" v-model="resetPwdDialogVisible" width="400px" top="20vh">
<el-form ref="resetPwdFormRef" :model="resetPwdTemp" label-width="80px">
<el-form-item label="工号" >
<el-input :value="resetPwdTemp.real_name || resetPwdTemp.phone" disabled />
</el-form-item>
<el-form-item
label="新密码"
prop="password"
:rules="[{ required: true, message: '请输入新密码', trigger: 'blur' }, { min: 6, message: '密码至少6位', trigger: 'blur' }]"
>
<el-input v-model="resetPwdTemp.password" type="password" show-password placeholder="请输入新密码(至少6位)" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="resetPwdDialogVisible = false">取消</el-button>
<el-button type="primary" :loading="resetPwdSubmitting" @click="submitResetPassword">确认重置</el-button>
</div>
</template>
</el-dialog>
<!-- 绑定微信弹窗 -->
<el-dialog title="绑定微信" v-model="bindWechatDialogVisible" width="400px" top="15vh" @close="handleBindWechatDialogClose">
<div class="bind-wechat-body">
<!-- 已绑定状态 -->
<div v-if="bindWechatIsBound" class="bound-info">
<el-icon class="bound-icon"><CircleCheckFilled /></el-icon>
<span>已绑定微信:{{ bindWechatNickname || '微信用户' }}</span>
</div>
<!-- 未绑定:二维码区域 -->
<template v-else>
<div class="qrcode-wrapper">
<div v-if="bindWechatLoading" class="status-overlay loading-overlay">
<el-icon class="is-loading"><Loading /></el-icon>
<span>加载中...</span>
</div>
<div v-else-if="bindWechatQrStatus === 'expired'" class="status-overlay expired-overlay" @click="refreshBindWechatQr">
<el-icon><RefreshRight /></el-icon>
<span>二维码已过期,点击刷新</span>
</div>
<div v-else-if="bindWechatQrStatus === 'scanned'" class="status-overlay scanned-overlay">
<el-icon><CircleCheckFilled /></el-icon>
<span>扫码成功,正在确认...</span>
</div>
<img v-else-if="bindWechatQrCodeUrl" :src="bindWechatQrCodeUrl" alt="微信二维码" class="qrcode-img" />
<div v-else class="status-overlay loading-overlay">
<el-icon class="is-loading"><Loading /></el-icon>
<span>正在获取二维码...</span>
</div>
<p class="qrcode-tip">
<template v-if="bindWechatQrStatus === 'scanned'">请在微信中确认绑定</template>
<template v-else-if="bindWechatQrStatus === 'expired'">二维码已失效,点击上方刷新</template>
<template v-else>请使用微信扫码关注公众号完成绑定</template>
</p>
</div>
</template>
</div>
<template #footer>
<el-button @click="bindWechatDialogVisible = false">关闭</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted, reactive } from 'vue'
import { accountList, accountAdd, accountUpdate, accountdelete } from '@/api/setting/account'
import { roleList, roleUpdate, roleDelete } from '@/api/setting/role'
import { ref, onMounted, onUnmounted, reactive, nextTick, computed } from 'vue'
import { accountList, accountAdd, accountUpdate, accountdelete, accountResetPassword, getBindWechatCode, unbindWechat } from '@/api/setting/account'
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'
const list = ref([])
@ -161,10 +262,25 @@ const listQuery = reactive({
})
const imagesUploadRef = ref()
const dataForm = ref()
const columns = accountColumns
const temp = reactive({ ...defaultTemp })
const temp = reactive<{
employee_id?: number
phone: string
real_name: string
username: string
password: string
role_ids: number[]
email: string
file_id?: number
avatar_url: string
}>({ ...defaultTemp })
// 表单中可用角色列表
const availableRoles = ref<any[]>([])
const rolesForFormLoading = ref(false)
const dialogFormVisible = ref(false)
const dialogStatus = ref('')
@ -195,28 +311,47 @@ const resetTemp = () => {
Object.assign(temp, defaultTemp)
}
const loadAvailableRoles = async () => {
rolesForFormLoading.value = true
try {
const res = await roleList({ includeDisabled: false })
availableRoles.value = res.data?.roles || []
} catch (e) {
console.error(e)
} finally {
rolesForFormLoading.value = false
}
}
const handleCreate = () => {
resetTemp()
dialogStatus.value = 'create'
dialogFormVisible.value = true
loadAvailableRoles()
}
const createData = async () => {
try {
const { phone, real_name, email } = temp
await accountAdd({ phone, real_name, email })
dialogFormVisible.value = false
ElMessage.success('创建成功')
getList()
} catch (error) {
console.error(error)
}
if (!dataForm.value) return
await dataForm.value.validate(async (valid: boolean) => {
if (!valid) return
try {
// 按接口文档,accountAdd 需传 phone, real_name, ids(必填), username, password, email
const { phone, real_name, username, password, email, role_ids } = temp
await accountAdd({ phone, real_name, ids: role_ids, username, password, email })
dialogFormVisible.value = false
ElMessage.success('创建成功')
getList()
} catch (error) {
console.error(error)
}
})
}
const handleUpdate = (row: any) => {
Object.assign(temp, row)
Object.assign(temp, { ...row, role_ids: row.role_ids ? [...row.role_ids] : [] })
dialogStatus.value = 'update'
dialogFormVisible.value = true
loadAvailableRoles()
}
const handleDialogClose = () => {
@ -224,15 +359,20 @@ const handleDialogClose = () => {
}
const updateData = async () => {
try {
const { employee_id, real_name, file_id } = temp
await accountUpdate({ employee_id: employee_id!, real_name, file_id })
dialogFormVisible.value = false
ElMessage.success('更新成功')
getList()
} catch (error) {
console.error(error)
}
if (!dataForm.value) return
await dataForm.value.validate(async (valid: boolean) => {
if (!valid) return
try {
// 按接口文档,accountUpdate 需传 employee_id, real_name, file_id, ids(必填) 等
const { employee_id, real_name, file_id, email, role_ids } = temp
await accountUpdate({ employee_id: employee_id!, real_name, file_id, email, ids: role_ids })
dialogFormVisible.value = false
ElMessage.success('更新成功')
getList()
} catch (error) {
console.error(error)
}
})
}
const handleDelete = (row: any) => {
@ -241,12 +381,54 @@ const handleDelete = (row: any) => {
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
// 按接口文档,accountdelete 需传 employee_id: number(单个)
await accountdelete({ employee_id: row.employee_id })
ElMessage.success('已停用')
getList()
})
}
const handleEnable = (row: any) => {
ElMessageBox.confirm('确认启用该工号吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'info'
}).then(async () => {
// 启用时保留原有角色组,ids 必传
await accountUpdate({ employee_id: row.employee_id, status: 1, ids: row.role_ids || [] })
ElMessage.success('已启用')
getList()
})
}
// ---------------- 重置密码 ----------------
const resetPwdDialogVisible = ref(false)
const resetPwdSubmitting = ref(false)
const resetPwdFormRef = ref()
const resetPwdTemp = reactive({ employee_id: 0, phone: '', real_name: '', password: '' })
const handleResetPassword = (row: any) => {
Object.assign(resetPwdTemp, { employee_id: row.employee_id, phone: row.phone, real_name: row.real_name, password: '' })
resetPwdDialogVisible.value = true
}
const submitResetPassword = async () => {
if (!resetPwdFormRef.value) return
await resetPwdFormRef.value.validate(async (valid: boolean) => {
if (!valid) return
resetPwdSubmitting.value = true
try {
await accountResetPassword({ employee_id: resetPwdTemp.employee_id, password: resetPwdTemp.password })
ElMessage.success('密码重置成功')
resetPwdDialogVisible.value = false
} catch (error) {
console.error(error)
} finally {
resetPwdSubmitting.value = false
}
})
}
const handleAvatarSuccess = (res: any) => {
temp.file_id = res.file_id
temp.avatar_url = res.url
@ -256,43 +438,81 @@ const handleAvatarSuccess = (res: any) => {
const roleDialogVisible = ref(false)
const roleLoading = ref(false)
const roleSubmitting = ref(false)
const currentEmployeeRow = ref<any>(null)
const allRoles = ref<any[]>([])
const filteredRoles = ref<any[]>([])
const selectedRoleIds = ref<number[]>([])
const currentEmployeeId = ref<number | null>(null)
const roleTreeRef = ref()
const roleTableRef = ref()
const defaultProps = {
children: 'children',
label: 'role_name'
}
const roleFilter = reactive({ keyword: '' })
// 递归提取已选中的角色ID
const extractSelectedRoleIds = (roles: any[]) => {
let ids: number[] = []
roles.forEach(role => {
if (role.selected) {
ids.push(role.role_id)
}
if (role.children && role.children.length > 0) {
ids = ids.concat(extractSelectedRoleIds(role.children))
const applyRoleFilter = () => {
const { keyword } = roleFilter
filteredRoles.value = allRoles.value.filter(p => {
const matchKeyword = !keyword || [
p.role_name, p.description
].some(val => val && val.toLowerCase().includes(keyword.toLowerCase()))
return matchKeyword
})
nextTick(() => {
if (roleTableRef.value) {
filteredRoles.value.forEach(row => {
roleTableRef.value!.toggleRowSelection(row, selectedRoleIds.value.includes(row.role_id))
})
}
})
return ids
}
const handleRoleSelectionChange = (rows: any[]) => {
const visibleIds = filteredRoles.value.map((r: any) => r.role_id)
const notVisible = selectedRoleIds.value.filter(id => !visibleIds.includes(id))
selectedRoleIds.value = [...notVisible, ...rows.map((r: any) => r.role_id)]
}
const isAllSelected = computed(() => {
if (!filteredRoles.value.length) return false
return filteredRoles.value.every(p => selectedRoleIds.value.includes(p.role_id))
})
const toggleSelectAll = () => {
if (isAllSelected.value) {
const visibleIds = filteredRoles.value.map((r: any) => r.role_id)
selectedRoleIds.value = selectedRoleIds.value.filter(id => !visibleIds.includes(id))
roleTableRef.value?.clearSelection()
} else {
filteredRoles.value.forEach(row => {
if (!selectedRoleIds.value.includes(row.role_id)) {
selectedRoleIds.value.push(row.role_id)
}
})
filteredRoles.value.forEach(row => roleTableRef.value?.toggleRowSelection(row, true))
}
}
const handleAssignRole = async (row: any) => {
currentEmployeeId.value = row.employee_id
// 保存当前行引用,以便提交时获取姓名等字段
currentEmployeeRow.value = row
roleFilter.keyword = ''
selectedRoleIds.value = []
roleDialogVisible.value = true
roleLoading.value = true
try {
const res = await roleList({ employee_id: row.employee_id, includeDisabled: false, includeSystem: true })
// roleList 返回所有可分配角色(selected 字段表示当前登录工号自身的绑定状态)
// 目标工号的已绑定角色从 account list 中的 role_ids 字段获取
const res = await roleList({ includeDisabled: false })
if (res.data && res.data.roles) {
allRoles.value = res.data.roles
selectedRoleIds.value = extractSelectedRoleIds(res.data.roles)
// 更新树的选中状态
if (roleTreeRef.value) {
roleTreeRef.value.setCheckedKeys(selectedRoleIds.value)
}
filteredRoles.value = [...allRoles.value]
// 使用 row.role_ids 作为预选状态(目标工号的角色)
selectedRoleIds.value = row.role_ids ? [...row.role_ids] : []
await nextTick()
filteredRoles.value.forEach((p: any) => {
if (selectedRoleIds.value.includes(p.role_id)) {
roleTableRef.value?.toggleRowSelection(p, true)
}
})
}
} catch (error) {
console.error(error)
@ -301,49 +521,20 @@ const handleAssignRole = async (row: any) => {
}
}
const handleRemoveSingleRole = (role: any) => {
if (!currentEmployeeId.value) return
ElMessageBox.confirm(`确认移除该用户拥有的角色 [${role.role_name}] 吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
try {
await roleDelete({
employee_id: currentEmployeeId.value!,
role_id: role.role_id
})
ElMessage.success('移除成功')
// 重新加载当前用户的角色状态
const res = await roleList({ employee_id: currentEmployeeId.value!, includeDisabled: false, includeSystem: true })
if (res.data && res.data.roles) {
allRoles.value = res.data.roles
selectedRoleIds.value = extractSelectedRoleIds(res.data.roles)
if (roleTreeRef.value) {
roleTreeRef.value.setCheckedKeys(selectedRoleIds.value)
}
}
} catch (error) {
console.error(error)
}
})
}
const submitRoleUpdate = async () => {
if (!currentEmployeeId.value) return
// 获取树中选中的节点 key
const checkedKeys = roleTreeRef.value ? roleTreeRef.value.getCheckedKeys() : []
if (!checkedKeys.length) {
ElMessage.warning('至少需要分配一个角色')
return
}
roleSubmitting.value = true
try {
await roleUpdate({ employee_id: currentEmployeeId.value, role_ids: checkedKeys })
// 按接口文档:accountUpdate 的 ids 字段整体替换角色组,用于分配角色
const row = currentEmployeeRow.value
await accountUpdate({
employee_id: currentEmployeeId.value,
real_name: row?.real_name,
ids: selectedRoleIds.value,
})
ElMessage.success('角色分配成功')
roleDialogVisible.value = false
getList()
} catch (error) {
console.error(error)
} finally {
@ -354,6 +545,156 @@ const submitRoleUpdate = async () => {
onMounted(() => {
getList()
})
onUnmounted(() => {
stopBindWechatPoll()
})
// ---------------- 绑定微信 ----------------
type QrStatus = 'waiting' | 'pending' | 'scanned' | 'bound' | 'expired'
const qrBaseUrl = 'https://ye4s.wms.gztbyc.com/qrcode/build?text='
const bindLinkTemplate = 'https://ye4s.wms.gztbyc.com/mini/?spm=0.3.${code}.1.4'
const bindWechatDialogVisible = ref(false)
const bindWechatUserId = ref<number | null>(null)
const bindWechatIsBound = ref(false)
const bindWechatNickname = ref('')
const bindWechatLoading = ref(false)
const bindWechatQrCodeUrl = ref('')
const bindWechatQrStatus = ref<QrStatus>('waiting')
let bindWechatStopPollFlag = false
let bindWechatPollVersion = 0
const getFullQrUrl = (code: string) => {
const targetUrl = bindLinkTemplate.replace('${code}', code)
return qrBaseUrl + encodeURIComponent(targetUrl)
}
const processBindWechatData = (data: any, showSuccessMsg = false): boolean => {
const boundNow = data.status === 'bound' || data.is_bound === true
if (boundNow) {
bindWechatIsBound.value = true
bindWechatNickname.value = data.nickname || ''
if (showSuccessMsg) {
ElMessage.success(`微信绑定成功:${data.nickname || '微信用户'}`)
getList()
}
return true
}
if (data.code && bindWechatQrCodeUrl.value !== getFullQrUrl(data.code)) {
bindWechatQrCodeUrl.value = getFullQrUrl(data.code)
bindWechatQrStatus.value = 'waiting'
} else if (data.status) {
const mapped: QrStatus = data.status === 'pending' ? 'waiting' : (data.status as QrStatus)
bindWechatQrStatus.value = mapped
}
return false
}
const startBindWechatPoll = () => {
bindWechatStopPollFlag = false
const version = bindWechatPollVersion
const poll = async () => {
if (bindWechatStopPollFlag || bindWechatPollVersion !== version || bindWechatIsBound.value || !bindWechatUserId.value) return
try {
const res = await getBindWechatCode({
user_id: bindWechatUserId.value,
longPoll: true,
waitForChange: true,
waitTimeoutMs: 60000
}, { timeout: 65000 })
if (bindWechatStopPollFlag || bindWechatPollVersion !== version || bindWechatIsBound.value) return
const data = res?.data
if (data) {
const bound = processBindWechatData(data, true)
if (bound) return
}
poll()
} catch {
if (!bindWechatStopPollFlag && bindWechatPollVersion === version && !bindWechatIsBound.value) {
setTimeout(poll, 3000)
}
}
}
poll()
}
const stopBindWechatPoll = () => {
bindWechatStopPollFlag = true
bindWechatPollVersion++
}
const initBindWechatQr = async () => {
if (!bindWechatUserId.value) return
bindWechatLoading.value = true
bindWechatQrStatus.value = 'waiting'
bindWechatQrCodeUrl.value = ''
try {
const res = await getBindWechatCode({ user_id: bindWechatUserId.value })
const data = res?.data
if (!data) throw new Error('无返回数据')
const bound = processBindWechatData(data)
if (!bound) startBindWechatPoll()
} catch {
ElMessage.error('获取二维码失败,请重试')
} finally {
bindWechatLoading.value = false
}
}
const refreshBindWechatQr = async () => {
if (!bindWechatUserId.value) return
stopBindWechatPoll()
bindWechatLoading.value = true
bindWechatQrStatus.value = 'waiting'
bindWechatQrCodeUrl.value = ''
try {
const res = await getBindWechatCode({ user_id: bindWechatUserId.value, forceRefresh: true })
const data = res?.data
if (!data) throw new Error('无返回数据')
const bound = processBindWechatData(data)
if (!bound) startBindWechatPoll()
} catch {
ElMessage.error('获取二维码失败,请重试')
} finally {
bindWechatLoading.value = false
}
}
const handleBindWechat = async (row: any) => {
stopBindWechatPoll()
bindWechatUserId.value = row.account_id
bindWechatIsBound.value = false
bindWechatNickname.value = ''
bindWechatQrCodeUrl.value = ''
bindWechatQrStatus.value = 'waiting'
bindWechatDialogVisible.value = true
await initBindWechatQr()
}
const handleBindWechatDialogClose = () => {
stopBindWechatPoll()
bindWechatUserId.value = null
}
const handleUnbindWechat = (row: any) => {
ElMessageBox.confirm(`确定要解除工号「${row.real_name}」的微信绑定吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
try {
await unbindWechat({ user_id: row.account_id })
ElMessage.success('解绑成功')
getList()
} catch (error) {
console.error(error)
}
}).catch(() => {})
}
</script>
<style scoped lang="scss">
@ -395,30 +736,81 @@ onMounted(() => {
}
}
.role-tree-container {
max-height: 400px;
overflow-y: auto;
border: 1px solid #ebeef5;
padding: 10px;
border-radius: 4px;
}
.custom-tree-node {
flex: 1;
.bind-wechat-body {
display: flex;
flex-direction: column;
align-items: center;
font-size: 14px;
.role-desc {
margin-left: 8px;
color: #999;
font-size: 12px;
padding: 10px 0;
.bound-info {
display: flex;
align-items: center;
gap: 10px;
font-size: 16px;
color: var(--el-color-success);
padding: 30px 0;
.bound-icon {
font-size: 28px;
}
}
.delete-role-btn {
margin-left: auto;
margin-right: 15px;
padding: 0;
.qrcode-wrapper {
display: flex;
flex-direction: column;
align-items: center;
.qrcode-img {
width: 220px;
height: 220px;
border: 1px solid var(--el-border-color);
border-radius: 4px;
}
.qrcode-tip {
margin-top: 15px;
font-size: 13px;
color: var(--el-text-color-secondary);
text-align: center;
}
.status-overlay {
width: 220px;
height: 220px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 10px;
font-size: 13px;
border: 1px solid var(--el-border-color);
border-radius: 4px;
.el-icon { font-size: 36px; }
}
.loading-overlay {
background: var(--el-fill-color-light);
color: var(--el-text-color-secondary);
.el-icon { color: var(--el-color-primary); }
}
.expired-overlay {
background: var(--el-fill-color);
color: var(--el-text-color-secondary);
cursor: pointer;
transition: background 0.2s;
&:hover { background: var(--el-fill-color-dark); }
.el-icon { color: var(--el-color-warning); }
}
.scanned-overlay {
background: var(--el-color-success-light-9);
color: var(--el-color-success);
.el-icon { color: var(--el-color-success); }
}
}
}
</style>

View File

@ -0,0 +1,393 @@
<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>
<!-- 列表视图(树形展示) -->
<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>
<!-- 弹窗 -->
<el-dialog :title="dialogStatus === 'create' ? '新增权限' : '编辑权限'" v-model="dialogVisible" width="600px" top="8vh">
<el-form ref="dataFormRef" :rules="rules" :model="temp" label-width="100px" label-position="right">
<el-form-item label="上级权限" prop="parent_id">
<el-tree-select
v-model="temp.parent_id"
:data="parentOptions"
:props="{ label: 'title_display', value: 'permission_id', children: 'children' }"
placeholder="请选择上级权限(留空表示顶级)"
clearable
check-strictly
style="width: 100%"
/>
</el-form-item>
<el-form-item label="权限类型" prop="type">
<el-select v-model="temp.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-select>
</el-form-item>
<el-form-item label="权限路径" prop="path">
<el-input v-model="temp.path" placeholder="必填,如:setting.account.list 或 /system/account" />
</el-form-item>
<el-form-item label="页面标题" prop="meta_title">
<el-input v-model="temp.meta_title" placeholder="如:工号管理" />
</el-form-item>
<el-form-item label="权限名称" prop="name">
<el-input v-model="temp.name" placeholder="内部英文名或中文名称均可" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="temp.sort" :min="0" :max="9999" style="width: 150px" />
</el-form-item>
<el-form-item v-if="dialogStatus === 'update'" label="状态" prop="status">
<el-radio-group v-model="temp.status">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">禁用</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitLoading" @click="dialogStatus === 'create' ? createData() : updateData()">确定</el-button>
</span>
</template>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import { ref, reactive, computed, onMounted } from 'vue'
import { permissionList, permissionAdd, permissionUpdate, permissionDelete } from '@/api/setting/permission'
import { ElMessage, ElMessageBox } from 'element-plus'
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 typeNameMap: Record<string, string> = {
web_pages: 'Web页面',
api: 'API',
pda_pages: 'PDA',
btns: '按钮',
block: '区块',
miniprogram_pages: '小程序'
}
// 获取并构建树形结构
const getList = async () => {
listLoading.value = true
try {
const res = await permissionList({
type: listQuery.type || undefined,
keyword: listQuery.keyword || undefined,
includeDisabled: listQuery.includeDisabled
})
rawList.value = res.data?.permissions || []
treeData.value = buildTree(rawList.value)
} catch (err) {
console.error(err)
} finally {
listLoading.value = false
}
}
const buildTree = (data: any[], parentId: number | null = null, parentMap?: any) => {
const map = parentMap || new Map()
if (!parentMap) {
data.forEach(item => {
item.children = []
map.set(item.permission_id, item)
})
}
const tree: any[] = []
data.forEach(item => {
// Treat 0 or null as root
const pId = item.parent_id
if (!pId || pId === 0) {
if (!parentMap) tree.push(item)
} else {
if (!parentMap) {
const parent = map.get(pId)
if (parent) {
parent.children.push(item)
} else {
// If parent is not found in the current filtered list, treat as root
tree.push(item)
}
}
}
})
// Sort children
const sortFunc = (a: any, b: any) => (a.sort || 0) - (b.sort || 0)
tree.sort(sortFunc)
Array.from(map.values()).forEach((item: any) => {
if (item.children.length > 0) {
item.children.sort(sortFunc)
} else {
delete item.children
}
})
return tree
}
// 树状下拉框数据(仅在新建/编辑时需要完整的,所以不要带 keyword 过滤)
const parentOptions = ref<any[]>([])
const getParentOptions = async () => {
try {
const res = await permissionList({ includeDisabled: true })
const all = res.data?.permissions || []
const withTitle = all.map((p: any) => ({
...p,
title_display: p.meta_title ? `${p.meta_title} (${p.path})` : `${p.name || ''} (${p.path})`
}))
parentOptions.value = buildTree(withTitle)
} catch (err) {
console.error(err)
}
}
const handleFilter = () => {
getList()
}
const handleSelectionChange = (val: any[]) => {
selectedIds.value = val.map(v => v.permission_id)
}
const handleBatchDelete = () => {
if (selectedIds.value.length === 0) return
ElMessageBox.confirm('确认删除选中的权限吗(软删除)?', '提示', {
type: 'warning'
}).then(async () => {
await permissionDelete({ ids: selectedIds.value })
ElMessage.success('批量删除成功')
getList()
})
}
const handleDelete = (row: any) => {
ElMessageBox.confirm(`确认删除权限 "${row.meta_title || row.path}" 吗?`, '提示', {
type: 'warning'
}).then(async () => {
await permissionDelete({ ids: [row.permission_id] })
ElMessage.success('删除成功')
getList()
})
}
/* ---------------- 弹窗表单逻辑 ---------------- */
const dialogVisible = ref(false)
const dialogStatus = ref('create')
const submitLoading = ref(false)
const dataFormRef = ref()
const defaultTemp = {
permission_id: undefined,
parent_id: undefined as number | undefined,
type: 'web_pages',
path: '',
meta_title: '',
name: '',
sort: 0,
status: 1
}
const temp = reactive({ ...defaultTemp })
const rules = {
path: [{ required: true, message: '请输入权限路径', trigger: 'blur' }],
type: [{ required: true, message: '请选择权限类型', trigger: 'change' }]
}
const resetTemp = (parentId?: number) => {
Object.assign(temp, defaultTemp)
if (parentId) {
temp.parent_id = parentId
}
}
const handleCreate = () => {
getParentOptions()
resetTemp()
dialogStatus.value = 'create'
dialogVisible.value = true
if (dataFormRef.value) {
dataFormRef.value.clearValidate()
}
}
const handleCreateChild = (row: any) => {
getParentOptions()
resetTemp(row.permission_id)
dialogStatus.value = 'create'
dialogVisible.value = true
if (dataFormRef.value) {
dataFormRef.value.clearValidate()
}
}
const handleUpdate = (row: any) => {
getParentOptions()
Object.assign(temp, {
permission_id: row.permission_id,
parent_id: row.parent_id === 0 ? undefined : row.parent_id,
type: row.type,
path: row.path,
meta_title: row.meta_title || '',
name: row.name || '',
sort: row.sort || 0,
status: row.status
})
dialogStatus.value = 'update'
dialogVisible.value = true
if (dataFormRef.value) {
dataFormRef.value.clearValidate()
}
}
const createData = async () => {
if (!dataFormRef.value) return
await dataFormRef.value.validate(async (valid: boolean) => {
if (valid) {
submitLoading.value = true
try {
const payload = {
path: temp.path,
type: temp.type,
name: temp.name,
parent_id: temp.parent_id || 0,
meta_title: temp.meta_title,
sort: temp.sort
}
await permissionAdd(payload)
ElMessage.success('新增成功')
dialogVisible.value = false
getList()
} catch (err) {
console.error(err)
} finally {
submitLoading.value = false
}
}
})
}
const updateData = async () => {
if (!dataFormRef.value) return
await dataFormRef.value.validate(async (valid: boolean) => {
if (valid) {
submitLoading.value = true
try {
const payload = {
permission_id: temp.permission_id!,
path: temp.path,
type: temp.type,
name: temp.name,
parent_id: temp.parent_id || 0,
sort: temp.sort,
status: temp.status
}
await permissionUpdate(payload)
ElMessage.success('修改成功')
dialogVisible.value = false
getList()
} catch (err) {
console.error(err)
} finally {
submitLoading.value = false
}
}
})
}
onMounted(() => {
getList()
})
</script>
<style scoped>
.filter-container {
margin-bottom: 20px;
}
</style>

View File

@ -1,120 +0,0 @@
工号角色管理模块
所有请求为Post请求,请求Body为JSON格式
setting.role.list
查询当前主体可分配角色列表,可选返回指定工号已选角色
employee_id number 否 可选,传入后返回该工号的角色选中状态
includeDisabled boolean 否 是否包含停用角色,默认 false
includeSystem boolean 否 是否包含系统默认角色(store_id=0/null),默认 true
接口响应:
{
"flag": "success",
"code": 200,
"message": "ok",
"data": {
"employee_id": 34,
"roles": [
{
"role_id": 2,
"role_code": "warehouse_admin_default",
"role_name": "仓库管理员",
"description": "仓库全部权限",
"role_type": 1,
"scope": 1,
"is_system": 1,
"status": 1,
"store_id": null,
"pid": 0,
"selected": true,
"children": [
{
"role_id": 8,
"role_code": "2",
"role_name": "仓库经理",
"description": "仓库经理权限",
"role_type": 1,
"scope": 1,
"is_system": 0,
"status": 1,
"store_id": 1000028,
"pid": 2,
"selected": false,
"children": []
}
]
},
{
"role_id": 5,
"role_code": "store_admin_default",
"role_name": "货主管理员",
"description": "货主全部权限",
"role_type": 1,
"scope": 1,
"is_system": 1,
"status": 1,
"store_id": null,
"pid": 0,
"selected": false,
"children": []
},
{
"role_id": 7,
"role_code": "1",
"role_name": "超级管理员",
"description": "系统管理权限",
"role_type": 1,
"scope": 1,
"is_system": 1,
"status": 1,
"store_id": null,
"pid": 0,
"selected": false,
"children": []
}
]
},
"timestamp": 1774861907
}
setting.role.add
给工号新增单个角色绑定
employee_id number 是 工号ID
role_id number 是 角色ID
接口响应:
待补充
setting.role.delete
删除工号单个角色绑定
employee_id number 是 工号ID
role_id number 是 角色ID
接口响应:
待补充
setting.role.update
批量重置工号角色绑定
employee_id number 是 工号ID
role_ids number[] 是 目标角色ID列表,至少包含 1 个角色
接口响应:
待补充