Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8349b0ce73 | ||
|
|
85fe63fa9f | ||
|
|
77cdeede15 | ||
|
|
4dc352e4f4 | ||
|
|
c5f26912bd |
No files matched your search
@@ -86,7 +86,7 @@ SECRET_KEY=
|
|||||||
# WX_MP_TPL_PROGRESS_FIELD_APPROVER=thing6
|
# WX_MP_TPL_PROGRESS_FIELD_APPROVER=thing6
|
||||||
# WX_MP_TPL_PROGRESS_FIELD_RESULT=const4
|
# WX_MP_TPL_PROGRESS_FIELD_RESULT=const4
|
||||||
# WX_MP_TPL_PROGRESS_FIELD_TIME=time11
|
# WX_MP_TPL_PROGRESS_FIELD_TIME=time11
|
||||||
# 临床科研交付日前一天提醒(出库提醒模板)
|
# 基础实验交付日前一天提醒(出库提醒模板)
|
||||||
# WX_MP_TEMPLATE_BASIC_EXPERIMENT_DELIVERY=oQNU3t0Q5kwc4KPJ8Z6yPA-k6qlsH9pikSCIb4eAwgM
|
# WX_MP_TEMPLATE_BASIC_EXPERIMENT_DELIVERY=oQNU3t0Q5kwc4KPJ8Z6yPA-k6qlsH9pikSCIb4eAwgM
|
||||||
# WX_MP_TPL_BE_DELIVERY_FIELD_CUSTOMER=thing6
|
# WX_MP_TPL_BE_DELIVERY_FIELD_CUSTOMER=thing6
|
||||||
# WX_MP_TPL_BE_DELIVERY_FIELD_PRODUCT=thing10
|
# WX_MP_TPL_BE_DELIVERY_FIELD_PRODUCT=thing10
|
||||||
|
|||||||
+5
-35
@@ -7,7 +7,7 @@ from app.core.response import success_response
|
|||||||
router = APIRouter(prefix="/web/menu", tags=["菜单管理"])
|
router = APIRouter(prefix="/web/menu", tags=["菜单管理"])
|
||||||
|
|
||||||
# 与 web-admin/src/router/modules/sqxp.ts 一致:6 个一级菜单分组
|
# 与 web-admin/src/router/modules/sqxp.ts 一致:6 个一级菜单分组
|
||||||
# 市场二级顺序:存储服务、科研捐赠、市场基础信息、中试服务、临床科研、器械销售
|
# 市场二级顺序:存储服务、科研捐赠、市场基础信息、基础实验、器械销售
|
||||||
STATIC_MENU_TREE = [
|
STATIC_MENU_TREE = [
|
||||||
{
|
{
|
||||||
"id": "TOP00000000000000000000000000006",
|
"id": "TOP00000000000000000000000000006",
|
||||||
@@ -199,7 +199,7 @@ STATIC_MENU_TREE = [
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
||||||
# 市场基础信息(前段:存储/捐赠相关;后段:中试/临床科研相关)
|
# 市场基础信息(前段:存储/捐赠相关;后段:中试/基础实验相关)
|
||||||
{
|
{
|
||||||
"id": "MKT00000000000000000000000000001",
|
"id": "MKT00000000000000000000000000001",
|
||||||
"name": "MarketInfo",
|
"name": "MarketInfo",
|
||||||
@@ -298,44 +298,14 @@ 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",
|
"id": "BEX00000000000000000000000000001",
|
||||||
"name": "BasicExperiment",
|
"name": "BasicExperiment",
|
||||||
"path": "basic-experiment",
|
"path": "basic-experiment",
|
||||||
"component": "",
|
"component": "",
|
||||||
"meta": {
|
"meta": {
|
||||||
"title": "临床科研",
|
"title": "基础实验",
|
||||||
"icon": "ri:flask-line",
|
"icon": "ri:flask-line",
|
||||||
"keepAlive": False,
|
"keepAlive": False,
|
||||||
"roles": ["admin"],
|
"roles": ["admin"],
|
||||||
@@ -347,7 +317,7 @@ STATIC_MENU_TREE = [
|
|||||||
"path": "application",
|
"path": "application",
|
||||||
"component": "/pilot-service/pilot-application/index",
|
"component": "/pilot-service/pilot-application/index",
|
||||||
"meta": {
|
"meta": {
|
||||||
"title": "临床科研申请单",
|
"title": "基础实验申请单",
|
||||||
"keepAlive": True,
|
"keepAlive": True,
|
||||||
"menuCode": "basic-experiment:application:list",
|
"menuCode": "basic-experiment:application:list",
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -136,14 +136,14 @@ class Settings(BaseSettings):
|
|||||||
WX_TEMPLATE_DELIVERY_WARNING: str = "" # 配送时效预警模板ID
|
WX_TEMPLATE_DELIVERY_WARNING: str = "" # 配送时效预警模板ID
|
||||||
|
|
||||||
# 微信服务号(OA 审批/抄送通知)
|
# 微信服务号(OA 审批/抄送通知)
|
||||||
# 总开关:false 时不发送审批/抄送/申请人进度/评论@提到/临床科研交付提醒/样本采集通知模板消息
|
# 总开关:false 时不发送审批/抄送/申请人进度/评论@提到/基础实验交付提醒/样本采集通知模板消息
|
||||||
WX_MP_NOTIFY_ENABLED: bool = False
|
WX_MP_NOTIFY_ENABLED: bool = False
|
||||||
WX_MP_APPID: str = ""
|
WX_MP_APPID: str = ""
|
||||||
WX_MP_SECRET: str = ""
|
WX_MP_SECRET: str = ""
|
||||||
WX_MP_TEMPLATE_APPROVAL: str = ""
|
WX_MP_TEMPLATE_APPROVAL: str = ""
|
||||||
WX_MP_TEMPLATE_CC: str = ""
|
WX_MP_TEMPLATE_CC: str = ""
|
||||||
WX_MP_TEMPLATE_APPLICANT_PROGRESS: str = ""
|
WX_MP_TEMPLATE_APPLICANT_PROGRESS: str = ""
|
||||||
# 临床科研交付日前一天提醒(出库提醒模板)
|
# 基础实验交付日前一天提醒(出库提醒模板)
|
||||||
WX_MP_TEMPLATE_BASIC_EXPERIMENT_DELIVERY: str = (
|
WX_MP_TEMPLATE_BASIC_EXPERIMENT_DELIVERY: str = (
|
||||||
"oQNU3t0Q5kwc4KPJ8Z6yPA-k6qlsH9pikSCIb4eAwgM"
|
"oQNU3t0Q5kwc4KPJ8Z6yPA-k6qlsH9pikSCIb4eAwgM"
|
||||||
)
|
)
|
||||||
@@ -171,7 +171,7 @@ class Settings(BaseSettings):
|
|||||||
WX_MP_TPL_PROGRESS_FIELD_APPROVER: str = "thing6"
|
WX_MP_TPL_PROGRESS_FIELD_APPROVER: str = "thing6"
|
||||||
WX_MP_TPL_PROGRESS_FIELD_RESULT: str = "const4"
|
WX_MP_TPL_PROGRESS_FIELD_RESULT: str = "const4"
|
||||||
WX_MP_TPL_PROGRESS_FIELD_TIME: str = "time11"
|
WX_MP_TPL_PROGRESS_FIELD_TIME: str = "time11"
|
||||||
# 临床科研交付提醒:客户名称/产品名称/件数/收货联系人/出库时间
|
# 基础实验交付提醒:客户名称/产品名称/件数/收货联系人/出库时间
|
||||||
WX_MP_TPL_BE_DELIVERY_FIELD_CUSTOMER: str = "thing6"
|
WX_MP_TPL_BE_DELIVERY_FIELD_CUSTOMER: str = "thing6"
|
||||||
WX_MP_TPL_BE_DELIVERY_FIELD_PRODUCT: str = "thing10"
|
WX_MP_TPL_BE_DELIVERY_FIELD_PRODUCT: str = "thing10"
|
||||||
WX_MP_TPL_BE_DELIVERY_FIELD_QTY: str = "character_string8"
|
WX_MP_TPL_BE_DELIVERY_FIELD_QTY: str = "character_string8"
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ _QC_STATUS_LABELS = {
|
|||||||
_BIZ_TYPE_LABELS = {
|
_BIZ_TYPE_LABELS = {
|
||||||
"pilot_service": "中试服务",
|
"pilot_service": "中试服务",
|
||||||
"clinical_application": "临床应用",
|
"clinical_application": "临床应用",
|
||||||
"basic_experiment": "临床科研",
|
"basic_experiment": "基础实验",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1601,7 +1601,7 @@ def _get_or_create_infusion_plan(
|
|||||||
user_id: str,
|
user_id: str,
|
||||||
dept_id: str,
|
dept_id: str,
|
||||||
) -> BizPilotInfusionPlan:
|
) -> BizPilotInfusionPlan:
|
||||||
"""获取或创建申请单下的输注/售卖方案(临床科研批量创建售卖计划用)。"""
|
"""获取或创建申请单下的输注/售卖方案(基础实验批量创建售卖计划用)。"""
|
||||||
plans = list_infusion_plans(db, application_id, tenant_no)
|
plans = list_infusion_plans(db, application_id, tenant_no)
|
||||||
if plans:
|
if plans:
|
||||||
plan_row = (
|
plan_row = (
|
||||||
@@ -1647,7 +1647,7 @@ def create_basic_experiment_sale_schedules(
|
|||||||
user_id: str,
|
user_id: str,
|
||||||
dept_id: str,
|
dept_id: str,
|
||||||
) -> List[Dict[str, Any]]:
|
) -> List[Dict[str, Any]]:
|
||||||
"""临床科研:每个产品行创建一条售卖计划(一产品一计划)。"""
|
"""基础实验:每个产品行创建一条售卖计划(一产品一计划)。"""
|
||||||
app = (
|
app = (
|
||||||
db.query(BizPilotApplication)
|
db.query(BizPilotApplication)
|
||||||
.filter(
|
.filter(
|
||||||
@@ -1660,7 +1660,7 @@ def create_basic_experiment_sale_schedules(
|
|||||||
if not app:
|
if not app:
|
||||||
raise ValueError("申请单不存在")
|
raise ValueError("申请单不存在")
|
||||||
if (app.biz_type or "") != "basic_experiment":
|
if (app.biz_type or "") != "basic_experiment":
|
||||||
raise ValueError("仅临床科研申请单可批量创建售卖计划")
|
raise ValueError("仅基础实验申请单可批量创建售卖计划")
|
||||||
if not product_lines:
|
if not product_lines:
|
||||||
raise ValueError("请至少添加一行售卖产品")
|
raise ValueError("请至少添加一行售卖产品")
|
||||||
|
|
||||||
|
|||||||
@@ -918,7 +918,7 @@ def _deduct_fee_on_complete(db: Session, schedule_id: str, tenant_no: str, user_
|
|||||||
if not application:
|
if not application:
|
||||||
raise ValueError("中试申请单不存在")
|
raise ValueError("中试申请单不存在")
|
||||||
|
|
||||||
# 临床应用/临床科研走缴费模块,不走服务订单扣费
|
# 临床应用/基础实验走缴费模块,不走服务订单扣费
|
||||||
if (application.biz_type or "") in ("clinical_application", "basic_experiment"):
|
if (application.biz_type or "") in ("clinical_application", "basic_experiment"):
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ def _wo_to_dict(wo: BizProductionWorkOrder) -> Dict[str, Any]:
|
|||||||
"bizTypeLabel": {
|
"bizTypeLabel": {
|
||||||
"pilot_service": "中试服务",
|
"pilot_service": "中试服务",
|
||||||
"clinical_application": "临床应用",
|
"clinical_application": "临床应用",
|
||||||
"basic_experiment": "临床科研",
|
"basic_experiment": "基础实验",
|
||||||
}.get(getattr(wo, "biz_type", None) or "", ""),
|
}.get(getattr(wo, "biz_type", None) or "", ""),
|
||||||
"workOrderStatus": wo.work_order_status,
|
"workOrderStatus": wo.work_order_status,
|
||||||
"workOrderStatusLabel": _WORK_ORDER_STATUS_LABELS.get(wo.work_order_status, wo.work_order_status),
|
"workOrderStatusLabel": _WORK_ORDER_STATUS_LABELS.get(wo.work_order_status, wo.work_order_status),
|
||||||
@@ -288,7 +288,7 @@ def _enrich_inbound_qc_conclusions(
|
|||||||
_BIZ_TYPE_LABELS = {
|
_BIZ_TYPE_LABELS = {
|
||||||
"pilot_service": "中试服务",
|
"pilot_service": "中试服务",
|
||||||
"clinical_application": "临床应用",
|
"clinical_application": "临床应用",
|
||||||
"basic_experiment": "临床科研",
|
"basic_experiment": "基础实验",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ _CONCLUSION_LABELS = {"tg": "通过", "btg": "不通过"}
|
|||||||
_OUTBOUND_BIZ_TYPE_LABELS = {
|
_OUTBOUND_BIZ_TYPE_LABELS = {
|
||||||
"pilot_service": "中试服务",
|
"pilot_service": "中试服务",
|
||||||
"clinical_application": "临床应用",
|
"clinical_application": "临床应用",
|
||||||
"basic_experiment": "临床科研",
|
"basic_experiment": "基础实验",
|
||||||
}
|
}
|
||||||
_OUTBOUND_BIZ_TYPES = tuple(_OUTBOUND_BIZ_TYPE_LABELS.keys())
|
_OUTBOUND_BIZ_TYPES = tuple(_OUTBOUND_BIZ_TYPE_LABELS.keys())
|
||||||
|
|
||||||
|
|||||||
@@ -4178,15 +4178,15 @@ class BizPilotApplication(Base):
|
|||||||
project_id = Column(String(64), nullable=True, index=True, comment="所属统计项目ID")
|
project_id = Column(String(64), nullable=True, index=True, comment="所属统计项目ID")
|
||||||
application_no = Column(String(64), nullable=True, comment="申请单号(自动生成,前缀ZSSQ)")
|
application_no = Column(String(64), nullable=True, comment="申请单号(自动生成,前缀ZSSQ)")
|
||||||
application_name = Column(String(200), nullable=True, comment="申请单名称")
|
application_name = Column(String(200), nullable=True, comment="申请单名称")
|
||||||
project_title = Column(String(200), nullable=True, comment="课题名称(临床科研)")
|
project_title = Column(String(200), nullable=True, comment="课题名称(基础实验)")
|
||||||
customer_name = Column(String(200), nullable=True, comment="客户名称(临床科研)")
|
customer_name = Column(String(200), nullable=True, comment="客户名称(基础实验)")
|
||||||
customer_contact = Column(String(100), nullable=True, comment="客户联系人(临床科研)")
|
customer_contact = Column(String(100), nullable=True, comment="客户联系人(基础实验)")
|
||||||
customer_phone = Column(String(32), nullable=True, comment="客户联系方式(临床科研)")
|
customer_phone = Column(String(32), nullable=True, comment="客户联系方式(基础实验)")
|
||||||
application_status = Column(String(16), nullable=False, default="dks", comment="dks待开始 jxz进行中 ywc已完成 yzf已作废")
|
application_status = Column(String(16), nullable=False, default="dks", comment="dks待开始 jxz进行中 ywc已完成 yzf已作废")
|
||||||
channel_service_order_id = Column(String(64), nullable=False, comment="渠道服务购买订单ID")
|
channel_service_order_id = Column(String(64), nullable=False, comment="渠道服务购买订单ID")
|
||||||
channel_id = Column(String(64), nullable=True, comment="渠道ID(缓存自服务订单)")
|
channel_id = Column(String(64), nullable=True, comment="渠道ID(缓存自服务订单)")
|
||||||
channel_name = Column(String(200), nullable=True, comment="渠道名称(缓存)")
|
channel_name = Column(String(200), nullable=True, comment="渠道名称(缓存)")
|
||||||
biz_type = Column(String(20), nullable=False, default="pilot_service", comment="业务类型: pilot_service=中试服务, clinical_application=临床应用, basic_experiment=临床科研")
|
biz_type = Column(String(20), nullable=False, default="pilot_service", comment="业务类型: pilot_service=中试服务, clinical_application=临床应用, basic_experiment=基础实验")
|
||||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||||
remark = Column(String(512), nullable=True, comment="备注")
|
remark = Column(String(512), nullable=True, comment="备注")
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
"""临床科研交付日前一天:服务号模板提醒。"""
|
"""基础实验交付日前一天:服务号模板提醒。"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
@@ -137,7 +137,7 @@ def _iter_candidate_schedules(db: Session, *, delivery_day: date) -> List[Any]:
|
|||||||
.order_by(BizPilotInfusionSchedule.infusion_time.asc())
|
.order_by(BizPilotInfusionSchedule.infusion_time.asc())
|
||||||
.all()
|
.all()
|
||||||
)
|
)
|
||||||
# 一计划多产品时取首条产品行(临床科研通常一行)
|
# 一计划多产品时取首条产品行(基础实验通常一行)
|
||||||
seen: set = set()
|
seen: set = set()
|
||||||
out = []
|
out = []
|
||||||
for sched, app, prod in rows:
|
for sched, app, prod in rows:
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
"""质检工单 · 用户费用摘要(采集协议 / 临床科研)"""
|
"""质检工单 · 用户费用摘要(采集协议 / 基础实验)"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
@@ -27,7 +27,7 @@ _PAY_STATUS_LABELS = {
|
|||||||
"ytf": "已退费",
|
"ytf": "已退费",
|
||||||
}
|
}
|
||||||
|
|
||||||
# 出库工单:输注计划缴费(临床科研 / 临床应用共用 biz_pilot_payment)
|
# 出库工单:输注计划缴费(基础实验 / 临床应用共用 biz_pilot_payment)
|
||||||
_OUTBOUND_FEE_BIZ_TYPES = frozenset({"basic_experiment", "clinical_application"})
|
_OUTBOUND_FEE_BIZ_TYPES = frozenset({"basic_experiment", "clinical_application"})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -246,7 +246,7 @@ def send_basic_experiment_delivery_remind(
|
|||||||
time_text: str,
|
time_text: str,
|
||||||
pagepath: str = "",
|
pagepath: str = "",
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""临床科研:交付日前一天出库提醒。"""
|
"""基础实验:交付日前一天出库提醒。"""
|
||||||
data: Dict[str, Dict[str, str]] = {}
|
data: Dict[str, Dict[str, str]] = {}
|
||||||
customer_key = (settings.WX_MP_TPL_BE_DELIVERY_FIELD_CUSTOMER or "").strip()
|
customer_key = (settings.WX_MP_TPL_BE_DELIVERY_FIELD_CUSTOMER or "").strip()
|
||||||
product_key = (settings.WX_MP_TPL_BE_DELIVERY_FIELD_PRODUCT or "").strip()
|
product_key = (settings.WX_MP_TPL_BE_DELIVERY_FIELD_PRODUCT or "").strip()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
"""临床科研申请单与售卖计划批量创建"""
|
"""基础实验申请单与售卖计划批量创建"""
|
||||||
import unittest
|
import unittest
|
||||||
from unittest.mock import MagicMock, patch
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
"""临床科研交付日前一天服务号提醒单测。"""
|
"""基础实验交付日前一天服务号提醒单测。"""
|
||||||
from datetime import date, datetime
|
from datetime import date, datetime
|
||||||
from unittest.mock import MagicMock, patch
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
|
|||||||
@@ -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';
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
-- 展示名:基础实验 → 临床科研(仅中文;不改 perms / path / component / id)
|
|
||||||
-- MySQL 5.7,可重复执行。目标库:测试库(如 zkxw-sc)。
|
|
||||||
|
|
||||||
UPDATE sys_menu
|
|
||||||
SET
|
|
||||||
menu_name = REPLACE(menu_name, '基础实验', '临床科研'),
|
|
||||||
remark = REPLACE(IFNULL(remark, ''), '基础实验', '临床科研'),
|
|
||||||
update_by = 'migration',
|
|
||||||
update_time = NOW()
|
|
||||||
WHERE del_flag = 0
|
|
||||||
AND (
|
|
||||||
menu_name LIKE '%基础实验%'
|
|
||||||
OR IFNULL(remark, '') LIKE '%基础实验%'
|
|
||||||
);
|
|
||||||
@@ -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;
|
||||||
@@ -103,7 +103,7 @@ export const receptionSource = createRegistry({
|
|||||||
outbound: { label: '出库', tagType: 'primary' },
|
outbound: { label: '出库', tagType: 'primary' },
|
||||||
pilot_service: { label: '中试服务', tagType: 'primary' },
|
pilot_service: { label: '中试服务', tagType: 'primary' },
|
||||||
clinical_application: { label: '临床应用', tagType: 'warning' },
|
clinical_application: { label: '临床应用', tagType: 'warning' },
|
||||||
basic_experiment: { label: '临床科研', tagType: 'primary' }
|
basic_experiment: { label: '基础实验', tagType: 'primary' }
|
||||||
})
|
})
|
||||||
|
|
||||||
/** 协议/捐赠样本状态;与 Web sampleStatus 保持一致 */
|
/** 协议/捐赠样本状态;与 Web sampleStatus 保持一致 */
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
用户明确采用 [Figma 原型 v2](https://www.figma.com/design/wOQLDAhr1gdlQEXnVaFO9S?node-id=13-23)。范围为 Web 历史归属维护及其后端读取接口,沿用用户先合入 V2.0 再自测的安排。复用 P02 列表和 `pilot-service/pilot-application/index.vue` 的 `panel-pill-tabs`,操作列固定右侧,搜索右对齐。
|
用户明确采用 [Figma 原型 v2](https://www.figma.com/design/wOQLDAhr1gdlQEXnVaFO9S?node-id=13-23)。范围为 Web 历史归属维护及其后端读取接口,沿用用户先合入 V2.0 再自测的安排。复用 P02 列表和 `pilot-service/pilot-application/index.vue` 的 `panel-pill-tabs`,操作列固定右侧,搜索右对齐。
|
||||||
|
|
||||||
`RecordList` 仅在 assignment 模式显示四类正式业务 tab 和业务识别列。细胞存储/科研捐赠展示母亲姓名、电话、采集医院、市场专员及采集/捐赠日期;中试展示申请名称、渠道、服务订单名称、患者姓名/电话;临床科研展示课题、客户名称/联系人/电话。公共列保留序号、主单号、状态、项目组、所属项目、创建时间。多个有效子记录以稳定顺序去重连接展示,缺失值显示破折号,采集日期来自采集信息的样本采集时间。
|
`RecordList` 仅在 assignment 模式显示四类正式业务 tab 和业务识别列。细胞存储/科研捐赠展示母亲姓名、电话、采集医院、市场专员及采集/捐赠日期;中试展示申请名称、渠道、服务订单名称、患者姓名/电话;基础实验展示课题、客户名称/联系人/电话。公共列保留序号、主单号、状态、项目组、所属项目、创建时间。多个有效子记录以稳定顺序去重连接展示,缺失值显示破折号,采集日期来自采集信息的样本采集时间。
|
||||||
|
|
||||||
新增 `GET /web/admin/project-management/assignments/records`,严格要求 `project:assignment:edit`,仅接受四类正式业务。原 `/records` 继续服务统计明细,不扩展联系信息;移动接口不变。专用服务复用主单租户、软删除、数据权限和归属筛选。关键词支持单号、姓名/电话、医院/专员、渠道/服务订单名称、课题/客户信息(日期使用现有创建日期条件);子表使用同租户未删除记录 EXISTS 匹配,不增加主单行数。分页后批量补充项目、医院、人员、患者和服务订单资料,避免逐行查询。
|
新增 `GET /web/admin/project-management/assignments/records`,严格要求 `project:assignment:edit`,仅接受四类正式业务。原 `/records` 继续服务统计明细,不扩展联系信息;移动接口不变。专用服务复用主单租户、软删除、数据权限和归属筛选。关键词支持单号、姓名/电话、医院/专员、渠道/服务订单名称、课题/客户信息(日期使用现有创建日期条件);子表使用同租户未删除记录 EXISTS 匹配,不增加主单行数。分页后批量补充项目、医院、人员、患者和服务订单资料,避免逐行查询。
|
||||||
|
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
## 模块边界
|
## 模块边界
|
||||||
|
|
||||||
新增 models/project_management.py、services/project_management.py、api/project_management.py。现有四种主表(预签约、采集协议、科研捐赠、中试/临床科研申请)增加可空 project_id,不向下游样本表复制归属。不更改已有课题名称 project_title。
|
新增 models/project_management.py、services/project_management.py、api/project_management.py。现有四种主表(预签约、采集协议、科研捐赠、中试/基础实验申请)增加可空 project_id,不向下游样本表复制归属。不更改已有课题名称 project_title。
|
||||||
|
|
||||||
项目组包含 teamName、leaderUserId、members[{id?,userId}]、regions[{id?,regionId}]、hospitals[{id?,hospitalId}]、enabled、remark。子行按 sync_child_rows 与自然键更新。负责人应计入可选项目成员判断。项目包含 projectNo、projectName、teamId、leaderUserId、bizTypes[]、startDate、endDate、status(pending/active/completed/disabled)、remark。编号服务端生成。项目已有业务后禁止换组;引用中的项目和组只能停用,不能删除。所有引用租户内校验。
|
项目组包含 teamName、leaderUserId、members[{id?,userId}]、regions[{id?,regionId}]、hospitals[{id?,hospitalId}]、enabled、remark。子行按 sync_child_rows 与自然键更新。负责人应计入可选项目成员判断。项目包含 projectNo、projectName、teamId、leaderUserId、bizTypes[]、startDate、endDate、status(pending/active/completed/disabled)、remark。编号服务端生成。项目已有业务后禁止换组;引用中的项目和组只能停用,不能删除。所有引用租户内校验。
|
||||||
|
|
||||||
@@ -61,7 +61,7 @@ project_brief(db, tenant_no, project_id) -> dict # projectId/projectName/teamId
|
|||||||
|
|
||||||
预签约转协议继承归属;存储/捐赠互转继承。归属维护将同租户的预签约→协议→捐赠转换记录组成关联集合,循环防重,锁定顺序固定;任一关联记录不可访问则拒绝整个操作,返回信息不暴露无权查看单据。历史软删除记录不参与活跃统计,不复活。
|
预签约转协议继承归属;存储/捐赠互转继承。归属维护将同租户的预签约→协议→捐赠转换记录组成关联集合,循环防重,锁定顺序固定;任一关联记录不可访问则拒绝整个操作,返回信息不暴露无权查看单据。历史软删除记录不参与活跃统计,不复活。
|
||||||
|
|
||||||
正式存储按协议、捐赠按主单、中试和临床科研按对应 biz_type 申请单计数;预签约另列,不把四类数量称为独立客户数。日期按创建日期(起日含、结束日次日不含),状态显示当前状态。查询先按租户、软删除、原有数据权限过滤,再聚合,不联接子行产生重复;金额不在本期。
|
正式存储按协议、捐赠按主单、中试和基础实验按对应 biz_type 申请单计数;预签约另列,不把四类数量称为独立客户数。日期按创建日期(起日含、结束日次日不含),状态显示当前状态。查询先按租户、软删除、原有数据权限过滤,再聚合,不联接子行产生重复;金额不在本期。
|
||||||
|
|
||||||
## 界面与验证
|
## 界面与验证
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
## ADDED Requirements
|
## ADDED Requirements
|
||||||
|
|
||||||
### Requirement: 按业务识别历史归属单据
|
### Requirement: 按业务识别历史归属单据
|
||||||
历史归属维护 SHALL 按细胞存储、科研捐赠、中试服务、临床科研展示四个 tab,并提供对应业务识别字段和关键词搜索;列表保持主单分页,右侧固定归属与审计操作。
|
历史归属维护 SHALL 按细胞存储、科研捐赠、中试服务、基础实验展示四个 tab,并提供对应业务识别字段和关键词搜索;列表保持主单分页,右侧固定归属与审计操作。
|
||||||
#### Scenario: 存储和捐赠以样本编码识别
|
#### Scenario: 存储和捐赠以样本编码识别
|
||||||
- **WHEN** 查看细胞存储或科研捐赠 tab
|
- **WHEN** 查看细胞存储或科研捐赠 tab
|
||||||
- **THEN** 展示样本编码列而非协议单号/捐赠单号列;多个有效编码在同一主单行去重展示,无编码显示破折号,支持按任一编码搜索;跨租户或已删除的样本不用于展示和匹配,分页和归属仍以主单为单位。
|
- **THEN** 展示样本编码列而非协议单号/捐赠单号列;多个有效编码在同一主单行去重展示,无编码显示破折号,支持按任一编码搜索;跨租户或已删除的样本不用于展示和匹配,分页和归属仍以主单为单位。
|
||||||
@@ -54,7 +54,7 @@ Web SHALL 使用“项目 → 项目管理 → 项目组管理 / 项目管理 /
|
|||||||
- **WHEN** 用户打开某项目的某类业务明细
|
- **WHEN** 用户打开某项目的某类业务明细
|
||||||
- **THEN** 明细总数与相同筛选条件汇总一致,不因子行联接重复计数。
|
- **THEN** 明细总数与相同筛选条件汇总一致,不因子行联接重复计数。
|
||||||
#### Scenario: 四类统计明细展示业务字段
|
#### Scenario: 四类统计明细展示业务字段
|
||||||
- **WHEN** 点击细胞存储、科研捐赠、中试服务、临床科研的统计数量
|
- **WHEN** 点击细胞存储、科研捐赠、中试服务、基础实验的统计数量
|
||||||
- **THEN** 原明细弹窗复用历史归属维护对应 tab 的业务列与关键词能力,存储/捐赠显示样本编码,保留汇总传入的筛选条件和只读权限,不显示归属维护操作;预签约仍沿用原行为。
|
- **THEN** 原明细弹窗复用历史归属维护对应 tab 的业务列与关键词能力,存储/捐赠显示样本编码,保留汇总传入的筛选条件和只读权限,不显示归属维护操作;预签约仍沿用原行为。
|
||||||
|
|
||||||
### Requirement: 沿用现有界面样式
|
### Requirement: 沿用现有界面样式
|
||||||
|
|||||||
@@ -56,9 +56,9 @@ export interface ProductionWorkOrderItem {
|
|||||||
/** 出库工单:输注计划总次数 */
|
/** 出库工单:输注计划总次数 */
|
||||||
totalCourseCount?: number | null
|
totalCourseCount?: number | null
|
||||||
infusionTime?: string
|
infusionTime?: string
|
||||||
/** 临床科研出库:课题名称(列表 enrich) */
|
/** 基础实验出库:课题名称(列表 enrich) */
|
||||||
projectTitle?: string
|
projectTitle?: string
|
||||||
/** 临床科研出库:客户名称(列表 enrich) */
|
/** 基础实验出库:客户名称(列表 enrich) */
|
||||||
customerName?: string
|
customerName?: string
|
||||||
/** 出库工单:输注计划细胞类型(列表 enrich,无产品明细时兜底) */
|
/** 出库工单:输注计划细胞类型(列表 enrich,无产品明细时兜底) */
|
||||||
cellType?: string
|
cellType?: string
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export const bizLabels: Record<BizType, string> = {
|
|||||||
cell_storage: '细胞存储',
|
cell_storage: '细胞存储',
|
||||||
research_donation: '科研捐赠',
|
research_donation: '科研捐赠',
|
||||||
pilot_service: '中试服务',
|
pilot_service: '中试服务',
|
||||||
basic_experiment: '临床科研'
|
basic_experiment: '基础实验'
|
||||||
}
|
}
|
||||||
export type ProjectOption = {
|
export type ProjectOption = {
|
||||||
id: string
|
id: string
|
||||||
|
|||||||
@@ -751,7 +751,7 @@ body {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 面板级步骤胶囊 Tab(样本信息管理 / 采集协议单 / 中试·临床科研申请单等)
|
// 面板级步骤胶囊 Tab(样本信息管理 / 采集协议单 / 中试·基础实验申请单等)
|
||||||
.pill-tab-nav {
|
.pill-tab-nav {
|
||||||
padding: 16px 20px 0;
|
padding: 16px 20px 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ export const PILOT_BIZ_TYPE_CONFIG: Record<PilotBizType, PilotBizTypeConfig> = {
|
|||||||
statusLabel: '输注状态'
|
statusLabel: '输注状态'
|
||||||
},
|
},
|
||||||
basic_experiment: {
|
basic_experiment: {
|
||||||
label: '临床科研',
|
label: '基础实验',
|
||||||
applicationNoPrefix: 'JCSY',
|
applicationNoPrefix: 'JCSY',
|
||||||
showChannel: false,
|
showChannel: false,
|
||||||
showPatient: false,
|
showPatient: false,
|
||||||
|
|||||||
@@ -60,8 +60,8 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
|
|||||||
},
|
},
|
||||||
// ═══════════════════════════════════════════════════════════════════════════
|
// ═══════════════════════════════════════════════════════════════════════════
|
||||||
// 1. 市场 (menu:market)
|
// 1. 市场 (menu:market)
|
||||||
// 二级菜单:存储服务、科研捐赠、市场基础信息、中试服务、临床科研、器械销售
|
// 二级菜单:存储服务、科研捐赠、市场基础信息、基础实验、器械销售
|
||||||
// (主推存储/捐赠在前;中试/临床科研及关联基础信息后置;器械销售在末位)
|
// (主推存储/捐赠在前;中试/基础实验及关联基础信息后置;器械销售在末位)
|
||||||
// ═══════════════════════════════════════════════════════════════════════════
|
// ═══════════════════════════════════════════════════════════════════════════
|
||||||
{
|
{
|
||||||
id: 'TOP00000000000000000000000000001',
|
id: 'TOP00000000000000000000000000001',
|
||||||
@@ -329,7 +329,7 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
// ── 市场基础信息(前段:存储/捐赠相关;后段:中试/临床科研相关)──
|
// ── 市场基础信息(前段:存储/捐赠相关;后段:中试/基础实验相关)──
|
||||||
{
|
{
|
||||||
id: 'MKT00000000000000000000000000001',
|
id: 'MKT00000000000000000000000000001',
|
||||||
name: 'MarketInfo',
|
name: 'MarketInfo',
|
||||||
@@ -553,80 +553,14 @@ 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',
|
id: 'BEX00000000000000000000000000001',
|
||||||
name: 'BasicExperiment',
|
name: 'BasicExperiment',
|
||||||
path: 'basic-experiment',
|
path: 'basic-experiment',
|
||||||
component: '',
|
component: '',
|
||||||
meta: {
|
meta: {
|
||||||
title: '临床科研',
|
title: '基础实验',
|
||||||
icon: 'ri:flask-line',
|
icon: 'ri:flask-line',
|
||||||
keepAlive: false,
|
keepAlive: false,
|
||||||
roles: ['admin']
|
roles: ['admin']
|
||||||
@@ -638,7 +572,7 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
|
|||||||
path: 'application',
|
path: 'application',
|
||||||
component: '/pilot-service/pilot-application/index',
|
component: '/pilot-service/pilot-application/index',
|
||||||
meta: {
|
meta: {
|
||||||
title: '临床科研申请单',
|
title: '基础实验申请单',
|
||||||
keepAlive: true,
|
keepAlive: true,
|
||||||
menuCode: 'basic-experiment:application:list'
|
menuCode: 'basic-experiment:application:list'
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ const SECTION_TITLES: Record<
|
|||||||
schedule: '临床应用输注计划信息'
|
schedule: '临床应用输注计划信息'
|
||||||
},
|
},
|
||||||
basic_experiment: {
|
basic_experiment: {
|
||||||
application: '临床科研申请信息',
|
application: '基础实验申请信息',
|
||||||
schedule: '交付计划信息'
|
schedule: '交付计划信息'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ import {
|
|||||||
resolveTabKeyFromWorkOrder,
|
resolveTabKeyFromWorkOrder,
|
||||||
getProductionWorkOrderTab,
|
getProductionWorkOrderTab,
|
||||||
toWorkOrderListQuery,
|
toWorkOrderListQuery,
|
||||||
isAllProductionWorkOrderTab
|
isAllProductionWorkOrderTab,
|
||||||
|
workOrderMatchesTab
|
||||||
} from '@/utils/production-work-order-tabs'
|
} from '@/utils/production-work-order-tabs'
|
||||||
import { toAllTabListQuery, workOrderMatchesCategory } from '@/utils/production-work-order-category'
|
import { toAllTabListQuery, workOrderMatchesCategory } from '@/utils/production-work-order-category'
|
||||||
import { matchesWorkOrderStatusFilter } from '@/utils/status-tag-registry'
|
import { matchesWorkOrderStatusFilter } from '@/utils/status-tag-registry'
|
||||||
@@ -231,9 +232,7 @@ export function filterMineEntriesByWorkOrderSearch(
|
|||||||
const tabKey = filters.tabKey
|
const tabKey = filters.tabKey
|
||||||
return entries.filter((entry) => {
|
return entries.filter((entry) => {
|
||||||
const row = entry.workOrder
|
const row = entry.workOrder
|
||||||
if (!isAllProductionWorkOrderTab(tabKey) && resolveTabKeyFromWorkOrder(row) !== tabKey) {
|
if (!workOrderMatchesTab(row, tabKey)) return false
|
||||||
return false
|
|
||||||
}
|
|
||||||
if (
|
if (
|
||||||
isAllProductionWorkOrderTab(tabKey) &&
|
isAllProductionWorkOrderTab(tabKey) &&
|
||||||
!workOrderMatchesCategory(row, filters.productionCategory || '')
|
!workOrderMatchesCategory(row, filters.productionCategory || '')
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ const CATEGORY_LABELS: Record<ProductionWorkOrderCategoryKey, string> = {
|
|||||||
inbound_cell_storage: '细胞存储',
|
inbound_cell_storage: '细胞存储',
|
||||||
inbound_research_donation: '科研捐赠',
|
inbound_research_donation: '科研捐赠',
|
||||||
outbound_pilot_service: '中试服务',
|
outbound_pilot_service: '中试服务',
|
||||||
outbound_basic_experiment: '临床科研',
|
outbound_basic_experiment: '基础实验',
|
||||||
temporary: '临时'
|
temporary: '临时'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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,11 +53,13 @@ export const PRODUCTION_WORK_ORDER_TABS: ProductionWorkOrderTabConfig[] = [
|
|||||||
group: 'outbound',
|
group: 'outbound',
|
||||||
workOrderType: 'outbound',
|
workOrderType: 'outbound',
|
||||||
bizType: 'pilot_service',
|
bizType: 'pilot_service',
|
||||||
listLayout: 'standalone'
|
listLayout: 'standalone',
|
||||||
|
/** 客户已下线中试业务:侧栏不展示,路由 key 保留供历史解析 */
|
||||||
|
hidden: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'outbound_basic_experiment',
|
key: 'outbound_basic_experiment',
|
||||||
label: '临床科研生产',
|
label: '基础实验生产',
|
||||||
group: 'outbound',
|
group: 'outbound',
|
||||||
workOrderType: 'outbound',
|
workOrderType: 'outbound',
|
||||||
bizType: 'basic_experiment',
|
bizType: 'basic_experiment',
|
||||||
@@ -97,7 +99,7 @@ export function parseProductionWorkOrderTabKey(raw?: string | null): ProductionW
|
|||||||
const tab = getProductionWorkOrderTab(k)
|
const tab = getProductionWorkOrderTab(k)
|
||||||
if (tab && !tab.hidden) return tab.key
|
if (tab && !tab.hidden) return tab.key
|
||||||
if (k === 'inbound') return 'inbound_cell_storage'
|
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'
|
if (k === 'temporary') return 'temporary'
|
||||||
return DEFAULT_PRODUCTION_WORK_ORDER_TAB
|
return DEFAULT_PRODUCTION_WORK_ORDER_TAB
|
||||||
}
|
}
|
||||||
@@ -145,11 +147,19 @@ export function keywordPlaceholderForTab(tab: ProductionWorkOrderTabConfig): str
|
|||||||
return '工单号/样本编码/入库编码'
|
return '工单号/样本编码/入库编码'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 出库中试服务(含 bizType 缺省落成中试) */
|
||||||
|
export function isPilotServiceOutboundWorkOrder(row: {
|
||||||
|
workOrderType?: string
|
||||||
|
bizType?: string
|
||||||
|
}): boolean {
|
||||||
|
return resolveTabKeyFromWorkOrder(row) === 'outbound_pilot_service'
|
||||||
|
}
|
||||||
|
|
||||||
export function workOrderMatchesTab(
|
export function workOrderMatchesTab(
|
||||||
row: ProductionWorkOrderItem,
|
row: ProductionWorkOrderItem,
|
||||||
tabKey: ProductionWorkOrderTabKey
|
tabKey: ProductionWorkOrderTabKey
|
||||||
): boolean {
|
): boolean {
|
||||||
if (tabKey === 'all') return true
|
if (tabKey === 'all') return !isPilotServiceOutboundWorkOrder(row)
|
||||||
return resolveTabKeyFromWorkOrder(row) === tabKey
|
return resolveTabKeyFromWorkOrder(row) === tabKey
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ import {
|
|||||||
tabUsesInfusionTimeFilter,
|
tabUsesInfusionTimeFilter,
|
||||||
getQcWorkOrderTab,
|
getQcWorkOrderTab,
|
||||||
toWorkOrderListQuery,
|
toWorkOrderListQuery,
|
||||||
isAllQcWorkOrderTab
|
isAllQcWorkOrderTab,
|
||||||
|
workOrderMatchesTab
|
||||||
} from '@/utils/qc-work-order-tabs'
|
} from '@/utils/qc-work-order-tabs'
|
||||||
import {
|
import {
|
||||||
matchesAllTabTriggerSource,
|
matchesAllTabTriggerSource,
|
||||||
@@ -101,9 +102,7 @@ export function filterMineEntriesByWorkOrderSearch(
|
|||||||
const tab = getQcWorkOrderTab(tabKey)!
|
const tab = getQcWorkOrderTab(tabKey)!
|
||||||
return entries.filter((entry) => {
|
return entries.filter((entry) => {
|
||||||
const row = entry.workOrder
|
const row = entry.workOrder
|
||||||
if (!isAllQcWorkOrderTab(tabKey) && resolveTabKeyFromWorkOrder(row) !== tabKey) {
|
if (!workOrderMatchesTab(row, tabKey)) return false
|
||||||
return false
|
|
||||||
}
|
|
||||||
if (isAllQcWorkOrderTab(tabKey) && !workOrderMatchesCategory(row, filters.qcCategory || '')) {
|
if (isAllQcWorkOrderTab(tabKey) && !workOrderMatchesCategory(row, filters.qcCategory || '')) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ const CATEGORY_LABELS: Record<QcWorkOrderCategoryKey, string> = {
|
|||||||
inbound_cell_storage: '细胞存储',
|
inbound_cell_storage: '细胞存储',
|
||||||
inbound_research_donation: '科研捐赠',
|
inbound_research_donation: '科研捐赠',
|
||||||
outbound_pilot_service: '中试服务',
|
outbound_pilot_service: '中试服务',
|
||||||
outbound_basic_experiment: '临床科研',
|
outbound_basic_experiment: '基础实验',
|
||||||
temporary: '临时'
|
temporary: '临时'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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,11 +53,13 @@ export const QC_WORK_ORDER_TABS: QcWorkOrderTabConfig[] = [
|
|||||||
group: 'outbound',
|
group: 'outbound',
|
||||||
workOrderType: 'outbound',
|
workOrderType: 'outbound',
|
||||||
bizType: 'pilot_service',
|
bizType: 'pilot_service',
|
||||||
listLayout: 'outbound-grouped'
|
listLayout: 'outbound-grouped',
|
||||||
|
/** 客户已下线中试业务:侧栏不展示,路由 key 保留供历史解析 */
|
||||||
|
hidden: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'outbound_basic_experiment',
|
key: 'outbound_basic_experiment',
|
||||||
label: '临床科研质检',
|
label: '基础实验质检',
|
||||||
group: 'outbound',
|
group: 'outbound',
|
||||||
workOrderType: 'outbound',
|
workOrderType: 'outbound',
|
||||||
bizType: 'basic_experiment',
|
bizType: 'basic_experiment',
|
||||||
@@ -95,7 +97,7 @@ export function parseQcWorkOrderTabKey(raw?: string | null): QcWorkOrderTabKey {
|
|||||||
const tab = getQcWorkOrderTab(k)
|
const tab = getQcWorkOrderTab(k)
|
||||||
if (tab && !tab.hidden) return tab.key
|
if (tab && !tab.hidden) return tab.key
|
||||||
if (k === 'inbound') return 'inbound_cell_storage'
|
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'
|
if (k === 'temporary') return 'temporary'
|
||||||
return DEFAULT_QC_WORK_ORDER_TAB
|
return DEFAULT_QC_WORK_ORDER_TAB
|
||||||
}
|
}
|
||||||
@@ -160,8 +162,16 @@ export function filterTimeLabelForTab(tab: QcWorkOrderTabConfig): string {
|
|||||||
return '创建时间'
|
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 {
|
export function workOrderMatchesTab(row: QcWorkOrder, tabKey: QcWorkOrderTabKey): boolean {
|
||||||
if (tabKey === 'all') return true
|
if (tabKey === 'all') return !isPilotServiceOutboundWorkOrder(row)
|
||||||
return resolveTabKeyFromWorkOrder(row) === tabKey
|
return resolveTabKeyFromWorkOrder(row) === tabKey
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ export const receptionSource: StatusRegistry = {
|
|||||||
outbound: { label: '出库', tagType: 'primary' },
|
outbound: { label: '出库', tagType: 'primary' },
|
||||||
pilot_service: { label: '中试服务', tagType: 'primary' },
|
pilot_service: { label: '中试服务', tagType: 'primary' },
|
||||||
clinical_application: { label: '临床应用', tagType: 'warning' },
|
clinical_application: { label: '临床应用', tagType: 'warning' },
|
||||||
basic_experiment: { label: '临床科研', tagType: 'primary' }
|
basic_experiment: { label: '基础实验', tagType: 'primary' }
|
||||||
}
|
}
|
||||||
export const receptionSourceLabel = createLabelGetter(receptionSource)
|
export const receptionSourceLabel = createLabelGetter(receptionSource)
|
||||||
export const receptionSourceTagType = createTagTypeGetter(receptionSource)
|
export const receptionSourceTagType = createTagTypeGetter(receptionSource)
|
||||||
@@ -386,7 +386,7 @@ export const agreementType: StatusRegistry = {
|
|||||||
kyxy: { label: '框架协议', tagType: 'primary' },
|
kyxy: { label: '框架协议', tagType: 'primary' },
|
||||||
zsxy: { label: '中试协议', tagType: 'success' },
|
zsxy: { label: '中试协议', tagType: 'success' },
|
||||||
lcxy: { label: '临床协议', tagType: 'warning' },
|
lcxy: { label: '临床协议', tagType: 'warning' },
|
||||||
jcsy: { label: '临床科研', tagType: 'primary' }
|
jcsy: { label: '基础实验', tagType: 'primary' }
|
||||||
}
|
}
|
||||||
export const agreementTypeLabel = createLabelGetter(agreementType)
|
export const agreementTypeLabel = createLabelGetter(agreementType)
|
||||||
export const agreementTypeTagType = createTagTypeGetter(agreementType)
|
export const agreementTypeTagType = createTagTypeGetter(agreementType)
|
||||||
@@ -761,7 +761,7 @@ export function bizTypeLabel(type: string): string {
|
|||||||
const map: Record<string, string> = {
|
const map: Record<string, string> = {
|
||||||
pilot_service: '中试服务',
|
pilot_service: '中试服务',
|
||||||
clinical_application: '临床应用',
|
clinical_application: '临床应用',
|
||||||
basic_experiment: '临床科研'
|
basic_experiment: '基础实验'
|
||||||
}
|
}
|
||||||
return map[type] || type || '-'
|
return map[type] || type || '-'
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -288,7 +288,7 @@
|
|||||||
const contextSections: ViewSection[] = basic
|
const contextSections: ViewSection[] = basic
|
||||||
? [
|
? [
|
||||||
{
|
{
|
||||||
title: '临床科研申请信息',
|
title: '基础实验申请信息',
|
||||||
fields: [
|
fields: [
|
||||||
{ label: '申请单号', value: app.applicationNo || d.applicationNo || '—' },
|
{ label: '申请单号', value: app.applicationNo || d.applicationNo || '—' },
|
||||||
{ label: '课题名称', value: app.projectTitle || d.projectTitle || '—' },
|
{ label: '课题名称', value: app.projectTitle || d.projectTitle || '—' },
|
||||||
|
|||||||
+1
-1
@@ -256,7 +256,7 @@
|
|||||||
total: number
|
total: number
|
||||||
selectedIds: string[]
|
selectedIds: string[]
|
||||||
pickupTimeLabel: string
|
pickupTimeLabel: string
|
||||||
/** 中试/临床展示患者;临床科研展示课题与客户 */
|
/** 中试/临床展示患者;基础实验展示课题与客户 */
|
||||||
showPatient?: boolean
|
showPatient?: boolean
|
||||||
bizType?: string
|
bizType?: string
|
||||||
}>()
|
}>()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<!-- 中试/临床/临床科研申请单页:Tab 由 bizType 策略配置驱动 -->
|
<!-- 中试/临床/基础实验申请单页:Tab 由 bizType 策略配置驱动 -->
|
||||||
<template>
|
<template>
|
||||||
<div class="page-container">
|
<div class="page-container">
|
||||||
<section class="panel">
|
<section class="panel">
|
||||||
|
|||||||
+11
-2
@@ -22,6 +22,7 @@ import {
|
|||||||
isAllProductionWorkOrderTab,
|
isAllProductionWorkOrderTab,
|
||||||
tabSupportsInactiveProtocolFilter,
|
tabSupportsInactiveProtocolFilter,
|
||||||
resolveTabKeyFromWorkOrder,
|
resolveTabKeyFromWorkOrder,
|
||||||
|
workOrderMatchesTab,
|
||||||
type ProductionWorkOrderTabKey
|
type ProductionWorkOrderTabKey
|
||||||
} from '@/utils/production-work-order-tabs'
|
} from '@/utils/production-work-order-tabs'
|
||||||
import { toAllTabListQuery } from '@/utils/production-work-order-category'
|
import { toAllTabListQuery } from '@/utils/production-work-order-category'
|
||||||
@@ -164,8 +165,16 @@ export function useProductionWorkOrderTabPage(
|
|||||||
...listQuery,
|
...listQuery,
|
||||||
...buildPlannedStartTimeParams()
|
...buildPlannedStartTimeParams()
|
||||||
})
|
})
|
||||||
tableData.value = res.list || []
|
const rawList = res.list || []
|
||||||
pagination.total = res.total ?? 0
|
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) =>
|
selectedRows.value = selectedRows.value.filter((row) =>
|
||||||
tableData.value.some((item) => item.id === row.id)
|
tableData.value.some((item) => item.id === row.id)
|
||||||
)
|
)
|
||||||
|
|||||||
+2
-2
@@ -1,9 +1,9 @@
|
|||||||
<!-- 临床科研生产工单 — 查看详情 -->
|
<!-- 基础实验生产工单 — 查看详情 -->
|
||||||
<!-- eslint-disable vue/no-v-model-argument -->
|
<!-- eslint-disable vue/no-v-model-argument -->
|
||||||
<template>
|
<template>
|
||||||
<ProductionWorkOrderViewDialogFrame
|
<ProductionWorkOrderViewDialogFrame
|
||||||
v-model:visible="dialogVisible"
|
v-model:visible="dialogVisible"
|
||||||
title="临床科研生产工单详情"
|
title="基础实验生产工单详情"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
:detail="detail"
|
:detail="detail"
|
||||||
:sections="sections"
|
:sections="sections"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export const assignmentTabs: { key: AssignmentBizType; title: string }[] = [
|
|||||||
{ key: 'cell_storage', title: '细胞存储' },
|
{ key: 'cell_storage', title: '细胞存储' },
|
||||||
{ key: 'research_donation', title: '科研捐赠' },
|
{ key: 'research_donation', title: '科研捐赠' },
|
||||||
{ key: 'pilot_service', title: '中试服务' },
|
{ key: 'pilot_service', title: '中试服务' },
|
||||||
{ key: 'basic_experiment', title: '临床科研' }
|
{ key: 'basic_experiment', title: '基础实验' }
|
||||||
]
|
]
|
||||||
|
|
||||||
const collectionColumns: AssignmentColumn[] = [
|
const collectionColumns: AssignmentColumn[] = [
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<!-- 质检工单 · 用户费用摘要条(采集协议 / 临床科研) -->
|
<!-- 质检工单 · 用户费用摘要条(采集协议 / 基础实验) -->
|
||||||
<template>
|
<template>
|
||||||
<div v-if="visible" class="qc-fee-summary">
|
<div v-if="visible" class="qc-fee-summary">
|
||||||
<span class="qc-fee-summary__label">{{ label }}</span>
|
<span class="qc-fee-summary__label">{{ label }}</span>
|
||||||
|
|||||||
+7
-2
@@ -20,6 +20,7 @@ import {
|
|||||||
isAllQcWorkOrderTab,
|
isAllQcWorkOrderTab,
|
||||||
isInboundSampleQcTab,
|
isInboundSampleQcTab,
|
||||||
resolveTabKeyFromWorkOrder,
|
resolveTabKeyFromWorkOrder,
|
||||||
|
workOrderMatchesTab,
|
||||||
type QcWorkOrderTabKey
|
type QcWorkOrderTabKey
|
||||||
} from '@/utils/qc-work-order-tabs'
|
} from '@/utils/qc-work-order-tabs'
|
||||||
import { toAllTabListQuery } from '@/utils/qc-work-order-category'
|
import { toAllTabListQuery } from '@/utils/qc-work-order-category'
|
||||||
@@ -210,7 +211,10 @@ export function useQcWorkOrderTabPage(
|
|||||||
...listQuery,
|
...listQuery,
|
||||||
...timeParams
|
...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 ids = list.map((row) => row.id).filter(Boolean)
|
||||||
const batchMap = ids.length
|
const batchMap = ids.length
|
||||||
? (await fetchQcInspectionBatchesBatch(ids).catch(() => ({}))) || {}
|
? (await fetchQcInspectionBatchesBatch(ids).catch(() => ({}))) || {}
|
||||||
@@ -218,7 +222,8 @@ export function useQcWorkOrderTabPage(
|
|||||||
// 先写入批次摘要,再渲染卡片,避免子组件在 preset 未就绪时逐条请求 inspection-batches
|
// 先写入批次摘要,再渲染卡片,避免子组件在 preset 未就绪时逐条请求 inspection-batches
|
||||||
presetBatchesByWorkOrderId.value = batchMap
|
presetBatchesByWorkOrderId.value = batchMap
|
||||||
tableData.value = list
|
tableData.value = list
|
||||||
pagination.total = res.total ?? 0
|
// 「所有」前端排除中试时,按本页剔除量修正 total(后端未改)
|
||||||
|
pagination.total = Math.max(0, (res.total ?? 0) - (rawList.length - list.length))
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -1,9 +1,9 @@
|
|||||||
<!-- 临床科研出库质检工单 — 查看详情 -->
|
<!-- 基础实验出库质检工单 — 查看详情 -->
|
||||||
<!-- eslint-disable vue/no-v-model-argument -->
|
<!-- eslint-disable vue/no-v-model-argument -->
|
||||||
<template>
|
<template>
|
||||||
<QcWorkOrderSystemViewDialog
|
<QcWorkOrderSystemViewDialog
|
||||||
v-model:visible="dialogVisible"
|
v-model:visible="dialogVisible"
|
||||||
title="临床科研出库质检工单详情"
|
title="基础实验出库质检工单详情"
|
||||||
width="1200px"
|
width="1200px"
|
||||||
:grid-columns="4"
|
:grid-columns="4"
|
||||||
compact
|
compact
|
||||||
|
|||||||
+1
-1
@@ -75,7 +75,7 @@
|
|||||||
|
|
||||||
defineProps<{
|
defineProps<{
|
||||||
products?: OutboundQcDetail['products']
|
products?: OutboundQcDetail['products']
|
||||||
/** 临床科研时产品状态 dtz 展示为「待交付」 */
|
/** 基础实验时产品状态 dtz 展示为「待交付」 */
|
||||||
bizType?: string
|
bizType?: string
|
||||||
}>()
|
}>()
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in new issue
Block a user