diff --git a/backend/app/api/menu.py b/backend/app/api/menu.py index 30f9c142..addd45b5 100644 --- a/backend/app/api/menu.py +++ b/backend/app/api/menu.py @@ -7,7 +7,7 @@ from app.core.response import success_response router = APIRouter(prefix="/web/menu", tags=["菜单管理"]) # 与 web-admin/src/router/modules/sqxp.ts 一致:6 个一级菜单分组 -# 市场二级顺序:存储服务、科研捐赠、市场基础信息、中试服务、基础实验 +# 市场二级顺序:存储服务、科研捐赠、市场基础信息、中试服务、基础实验、器械销售 STATIC_MENU_TREE = [ { "id": "TOP00000000000000000000000000006", @@ -375,7 +375,55 @@ STATIC_MENU_TREE = [ }, }, ], - } + }, + # 器械销售(市场侧栏末位) + { + "id": "DEV00000000000000000000000000001", + "name": "DeviceSales", + "path": "device-sales", + "component": "", + "meta": { + "title": "器械销售", + "icon": "ri:shopping-bag-3-line", + "keepAlive": False, + "roles": ["admin"], + }, + "children": [ + { + "id": "DEV00000000000000000000000000002", + "name": "DeviceSalesClassIii", + "path": "class-iii", + "component": "/device-sales/under-construction/index", + "meta": { + "title": "三类医疗器械", + "keepAlive": False, + "menuCode": "device-sales:class-iii:list", + }, + }, + { + "id": "DEV00000000000000000000000000003", + "name": "DeviceSalesClassIi", + "path": "class-ii", + "component": "/device-sales/under-construction/index", + "meta": { + "title": "二类医疗器械", + "keepAlive": False, + "menuCode": "device-sales:class-ii:list", + }, + }, + { + "id": "DEV00000000000000000000000000004", + "name": "DeviceSalesCosmetics", + "path": "cosmetics", + "component": "/device-sales/under-construction/index", + "meta": { + "title": "化妆品产品", + "keepAlive": False, + "menuCode": "device-sales:cosmetics:list", + }, + }, + ], + }, ], }, diff --git a/docs/sql/migrations/2026-11-17-device-sales-menus.sql b/docs/sql/migrations/2026-11-17-device-sales-menus.sql new file mode 100644 index 00000000..706621b7 --- /dev/null +++ b/docs/sql/migrations/2026-11-17-device-sales-menus.sql @@ -0,0 +1,164 @@ +-- 市场模块新增「器械销售」及三个子菜单;授权给已有 menu:market 的角色。 +-- 不新建角色/用户;用户经现有 sys_user_role 自动带上菜单。 +-- MySQL 5.7,可重复执行。目标库:测试库(如 zkxw-sc)。 + +-- 1) 二级目录:器械销售(挂在市场下,order_num=6 末位) +INSERT INTO sys_menu ( + id, menu_name, parent_id, menu_type, path, component, perms, + is_frame, visible, status, tenant_no, order_num, remark, + create_by, create_dept_id, create_time, update_by, update_time, del_flag +) +SELECT + 'DEV00000000000000000000000000001', + '器械销售', + m.id, + 'M', + 'device-sales', + NULL, + 'menu:device-sales', + 1, '1', '1', m.tenant_no, 6, + '市场-器械销售', + 'migration', '', NOW(), 'migration', NOW(), 0 +FROM sys_menu m +WHERE m.del_flag = 0 AND m.perms = 'menu:market' + AND NOT EXISTS ( + SELECT 1 FROM sys_menu e + WHERE e.id = 'DEV00000000000000000000000000001' AND e.del_flag = 0 + ); + +-- 2) 子菜单:三类 / 二类 / 化妆品 +INSERT INTO sys_menu ( + id, menu_name, parent_id, menu_type, path, component, perms, + is_frame, visible, status, tenant_no, order_num, remark, + create_by, create_dept_id, create_time, update_by, update_time, del_flag +) +SELECT + x.id, x.menu_name, 'DEV00000000000000000000000000001', 'C', x.path, + 'device-sales/under-construction/index', x.perms, + 1, '1', '1', p.tenant_no, x.order_num, x.remark, + 'migration', '', NOW(), 'migration', NOW(), 0 +FROM sys_menu p +JOIN ( + SELECT 'DEV00000000000000000000000000002' AS id, '三类医疗器械' AS menu_name, + 'class-iii' AS path, 'device-sales:class-iii:list' AS perms, 1 AS order_num, + '市场-器械销售-三类医疗器械' AS remark + UNION ALL + SELECT 'DEV00000000000000000000000000003', '二类医疗器械', + 'class-ii', 'device-sales:class-ii:list', 2, + '市场-器械销售-二类医疗器械' + UNION ALL + SELECT 'DEV00000000000000000000000000004', '化妆品产品', + 'cosmetics', 'device-sales:cosmetics:list', 3, + '市场-器械销售-化妆品产品' +) x ON 1 = 1 +WHERE p.del_flag = 0 AND p.id = 'DEV00000000000000000000000000001' + AND NOT EXISTS ( + SELECT 1 FROM sys_menu e WHERE e.id = x.id AND e.del_flag = 0 + ); + +-- 3) 给已有「市场」顶级菜单授权的角色,授予器械销售目录+三个子菜单 +-- (含祖先目录,满足选中子菜单须含祖先) +INSERT INTO sys_role_menu ( + id, role_id, menu_id, tenant_no, order_num, remark, + create_by, create_dept_id, create_time, update_by, update_time, del_flag +) +SELECT + INSERT(INSERT(MD5(CONCAT('device-sales-rm:', r.tenant_no, ':', r.id, ':', m.id)), 13, 1, '3'), 17, 1, '8'), + r.id, m.id, r.tenant_no, NULL, + 'grant device-sales from menu:market', + 'migration', '', NOW(), 'migration', NOW(), 0 +FROM sys_role r +JOIN sys_role_menu src + ON src.role_id = r.id AND src.tenant_no = r.tenant_no AND src.del_flag = 0 +JOIN sys_menu top + ON top.id = src.menu_id AND top.tenant_no = src.tenant_no AND top.del_flag = 0 + AND top.perms = 'menu:market' +JOIN sys_menu m + ON m.tenant_no = r.tenant_no AND m.del_flag = 0 AND m.status = '1' + AND m.id IN ( + 'DEV00000000000000000000000000001', + 'DEV00000000000000000000000000002', + 'DEV00000000000000000000000000003', + 'DEV00000000000000000000000000004' + ) +WHERE r.del_flag = 0 + AND NOT EXISTS ( + SELECT 1 FROM sys_role_menu existing + WHERE existing.role_id = r.id + AND existing.menu_id = m.id + AND existing.tenant_no = r.tenant_no + AND existing.del_flag = 0 + ); + +-- 3b) 超级管理员同步授予(角色管理勾选与超管侧栏数据一致) +INSERT INTO sys_role_menu ( + id, role_id, menu_id, tenant_no, order_num, remark, + create_by, create_dept_id, create_time, update_by, update_time, del_flag +) +SELECT + INSERT(INSERT(MD5(CONCAT('device-sales-sa:', r.tenant_no, ':', r.id, ':', m.id)), 13, 1, '3'), 17, 1, '8'), + r.id, m.id, r.tenant_no, NULL, + 'grant device-sales to super admin', + 'migration', '', NOW(), 'migration', NOW(), 0 +FROM sys_role r +JOIN sys_menu m + ON m.del_flag = 0 AND m.status = '1' + AND m.id IN ( + 'DEV00000000000000000000000000001', + 'DEV00000000000000000000000000002', + 'DEV00000000000000000000000000003', + 'DEV00000000000000000000000000004' + ) +WHERE r.del_flag = 0 AND r.role_name = '超级管理员' + AND NOT EXISTS ( + SELECT 1 FROM sys_role_menu existing + WHERE existing.role_id = r.id + AND existing.menu_id = m.id + AND existing.tenant_no = r.tenant_no + AND existing.del_flag = 0 + ); + +-- 3c) 恢复已挂到上述角色、但被软删的用户-角色关联(打通 用户→角色→菜单) +UPDATE sys_user_role ur +JOIN sys_role r ON r.id = ur.role_id AND r.del_flag = 0 +JOIN sys_role_menu rm + ON rm.role_id = r.id AND rm.del_flag = 0 + AND rm.menu_id = 'DEV00000000000000000000000000001' +JOIN sys_user u ON u.id = ur.user_id AND u.del_flag = 0 +SET ur.del_flag = 0, + ur.update_by = 'migration', + ur.update_time = NOW() +WHERE ur.del_flag = 1; + +-- 4) 核对 +SELECT id, menu_name, parent_id, path, perms, order_num, visible, del_flag +FROM sys_menu +WHERE id LIKE 'DEV0000000000000000000000000000%' +ORDER BY order_num, menu_name; + +SELECT COUNT(DISTINCT rm.role_id) AS roles_granted, + COUNT(*) AS role_menu_rows +FROM sys_role_menu rm +WHERE rm.del_flag = 0 + AND rm.menu_id IN ( + 'DEV00000000000000000000000000001', + 'DEV00000000000000000000000000002', + 'DEV00000000000000000000000000003', + 'DEV00000000000000000000000000004' + ); + +-- 抽样:有市场权限的用户是否能通过角色落到器械销售菜单 +SELECT u.nick_name, u.phone_no, r.role_name, m.menu_name, m.perms +FROM sys_user u +JOIN sys_user_role ur ON ur.user_id = u.id AND ur.del_flag = 0 +JOIN sys_role r ON r.id = ur.role_id AND r.del_flag = 0 +JOIN sys_role_menu rm ON rm.role_id = r.id AND rm.del_flag = 0 +JOIN sys_menu m ON m.id = rm.menu_id AND m.del_flag = 0 +WHERE u.del_flag = 0 + AND m.id IN ( + 'DEV00000000000000000000000000002', + 'DEV00000000000000000000000000003', + 'DEV00000000000000000000000000004' + ) +ORDER BY u.nick_name, m.order_num +LIMIT 30; diff --git a/web-admin/src/assets/images/common/under-construction.jpg b/web-admin/src/assets/images/common/under-construction.jpg new file mode 100644 index 00000000..36605b76 Binary files /dev/null and b/web-admin/src/assets/images/common/under-construction.jpg differ diff --git a/web-admin/src/router/modules/sqxp.ts b/web-admin/src/router/modules/sqxp.ts index c2cabbaa..09ad146b 100644 --- a/web-admin/src/router/modules/sqxp.ts +++ b/web-admin/src/router/modules/sqxp.ts @@ -60,8 +60,8 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [ }, // ═══════════════════════════════════════════════════════════════════════════ // 1. 市场 (menu:market) - // 二级菜单:存储服务、科研捐赠、市场基础信息、中试服务、基础实验 - // (主推存储/捐赠在前;中试/基础实验及关联基础信息后置) + // 二级菜单:存储服务、科研捐赠、市场基础信息、中试服务、基础实验、器械销售 + // (主推存储/捐赠在前;中试/基础实验及关联基础信息后置;器械销售在末位) // ═══════════════════════════════════════════════════════════════════════════ { id: 'TOP00000000000000000000000000001', @@ -669,6 +669,55 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [ props: { bizType: 'basic_experiment' } } ] + }, + + // ── 器械销售(市场侧栏末位;占位页待完善)──────────────────────────── + { + id: 'DEV00000000000000000000000000001', + name: 'DeviceSales', + path: 'device-sales', + component: '', + meta: { + title: '器械销售', + icon: 'ri:shopping-bag-3-line', + keepAlive: false, + roles: ['admin'] + }, + children: [ + { + id: 'DEV00000000000000000000000000002', + name: 'DeviceSalesClassIii', + path: 'class-iii', + component: '/device-sales/under-construction/index', + meta: { + title: '三类医疗器械', + keepAlive: false, + menuCode: 'device-sales:class-iii:list' + } + }, + { + id: 'DEV00000000000000000000000000003', + name: 'DeviceSalesClassIi', + path: 'class-ii', + component: '/device-sales/under-construction/index', + meta: { + title: '二类医疗器械', + keepAlive: false, + menuCode: 'device-sales:class-ii:list' + } + }, + { + id: 'DEV00000000000000000000000000004', + name: 'DeviceSalesCosmetics', + path: 'cosmetics', + component: '/device-sales/under-construction/index', + meta: { + title: '化妆品产品', + keepAlive: false, + menuCode: 'device-sales:cosmetics:list' + } + } + ] } ] }, diff --git a/web-admin/src/views/device-sales/under-construction/index.vue b/web-admin/src/views/device-sales/under-construction/index.vue new file mode 100644 index 00000000..da1d5370 --- /dev/null +++ b/web-admin/src/views/device-sales/under-construction/index.vue @@ -0,0 +1,63 @@ + + + + + +