diff --git a/backend/.env.example b/backend/.env.example index 4b01b8f4..fab3b832 100644 --- a/backend/.env.example +++ b/backend/.env.example @@ -86,7 +86,7 @@ SECRET_KEY= # WX_MP_TPL_PROGRESS_FIELD_APPROVER=thing6 # WX_MP_TPL_PROGRESS_FIELD_RESULT=const4 # WX_MP_TPL_PROGRESS_FIELD_TIME=time11 -# 基础实验交付日前一天提醒(出库提醒模板) +# 临床科研交付日前一天提醒(出库提醒模板) # WX_MP_TEMPLATE_BASIC_EXPERIMENT_DELIVERY=oQNU3t0Q5kwc4KPJ8Z6yPA-k6qlsH9pikSCIb4eAwgM # WX_MP_TPL_BE_DELIVERY_FIELD_CUSTOMER=thing6 # WX_MP_TPL_BE_DELIVERY_FIELD_PRODUCT=thing10 diff --git a/backend/app/api/menu.py b/backend/app/api/menu.py index f7ea89b1..1bfa2576 100644 --- a/backend/app/api/menu.py +++ b/backend/app/api/menu.py @@ -7,7 +7,7 @@ from app.core.response import success_response router = APIRouter(prefix="/web/menu", tags=["菜单管理"]) # 与 web-admin/src/router/modules/sqxp.ts 一致:6 个一级菜单分组 -# 市场二级顺序:存储服务、科研捐赠、市场基础信息、基础实验、器械销售 +# 市场二级顺序:存储服务、科研捐赠、市场基础信息、临床科研、器械销售 STATIC_MENU_TREE = [ { "id": "TOP00000000000000000000000000006", @@ -199,7 +199,7 @@ STATIC_MENU_TREE = [ ], }, - # 市场基础信息(前段:存储/捐赠相关;后段:中试/基础实验相关) + # 市场基础信息(前段:存储/捐赠相关;后段:中试/临床科研相关) { "id": "MKT00000000000000000000000000001", "name": "MarketInfo", @@ -298,14 +298,14 @@ STATIC_MENU_TREE = [ ], }, - # 基础实验 + # 临床科研 { "id": "BEX00000000000000000000000000001", "name": "BasicExperiment", "path": "basic-experiment", "component": "", "meta": { - "title": "基础实验", + "title": "临床科研", "icon": "ri:flask-line", "keepAlive": False, "roles": ["admin"], @@ -317,7 +317,7 @@ STATIC_MENU_TREE = [ "path": "application", "component": "/pilot-service/pilot-application/index", "meta": { - "title": "基础实验申请单", + "title": "临床科研申请单", "keepAlive": True, "menuCode": "basic-experiment:application:list", }, diff --git a/backend/app/core/config.py b/backend/app/core/config.py index 3561bff3..d3b64d00 100644 --- a/backend/app/core/config.py +++ b/backend/app/core/config.py @@ -136,14 +136,14 @@ class Settings(BaseSettings): WX_TEMPLATE_DELIVERY_WARNING: str = "" # 配送时效预警模板ID # 微信服务号(OA 审批/抄送通知) - # 总开关:false 时不发送审批/抄送/申请人进度/评论@提到/基础实验交付提醒/样本采集通知模板消息 + # 总开关:false 时不发送审批/抄送/申请人进度/评论@提到/临床科研交付提醒/样本采集通知模板消息 WX_MP_NOTIFY_ENABLED: bool = False WX_MP_APPID: str = "" WX_MP_SECRET: str = "" WX_MP_TEMPLATE_APPROVAL: str = "" WX_MP_TEMPLATE_CC: str = "" WX_MP_TEMPLATE_APPLICANT_PROGRESS: str = "" - # 基础实验交付日前一天提醒(出库提醒模板) + # 临床科研交付日前一天提醒(出库提醒模板) WX_MP_TEMPLATE_BASIC_EXPERIMENT_DELIVERY: str = ( "oQNU3t0Q5kwc4KPJ8Z6yPA-k6qlsH9pikSCIb4eAwgM" ) @@ -171,7 +171,7 @@ class Settings(BaseSettings): WX_MP_TPL_PROGRESS_FIELD_APPROVER: str = "thing6" WX_MP_TPL_PROGRESS_FIELD_RESULT: str = "const4" WX_MP_TPL_PROGRESS_FIELD_TIME: str = "time11" - # 基础实验交付提醒:客户名称/产品名称/件数/收货联系人/出库时间 + # 临床科研交付提醒:客户名称/产品名称/件数/收货联系人/出库时间 WX_MP_TPL_BE_DELIVERY_FIELD_CUSTOMER: str = "thing6" WX_MP_TPL_BE_DELIVERY_FIELD_PRODUCT: str = "thing10" WX_MP_TPL_BE_DELIVERY_FIELD_QTY: str = "character_string8" diff --git a/backend/app/crud/outbound_release_review.py b/backend/app/crud/outbound_release_review.py index 79813e48..2c304e33 100644 --- a/backend/app/crud/outbound_release_review.py +++ b/backend/app/crud/outbound_release_review.py @@ -41,7 +41,7 @@ _QC_STATUS_LABELS = { _BIZ_TYPE_LABELS = { "pilot_service": "中试服务", "clinical_application": "临床应用", - "basic_experiment": "基础实验", + "basic_experiment": "临床科研", } diff --git a/backend/app/crud/pilot_application.py b/backend/app/crud/pilot_application.py index 3067ebc0..d59fa164 100644 --- a/backend/app/crud/pilot_application.py +++ b/backend/app/crud/pilot_application.py @@ -1601,7 +1601,7 @@ def _get_or_create_infusion_plan( user_id: str, dept_id: str, ) -> BizPilotInfusionPlan: - """获取或创建申请单下的输注/售卖方案(基础实验批量创建售卖计划用)。""" + """获取或创建申请单下的输注/售卖方案(临床科研批量创建售卖计划用)。""" plans = list_infusion_plans(db, application_id, tenant_no) if plans: plan_row = ( @@ -1647,7 +1647,7 @@ def create_basic_experiment_sale_schedules( user_id: str, dept_id: str, ) -> List[Dict[str, Any]]: - """基础实验:每个产品行创建一条售卖计划(一产品一计划)。""" + """临床科研:每个产品行创建一条售卖计划(一产品一计划)。""" app = ( db.query(BizPilotApplication) .filter( @@ -1660,7 +1660,7 @@ def create_basic_experiment_sale_schedules( if not app: raise ValueError("申请单不存在") if (app.biz_type or "") != "basic_experiment": - raise ValueError("仅基础实验申请单可批量创建售卖计划") + raise ValueError("仅临床科研申请单可批量创建售卖计划") if not product_lines: raise ValueError("请至少添加一行售卖产品") diff --git a/backend/app/crud/pilot_infusion_schedule_mgmt.py b/backend/app/crud/pilot_infusion_schedule_mgmt.py index 391a0e89..c860d4b0 100644 --- a/backend/app/crud/pilot_infusion_schedule_mgmt.py +++ b/backend/app/crud/pilot_infusion_schedule_mgmt.py @@ -918,7 +918,7 @@ def _deduct_fee_on_complete(db: Session, schedule_id: str, tenant_no: str, user_ if not application: raise ValueError("中试申请单不存在") - # 临床应用/基础实验走缴费模块,不走服务订单扣费 + # 临床应用/临床科研走缴费模块,不走服务订单扣费 if (application.biz_type or "") in ("clinical_application", "basic_experiment"): return diff --git a/backend/app/crud/production_work_order.py b/backend/app/crud/production_work_order.py index ca88446b..617cc755 100644 --- a/backend/app/crud/production_work_order.py +++ b/backend/app/crud/production_work_order.py @@ -198,7 +198,7 @@ def _wo_to_dict(wo: BizProductionWorkOrder) -> Dict[str, Any]: "bizTypeLabel": { "pilot_service": "中试服务", "clinical_application": "临床应用", - "basic_experiment": "基础实验", + "basic_experiment": "临床科研", }.get(getattr(wo, "biz_type", None) or "", ""), "workOrderStatus": 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 = { "pilot_service": "中试服务", "clinical_application": "临床应用", - "basic_experiment": "基础实验", + "basic_experiment": "临床科研", } diff --git a/backend/app/crud/qc_work_order.py b/backend/app/crud/qc_work_order.py index b9b72fa7..f96017ce 100644 --- a/backend/app/crud/qc_work_order.py +++ b/backend/app/crud/qc_work_order.py @@ -108,7 +108,7 @@ _CONCLUSION_LABELS = {"tg": "通过", "btg": "不通过"} _OUTBOUND_BIZ_TYPE_LABELS = { "pilot_service": "中试服务", "clinical_application": "临床应用", - "basic_experiment": "基础实验", + "basic_experiment": "临床科研", } _OUTBOUND_BIZ_TYPES = tuple(_OUTBOUND_BIZ_TYPE_LABELS.keys()) diff --git a/backend/app/models/models.py b/backend/app/models/models.py index ea32bd44..a9350612 100644 --- a/backend/app/models/models.py +++ b/backend/app/models/models.py @@ -4178,15 +4178,15 @@ class BizPilotApplication(Base): project_id = Column(String(64), nullable=True, index=True, comment="所属统计项目ID") application_no = Column(String(64), nullable=True, comment="申请单号(自动生成,前缀ZSSQ)") application_name = Column(String(200), nullable=True, comment="申请单名称") - project_title = Column(String(200), nullable=True, comment="课题名称(基础实验)") - customer_name = Column(String(200), nullable=True, comment="客户名称(基础实验)") - customer_contact = Column(String(100), nullable=True, comment="客户联系人(基础实验)") - customer_phone = Column(String(32), nullable=True, comment="客户联系方式(基础实验)") + project_title = Column(String(200), nullable=True, comment="课题名称(临床科研)") + customer_name = Column(String(200), nullable=True, comment="客户名称(临床科研)") + customer_contact = Column(String(100), 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已作废") channel_service_order_id = Column(String(64), nullable=False, comment="渠道服务购买订单ID") channel_id = Column(String(64), nullable=True, comment="渠道ID(缓存自服务订单)") 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="租户编号") order_num = Column(Integer, nullable=True, comment="排序号") remark = Column(String(512), nullable=True, comment="备注") diff --git a/backend/app/services/basic_experiment_delivery_remind.py b/backend/app/services/basic_experiment_delivery_remind.py index d7b77d51..7825fb3d 100644 --- a/backend/app/services/basic_experiment_delivery_remind.py +++ b/backend/app/services/basic_experiment_delivery_remind.py @@ -1,4 +1,4 @@ -"""基础实验交付日前一天:服务号模板提醒。""" +"""临床科研交付日前一天:服务号模板提醒。""" from __future__ import annotations import logging @@ -137,7 +137,7 @@ def _iter_candidate_schedules(db: Session, *, delivery_day: date) -> List[Any]: .order_by(BizPilotInfusionSchedule.infusion_time.asc()) .all() ) - # 一计划多产品时取首条产品行(基础实验通常一行) + # 一计划多产品时取首条产品行(临床科研通常一行) seen: set = set() out = [] for sched, app, prod in rows: diff --git a/backend/app/services/qc_work_order_fee_summary.py b/backend/app/services/qc_work_order_fee_summary.py index b19155d3..7bb1abf0 100644 --- a/backend/app/services/qc_work_order_fee_summary.py +++ b/backend/app/services/qc_work_order_fee_summary.py @@ -1,4 +1,4 @@ -"""质检工单 · 用户费用摘要(采集协议 / 基础实验)""" +"""质检工单 · 用户费用摘要(采集协议 / 临床科研)""" from __future__ import annotations from decimal import Decimal @@ -27,7 +27,7 @@ _PAY_STATUS_LABELS = { "ytf": "已退费", } -# 出库工单:输注计划缴费(基础实验 / 临床应用共用 biz_pilot_payment) +# 出库工单:输注计划缴费(临床科研 / 临床应用共用 biz_pilot_payment) _OUTBOUND_FEE_BIZ_TYPES = frozenset({"basic_experiment", "clinical_application"}) diff --git a/backend/app/services/wechat_mp_message.py b/backend/app/services/wechat_mp_message.py index 0857fe48..2682091a 100644 --- a/backend/app/services/wechat_mp_message.py +++ b/backend/app/services/wechat_mp_message.py @@ -246,7 +246,7 @@ def send_basic_experiment_delivery_remind( time_text: str, pagepath: str = "", ) -> dict: - """基础实验:交付日前一天出库提醒。""" + """临床科研:交付日前一天出库提醒。""" data: Dict[str, Dict[str, str]] = {} customer_key = (settings.WX_MP_TPL_BE_DELIVERY_FIELD_CUSTOMER or "").strip() product_key = (settings.WX_MP_TPL_BE_DELIVERY_FIELD_PRODUCT or "").strip() diff --git a/backend/tests/test_basic_experiment_application.py b/backend/tests/test_basic_experiment_application.py index b0a12e12..1c82df20 100644 --- a/backend/tests/test_basic_experiment_application.py +++ b/backend/tests/test_basic_experiment_application.py @@ -1,4 +1,4 @@ -"""基础实验申请单与售卖计划批量创建""" +"""临床科研申请单与售卖计划批量创建""" import unittest from unittest.mock import MagicMock, patch diff --git a/backend/tests/test_basic_experiment_delivery_remind.py b/backend/tests/test_basic_experiment_delivery_remind.py index 158d02b3..7d6bb15d 100644 --- a/backend/tests/test_basic_experiment_delivery_remind.py +++ b/backend/tests/test_basic_experiment_delivery_remind.py @@ -1,4 +1,4 @@ -"""基础实验交付日前一天服务号提醒单测。""" +"""临床科研交付日前一天服务号提醒单测。""" from datetime import date, datetime from unittest.mock import MagicMock, patch diff --git a/docs/sql/migrations/2026-11-20-rename-basic-experiment-to-clinical-research.sql b/docs/sql/migrations/2026-11-20-rename-basic-experiment-to-clinical-research.sql new file mode 100644 index 00000000..5a94dd9c --- /dev/null +++ b/docs/sql/migrations/2026-11-20-rename-basic-experiment-to-clinical-research.sql @@ -0,0 +1,14 @@ +-- 展示名:基础实验 → 临床科研(仅中文;不改 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 '%基础实验%' + ); diff --git a/mobile-oa-h5/src/market/status-tag-registry.js b/mobile-oa-h5/src/market/status-tag-registry.js index 21c76c47..e447c635 100644 --- a/mobile-oa-h5/src/market/status-tag-registry.js +++ b/mobile-oa-h5/src/market/status-tag-registry.js @@ -103,7 +103,7 @@ export const receptionSource = createRegistry({ outbound: { label: '出库', tagType: 'primary' }, pilot_service: { label: '中试服务', tagType: 'primary' }, clinical_application: { label: '临床应用', tagType: 'warning' }, - basic_experiment: { label: '基础实验', tagType: 'primary' } + basic_experiment: { label: '临床科研', tagType: 'primary' } }) /** 协议/捐赠样本状态;与 Web sampleStatus 保持一致 */ diff --git a/openspec/changes/project-business-statistics/design.md b/openspec/changes/project-business-statistics/design.md index abd486b5..6cf1ef80 100644 --- a/openspec/changes/project-business-statistics/design.md +++ b/openspec/changes/project-business-statistics/design.md @@ -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`,操作列固定右侧,搜索右对齐。 -`RecordList` 仅在 assignment 模式显示四类正式业务 tab 和业务识别列。细胞存储/科研捐赠展示母亲姓名、电话、采集医院、市场专员及采集/捐赠日期;中试展示申请名称、渠道、服务订单名称、患者姓名/电话;基础实验展示课题、客户名称/联系人/电话。公共列保留序号、主单号、状态、项目组、所属项目、创建时间。多个有效子记录以稳定顺序去重连接展示,缺失值显示破折号,采集日期来自采集信息的样本采集时间。 +`RecordList` 仅在 assignment 模式显示四类正式业务 tab 和业务识别列。细胞存储/科研捐赠展示母亲姓名、电话、采集医院、市场专员及采集/捐赠日期;中试展示申请名称、渠道、服务订单名称、患者姓名/电话;临床科研展示课题、客户名称/联系人/电话。公共列保留序号、主单号、状态、项目组、所属项目、创建时间。多个有效子记录以稳定顺序去重连接展示,缺失值显示破折号,采集日期来自采集信息的样本采集时间。 新增 `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。编号服务端生成。项目已有业务后禁止换组;引用中的项目和组只能停用,不能删除。所有引用租户内校验。 @@ -61,7 +61,7 @@ project_brief(db, tenant_no, project_id) -> dict # projectId/projectName/teamId 预签约转协议继承归属;存储/捐赠互转继承。归属维护将同租户的预签约→协议→捐赠转换记录组成关联集合,循环防重,锁定顺序固定;任一关联记录不可访问则拒绝整个操作,返回信息不暴露无权查看单据。历史软删除记录不参与活跃统计,不复活。 -正式存储按协议、捐赠按主单、中试和基础实验按对应 biz_type 申请单计数;预签约另列,不把四类数量称为独立客户数。日期按创建日期(起日含、结束日次日不含),状态显示当前状态。查询先按租户、软删除、原有数据权限过滤,再聚合,不联接子行产生重复;金额不在本期。 +正式存储按协议、捐赠按主单、中试和临床科研按对应 biz_type 申请单计数;预签约另列,不把四类数量称为独立客户数。日期按创建日期(起日含、结束日次日不含),状态显示当前状态。查询先按租户、软删除、原有数据权限过滤,再聚合,不联接子行产生重复;金额不在本期。 ## 界面与验证 diff --git a/openspec/changes/project-business-statistics/specs/project-management/spec.md b/openspec/changes/project-business-statistics/specs/project-management/spec.md index 1cd8d04b..2a42e057 100644 --- a/openspec/changes/project-business-statistics/specs/project-management/spec.md +++ b/openspec/changes/project-business-statistics/specs/project-management/spec.md @@ -1,7 +1,7 @@ ## ADDED Requirements ### Requirement: 按业务识别历史归属单据 -历史归属维护 SHALL 按细胞存储、科研捐赠、中试服务、基础实验展示四个 tab,并提供对应业务识别字段和关键词搜索;列表保持主单分页,右侧固定归属与审计操作。 +历史归属维护 SHALL 按细胞存储、科研捐赠、中试服务、临床科研展示四个 tab,并提供对应业务识别字段和关键词搜索;列表保持主单分页,右侧固定归属与审计操作。 #### Scenario: 存储和捐赠以样本编码识别 - **WHEN** 查看细胞存储或科研捐赠 tab - **THEN** 展示样本编码列而非协议单号/捐赠单号列;多个有效编码在同一主单行去重展示,无编码显示破折号,支持按任一编码搜索;跨租户或已删除的样本不用于展示和匹配,分页和归属仍以主单为单位。 @@ -54,7 +54,7 @@ Web SHALL 使用“项目 → 项目管理 → 项目组管理 / 项目管理 / - **WHEN** 用户打开某项目的某类业务明细 - **THEN** 明细总数与相同筛选条件汇总一致,不因子行联接重复计数。 #### Scenario: 四类统计明细展示业务字段 -- **WHEN** 点击细胞存储、科研捐赠、中试服务、基础实验的统计数量 +- **WHEN** 点击细胞存储、科研捐赠、中试服务、临床科研的统计数量 - **THEN** 原明细弹窗复用历史归属维护对应 tab 的业务列与关键词能力,存储/捐赠显示样本编码,保留汇总传入的筛选条件和只读权限,不显示归属维护操作;预签约仍沿用原行为。 ### Requirement: 沿用现有界面样式 diff --git a/web-admin/src/api/production-work-order.ts b/web-admin/src/api/production-work-order.ts index bc4370e6..fe806f48 100644 --- a/web-admin/src/api/production-work-order.ts +++ b/web-admin/src/api/production-work-order.ts @@ -56,9 +56,9 @@ export interface ProductionWorkOrderItem { /** 出库工单:输注计划总次数 */ totalCourseCount?: number | null infusionTime?: string - /** 基础实验出库:课题名称(列表 enrich) */ + /** 临床科研出库:课题名称(列表 enrich) */ projectTitle?: string - /** 基础实验出库:客户名称(列表 enrich) */ + /** 临床科研出库:客户名称(列表 enrich) */ customerName?: string /** 出库工单:输注计划细胞类型(列表 enrich,无产品明细时兜底) */ cellType?: string diff --git a/web-admin/src/api/project-management.ts b/web-admin/src/api/project-management.ts index b6946fd7..4542265f 100644 --- a/web-admin/src/api/project-management.ts +++ b/web-admin/src/api/project-management.ts @@ -10,7 +10,7 @@ export const bizLabels: Record = { cell_storage: '细胞存储', research_donation: '科研捐赠', pilot_service: '中试服务', - basic_experiment: '基础实验' + basic_experiment: '临床科研' } export type ProjectOption = { id: string diff --git a/web-admin/src/assets/styles/core/app.scss b/web-admin/src/assets/styles/core/app.scss index e6fbf87b..e4da8363 100755 --- a/web-admin/src/assets/styles/core/app.scss +++ b/web-admin/src/assets/styles/core/app.scss @@ -751,7 +751,7 @@ body { } } -// 面板级步骤胶囊 Tab(样本信息管理 / 采集协议单 / 中试·基础实验申请单等) +// 面板级步骤胶囊 Tab(样本信息管理 / 采集协议单 / 中试·临床科研申请单等) .pill-tab-nav { padding: 16px 20px 0; display: flex; diff --git a/web-admin/src/config/pilot-biz-type.ts b/web-admin/src/config/pilot-biz-type.ts index 8080b0c6..a53850c9 100644 --- a/web-admin/src/config/pilot-biz-type.ts +++ b/web-admin/src/config/pilot-biz-type.ts @@ -60,7 +60,7 @@ export const PILOT_BIZ_TYPE_CONFIG: Record = { statusLabel: '输注状态' }, basic_experiment: { - label: '基础实验', + label: '临床科研', applicationNoPrefix: 'JCSY', showChannel: false, showPatient: false, diff --git a/web-admin/src/router/modules/sqxp.ts b/web-admin/src/router/modules/sqxp.ts index aa7c11c4..2df87f1f 100644 --- a/web-admin/src/router/modules/sqxp.ts +++ b/web-admin/src/router/modules/sqxp.ts @@ -60,8 +60,8 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [ }, // ═══════════════════════════════════════════════════════════════════════════ // 1. 市场 (menu:market) - // 二级菜单:存储服务、科研捐赠、市场基础信息、基础实验、器械销售 - // (主推存储/捐赠在前;中试/基础实验及关联基础信息后置;器械销售在末位) + // 二级菜单:存储服务、科研捐赠、市场基础信息、临床科研、器械销售 + // (主推存储/捐赠在前;中试/临床科研及关联基础信息后置;器械销售在末位) // ═══════════════════════════════════════════════════════════════════════════ { id: 'TOP00000000000000000000000000001', @@ -329,7 +329,7 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [ ] }, - // ── 市场基础信息(前段:存储/捐赠相关;后段:中试/基础实验相关)── + // ── 市场基础信息(前段:存储/捐赠相关;后段:中试/临床科研相关)── { id: 'MKT00000000000000000000000000001', name: 'MarketInfo', @@ -553,14 +553,14 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [ ] }, - // ── 基础实验 ────────────────────────────────────────────────────────── + // ── 临床科研 ────────────────────────────────────────────────────────── { id: 'BEX00000000000000000000000000001', name: 'BasicExperiment', path: 'basic-experiment', component: '', meta: { - title: '基础实验', + title: '临床科研', icon: 'ri:flask-line', keepAlive: false, roles: ['admin'] @@ -572,7 +572,7 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [ path: 'application', component: '/pilot-service/pilot-application/index', meta: { - title: '基础实验申请单', + title: '临床科研申请单', keepAlive: true, menuCode: 'basic-experiment:application:list' }, diff --git a/web-admin/src/utils/outbound-qc-pilot-view-sections.ts b/web-admin/src/utils/outbound-qc-pilot-view-sections.ts index 2fba18a1..56a74fa3 100644 --- a/web-admin/src/utils/outbound-qc-pilot-view-sections.ts +++ b/web-admin/src/utils/outbound-qc-pilot-view-sections.ts @@ -32,7 +32,7 @@ const SECTION_TITLES: Record< schedule: '临床应用输注计划信息' }, basic_experiment: { - application: '基础实验申请信息', + application: '临床科研申请信息', schedule: '交付计划信息' } } diff --git a/web-admin/src/utils/production-work-order-category.ts b/web-admin/src/utils/production-work-order-category.ts index 2bcd80d7..f23523c3 100644 --- a/web-admin/src/utils/production-work-order-category.ts +++ b/web-admin/src/utils/production-work-order-category.ts @@ -25,7 +25,7 @@ const CATEGORY_LABELS: Record = { inbound_cell_storage: '细胞存储', inbound_research_donation: '科研捐赠', outbound_pilot_service: '中试服务', - outbound_basic_experiment: '基础实验', + outbound_basic_experiment: '临床科研', temporary: '临时' } diff --git a/web-admin/src/utils/production-work-order-tabs.ts b/web-admin/src/utils/production-work-order-tabs.ts index 91674c48..c233794c 100644 --- a/web-admin/src/utils/production-work-order-tabs.ts +++ b/web-admin/src/utils/production-work-order-tabs.ts @@ -59,7 +59,7 @@ export const PRODUCTION_WORK_ORDER_TABS: ProductionWorkOrderTabConfig[] = [ }, { key: 'outbound_basic_experiment', - label: '基础实验生产', + label: '临床科研生产', group: 'outbound', workOrderType: 'outbound', bizType: 'basic_experiment', diff --git a/web-admin/src/utils/qc-work-order-category.ts b/web-admin/src/utils/qc-work-order-category.ts index c68fafc2..a38c324c 100644 --- a/web-admin/src/utils/qc-work-order-category.ts +++ b/web-admin/src/utils/qc-work-order-category.ts @@ -24,7 +24,7 @@ const CATEGORY_LABELS: Record = { inbound_cell_storage: '细胞存储', inbound_research_donation: '科研捐赠', outbound_pilot_service: '中试服务', - outbound_basic_experiment: '基础实验', + outbound_basic_experiment: '临床科研', temporary: '临时' } diff --git a/web-admin/src/utils/qc-work-order-tabs.ts b/web-admin/src/utils/qc-work-order-tabs.ts index ef7cb9b7..211af8ef 100644 --- a/web-admin/src/utils/qc-work-order-tabs.ts +++ b/web-admin/src/utils/qc-work-order-tabs.ts @@ -59,7 +59,7 @@ export const QC_WORK_ORDER_TABS: QcWorkOrderTabConfig[] = [ }, { key: 'outbound_basic_experiment', - label: '基础实验质检', + label: '临床科研质检', group: 'outbound', workOrderType: 'outbound', bizType: 'basic_experiment', diff --git a/web-admin/src/utils/status-tag-registry.ts b/web-admin/src/utils/status-tag-registry.ts index 956463fb..539faa66 100644 --- a/web-admin/src/utils/status-tag-registry.ts +++ b/web-admin/src/utils/status-tag-registry.ts @@ -228,7 +228,7 @@ export const receptionSource: StatusRegistry = { outbound: { label: '出库', tagType: 'primary' }, pilot_service: { label: '中试服务', tagType: 'primary' }, clinical_application: { label: '临床应用', tagType: 'warning' }, - basic_experiment: { label: '基础实验', tagType: 'primary' } + basic_experiment: { label: '临床科研', tagType: 'primary' } } export const receptionSourceLabel = createLabelGetter(receptionSource) export const receptionSourceTagType = createTagTypeGetter(receptionSource) @@ -386,7 +386,7 @@ export const agreementType: StatusRegistry = { kyxy: { label: '框架协议', tagType: 'primary' }, zsxy: { label: '中试协议', tagType: 'success' }, lcxy: { label: '临床协议', tagType: 'warning' }, - jcsy: { label: '基础实验', tagType: 'primary' } + jcsy: { label: '临床科研', tagType: 'primary' } } export const agreementTypeLabel = createLabelGetter(agreementType) export const agreementTypeTagType = createTagTypeGetter(agreementType) @@ -761,7 +761,7 @@ export function bizTypeLabel(type: string): string { const map: Record = { pilot_service: '中试服务', clinical_application: '临床应用', - basic_experiment: '基础实验' + basic_experiment: '临床科研' } return map[type] || type || '-' } diff --git a/web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleViewDialog.vue b/web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleViewDialog.vue index 8d788095..afeea479 100644 --- a/web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleViewDialog.vue +++ b/web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleViewDialog.vue @@ -288,7 +288,7 @@ const contextSections: ViewSection[] = basic ? [ { - title: '基础实验申请信息', + title: '临床科研申请信息', fields: [ { label: '申请单号', value: app.applicationNo || d.applicationNo || '—' }, { label: '课题名称', value: app.projectTitle || d.projectTitle || '—' }, diff --git a/web-admin/src/views/pilot-service/outbound-release-review/OutboundReleaseReviewCardList.vue b/web-admin/src/views/pilot-service/outbound-release-review/OutboundReleaseReviewCardList.vue index c26b8edc..df9ce2a1 100644 --- a/web-admin/src/views/pilot-service/outbound-release-review/OutboundReleaseReviewCardList.vue +++ b/web-admin/src/views/pilot-service/outbound-release-review/OutboundReleaseReviewCardList.vue @@ -256,7 +256,7 @@ total: number selectedIds: string[] pickupTimeLabel: string - /** 中试/临床展示患者;基础实验展示课题与客户 */ + /** 中试/临床展示患者;临床科研展示课题与客户 */ showPatient?: boolean bizType?: string }>() diff --git a/web-admin/src/views/pilot-service/pilot-application/index.vue b/web-admin/src/views/pilot-service/pilot-application/index.vue index 351f0b56..24087cfb 100644 --- a/web-admin/src/views/pilot-service/pilot-application/index.vue +++ b/web-admin/src/views/pilot-service/pilot-application/index.vue @@ -1,4 +1,4 @@ - +