Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8349b0ce73 | ||
|
|
85fe63fa9f | ||
|
|
77cdeede15 | ||
|
|
4dc352e4f4 | ||
|
|
c5f26912bd |
No files matched your search
+1
-31
@@ -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",
|
||||
@@ -298,36 +298,6 @@ STATIC_MENU_TREE = [
|
||||
],
|
||||
},
|
||||
|
||||
# 中试服务
|
||||
{
|
||||
"id": "PIL00000000000000000000000000001",
|
||||
"name": "PilotService",
|
||||
"path": "pilot-service",
|
||||
"component": "",
|
||||
"meta": {
|
||||
"title": "中试服务",
|
||||
"icon": "ri:flask-line",
|
||||
"keepAlive": False,
|
||||
"roles": ["admin"],
|
||||
},
|
||||
"children": [
|
||||
{
|
||||
"id": "80000000000000000000000000000010",
|
||||
"name": "PilotApplication",
|
||||
"path": "pilot-application",
|
||||
"component": "/pilot-service/pilot-application/index",
|
||||
"meta": {"title": "中试服务申请单", "keepAlive": True, "menuCode": "pilot-service:pilot-application:list"},
|
||||
},
|
||||
{
|
||||
"id": "PIL00000000000000000000000000004",
|
||||
"name": "PilotOutboundRelease",
|
||||
"path": "outbound-release-review",
|
||||
"component": "/pilot-service/outbound-release-review/index",
|
||||
"meta": {"title": "出库放行审核", "keepAlive": True, "menuCode": "pilot-service:outbound-release-review:list"},
|
||||
},
|
||||
],
|
||||
},
|
||||
|
||||
# 基础实验
|
||||
{
|
||||
"id": "BEX00000000000000000000000000001",
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
"""市场下「中试服务」已从静态菜单树下线(Issue #158)。"""
|
||||
import ast
|
||||
import re
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
MENU_PY = ROOT / "backend/app/api/menu.py"
|
||||
SQXP_TS = ROOT / "web-admin/src/router/modules/sqxp.ts"
|
||||
HIDE_SQL = ROOT / "docs/sql/migrations/2026-11-20-hide-market-pilot-service-menus.sql"
|
||||
|
||||
|
||||
def _market_children_titles_from_menu_py() -> list[str]:
|
||||
source = MENU_PY.read_text(encoding="utf-8")
|
||||
tree_match = re.search(r"STATIC_MENU_TREE\s*=\s*(\[[\s\S]*?\n\])\s*\n", source)
|
||||
assert tree_match, "STATIC_MENU_TREE not found"
|
||||
tree = ast.literal_eval(tree_match.group(1))
|
||||
market = next(
|
||||
node
|
||||
for node in tree
|
||||
if isinstance(node, dict) and (node.get("meta") or {}).get("menuCode") == "menu:market"
|
||||
)
|
||||
titles = []
|
||||
for child in market.get("children") or []:
|
||||
meta = child.get("meta") or {}
|
||||
titles.append(str(meta.get("title") or ""))
|
||||
return titles
|
||||
|
||||
|
||||
def test_backend_static_menu_has_no_market_pilot_service():
|
||||
titles = _market_children_titles_from_menu_py()
|
||||
assert "中试服务" not in titles
|
||||
assert "中试服务申请单" not in titles
|
||||
|
||||
|
||||
def test_frontend_sqxp_has_no_market_pilot_service_block():
|
||||
text = SQXP_TS.read_text(encoding="utf-8")
|
||||
assert "name: 'PilotService'" not in text
|
||||
assert "id: 'PIL00000000000000000000000000001'" not in text
|
||||
assert "pilot-service:pilot-application:list" not in text
|
||||
# 基础实验 / 临床仍可复用出库放行组件与权限码前缀
|
||||
assert "basic-experiment:outbound-release-review:list" in text
|
||||
assert "clinical-application:outbound-release-review:list" in text
|
||||
|
||||
|
||||
def test_hide_sql_soft_deletes_sys_menu_only_under_market_pilot():
|
||||
sql = HIDE_SQL.read_text(encoding="utf-8")
|
||||
compact = re.sub(r"\s+", " ", re.sub(r"--[^\n]*", "", sql))
|
||||
assert re.search(r"UPDATE\s+sys_menu", compact, re.IGNORECASE)
|
||||
assert re.search(r"SET\s+m\.del_flag\s*=\s*1", compact, re.IGNORECASE)
|
||||
assert "menu:market" in compact
|
||||
assert "中试服务" in compact
|
||||
assert not re.search(r"DELETE\s+FROM\s+sys_menu", compact, re.IGNORECASE)
|
||||
@@ -0,0 +1,62 @@
|
||||
"""Static checks for market/pilot-service role-menu revoke migration (#156)."""
|
||||
import re
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
MIGRATION = (
|
||||
Path(__file__).resolve().parents[2]
|
||||
/ "docs/sql/migrations/2026-11-20-revoke-market-pilot-service-role-menus.sql"
|
||||
)
|
||||
|
||||
|
||||
def _sql() -> str:
|
||||
return MIGRATION.read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def _compact(sql: str) -> str:
|
||||
return re.sub(r"\s+", " ", sql)
|
||||
|
||||
|
||||
def _without_comments(sql: str) -> str:
|
||||
return re.sub(r"--[^\n]*", "", sql)
|
||||
|
||||
|
||||
def test_migration_file_exists():
|
||||
assert MIGRATION.is_file()
|
||||
|
||||
|
||||
def test_scopes_to_market_pilot_service_tree():
|
||||
compact = _compact(_without_comments(_sql()))
|
||||
assert "menu:market" in compact
|
||||
assert "中试服务" in compact
|
||||
assert re.search(r"pilot\.menu_name\s*=\s*'中试服务'", compact)
|
||||
assert re.search(r"market\.perms\s*=\s*'menu:market'", compact)
|
||||
|
||||
|
||||
def test_revokes_role_menu_by_soft_delete_only():
|
||||
compact = _compact(_without_comments(_sql()))
|
||||
assert re.search(r"UPDATE\s+sys_role_menu", compact, re.IGNORECASE)
|
||||
assert re.search(
|
||||
r"UPDATE\s+sys_role_menu\s+rm\b.*SET\s+rm\.del_flag\s*=\s*1",
|
||||
compact,
|
||||
re.IGNORECASE,
|
||||
)
|
||||
assert not re.search(r"DELETE\s+FROM\s+sys_role_menu", compact, re.IGNORECASE)
|
||||
assert not re.search(r"UPDATE\s+sys_menu\s+SET\s+del_flag\s*=\s*1", compact, re.IGNORECASE)
|
||||
assert not re.search(r"DELETE\s+FROM\s+sys_menu", compact, re.IGNORECASE)
|
||||
|
||||
|
||||
def test_includes_children_and_button_descendants():
|
||||
compact = _compact(_without_comments(_sql()))
|
||||
assert re.search(r"child\.parent_id\s*=\s*pilot\.id", compact)
|
||||
assert re.search(r"btn\.parent_id\s*=\s*child\.id", compact)
|
||||
assert compact.count("UNION") >= 2
|
||||
|
||||
|
||||
def test_update_only_touches_active_bindings():
|
||||
compact = _compact(_without_comments(_sql()))
|
||||
assert re.search(
|
||||
r"SET\s+rm\.del_flag\s*=\s*1[\s\S]*WHERE\s+rm\.del_flag\s*=\s*0",
|
||||
compact,
|
||||
re.IGNORECASE,
|
||||
)
|
||||
@@ -0,0 +1,129 @@
|
||||
-- 软删【市场】下【中试服务】目录及其子菜单(含按钮),与前端静态路由下线对齐。
|
||||
-- Issue #158(承接 #156:仅解绑角色对超管侧栏无效)
|
||||
-- MySQL 5.7,可重复执行;不影响基础实验/临床应用下同名菜单。
|
||||
|
||||
-- 0) 预览目标菜单
|
||||
SELECT
|
||||
m.tenant_no,
|
||||
m.id AS menu_id,
|
||||
m.menu_name,
|
||||
m.menu_type,
|
||||
m.perms,
|
||||
m.parent_id,
|
||||
m.del_flag
|
||||
FROM sys_menu m
|
||||
JOIN (
|
||||
SELECT pilot.id AS menu_id, pilot.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT child.id, child.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT btn.id, btn.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
JOIN sys_menu btn
|
||||
ON btn.parent_id = child.id
|
||||
AND btn.tenant_no = market.tenant_no
|
||||
AND btn.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
) tgt
|
||||
ON tgt.menu_id = m.id
|
||||
AND tgt.tenant_no = m.tenant_no
|
||||
WHERE m.del_flag = 0
|
||||
ORDER BY m.tenant_no, m.menu_type, m.order_num, m.menu_name;
|
||||
|
||||
-- 1) 软删目标菜单
|
||||
UPDATE sys_menu m
|
||||
JOIN (
|
||||
SELECT pilot.id AS menu_id, pilot.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT child.id, child.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT btn.id, btn.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
JOIN sys_menu btn
|
||||
ON btn.parent_id = child.id
|
||||
AND btn.tenant_no = market.tenant_no
|
||||
AND btn.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
) tgt
|
||||
ON tgt.menu_id = m.id
|
||||
AND tgt.tenant_no = m.tenant_no
|
||||
SET
|
||||
m.del_flag = 1,
|
||||
m.update_by = 'migration',
|
||||
m.update_time = NOW()
|
||||
WHERE m.del_flag = 0;
|
||||
|
||||
-- 2) 核对:市场下不应再有有效「中试服务」目录(期望 0 行)
|
||||
SELECT
|
||||
market.tenant_no,
|
||||
pilot.id,
|
||||
pilot.menu_name,
|
||||
pilot.del_flag
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market';
|
||||
@@ -0,0 +1,256 @@
|
||||
-- 解除【市场】下【中试服务】目录及其全部子菜单(含按钮)与角色的绑定。
|
||||
-- Issue #156
|
||||
-- 仅软删 sys_role_menu(del_flag=1),不删除/隐藏菜单本身。
|
||||
-- 按树定位:menu:market → menu_name=中试服务 → 直系子菜单 → 孙级按钮;
|
||||
-- 不匹配基础实验/临床应用等其他目录下的同名「出库放行审核」。
|
||||
-- MySQL 5.7,可重复执行(只处理 del_flag=0 的绑定)。
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 0) 预览:将要解绑的目标菜单(目录 + 子菜单 + 按钮)
|
||||
-- ---------------------------------------------------------------------------
|
||||
SELECT
|
||||
m.tenant_no,
|
||||
m.id AS menu_id,
|
||||
m.menu_name,
|
||||
m.menu_type,
|
||||
m.perms,
|
||||
m.parent_id,
|
||||
m.path
|
||||
FROM sys_menu m
|
||||
JOIN (
|
||||
SELECT pilot.id AS menu_id, pilot.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT child.id, child.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT btn.id, btn.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
JOIN sys_menu btn
|
||||
ON btn.parent_id = child.id
|
||||
AND btn.tenant_no = market.tenant_no
|
||||
AND btn.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
) tgt
|
||||
ON tgt.menu_id = m.id
|
||||
AND tgt.tenant_no = m.tenant_no
|
||||
WHERE m.del_flag = 0
|
||||
ORDER BY m.tenant_no, m.menu_type, m.order_num, m.menu_name;
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 1) 预览:将要软删的角色-菜单绑定
|
||||
-- ---------------------------------------------------------------------------
|
||||
SELECT
|
||||
rm.tenant_no,
|
||||
r.id AS role_id,
|
||||
r.role_name,
|
||||
m.id AS menu_id,
|
||||
m.menu_name,
|
||||
m.menu_type,
|
||||
m.perms,
|
||||
rm.id AS role_menu_id
|
||||
FROM sys_role_menu rm
|
||||
JOIN sys_role r
|
||||
ON r.id = rm.role_id
|
||||
AND r.tenant_no = rm.tenant_no
|
||||
AND r.del_flag = 0
|
||||
JOIN sys_menu m
|
||||
ON m.id = rm.menu_id
|
||||
AND m.tenant_no = rm.tenant_no
|
||||
AND m.del_flag = 0
|
||||
JOIN (
|
||||
SELECT pilot.id AS menu_id, pilot.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT child.id, child.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT btn.id, btn.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
JOIN sys_menu btn
|
||||
ON btn.parent_id = child.id
|
||||
AND btn.tenant_no = market.tenant_no
|
||||
AND btn.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
) tgt
|
||||
ON tgt.menu_id = rm.menu_id
|
||||
AND tgt.tenant_no = rm.tenant_no
|
||||
WHERE rm.del_flag = 0
|
||||
ORDER BY rm.tenant_no, r.role_name, m.menu_name;
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 2) 软删绑定(可重复执行)
|
||||
-- ---------------------------------------------------------------------------
|
||||
UPDATE sys_role_menu rm
|
||||
JOIN (
|
||||
SELECT pilot.id AS menu_id, pilot.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT child.id, child.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT btn.id, btn.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
JOIN sys_menu btn
|
||||
ON btn.parent_id = child.id
|
||||
AND btn.tenant_no = market.tenant_no
|
||||
AND btn.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
) tgt
|
||||
ON tgt.menu_id = rm.menu_id
|
||||
AND tgt.tenant_no = rm.tenant_no
|
||||
SET
|
||||
rm.del_flag = 1,
|
||||
rm.update_by = 'migration',
|
||||
rm.update_time = NOW()
|
||||
WHERE rm.del_flag = 0;
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 3) 核对:目标菜单上不应再有有效角色绑定(期望 0 行)
|
||||
-- ---------------------------------------------------------------------------
|
||||
SELECT
|
||||
rm.tenant_no,
|
||||
r.role_name,
|
||||
m.menu_name,
|
||||
m.perms,
|
||||
COUNT(*) AS active_role_menu_rows
|
||||
FROM sys_role_menu rm
|
||||
JOIN sys_role r
|
||||
ON r.id = rm.role_id
|
||||
AND r.tenant_no = rm.tenant_no
|
||||
AND r.del_flag = 0
|
||||
JOIN sys_menu m
|
||||
ON m.id = rm.menu_id
|
||||
AND m.tenant_no = rm.tenant_no
|
||||
AND m.del_flag = 0
|
||||
JOIN (
|
||||
SELECT pilot.id AS menu_id, pilot.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT child.id, child.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
UNION
|
||||
SELECT btn.id, btn.tenant_no
|
||||
FROM sys_menu market
|
||||
JOIN sys_menu pilot
|
||||
ON pilot.parent_id = market.id
|
||||
AND pilot.tenant_no = market.tenant_no
|
||||
AND pilot.del_flag = 0
|
||||
AND pilot.menu_name = '中试服务'
|
||||
JOIN sys_menu child
|
||||
ON child.parent_id = pilot.id
|
||||
AND child.tenant_no = market.tenant_no
|
||||
AND child.del_flag = 0
|
||||
JOIN sys_menu btn
|
||||
ON btn.parent_id = child.id
|
||||
AND btn.tenant_no = market.tenant_no
|
||||
AND btn.del_flag = 0
|
||||
WHERE market.del_flag = 0
|
||||
AND market.perms = 'menu:market'
|
||||
) tgt
|
||||
ON tgt.menu_id = rm.menu_id
|
||||
AND tgt.tenant_no = rm.tenant_no
|
||||
WHERE rm.del_flag = 0
|
||||
GROUP BY rm.tenant_no, r.role_name, m.menu_name, m.perms;
|
||||
@@ -60,7 +60,7 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
|
||||
},
|
||||
// ═══════════════════════════════════════════════════════════════════════════
|
||||
// 1. 市场 (menu:market)
|
||||
// 二级菜单:存储服务、科研捐赠、市场基础信息、中试服务、基础实验、器械销售
|
||||
// 二级菜单:存储服务、科研捐赠、市场基础信息、基础实验、器械销售
|
||||
// (主推存储/捐赠在前;中试/基础实验及关联基础信息后置;器械销售在末位)
|
||||
// ═══════════════════════════════════════════════════════════════════════════
|
||||
{
|
||||
@@ -553,72 +553,6 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
|
||||
]
|
||||
},
|
||||
|
||||
// ── 中试服务 ──────────────────────────────────────────────────────────
|
||||
{
|
||||
id: 'PIL00000000000000000000000000001',
|
||||
name: 'PilotService',
|
||||
path: 'pilot-service',
|
||||
component: '',
|
||||
meta: {
|
||||
title: '中试服务',
|
||||
icon: 'ri:flask-line',
|
||||
keepAlive: false,
|
||||
roles: ['admin']
|
||||
},
|
||||
children: [
|
||||
{
|
||||
id: '80000000000000000000000000000010',
|
||||
name: 'PilotApplication',
|
||||
path: 'pilot-application',
|
||||
component: '/pilot-service/pilot-application/index',
|
||||
meta: {
|
||||
title: '中试服务申请单',
|
||||
keepAlive: true,
|
||||
menuCode: 'pilot-service:pilot-application:list'
|
||||
},
|
||||
props: { bizType: 'pilot_service' }
|
||||
},
|
||||
{
|
||||
id: 'PIL00000000000000000000000000002',
|
||||
name: 'PilotCheckupManagement',
|
||||
path: 'checkup-management',
|
||||
component: '/pilot-service/checkup-management/index',
|
||||
meta: {
|
||||
title: '体检管理',
|
||||
keepAlive: false,
|
||||
isHide: true,
|
||||
menuCode: 'pilot-service:checkup-management:list'
|
||||
},
|
||||
props: { bizType: 'pilot_service' }
|
||||
},
|
||||
{
|
||||
id: 'PIL00000000000000000000000000003',
|
||||
name: 'PilotInfusionSchedule',
|
||||
path: 'infusion-schedule-management',
|
||||
component: '/pilot-service/infusion-schedule-management/index',
|
||||
meta: {
|
||||
title: '输注计划管理',
|
||||
keepAlive: false,
|
||||
isHide: true,
|
||||
menuCode: 'pilot-service:infusion-schedule-management:list'
|
||||
},
|
||||
props: { bizType: 'pilot_service' }
|
||||
},
|
||||
{
|
||||
id: 'PIL00000000000000000000000000004',
|
||||
name: 'PilotOutboundRelease',
|
||||
path: 'outbound-release-review',
|
||||
component: '/pilot-service/outbound-release-review/index',
|
||||
meta: {
|
||||
title: '出库放行审核',
|
||||
keepAlive: true,
|
||||
menuCode: 'pilot-service:outbound-release-review:list'
|
||||
},
|
||||
props: { bizType: 'pilot_service' }
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
// ── 基础实验 ──────────────────────────────────────────────────────────
|
||||
{
|
||||
id: 'BEX00000000000000000000000000001',
|
||||
|
||||
@@ -6,7 +6,8 @@ import {
|
||||
resolveTabKeyFromWorkOrder,
|
||||
getProductionWorkOrderTab,
|
||||
toWorkOrderListQuery,
|
||||
isAllProductionWorkOrderTab
|
||||
isAllProductionWorkOrderTab,
|
||||
workOrderMatchesTab
|
||||
} from '@/utils/production-work-order-tabs'
|
||||
import { toAllTabListQuery, workOrderMatchesCategory } from '@/utils/production-work-order-category'
|
||||
import { matchesWorkOrderStatusFilter } from '@/utils/status-tag-registry'
|
||||
@@ -231,9 +232,7 @@ export function filterMineEntriesByWorkOrderSearch(
|
||||
const tabKey = filters.tabKey
|
||||
return entries.filter((entry) => {
|
||||
const row = entry.workOrder
|
||||
if (!isAllProductionWorkOrderTab(tabKey) && resolveTabKeyFromWorkOrder(row) !== tabKey) {
|
||||
return false
|
||||
}
|
||||
if (!workOrderMatchesTab(row, tabKey)) return false
|
||||
if (
|
||||
isAllProductionWorkOrderTab(tabKey) &&
|
||||
!workOrderMatchesCategory(row, filters.productionCategory || '')
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
import { describe, it } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import {
|
||||
PRODUCTION_WORK_ORDER_VISIBLE_TABS,
|
||||
parseProductionWorkOrderTabKey,
|
||||
workOrderMatchesTab,
|
||||
isPilotServiceOutboundWorkOrder
|
||||
} from './production-work-order-tabs'
|
||||
import { PRODUCTION_WORK_ORDER_CATEGORY_OPTIONS } from './production-work-order-category'
|
||||
|
||||
describe('production work order tabs — hide pilot service', () => {
|
||||
it('visible tabs exclude outbound_pilot_service', () => {
|
||||
assert.ok(!PRODUCTION_WORK_ORDER_VISIBLE_TABS.some((t) => t.key === 'outbound_pilot_service'))
|
||||
assert.ok(!PRODUCTION_WORK_ORDER_CATEGORY_OPTIONS.some((o) => o.key === 'outbound_pilot_service'))
|
||||
})
|
||||
|
||||
it('parse: hidden pilot key and outbound alias fall back safely', () => {
|
||||
assert.equal(parseProductionWorkOrderTabKey('outbound_pilot_service'), 'all')
|
||||
assert.equal(parseProductionWorkOrderTabKey('outbound'), 'outbound_basic_experiment')
|
||||
})
|
||||
|
||||
it('「所有」excludes pilot outbound (incl. default bizType)', () => {
|
||||
const pilot = { workOrderType: 'outbound', bizType: 'pilot_service' }
|
||||
const defaultPilot = { workOrderType: 'outbound' }
|
||||
const basic = { workOrderType: 'outbound', bizType: 'basic_experiment' }
|
||||
assert.equal(isPilotServiceOutboundWorkOrder(pilot), true)
|
||||
assert.equal(isPilotServiceOutboundWorkOrder(defaultPilot), true)
|
||||
assert.equal(workOrderMatchesTab(pilot as any, 'all'), false)
|
||||
assert.equal(workOrderMatchesTab(defaultPilot as any, 'all'), false)
|
||||
assert.equal(workOrderMatchesTab(basic as any, 'all'), true)
|
||||
})
|
||||
})
|
||||
@@ -53,7 +53,9 @@ export const PRODUCTION_WORK_ORDER_TABS: ProductionWorkOrderTabConfig[] = [
|
||||
group: 'outbound',
|
||||
workOrderType: 'outbound',
|
||||
bizType: 'pilot_service',
|
||||
listLayout: 'standalone'
|
||||
listLayout: 'standalone',
|
||||
/** 客户已下线中试业务:侧栏不展示,路由 key 保留供历史解析 */
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
key: 'outbound_basic_experiment',
|
||||
@@ -97,7 +99,7 @@ export function parseProductionWorkOrderTabKey(raw?: string | null): ProductionW
|
||||
const tab = getProductionWorkOrderTab(k)
|
||||
if (tab && !tab.hidden) return tab.key
|
||||
if (k === 'inbound') return 'inbound_cell_storage'
|
||||
if (k === 'outbound') return 'outbound_pilot_service'
|
||||
if (k === 'outbound') return 'outbound_basic_experiment'
|
||||
if (k === 'temporary') return 'temporary'
|
||||
return DEFAULT_PRODUCTION_WORK_ORDER_TAB
|
||||
}
|
||||
@@ -145,11 +147,19 @@ export function keywordPlaceholderForTab(tab: ProductionWorkOrderTabConfig): str
|
||||
return '工单号/样本编码/入库编码'
|
||||
}
|
||||
|
||||
/** 出库中试服务(含 bizType 缺省落成中试) */
|
||||
export function isPilotServiceOutboundWorkOrder(row: {
|
||||
workOrderType?: string
|
||||
bizType?: string
|
||||
}): boolean {
|
||||
return resolveTabKeyFromWorkOrder(row) === 'outbound_pilot_service'
|
||||
}
|
||||
|
||||
export function workOrderMatchesTab(
|
||||
row: ProductionWorkOrderItem,
|
||||
tabKey: ProductionWorkOrderTabKey
|
||||
): boolean {
|
||||
if (tabKey === 'all') return true
|
||||
if (tabKey === 'all') return !isPilotServiceOutboundWorkOrder(row)
|
||||
return resolveTabKeyFromWorkOrder(row) === tabKey
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,8 @@ import {
|
||||
tabUsesInfusionTimeFilter,
|
||||
getQcWorkOrderTab,
|
||||
toWorkOrderListQuery,
|
||||
isAllQcWorkOrderTab
|
||||
isAllQcWorkOrderTab,
|
||||
workOrderMatchesTab
|
||||
} from '@/utils/qc-work-order-tabs'
|
||||
import {
|
||||
matchesAllTabTriggerSource,
|
||||
@@ -101,9 +102,7 @@ export function filterMineEntriesByWorkOrderSearch(
|
||||
const tab = getQcWorkOrderTab(tabKey)!
|
||||
return entries.filter((entry) => {
|
||||
const row = entry.workOrder
|
||||
if (!isAllQcWorkOrderTab(tabKey) && resolveTabKeyFromWorkOrder(row) !== tabKey) {
|
||||
return false
|
||||
}
|
||||
if (!workOrderMatchesTab(row, tabKey)) return false
|
||||
if (isAllQcWorkOrderTab(tabKey) && !workOrderMatchesCategory(row, filters.qcCategory || '')) {
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
import { describe, it } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import {
|
||||
QC_WORK_ORDER_VISIBLE_TABS,
|
||||
parseQcWorkOrderTabKey,
|
||||
workOrderMatchesTab,
|
||||
isPilotServiceOutboundWorkOrder
|
||||
} from './qc-work-order-tabs'
|
||||
import { QC_WORK_ORDER_CATEGORY_OPTIONS } from './qc-work-order-category'
|
||||
|
||||
describe('qc work order tabs — hide pilot service', () => {
|
||||
it('visible tabs exclude outbound_pilot_service', () => {
|
||||
assert.ok(!QC_WORK_ORDER_VISIBLE_TABS.some((t) => t.key === 'outbound_pilot_service'))
|
||||
assert.ok(!QC_WORK_ORDER_CATEGORY_OPTIONS.some((o) => o.key === 'outbound_pilot_service'))
|
||||
})
|
||||
|
||||
it('parse: hidden pilot key and outbound alias fall back safely', () => {
|
||||
// 质检默认 Tab 为细胞存储(「所有」本身也是 hidden)
|
||||
assert.equal(parseQcWorkOrderTabKey('outbound_pilot_service'), 'inbound_cell_storage')
|
||||
assert.equal(parseQcWorkOrderTabKey('outbound'), 'outbound_basic_experiment')
|
||||
})
|
||||
|
||||
it('「所有」excludes pilot outbound (incl. default bizType)', () => {
|
||||
const pilot = { workOrderType: 'outbound', bizType: 'pilot_service' }
|
||||
const defaultPilot = { workOrderType: 'outbound' }
|
||||
const basic = { workOrderType: 'outbound', bizType: 'basic_experiment' }
|
||||
assert.equal(isPilotServiceOutboundWorkOrder(pilot), true)
|
||||
assert.equal(isPilotServiceOutboundWorkOrder(defaultPilot), true)
|
||||
assert.equal(workOrderMatchesTab(pilot as any, 'all'), false)
|
||||
assert.equal(workOrderMatchesTab(defaultPilot as any, 'all'), false)
|
||||
assert.equal(workOrderMatchesTab(basic as any, 'all'), true)
|
||||
})
|
||||
})
|
||||
@@ -53,7 +53,9 @@ export const QC_WORK_ORDER_TABS: QcWorkOrderTabConfig[] = [
|
||||
group: 'outbound',
|
||||
workOrderType: 'outbound',
|
||||
bizType: 'pilot_service',
|
||||
listLayout: 'outbound-grouped'
|
||||
listLayout: 'outbound-grouped',
|
||||
/** 客户已下线中试业务:侧栏不展示,路由 key 保留供历史解析 */
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
key: 'outbound_basic_experiment',
|
||||
@@ -95,7 +97,7 @@ export function parseQcWorkOrderTabKey(raw?: string | null): QcWorkOrderTabKey {
|
||||
const tab = getQcWorkOrderTab(k)
|
||||
if (tab && !tab.hidden) return tab.key
|
||||
if (k === 'inbound') return 'inbound_cell_storage'
|
||||
if (k === 'outbound') return 'outbound_pilot_service'
|
||||
if (k === 'outbound') return 'outbound_basic_experiment'
|
||||
if (k === 'temporary') return 'temporary'
|
||||
return DEFAULT_QC_WORK_ORDER_TAB
|
||||
}
|
||||
@@ -160,8 +162,16 @@ export function filterTimeLabelForTab(tab: QcWorkOrderTabConfig): string {
|
||||
return '创建时间'
|
||||
}
|
||||
|
||||
/** 出库中试服务(含 bizType 缺省落成中试) */
|
||||
export function isPilotServiceOutboundWorkOrder(row: {
|
||||
workOrderType?: string
|
||||
bizType?: string
|
||||
}): boolean {
|
||||
return resolveTabKeyFromWorkOrder(row) === 'outbound_pilot_service'
|
||||
}
|
||||
|
||||
export function workOrderMatchesTab(row: QcWorkOrder, tabKey: QcWorkOrderTabKey): boolean {
|
||||
if (tabKey === 'all') return true
|
||||
if (tabKey === 'all') return !isPilotServiceOutboundWorkOrder(row)
|
||||
return resolveTabKeyFromWorkOrder(row) === tabKey
|
||||
}
|
||||
|
||||
|
||||
+11
-2
@@ -22,6 +22,7 @@ import {
|
||||
isAllProductionWorkOrderTab,
|
||||
tabSupportsInactiveProtocolFilter,
|
||||
resolveTabKeyFromWorkOrder,
|
||||
workOrderMatchesTab,
|
||||
type ProductionWorkOrderTabKey
|
||||
} from '@/utils/production-work-order-tabs'
|
||||
import { toAllTabListQuery } from '@/utils/production-work-order-category'
|
||||
@@ -164,8 +165,16 @@ export function useProductionWorkOrderTabPage(
|
||||
...listQuery,
|
||||
...buildPlannedStartTimeParams()
|
||||
})
|
||||
tableData.value = res.list || []
|
||||
pagination.total = res.total ?? 0
|
||||
const rawList = res.list || []
|
||||
const list = isAllProductionWorkOrderTab(tabKey.value)
|
||||
? rawList.filter((row) => workOrderMatchesTab(row, 'all'))
|
||||
: rawList
|
||||
tableData.value = list
|
||||
// 「所有」前端排除中试时,按本页剔除量修正 total(后端未改)
|
||||
pagination.total = Math.max(
|
||||
0,
|
||||
(res.total ?? 0) - (rawList.length - list.length)
|
||||
)
|
||||
selectedRows.value = selectedRows.value.filter((row) =>
|
||||
tableData.value.some((item) => item.id === row.id)
|
||||
)
|
||||
|
||||
+7
-2
@@ -20,6 +20,7 @@ import {
|
||||
isAllQcWorkOrderTab,
|
||||
isInboundSampleQcTab,
|
||||
resolveTabKeyFromWorkOrder,
|
||||
workOrderMatchesTab,
|
||||
type QcWorkOrderTabKey
|
||||
} from '@/utils/qc-work-order-tabs'
|
||||
import { toAllTabListQuery } from '@/utils/qc-work-order-category'
|
||||
@@ -210,7 +211,10 @@ export function useQcWorkOrderTabPage(
|
||||
...listQuery,
|
||||
...timeParams
|
||||
})
|
||||
const list = res.list || []
|
||||
const rawList = res.list || []
|
||||
const list = isAllQcWorkOrderTab(tabKey.value)
|
||||
? rawList.filter((row) => workOrderMatchesTab(row, 'all'))
|
||||
: rawList
|
||||
const ids = list.map((row) => row.id).filter(Boolean)
|
||||
const batchMap = ids.length
|
||||
? (await fetchQcInspectionBatchesBatch(ids).catch(() => ({}))) || {}
|
||||
@@ -218,7 +222,8 @@ export function useQcWorkOrderTabPage(
|
||||
// 先写入批次摘要,再渲染卡片,避免子组件在 preset 未就绪时逐条请求 inspection-batches
|
||||
presetBatchesByWorkOrderId.value = batchMap
|
||||
tableData.value = list
|
||||
pagination.total = res.total ?? 0
|
||||
// 「所有」前端排除中试时,按本页剔除量修正 total(后端未改)
|
||||
pagination.total = Math.max(0, (res.total ?? 0) - (rawList.length - list.length))
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user