diff --git a/dist.tar.gz b/dist.tar.gz index 3d57e683..0e537f35 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/20260330145422_131_70.jpg b/src/20260330145422_131_70.jpg deleted file mode 100644 index 4619e8bd..00000000 Binary files a/src/20260330145422_131_70.jpg and /dev/null differ diff --git a/src/api/setting/account.ts b/src/api/setting/account.ts index c896a79a..cfea0f5a 100644 --- a/src/api/setting/account.ts +++ b/src/api/setting/account.ts @@ -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 + }) } \ No newline at end of file diff --git a/src/api/setting/permission.ts b/src/api/setting/permission.ts new file mode 100644 index 00000000..5ba77e3c --- /dev/null +++ b/src/api/setting/permission.ts @@ -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 + }) +} diff --git a/src/api/setting/role.ts b/src/api/setting/role.ts index 0d25b6a4..069ba173 100644 --- a/src/api/setting/role.ts +++ b/src/api/setting/role.ts @@ -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', diff --git a/src/lang/en-US.ts b/src/lang/en-US.ts index d47adbc6..08af6054 100644 --- a/src/lang/en-US.ts +++ b/src/lang/en-US.ts @@ -52,7 +52,8 @@ export default { "Video": "Video", "Message": "Message", "Profile": "Profile", - "printTemplate": "Print Template" + "printTemplate": "Print Template", + 'Permission': 'Permission', }, "login": { "title": "Login", diff --git a/src/lang/zh-CN.ts b/src/lang/zh-CN.ts index ab1952b5..f6cef620 100644 --- a/src/lang/zh-CN.ts +++ b/src/lang/zh-CN.ts @@ -52,7 +52,8 @@ export default { "Video": "录像", "Message": "消息", "Profile": "个人中心", - "printTemplate": "打印模板" + "printTemplate": "打印模板", + 'Permission': '权限管理', }, "login": { "title": "登录", diff --git a/src/layout/component/TopMenu.vue b/src/layout/component/TopMenu.vue index a0e92a27..e3b98cf7 100644 --- a/src/layout/component/TopMenu.vue +++ b/src/layout/component/TopMenu.vue @@ -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; diff --git a/src/router/map.ts b/src/router/map.ts index e9d618c9..65253cbf 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -1,11 +1,12 @@ export const componentMap: Record = { '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'), diff --git a/src/views/system/setting/account/account-config.ts b/src/views/system/setting/account/account-config.ts index 53e236f3..e85acef5 100644 --- a/src/views/system/setting/account/account-config.ts +++ b/src/views/system/setting/account/account-config.ts @@ -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' }] } diff --git a/src/views/system/setting/account/index.vue b/src/views/system/setting/account/index.vue index fc01af7d..fdd8dada 100644 --- a/src/views/system/setting/account/index.vue +++ b/src/views/system/setting/account/index.vue @@ -34,10 +34,20 @@ {{ row.status === 1 ? '启用' : '停用' }} + @@ -75,6 +85,26 @@ + + + + + + + @@ -101,56 +131,127 @@ - -
- +
+ + + + + + + + {{ isAllSelected ? '取消全选' : '全选当前页' }} + + + + - - + + + + + + + +
已选 {{ selectedRoleIds.length }} 项
+ + + + + + + + + + + + + + + + +
+ +
+ + 已绑定微信:{{ bindWechatNickname || '微信用户' }} +
+ + + +
+ +
\ No newline at end of file diff --git a/src/views/system/setting/permission/index.vue b/src/views/system/setting/permission/index.vue new file mode 100644 index 00000000..7eb7e8c1 --- /dev/null +++ b/src/views/system/setting/permission/index.vue @@ -0,0 +1,393 @@ + + + + + \ No newline at end of file diff --git a/src/接口文档.txt b/src/接口文档.txt deleted file mode 100644 index 107f982a..00000000 --- a/src/接口文档.txt +++ /dev/null @@ -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 个角色 - -接口响应: -待补充