Compare commits

...
Author SHA1 Message Date
zlwuandCursor 0b4c8dfda8 feat(sample): 展示样本状态并支持样本废弃与作废原因
生产/质检入库卡片展示样本状态并支持【样本废弃】;市场 Web 列表与移动市场部卡片补充样本状态及问号查看作废原因;样本表新增 void_desc,人工作废不联动接收但全部作废时自动作废协议(#131)。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 14:25:24 +08:00
cykj 7751cc0f4a Merge pull request 'fix(qc): 样本接收废弃同步该样本状态为已作废 (#129)' (#130)
fix(qc): 样本接收废弃同步该样本状态为已作废 (#129)
2026-11-19 05:19:04 +00:00
zlwuandCursor 0346bc0b1d fix(qc): 样本接收废弃同步该样本状态为已作废
单条接收结论为废弃时仅将该样本置 yzf;改回接收且协议仍有效时清空作废状态;全部废弃仍自动作废协议。补充历史回刷 SQL(#129)。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 13:14:10 +08:00
cykj 76ddb81818 Merge pull request 'fix(protocol): 协议作废/属地废弃同步样本状态为已作废 (#127)' (#128)
fix(protocol): 协议作废/属地废弃同步样本状态为已作废 (#127)
2026-11-19 04:33:48 +00:00
zlwuandCursor 3f16a8ab3e fix(protocol): 协议作废/属地废弃同步样本状态为已作废
协议变为 yzf 或 sdfq 时,除样本接收废弃联动外,将下属有效样本 sample_status 置为 yzf 并写入 void_date;补充历史回刷 SQL 与单测(#127)。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 12:31:57 +08:00
cykj 14e733faf0 Merge pull request 'feat(oa): 收款账户组件支持图标编辑与删除 (#110)' (#126) from codex/issue-110-receive-account-edit-07c5b0874c18 into V2.0
feat(oa): 收款账户组件支持图标编辑与删除 (#110)

Merge pull request #126
2026-11-19 04:05:04 +00:00
zlwuandCursor aac72e1fd9 feat(oa): 收款账户组件支持图标编辑与删除 (#110)
在 Web 与移动 OA 表单收款账户选择器中,对可见账户增加行尾编辑/删除图标;
复用现有新增表单做编辑,删除二次确认后软删并从已选移除。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 12:04:08 +08:00
cykj f0a6abe538 fix(oa): 同意/拒绝/打回前自动发送评论草稿 (#125)
fix(oa): 同意/拒绝/打回前自动发送评论草稿 (#125)

关联 #118。
2026-11-19 03:56:42 +00:00
zlwuandCursor a69dcc5bca fix(oa): 同意/拒绝/打回前自动发送评论草稿
审批动作前冲刷评论区未发送内容,减少先点发送再审批的一步操作。
关联 #118。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 11:55:53 +08:00
cykj 0929164bf5 fix(qc): 去掉入库质检对象两列跨度导致的空白间距 (#124)
Refs #122
2026-11-19 03:27:55 +00:00
zlwuandCursor 5ecde0c80d fix(qc): 去掉入库质检对象两列跨度导致的空白间距
样本接收场景「质检对象」值很短,colSpan:2 会在样本编码前留出空列(#122)。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 11:27:25 +08:00
cykj 4024aad174 feat(qc): 质检工单卡片展示协议母血采集时间 (#123)
feat(qc): 质检工单卡片展示协议母血采集时间 (#123)

Refs #122
2026-11-19 03:20:40 +00:00
zlwuandCursor 02811197c6 feat(qc): 质检工单卡片展示协议母血采集时间
入库细胞存储/科研捐赠质检列表从协议采集信息补齐 maternalBloodCollectTime,
卡片 meta 与协议组摘要同步展示,未录入显示 —(#122)。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-19 11:19:15 +08:00
zlwuandCursor 7b6a0523dd fix(sql): 兼容 UC MSC 回补脚本的 collation 与确定性 ID
跨表比较统一 COLLATE,避免 unicode_ci/general_ci 混用失败;回补 ID 改 MD5 业务键并修正 task_no 序号,避免 UUID 撞主键与浮点序号。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-13 13:27:43 +08:00
cykj 99562ee584 Merge pull request 'chore(sql): 移除旧版实验室样本处理一级菜单相关迁移 (#108)' (#109) from codex/issue-108-remove-old-lab-sql-5302d8a2cc into V2.0
chore(sql): 移除旧版实验室样本处理一级菜单相关迁移 (#108)

Merged from PR #109
2026-11-13 05:21:18 +00:00
71 changed files with 3076 additions and 314 deletions

No files matched your search

+2
View File
@@ -47,10 +47,12 @@ from app.api.sample_cert_insurance import router as sample_cert_insurance_router
from app.api.sample_code_correction import router as sample_code_correction_router from app.api.sample_code_correction import router as sample_code_correction_router
from app.api.lab_sample_process import router as lab_sample_process_router from app.api.lab_sample_process import router as lab_sample_process_router
from app.api.lab_sample_processing import router as lab_sample_processing_router from app.api.lab_sample_processing import router as lab_sample_processing_router
from app.api.business_sample import router as business_sample_router
from app.api.project_management import router as project_management_router from app.api.project_management import router as project_management_router
__all__ = [ __all__ = [
"business_sample_router",
"project_management_router", "project_management_router",
"lab_sample_process_router", "lab_sample_process_router",
"public_router", "public_router",
+80
View File
@@ -0,0 +1,80 @@
"""业务样本:人工作废等跨模块入口。"""
from __future__ import annotations
from typing import Optional
from fastapi import APIRouter, Depends
from pydantic import BaseModel, ConfigDict, Field
from sqlalchemy.orm import Session
from app.core.database import get_db
from app.core.menu_guard import require_admin_or_super_admin
from app.core.response import error_response, success_response
from app.models.models import SysUser
from app.services.protocol_reception_discard_sync import SAMPLE_VOID_STATUS, void_sample_manually
router = APIRouter(prefix="/web/admin", tags=["业务样本"])
class VoidSampleBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
reception_source: str = Field(..., alias="receptionSource")
void_desc: str = Field(..., alias="voidDesc")
sample_id: Optional[str] = Field(None, alias="sampleId")
sample_code: Optional[str] = Field(None, alias="sampleCode")
protocol_id: Optional[str] = Field(None, alias="protocolId")
def _get_tenant_no(db: Session, user: dict) -> str:
user_id = user.get("user_id")
if not user_id:
raise PermissionError("用户身份信息缺失,无法确定租户")
sys_user = db.query(SysUser).filter(SysUser.id == user_id).first()
if not sys_user or not sys_user.tenant_no:
raise PermissionError("用户租户信息缺失")
return sys_user.tenant_no
def _get_current_user_id(user: dict) -> str:
user_id = user.get("user_id")
if not user_id:
raise PermissionError("用户身份信息缺失")
return str(user_id)
@router.put("/business-samples/void")
async def void_business_sample(
body: VoidSampleBody,
db: Session = Depends(get_db),
user: dict = Depends(require_admin_or_super_admin),
):
try:
tenant_no = _get_tenant_no(db, user)
user_id = _get_current_user_id(user)
sample = void_sample_manually(
db,
source=body.reception_source,
tenant_no=tenant_no,
void_desc=body.void_desc,
user_id=user_id,
sample_id=body.sample_id,
sample_code=body.sample_code,
protocol_id=body.protocol_id,
commit=True,
)
return success_response(
{
"id": sample.id,
"sampleCode": getattr(sample, "sample_code", None) or "",
"sampleStatus": SAMPLE_VOID_STATUS,
"voidDate": getattr(sample, "void_date", None) or "",
"voidDesc": getattr(sample, "void_desc", None) or "",
}
)
except PermissionError as e:
return error_response(403, str(e))
except ValueError as e:
return error_response(400, str(e))
except Exception as e:
return error_response(400, str(e))
+2 -1
View File
@@ -739,6 +739,7 @@ def _sample_to_dict(s: BizProtocolSample) -> Dict[str, Any]:
"storageInDate": (s.storage_in_date or "").strip() if s.storage_in_date else "", "storageInDate": (s.storage_in_date or "").strip() if s.storage_in_date else "",
"detectStartDate": (s.detect_start_date or "").strip() if s.detect_start_date else "", "detectStartDate": (s.detect_start_date or "").strip() if s.detect_start_date else "",
"voidDate": (s.void_date or "").strip() if s.void_date else "", "voidDate": (s.void_date or "").strip() if s.void_date else "",
"voidDesc": (getattr(s, "void_desc", None) or "").strip() if (getattr(s, "void_desc", None) or "").strip() else "",
"storageExpireDate": (s.storage_expire_date or "").strip() if s.storage_expire_date else "", "storageExpireDate": (s.storage_expire_date or "").strip() if s.storage_expire_date else "",
**sample_special_to_dict(s), **sample_special_to_dict(s),
"tenantNo": s.tenant_no, "tenantNo": s.tenant_no,
@@ -2677,7 +2678,7 @@ def update_collection_protocol(
next_status = protocol_status.strip() next_status = protocol_status.strip()
assert_protocol_status_transition(obj.protocol_status or "", next_status, kind="protocol") assert_protocol_status_transition(obj.protocol_status or "", next_status, kind="protocol")
obj.protocol_status = next_status obj.protocol_status = next_status
if next_status == "yzf" and from_status != "yzf": if next_status in ("yzf", "sdfq") and from_status not in ("yzf", "sdfq"):
voided_now = True voided_now = True
if next_status == "yzf" and void_time is not None: if next_status == "yzf" and void_time is not None:
if void_type is None or not str(void_type).strip(): if void_type is None or not str(void_type).strip():
+63 -5
View File
@@ -49,6 +49,7 @@ from app.models.models import (
BizPilotInfusionSchedule, BizPilotInfusionSchedule,
BizPilotInfusionScheduleProduct, BizPilotInfusionScheduleProduct,
BizPilotPatient, BizPilotPatient,
BizProtocolCollectionInfo,
BizProtocolPartyCustomer, BizProtocolPartyCustomer,
BizProtocolSample, BizProtocolSample,
BizProductionTask, BizProductionTask,
@@ -69,6 +70,7 @@ from app.models.models import (
from app.models.qc_param import BizQcTaskResult from app.models.qc_param import BizQcTaskResult
from app.models.research_donation import ( from app.models.research_donation import (
BizResearchDonation, BizResearchDonation,
BizResearchDonationCollection,
BizResearchDonationParty, BizResearchDonationParty,
BizResearchDonationSample, BizResearchDonationSample,
) )
@@ -677,9 +679,6 @@ def _enrich_work_order_list_items(
code = (r.sample_code or "").strip() code = (r.sample_code or "").strip()
if code and code not in sample_code_rec_map: if code and code not in sample_code_rec_map:
sample_code_rec_map[code] = r sample_code_rec_map[code] = r
if not rec_map and not sample_code_rec_map:
return items
def _resolve_reception(item: Dict[str, Any]) -> Optional[BizSampleReception]: def _resolve_reception(item: Dict[str, Any]) -> Optional[BizSampleReception]:
rec = rec_map.get(item.get("receptionId") or "") rec = rec_map.get(item.get("receptionId") or "")
if rec: if rec:
@@ -695,7 +694,9 @@ def _enrich_work_order_list_items(
rec = _resolve_reception(item) rec = _resolve_reception(item)
source = _effective_reception_source(item, rec) source = _effective_reception_source(item, rec)
if source == "research_donation": if source == "research_donation":
dsid = _effective_donation_sample_id(item, rec) dsid = _effective_donation_sample_id(item, rec) or (
item.get("protocolSampleId") or ""
).strip()
if dsid: if dsid:
donation_sample_ids.append(dsid) donation_sample_ids.append(dsid)
did = ( did = (
@@ -704,7 +705,9 @@ def _enrich_work_order_list_items(
if did: if did:
donation_ids.append(did) donation_ids.append(did)
else: else:
psid = _effective_protocol_sample_id(item, rec) psid = _effective_protocol_sample_id(item, rec) or (
item.get("protocolSampleId") or ""
).strip()
if psid: if psid:
cell_sample_ids.append(psid) cell_sample_ids.append(psid)
pid = ( pid = (
@@ -808,12 +811,39 @@ def _enrich_work_order_list_items(
party.mother_name or "", party.mother_name or "",
party.newborn_name or "", party.newborn_name or "",
) )
cell_maternal_map: Dict[str, str] = {}
if cell_proto_ids:
for coll in (
db.query(BizProtocolCollectionInfo)
.filter(
BizProtocolCollectionInfo.collection_protocol_id.in_(cell_proto_ids),
BizProtocolCollectionInfo.del_flag == 0,
)
.all()
):
cell_maternal_map[coll.collection_protocol_id] = _fmt_dt(
coll.maternal_blood_collect_time
)
donation_maternal_map: Dict[str, str] = {}
if donation_ids:
for coll in (
db.query(BizResearchDonationCollection)
.filter(
BizResearchDonationCollection.research_donation_id.in_(donation_ids),
BizResearchDonationCollection.del_flag == 0,
)
.all()
):
donation_maternal_map[coll.research_donation_id] = _fmt_dt(
coll.maternal_blood_collect_time
)
for item in items: for item in items:
if item.get("workOrderType") == "temporary": if item.get("workOrderType") == "temporary":
item["receptionSource"] = "" item["receptionSource"] = ""
item["receptionSourceLabel"] = "" item["receptionSourceLabel"] = ""
item["motherName"] = "" item["motherName"] = ""
item["newbornName"] = "" item["newbornName"] = ""
item["maternalBloodCollectTime"] = ""
continue continue
rec = _resolve_reception(item) rec = _resolve_reception(item)
source = _effective_reception_source(item, rec) source = _effective_reception_source(item, rec)
@@ -826,6 +856,7 @@ def _enrich_work_order_list_items(
_mother, _newborn = donation_party_map.get(_did or "", ("", "")) _mother, _newborn = donation_party_map.get(_did or "", ("", ""))
item["motherName"] = _mother item["motherName"] = _mother
item["newbornName"] = _newborn item["newbornName"] = _newborn
item["maternalBloodCollectTime"] = donation_maternal_map.get(_did or "", "") or ""
else: else:
_pid = ( _pid = (
(getattr(rec, "collection_protocol_id", None) if rec else None) or "" (getattr(rec, "collection_protocol_id", None) if rec else None) or ""
@@ -833,11 +864,35 @@ def _enrich_work_order_list_items(
_mother, _newborn = cell_party_map.get(_pid or "", ("", "")) _mother, _newborn = cell_party_map.get(_pid or "", ("", ""))
item["motherName"] = _mother item["motherName"] = _mother
item["newbornName"] = _newborn item["newbornName"] = _newborn
item["maternalBloodCollectTime"] = cell_maternal_map.get(_pid or "", "") or ""
def _apply_sample_status_fields() -> None:
sample_obj = None
if source == "research_donation":
dsid = _effective_donation_sample_id(item, rec) or (
item.get("protocolSampleId") or ""
).strip()
sample_obj = donation_samples.get(dsid) if dsid else None
else:
psid = _effective_protocol_sample_id(item, rec) or (
item.get("protocolSampleId") or ""
).strip()
sample_obj = protocol_samples.get(psid) if psid else None
item["sampleStatus"] = (
(sample_obj.sample_status or "").strip() if sample_obj else ""
)
item["voidDesc"] = (
(getattr(sample_obj, "void_desc", None) or "").strip() if sample_obj else ""
)
item["voidDate"] = (
(sample_obj.void_date or "").strip() if sample_obj else ""
)
if not rec: if not rec:
item.setdefault("receptionTime", "") item.setdefault("receptionTime", "")
item.setdefault("handlerName", "") item.setdefault("handlerName", "")
item.setdefault("sampleTypeName", "") item.setdefault("sampleTypeName", "")
item.setdefault("labStorageCode", "") item.setdefault("labStorageCode", "")
_apply_sample_status_fields()
continue continue
item["receptionTime"] = _fmt_dt(rec.reception_time) item["receptionTime"] = _fmt_dt(rec.reception_time)
item["handlerName"] = rec.handler_name or "" item["handlerName"] = rec.handler_name or ""
@@ -858,6 +913,7 @@ def _enrich_work_order_list_items(
protocol_samples=protocol_samples, protocol_samples=protocol_samples,
donation_samples=donation_samples, donation_samples=donation_samples,
) )
_apply_sample_status_fields()
if source == "research_donation": if source == "research_donation":
_did = ( _did = (
(getattr(rec, "research_donation_id", None) or "").strip() (getattr(rec, "research_donation_id", None) or "").strip()
@@ -1140,6 +1196,7 @@ def _wo_to_dict(
"receptionTime": "", "receptionTime": "",
"handlerName": "", "handlerName": "",
"sampleTypeName": "", "sampleTypeName": "",
"maternalBloodCollectTime": "",
"workOrderStatus": wo.work_order_status, "workOrderStatus": wo.work_order_status,
"workOrderStatusLabel": _WORK_ORDER_STATUS_LABELS.get( "workOrderStatusLabel": _WORK_ORDER_STATUS_LABELS.get(
wo.work_order_status or "", wo.work_order_status or "" wo.work_order_status or "", wo.work_order_status or ""
@@ -2601,6 +2658,7 @@ def get_work_order_detail(
"receptionSourceLabel": enriched.get("receptionSourceLabel", ""), "receptionSourceLabel": enriched.get("receptionSourceLabel", ""),
"motherName": enriched.get("motherName", ""), "motherName": enriched.get("motherName", ""),
"newbornName": enriched.get("newbornName", ""), "newbornName": enriched.get("newbornName", ""),
"maternalBloodCollectTime": enriched.get("maternalBloodCollectTime", ""),
"protocolStatus": enriched.get("protocolStatus", ""), "protocolStatus": enriched.get("protocolStatus", ""),
"protocolStatusLabel": enriched.get("protocolStatusLabel", ""), "protocolStatusLabel": enriched.get("protocolStatusLabel", ""),
"cellProductCode": enriched.get("cellProductCode", ""), "cellProductCode": enriched.get("cellProductCode", ""),
+3 -1
View File
@@ -535,6 +535,7 @@ def _sample_to_dict(s: BizResearchDonationSample) -> Dict[str, Any]:
"storageInDate": (s.storage_in_date or "").strip() if s.storage_in_date else "", "storageInDate": (s.storage_in_date or "").strip() if s.storage_in_date else "",
"detectStartDate": (s.detect_start_date or "").strip() if s.detect_start_date else "", "detectStartDate": (s.detect_start_date or "").strip() if s.detect_start_date else "",
"voidDate": (s.void_date or "").strip() if s.void_date else "", "voidDate": (s.void_date or "").strip() if s.void_date else "",
"voidDesc": (getattr(s, "void_desc", None) or "").strip() if (getattr(s, "void_desc", None) or "").strip() else "",
"storageExpireDate": (s.storage_expire_date or "").strip() if s.storage_expire_date else "", "storageExpireDate": (s.storage_expire_date or "").strip() if s.storage_expire_date else "",
**sample_special_to_dict(s), **sample_special_to_dict(s),
"tenantNo": s.tenant_no, "tenantNo": s.tenant_no,
@@ -1702,7 +1703,8 @@ def change_status(
) )
db.add(obj) db.add(obj)
if ns == "yzf" and (current or "").strip() != "yzf": from_status = (current or "").strip()
if ns in ("yzf", "sdfq") and from_status not in ("yzf", "sdfq"):
from app.services.protocol_reception_discard_sync import after_protocol_voided from app.services.protocol_reception_discard_sync import after_protocol_voided
after_protocol_voided( after_protocol_voided(
+8 -10
View File
@@ -1045,12 +1045,11 @@ def create_sample_reception(
user_id=user_id, user_id=user_id,
create_dept_id=create_dept_id or "", create_dept_id=create_dept_id or "",
) )
if conclusion == "bj": from app.services.protocol_reception_discard_sync import after_sample_reception_saved
from app.services.protocol_reception_discard_sync import after_sample_reception_saved
after_sample_reception_saved( after_sample_reception_saved(
db, reception=obj, tenant_no=tenant_no, user_id=user_id db, reception=obj, tenant_no=tenant_no, user_id=user_id
) )
db.commit() db.commit()
db.refresh(obj) db.refresh(obj)
return obj return obj
@@ -1169,12 +1168,11 @@ def update_sample_reception(
) )
check_result_svc.sync_legacy_columns_from_results(db, rec, saved_rows) check_result_svc.sync_legacy_columns_from_results(db, rec, saved_rows)
db.add(rec) db.add(rec)
if conclusion == "bj": from app.services.protocol_reception_discard_sync import after_sample_reception_saved
from app.services.protocol_reception_discard_sync import after_sample_reception_saved
after_sample_reception_saved( after_sample_reception_saved(
db, reception=rec, tenant_no=tenant_no, user_id=user_id db, reception=rec, tenant_no=tenant_no, user_id=user_id
) )
db.commit() db.commit()
db.refresh(rec) db.refresh(rec)
return rec return rec
+2 -1
View File
@@ -13,7 +13,7 @@ from app.core.database import SessionLocal
from app.core.api_request_log_middleware import ApiRequestLogMiddleware from app.core.api_request_log_middleware import ApiRequestLogMiddleware
from app.core.api_crypto_middleware import ApiCryptoMiddleware from app.core.api_crypto_middleware import ApiCryptoMiddleware
from app.models import models # noqa: F401 from app.models import models # noqa: F401
from app.api import public_router, menu_router, admin_router, workflow_router, basic_info_router, collection_protocol_router, protocol_sample_payment_router, protocol_refund_record_router, presign_order_router, sample_freight_router, leave_router, operations_router, ethnic_router, sample_reception_router, sample_production_reception_router, qc_router, research_donation_router, production_router, pilot_service_router, insurance_company_router, material_router, storage_release_review_router, sample_sms_notification_router, storage_entry_sms_notification_router, qc_sms_notification_router, protocol_sample_collection_router, research_donation_sample_collection_router, pilot_application_router, pilot_checkup_router, pilot_delivery_router, pilot_infusion_confirm_router, pilot_infusion_schedule_mgmt_router, outbound_release_review_router, clinical_payment_router, env_detect_router, cleanroom_garment_router, market_router, pre_transit_sample_router, oa_approval_router, mini_auth_router, mini_menu_router, market_mobile_router, sample_storage_cert_qc_router, customer_service_dict_router, sample_cert_insurance_router, sample_code_correction_router, lab_sample_process_router, lab_sample_processing_router, project_management_router from app.api import public_router, menu_router, admin_router, workflow_router, basic_info_router, collection_protocol_router, protocol_sample_payment_router, protocol_refund_record_router, presign_order_router, sample_freight_router, leave_router, operations_router, ethnic_router, sample_reception_router, sample_production_reception_router, qc_router, research_donation_router, production_router, pilot_service_router, insurance_company_router, material_router, storage_release_review_router, sample_sms_notification_router, storage_entry_sms_notification_router, qc_sms_notification_router, protocol_sample_collection_router, research_donation_sample_collection_router, pilot_application_router, pilot_checkup_router, pilot_delivery_router, pilot_infusion_confirm_router, pilot_infusion_schedule_mgmt_router, outbound_release_review_router, clinical_payment_router, env_detect_router, cleanroom_garment_router, market_router, pre_transit_sample_router, oa_approval_router, mini_auth_router, mini_menu_router, market_mobile_router, sample_storage_cert_qc_router, customer_service_dict_router, sample_cert_insurance_router, sample_code_correction_router, lab_sample_process_router, lab_sample_processing_router, project_management_router, business_sample_router
@asynccontextmanager @asynccontextmanager
@@ -125,6 +125,7 @@ app.include_router(leave_router, prefix=settings.API_V1_PREFIX)
app.include_router(operations_router, prefix=settings.API_V1_PREFIX) app.include_router(operations_router, prefix=settings.API_V1_PREFIX)
app.include_router(ethnic_router, prefix=settings.API_V1_PREFIX) app.include_router(ethnic_router, prefix=settings.API_V1_PREFIX)
app.include_router(sample_reception_router, prefix=settings.API_V1_PREFIX) app.include_router(sample_reception_router, prefix=settings.API_V1_PREFIX)
app.include_router(business_sample_router, prefix=settings.API_V1_PREFIX)
app.include_router(sample_production_reception_router, prefix=settings.API_V1_PREFIX) app.include_router(sample_production_reception_router, prefix=settings.API_V1_PREFIX)
app.include_router(qc_router, prefix=settings.API_V1_PREFIX) app.include_router(qc_router, prefix=settings.API_V1_PREFIX)
app.include_router(research_donation_router, prefix=settings.API_V1_PREFIX) app.include_router(research_donation_router, prefix=settings.API_V1_PREFIX)
+1
View File
@@ -1597,6 +1597,7 @@ class BizProtocolSample(Base):
storage_in_date = Column(CHAR(8), nullable=True, comment="入库日期YYYYMMDD") storage_in_date = Column(CHAR(8), nullable=True, comment="入库日期YYYYMMDD")
detect_start_date = Column(CHAR(8), nullable=True, comment="检测开始日期YYYYMMDD") detect_start_date = Column(CHAR(8), nullable=True, comment="检测开始日期YYYYMMDD")
void_date = Column(CHAR(8), nullable=True, comment="作废日期YYYYMMDD") void_date = Column(CHAR(8), nullable=True, comment="作废日期YYYYMMDD")
void_desc = Column(String(512), nullable=True, comment="样本作废原因")
storage_expire_date = Column(CHAR(8), nullable=True, comment="存储到期日期YYYYMMDD") storage_expire_date = Column(CHAR(8), nullable=True, comment="存储到期日期YYYYMMDD")
is_special = Column(SmallInteger, nullable=False, default=0, comment="是否特殊样本:0否 1是") is_special = Column(SmallInteger, nullable=False, default=0, comment="是否特殊样本:0否 1是")
special_remark = Column(String(256), nullable=True, comment="特殊说明") special_remark = Column(String(256), nullable=True, comment="特殊说明")
+1
View File
@@ -175,6 +175,7 @@ class BizResearchDonationSample(Base):
storage_in_date = Column(String(8), nullable=True, comment="入库日期YYYYMMDD") storage_in_date = Column(String(8), nullable=True, comment="入库日期YYYYMMDD")
detect_start_date = Column(String(8), nullable=True, comment="检测开始日期YYYYMMDD") detect_start_date = Column(String(8), nullable=True, comment="检测开始日期YYYYMMDD")
void_date = Column(String(8), nullable=True, comment="作废日期YYYYMMDD") void_date = Column(String(8), nullable=True, comment="作废日期YYYYMMDD")
void_desc = Column(String(512), nullable=True, comment="样本作废原因")
storage_expire_date = Column(String(8), nullable=True, comment="存储到期日期YYYYMMDD") storage_expire_date = Column(String(8), nullable=True, comment="存储到期日期YYYYMMDD")
is_special = Column(SmallInteger, nullable=False, default=0, comment="是否特殊样本:0否 1是") is_special = Column(SmallInteger, nullable=False, default=0, comment="是否特殊样本:0否 1是")
special_remark = Column(String(256), nullable=True, comment="特殊说明") special_remark = Column(String(256), nullable=True, comment="特殊说明")
+15 -2
View File
@@ -56,6 +56,12 @@ from app.services.web_auth_roles import (
CELL = 'cell_storage' CELL = 'cell_storage'
DONATION = 'research_donation' DONATION = 'research_donation'
SOURCES = (CELL, DONATION) SOURCES = (CELL, DONATION)
_SAMPLE_STATUS_LABELS = {
'ycj': '已采集',
'jcz': '检测中',
'yrk': '已入库',
'yzf': '已作废',
}
def _current_tenant_user_info( def _current_tenant_user_info(
@@ -265,18 +271,25 @@ def _visible_rows(db: Session, freight_ids: List[str], ctx: MarketFieldContext,
def _item_dict(row) -> Dict[str, Any]: def _item_dict(row) -> Dict[str, Any]:
item, sample, parent, party, sample_type = row item, sample, parent, party, sample_type = row
source = item.sample_source source = item.sample_source
return { sample_code = sample.sample_code or ''
payload = {
'id': item.id, 'id': item.id,
'freightId': item.freight_id, 'freightId': item.freight_id,
'sampleSource': source, 'sampleSource': source,
'sampleId': sample.id, 'sampleId': sample.id,
'sampleCode': sample.sample_code or '', 'sampleCode': sample_code,
'protocolId': parent.id, 'protocolId': parent.id,
'protocolNo': (parent.protocol_no if source == CELL else parent.donation_no) or '', 'protocolNo': (parent.protocol_no if source == CELL else parent.donation_no) or '',
'sampleTypeName': sample_type.type_name if sample_type else '', 'sampleTypeName': sample_type.type_name if sample_type else '',
'motherName': party.mother_name if party else '', 'motherName': party.mother_name if party else '',
'newbornName': party.newborn_name if party else '', 'newbornName': party.newborn_name if party else '',
} }
if sample_code:
status = str(getattr(sample, 'sample_status', None) or '').strip()
payload['sampleStatus'] = status
payload['sampleStatusLabel'] = _SAMPLE_STATUS_LABELS.get(status, '')
payload['voidDesc'] = str(getattr(sample, 'void_desc', None) or '')
return payload
def _label_map(db: Session, tenant_no: str, values: List[str]) -> Dict[str, str]: def _label_map(db: Session, tenant_no: str, values: List[str]) -> Dict[str, str]:
+77 -3
View File
@@ -40,6 +40,51 @@ from app.services.market_support import (
) )
_SAMPLE_STATUS_LABELS = {
'ycj': '已采集',
'jcz': '检测中',
'yrk': '已入库',
'yzf': '已作废',
}
def _sample_status_by_code(
db: Session,
tenant_no: str,
sample_codes: List[str],
) -> Dict[str, Dict[str, str]]:
"""按租户 + 样本编码取样本状态;同一编码多行时保留最近更新的一条。"""
wanted = [code for code in {str(code or '').strip() for code in sample_codes} if code]
if not wanted:
return {}
rows = (
db.query(BizProtocolSample)
.filter(
BizProtocolSample.tenant_no == tenant_no,
BizProtocolSample.del_flag == 0,
BizProtocolSample.sample_code.in_(wanted),
)
.order_by(
BizProtocolSample.update_time.desc(),
BizProtocolSample.create_time.desc(),
BizProtocolSample.id.desc(),
)
.all()
)
result: Dict[str, Dict[str, str]] = {}
for sample in rows:
code = str(sample.sample_code or '').strip()
if not code or code in result:
continue
status = str(sample.sample_status or '').strip()
result[code] = {
'sampleStatus': status,
'sampleStatusLabel': _SAMPLE_STATUS_LABELS.get(status, ''),
'voidDesc': sample.void_desc or '',
}
return result
def _current_dept_id(user_info: dict) -> str: def _current_dept_id(user_info: dict) -> str:
return str( return str(
user_info.get('dept_id') user_info.get('dept_id')
@@ -104,12 +149,16 @@ def _load_sample_meta(
discount = None discount = None
if original is not None and current is not None and original > current: if original is not None and current is not None and original > current:
discount = original - current discount = original - current
status = str(sample.sample_status or '').strip()
result.setdefault( result.setdefault(
sample.sample_code or '', sample.sample_code or '',
{ {
'storageYears': sample.storage_years, 'storageYears': sample.storage_years,
'sampleTypeName': sample_type.type_name if sample_type else '', 'sampleTypeName': sample_type.type_name if sample_type else '',
'discountAmount': _money(discount), 'discountAmount': _money(discount),
'sampleStatus': status,
'sampleStatusLabel': _SAMPLE_STATUS_LABELS.get(status, ''),
'voidDesc': sample.void_desc or '',
}, },
) )
return result return result
@@ -235,7 +284,8 @@ def _payment_dict(
'bfyj': '部分已缴', 'bfyj': '部分已缴',
'dfj': '待缴费', 'dfj': '待缴费',
}[progress_code] }[progress_code]
return { sample_code = payment.sample_code or ''
payload = {
'id': payment.id, 'id': payment.id,
'collectionProtocolId': protocol.id, 'collectionProtocolId': protocol.id,
'protocolNo': protocol.protocol_no or '', 'protocolNo': protocol.protocol_no or '',
@@ -243,7 +293,7 @@ def _payment_dict(
'paymentModelVersion': int(getattr(protocol, 'payment_model_version', None) or 1), 'paymentModelVersion': int(getattr(protocol, 'payment_model_version', None) or 1),
'motherName': (party.mother_name if party else '') or '', 'motherName': (party.mother_name if party else '') or '',
'motherPhone': (party.mother_phone if party else '') or '', 'motherPhone': (party.mother_phone if party else '') or '',
'sampleCode': payment.sample_code or '', 'sampleCode': sample_code,
'payMode': payment.pay_mode or '', 'payMode': payment.pay_mode or '',
'contractAmount': _money(payment.contract_amount), 'contractAmount': _money(payment.contract_amount),
'signDate': _display_ymd(getattr(protocol, 'register_date', None)), 'signDate': _display_ymd(getattr(protocol, 'register_date', None)),
@@ -262,6 +312,11 @@ def _payment_dict(
'periods': periods, 'periods': periods,
'schedules': schedule_rows, 'schedules': schedule_rows,
} }
if sample_code:
payload['sampleStatus'] = meta.get('sampleStatus') or ''
payload['sampleStatusLabel'] = meta.get('sampleStatusLabel') or ''
payload['voidDesc'] = meta.get('voidDesc') or ''
return payload
def _scoped_payment_query( def _scoped_payment_query(
@@ -733,6 +788,14 @@ def list_payment_chase(
) )
} }
rows: List[Dict[str, Any]] = [] rows: List[Dict[str, Any]] = []
status_by_code = _sample_status_by_code(
db,
ctx.tenant_no,
[
payment.sample_code or schedule.sample_code or ''
for schedule, payment, _, _, _, _ in candidates
],
)
for schedule, payment, protocol, party, collection, paid in candidates: for schedule, payment, protocol, party, collection, paid in candidates:
due_date = parse_due_date_ymd(schedule.due_date) due_date = parse_due_date_ymd(schedule.due_date)
if due_date is None: if due_date is None:
@@ -741,6 +804,8 @@ def list_payment_chase(
due_value = Decimal(str(schedule.due_amount or 0)) due_value = Decimal(str(schedule.due_amount or 0))
arrears = max(due_value - paid_value, Decimal('0')) arrears = max(due_value - paid_value, Decimal('0'))
is_overdue = due_date < today_value is_overdue = due_date < today_value
sample_code = payment.sample_code or schedule.sample_code or ''
sample_state = status_by_code.get(sample_code, {}) if sample_code else {}
rows.append( rows.append(
{ {
'scheduleId': schedule.id, 'scheduleId': schedule.id,
@@ -750,7 +815,16 @@ def list_payment_chase(
'protocolStatus': protocol.protocol_status or '', 'protocolStatus': protocol.protocol_status or '',
'motherName': (party.mother_name if party else '') or '', 'motherName': (party.mother_name if party else '') or '',
'motherPhone': (party.mother_phone if party else '') or '', 'motherPhone': (party.mother_phone if party else '') or '',
'sampleCode': payment.sample_code or schedule.sample_code or '', 'sampleCode': sample_code,
**(
{
'sampleStatus': sample_state.get('sampleStatus', ''),
'sampleStatusLabel': sample_state.get('sampleStatusLabel', ''),
'voidDesc': sample_state.get('voidDesc', ''),
}
if sample_code
else {}
),
'salesUserId': collection.sales_user_id or '', 'salesUserId': collection.sales_user_id or '',
'salesUserName': sales_user_names.get( 'salesUserName': sales_user_names.get(
collection.sales_user_id or '', '' collection.sales_user_id or '', ''
+18
View File
@@ -641,6 +641,14 @@ def _party_name_donation(db: Session, ids: List[str], tenant_no: str) -> dict:
return {row.research_donation_id: row.mother_name or '' for row in rows} return {row.research_donation_id: row.mother_name or '' for row in rows}
_SAMPLE_STATUS_LABELS = {
'ycj': '已采集',
'jcz': '检测中',
'yrk': '已入库',
'yzf': '已作废',
}
def _enrich_protocol_cards( def _enrich_protocol_cards(
db: Session, items: List[dict], tenant_no: str db: Session, items: List[dict], tenant_no: str
) -> None: ) -> None:
@@ -795,6 +803,11 @@ def _enrich_protocol_cards(
payment_summary = payment_summaries.get(item['id']) or {} payment_summary = payment_summaries.get(item['id']) or {}
transport = transport_by_sample.get(getattr(sample, 'id', '')) transport = transport_by_sample.get(getattr(sample, 'id', ''))
sample_code = getattr(sample, 'sample_code', '') or '' sample_code = getattr(sample, 'sample_code', '') or ''
sample_status = ''
sample_void_desc = ''
if sample_code:
sample_status = str(getattr(sample, 'sample_status', None) or '').strip()
sample_void_desc = str(getattr(sample, 'void_desc', None) or '')
region_manager_name = user_names.get( region_manager_name = user_names.get(
getattr(collection, 'region_manager_user_id', ''), '' getattr(collection, 'region_manager_user_id', ''), ''
) )
@@ -844,6 +857,11 @@ def _enrich_protocol_cards(
str(item.get('voidType') or ''), '' str(item.get('voidType') or ''), ''
), ),
) )
if sample_code:
# 样本作废原因与协议级 voidDesc 分开,捐赠列表「废弃原因」仍读协议描述。
item['sampleStatus'] = sample_status
item['sampleStatusLabel'] = _SAMPLE_STATUS_LABELS.get(sample_status, '')
item['sampleVoidDesc'] = sample_void_desc
def list_protocols( def list_protocols(
@@ -1,16 +1,23 @@
"""市场协议作废 ↔ 质检样本接收废弃双向联动。 """市场协议无效态 ↔ 样本接收废弃 / 样本状态作废联动。
规则(细胞存储 / 科研捐赠): 规则(细胞存储 / 科研捐赠):
1. 协议变为已作废(yzf)时,协议下全部样本接收结论自动为废弃(bj)。 1. 单条样本接收结论为废弃(bj)时:仅该样本 `sample_status` 置为已作废(yzf)并写 `void_date`;
2. 协议下全部有效样本均已废弃/拒收(bj)时,协议自动已作废,作废类型为「实验室废弃」。 协议状态保持不变。接收结论改回接收(js)且协议仍有效时:若该样本为 yzf,则清空状态与 void_date。
2. 协议变为已作废(yzf)或属地废弃(sdfq)时:
- 协议下全部样本接收结论自动为废弃(bj);
- 协议下全部有效样本 `sample_status` 置为已作废(yzf),并写入 `void_date`。
3. 协议下全部有效样本均已废弃/拒收(bj)时,协议自动已作废,作废类型为「实验室废弃」。
4. 人工【样本废弃】:仅将该样本置 yzf 并写 void_date/void_desc,不改接收结论;
若协议下有效样本全部为 yzf,则自动作废协议(不联动接收结论)。
""" """
from __future__ import annotations from __future__ import annotations
from datetime import datetime from datetime import datetime
from typing import List, Optional from typing import List, Optional, Union
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from app.core.protocol_status_display import INACTIVE_PROTOCOL_STATUSES
from app.core.utils import generate_uuid from app.core.utils import generate_uuid
from app.models.models import ( from app.models.models import (
BizCollectionProtocol, BizCollectionProtocol,
@@ -23,9 +30,23 @@ from app.models.research_donation import BizResearchDonation, BizResearchDonatio
LAB_VOID_TYPE_CODE = "sysfq" LAB_VOID_TYPE_CODE = "sysfq"
LAB_VOID_TYPE_LABEL = "实验室废弃" LAB_VOID_TYPE_LABEL = "实验室废弃"
VOID_TYPE_DICT = "xyzflx" VOID_TYPE_DICT = "xyzflx"
SAMPLE_VOID_STATUS = "yzf"
_AUTO_DISCARD_REMARK = "协议作废自动废弃" _AUTO_DISCARD_REMARK = "协议作废自动废弃"
_AUTO_VOID_DESC = "全部样本接收废弃/拒收,系统自动作废" _AUTO_VOID_DESC = "全部样本接收废弃/拒收,系统自动作废"
_AUTO_VOID_BY_SAMPLE_STATUS_DESC = "全部样本已作废,系统自动作废协议"
def _void_date_yyyymmdd(
*,
void_time: Optional[datetime] = None,
void_date: Optional[str] = None,
) -> str:
raw = (void_date or "").strip()
if len(raw) == 8 and raw.isdigit():
return raw
ts = void_time or datetime.now()
return ts.strftime("%Y%m%d")
def ensure_lab_void_type(db: Session, *, tenant_no: str) -> str: def ensure_lab_void_type(db: Session, *, tenant_no: str) -> str:
@@ -204,7 +225,7 @@ def discard_receptions_for_voided_protocol(
tenant_no: str, tenant_no: str,
user_id: Optional[str] = None, user_id: Optional[str] = None,
) -> int: ) -> int:
"""协议已作废后,将其下样本接收全部置为废弃。返回处理样本数。""" """协议无效后,将其下样本接收全部置为废弃。返回处理样本数。"""
src = (source or "").strip() src = (source or "").strip()
pid = (protocol_id or "").strip() pid = (protocol_id or "").strip()
tenant = (tenant_no or "").strip() tenant = (tenant_no or "").strip()
@@ -242,6 +263,75 @@ def discard_receptions_for_voided_protocol(
return len(samples) return len(samples)
def void_samples_for_inactive_protocol(
db: Session,
*,
source: str,
protocol_id: str,
tenant_no: str,
user_id: Optional[str] = None,
void_time: Optional[datetime] = None,
void_date: Optional[str] = None,
) -> int:
"""协议无效后,将其下有效样本状态一律置为已作废并写入 void_date。返回处理样本数。"""
src = (source or "").strip()
pid = (protocol_id or "").strip()
tenant = (tenant_no or "").strip()
if src not in ("cell_storage", "research_donation") or not pid or not tenant:
return 0
date_s = _void_date_yyyymmdd(void_time=void_time, void_date=void_date)
now = datetime.now()
if src == "cell_storage":
samples: List[Union[BizProtocolSample, BizResearchDonationSample]] = list(
_list_cell_samples(db, protocol_id=pid, tenant_no=tenant)
)
else:
samples = list(_list_donation_samples(db, donation_id=pid, tenant_no=tenant))
for sample in samples:
sample.sample_status = SAMPLE_VOID_STATUS
sample.void_date = date_s
sample.update_by = user_id
sample.update_time = now
db.add(sample)
db.flush()
return len(samples)
def _resolve_protocol_void_time(
db: Session,
*,
source: str,
protocol_id: str,
tenant_no: str,
) -> Optional[datetime]:
src = (source or "").strip()
pid = (protocol_id or "").strip()
tenant = (tenant_no or "").strip()
if src == "cell_storage":
obj = (
db.query(BizCollectionProtocol)
.filter(
BizCollectionProtocol.id == pid,
BizCollectionProtocol.tenant_no == tenant,
BizCollectionProtocol.del_flag == 0,
)
.first()
)
return obj.void_time if obj else None
obj = (
db.query(BizResearchDonation)
.filter(
BizResearchDonation.id == pid,
BizResearchDonation.tenant_no == tenant,
BizResearchDonation.del_flag == 0,
)
.first()
)
return obj.void_time if obj else None
def _all_samples_discarded( def _all_samples_discarded(
db: Session, db: Session,
*, *,
@@ -299,7 +389,7 @@ def maybe_void_protocol_when_all_samples_discarded(
if not obj: if not obj:
return False return False
status = (obj.protocol_status or "").strip() status = (obj.protocol_status or "").strip()
if status in ("yzf", "sdfq"): if status in INACTIVE_PROTOCOL_STATUSES:
return False return False
from app.core.protocol_status_display import assert_protocol_status_transition from app.core.protocol_status_display import assert_protocol_status_transition
from app.crud.collection_protocol import update_collection_protocol from app.crud.collection_protocol import update_collection_protocol
@@ -319,7 +409,8 @@ def maybe_void_protocol_when_all_samples_discarded(
void_desc=_AUTO_VOID_DESC, void_desc=_AUTO_VOID_DESC,
void_type=void_type, void_type=void_type,
commit=False, commit=False,
sync_reception_discard=False, # 接收已全部废弃;仍需同步样本状态为已作废
sync_reception_discard=True,
) )
return True return True
@@ -335,7 +426,7 @@ def maybe_void_protocol_when_all_samples_discarded(
if not obj: if not obj:
return False return False
status = (obj.donation_status or "").strip() status = (obj.donation_status or "").strip()
if status in ("yzf", "sdfq"): if status in INACTIVE_PROTOCOL_STATUSES:
return False return False
# 捐赠 change_status 默认 commit;此处内联等价逻辑避免提前提交。 # 捐赠 change_status 默认 commit;此处内联等价逻辑避免提前提交。
@@ -374,6 +465,169 @@ def maybe_void_protocol_when_all_samples_discarded(
) )
db.add(obj) db.add(obj)
db.flush() db.flush()
# 接收已全部废弃;仍需同步样本状态为已作废
after_protocol_voided(
db,
source="research_donation",
protocol_id=pid,
tenant_no=tenant,
user_id=user_id,
)
return True
def _find_sample_for_reception(
db: Session,
*,
reception: BizSampleReception,
tenant_no: str,
) -> tuple[str, Optional[Union[BizProtocolSample, BizResearchDonationSample]]]:
source = (reception.reception_source or "cell_storage").strip() or "cell_storage"
tenant = (tenant_no or "").strip()
code = (reception.sample_code or "").strip()
if source == "cell_storage":
sid = (reception.protocol_sample_id or "").strip()
if sid:
obj = (
db.query(BizProtocolSample)
.filter(
BizProtocolSample.id == sid,
BizProtocolSample.tenant_no == tenant,
BizProtocolSample.del_flag == 0,
)
.first()
)
if obj:
return source, obj
pid = (reception.collection_protocol_id or "").strip()
if code and pid:
return source, (
db.query(BizProtocolSample)
.filter(
BizProtocolSample.collection_protocol_id == pid,
BizProtocolSample.sample_code == code,
BizProtocolSample.tenant_no == tenant,
BizProtocolSample.del_flag == 0,
)
.first()
)
return source, None
sid = (reception.donation_sample_id or "").strip()
if sid:
obj = (
db.query(BizResearchDonationSample)
.filter(
BizResearchDonationSample.id == sid,
BizResearchDonationSample.tenant_no == tenant,
BizResearchDonationSample.del_flag == 0,
)
.first()
)
if obj:
return source, obj
pid = (reception.research_donation_id or "").strip()
if code and pid:
return source, (
db.query(BizResearchDonationSample)
.filter(
BizResearchDonationSample.research_donation_id == pid,
BizResearchDonationSample.sample_code == code,
BizResearchDonationSample.tenant_no == tenant,
BizResearchDonationSample.del_flag == 0,
)
.first()
)
return source, None
def _protocol_is_inactive(
db: Session,
*,
source: str,
protocol_id: str,
tenant_no: str,
) -> bool:
src = (source or "").strip()
pid = (protocol_id or "").strip()
tenant = (tenant_no or "").strip()
if not pid or not tenant:
return False
if src == "cell_storage":
obj = (
db.query(BizCollectionProtocol)
.filter(
BizCollectionProtocol.id == pid,
BizCollectionProtocol.tenant_no == tenant,
BizCollectionProtocol.del_flag == 0,
)
.first()
)
status = (obj.protocol_status or "").strip() if obj else ""
else:
obj = (
db.query(BizResearchDonation)
.filter(
BizResearchDonation.id == pid,
BizResearchDonation.tenant_no == tenant,
BizResearchDonation.del_flag == 0,
)
.first()
)
status = (obj.donation_status or "").strip() if obj else ""
return status in INACTIVE_PROTOCOL_STATUSES
def void_sample_for_discarded_reception(
db: Session,
*,
reception: BizSampleReception,
tenant_no: str,
user_id: Optional[str] = None,
) -> bool:
"""单条接收废弃:仅将该样本置为已作废。"""
_source, sample = _find_sample_for_reception(db, reception=reception, tenant_no=tenant_no)
if not sample:
return False
now = datetime.now()
sample.sample_status = SAMPLE_VOID_STATUS
sample.void_date = _void_date_yyyymmdd(void_time=reception.reception_time or now)
sample.update_by = user_id
sample.update_time = now
db.add(sample)
db.flush()
return True
def clear_sample_void_for_accepted_reception(
db: Session,
*,
reception: BizSampleReception,
tenant_no: str,
user_id: Optional[str] = None,
) -> bool:
"""接收改回接收:协议仍有效且样本为 yzf 时,清空样本作废状态。"""
source, sample = _find_sample_for_reception(db, reception=reception, tenant_no=tenant_no)
if not sample:
return False
if (sample.sample_status or "").strip() != SAMPLE_VOID_STATUS:
return False
if source == "cell_storage":
protocol_id = (reception.collection_protocol_id or "").strip()
else:
protocol_id = (reception.research_donation_id or "").strip()
if _protocol_is_inactive(
db, source=source, protocol_id=protocol_id, tenant_no=tenant_no
):
return False
now = datetime.now()
sample.sample_status = None
sample.void_date = None
sample.void_desc = None
sample.update_by = user_id
sample.update_time = now
db.add(sample)
db.flush()
return True return True
@@ -384,23 +638,32 @@ def after_sample_reception_saved(
tenant_no: str, tenant_no: str,
user_id: Optional[str] = None, user_id: Optional[str] = None,
) -> None: ) -> None:
"""样本接收保存后:若结论为废弃,尝试自动作废所属协议。""" """样本接收保存后:同步该样本状态;若全部废弃则尝试自动作废协议。"""
if (reception.accept_conclusion or "").strip() != "bj": conclusion = (reception.accept_conclusion or "").strip()
return
source = (reception.reception_source or "cell_storage").strip() or "cell_storage" source = (reception.reception_source or "cell_storage").strip() or "cell_storage"
if source == "cell_storage": if source == "cell_storage":
protocol_id = (reception.collection_protocol_id or "").strip() protocol_id = (reception.collection_protocol_id or "").strip()
else: else:
protocol_id = (reception.research_donation_id or "").strip() protocol_id = (reception.research_donation_id or "").strip()
if not protocol_id:
if conclusion == "bj":
void_sample_for_discarded_reception(
db, reception=reception, tenant_no=tenant_no, user_id=user_id
)
if protocol_id:
maybe_void_protocol_when_all_samples_discarded(
db,
source=source,
protocol_id=protocol_id,
tenant_no=tenant_no,
user_id=user_id,
)
return return
maybe_void_protocol_when_all_samples_discarded(
db, if conclusion == "js":
source=source, clear_sample_void_for_accepted_reception(
protocol_id=protocol_id, db, reception=reception, tenant_no=tenant_no, user_id=user_id
tenant_no=tenant_no, )
user_id=user_id,
)
def after_protocol_voided( def after_protocol_voided(
@@ -411,7 +674,7 @@ def after_protocol_voided(
tenant_no: str, tenant_no: str,
user_id: Optional[str] = None, user_id: Optional[str] = None,
) -> None: ) -> None:
"""协议作废后:同步废弃其下全部样本接收。""" """协议作废/属地废弃后:同步废弃样本接收,并将样本状态置为已作废。"""
discard_receptions_for_voided_protocol( discard_receptions_for_voided_protocol(
db, db,
source=source, source=source,
@@ -419,3 +682,234 @@ def after_protocol_voided(
tenant_no=tenant_no, tenant_no=tenant_no,
user_id=user_id, user_id=user_id,
) )
void_samples_for_inactive_protocol(
db,
source=source,
protocol_id=protocol_id,
tenant_no=tenant_no,
user_id=user_id,
void_time=_resolve_protocol_void_time(
db, source=source, protocol_id=protocol_id, tenant_no=tenant_no
),
)
def _all_samples_status_voided(
db: Session,
*,
source: str,
protocol_id: str,
tenant_no: str,
) -> bool:
src = (source or "").strip()
if src == "cell_storage":
samples = _list_cell_samples(db, protocol_id=protocol_id, tenant_no=tenant_no)
else:
samples = _list_donation_samples(db, donation_id=protocol_id, tenant_no=tenant_no)
if not samples:
return False
for sample in samples:
if (sample.sample_status or "").strip() != SAMPLE_VOID_STATUS:
return False
return True
def maybe_void_protocol_when_all_samples_status_voided(
db: Session,
*,
source: str,
protocol_id: str,
tenant_no: str,
user_id: Optional[str] = None,
) -> bool:
"""若协议下有效样本全部已作废,则自动作废协议;不联动接收结论。"""
src = (source or "").strip()
pid = (protocol_id or "").strip()
tenant = (tenant_no or "").strip()
if src not in ("cell_storage", "research_donation") or not pid or not tenant:
return False
if not _all_samples_status_voided(db, source=src, protocol_id=pid, tenant_no=tenant):
return False
void_type = ensure_lab_void_type(db, tenant_no=tenant)
now = datetime.now()
if src == "cell_storage":
obj = (
db.query(BizCollectionProtocol)
.filter(
BizCollectionProtocol.id == pid,
BizCollectionProtocol.tenant_no == tenant,
BizCollectionProtocol.del_flag == 0,
)
.first()
)
if not obj:
return False
status = (obj.protocol_status or "").strip()
if status in INACTIVE_PROTOCOL_STATUSES:
return False
from app.core.protocol_status_display import assert_protocol_status_transition
from app.crud.collection_protocol import update_collection_protocol
try:
assert_protocol_status_transition(status, "yzf", kind="protocol")
except ValueError:
return False
update_collection_protocol(
db,
pid,
tenant_no=tenant,
user_id=user_id,
protocol_status="yzf",
void_time=now,
void_desc=_AUTO_VOID_BY_SAMPLE_STATUS_DESC,
void_type=void_type,
commit=False,
sync_reception_discard=False,
)
return True
obj = (
db.query(BizResearchDonation)
.filter(
BizResearchDonation.id == pid,
BizResearchDonation.tenant_no == tenant,
BizResearchDonation.del_flag == 0,
)
.first()
)
if not obj:
return False
status = (obj.donation_status or "").strip()
if status in INACTIVE_PROTOCOL_STATUSES:
return False
from app.core.protocol_status_display import assert_protocol_status_transition
from app.crud.dict_data import normalize_void_type
from app.crud.research_donation import (
_DONATION_STATUS_CHANGE_TYPE,
append_donation_status_change,
)
current = obj.donation_status or ""
try:
assert_protocol_status_transition(current, "yzf", kind="donation")
except ValueError:
return False
normalized = normalize_void_type(db, value=void_type, tenant_no=tenant)
obj.donation_status = "yzf"
obj.void_time = now
obj.void_desc = _AUTO_VOID_BY_SAMPLE_STATUS_DESC
obj.void_type = normalized
obj.update_by = user_id
obj.update_time = now
change_type = _DONATION_STATUS_CHANGE_TYPE.get("yzf")
if change_type:
append_donation_status_change(
db,
research_donation_id=obj.id,
change_type=change_type,
from_status=current,
to_status="yzf",
change_time=now,
change_desc=_AUTO_VOID_BY_SAMPLE_STATUS_DESC,
void_type=normalized,
tenant_no=tenant,
user_id=user_id,
)
db.add(obj)
db.flush()
return True
def void_sample_manually(
db: Session,
*,
source: str,
tenant_no: str,
void_desc: str,
user_id: Optional[str] = None,
sample_id: Optional[str] = None,
sample_code: Optional[str] = None,
protocol_id: Optional[str] = None,
commit: bool = True,
) -> Union[BizProtocolSample, BizResearchDonationSample]:
"""人工样本废弃:写 yzf/void_date/void_desc;不改接收;全作废则自动作废协议。"""
src = (source or "").strip()
tenant = (tenant_no or "").strip()
reason = (void_desc or "").strip()
sid = (sample_id or "").strip()
code = (sample_code or "").strip()
pid = (protocol_id or "").strip()
if src not in ("cell_storage", "research_donation"):
raise ValueError("来源类型无效")
if not tenant:
raise ValueError("租户编号不能为空")
if not reason:
raise ValueError("请填写作废原因")
if not sid and not code:
raise ValueError("样本标识不能为空")
now = datetime.now()
sample: Optional[Union[BizProtocolSample, BizResearchDonationSample]] = None
parent_id = ""
if src == "cell_storage":
q = db.query(BizProtocolSample).filter(
BizProtocolSample.tenant_no == tenant,
BizProtocolSample.del_flag == 0,
)
if sid:
q = q.filter(BizProtocolSample.id == sid)
else:
q = q.filter(BizProtocolSample.sample_code == code)
if pid:
q = q.filter(BizProtocolSample.collection_protocol_id == pid)
sample = q.first()
if not sample:
raise ValueError("样本不存在")
parent_id = (sample.collection_protocol_id or "").strip()
else:
q = db.query(BizResearchDonationSample).filter(
BizResearchDonationSample.tenant_no == tenant,
BizResearchDonationSample.del_flag == 0,
)
if sid:
q = q.filter(BizResearchDonationSample.id == sid)
else:
q = q.filter(BizResearchDonationSample.sample_code == code)
if pid:
q = q.filter(BizResearchDonationSample.research_donation_id == pid)
sample = q.first()
if not sample:
raise ValueError("样本不存在")
parent_id = (sample.research_donation_id or "").strip()
if _protocol_is_inactive(db, source=src, protocol_id=parent_id, tenant_no=tenant):
raise ValueError("所属协议已作废或属地废弃,无法操作")
sample.sample_status = SAMPLE_VOID_STATUS
sample.void_date = _void_date_yyyymmdd(void_time=now)
sample.void_desc = reason
sample.update_by = user_id
sample.update_time = now
db.add(sample)
db.flush()
if parent_id:
maybe_void_protocol_when_all_samples_status_voided(
db,
source=src,
protocol_id=parent_id,
tenant_no=tenant,
user_id=user_id,
)
if commit:
db.commit()
db.refresh(sample)
else:
db.flush()
return sample
+211
View File
@@ -0,0 +1,211 @@
"""人工样本废弃:写状态/原因,全作废则协议作废,不联动接收。"""
from __future__ import annotations
import unittest
from datetime import datetime
from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker
from app.core.database import Base
from app.models.models import (
BizCollectionProtocol,
BizProtocolSample,
BizProtocolStatusChange,
BizSampleReception,
SysDictData,
)
from app.services.protocol_reception_discard_sync import (
LAB_VOID_TYPE_CODE,
SAMPLE_VOID_STATUS,
void_sample_manually,
)
def _session():
engine = create_engine("sqlite://")
Base.metadata.create_all(
bind=engine,
tables=[
SysDictData.__table__,
BizCollectionProtocol.__table__,
BizProtocolSample.__table__,
BizProtocolStatusChange.__table__,
BizSampleReception.__table__,
],
)
return sessionmaker(bind=engine)()
def _now():
return datetime(2026, 11, 19, 12, 0, 0)
class TestBusinessSampleVoid(unittest.TestCase):
def test_void_one_sample_keeps_protocol_and_skips_reception(self):
db = _session()
now = _now()
db.add(
BizCollectionProtocol(
id="p1",
protocol_no="CP-1",
protocol_status="sxz",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
db.add(
BizProtocolSample(
id="sa",
collection_protocol_id="p1",
sample_code="A001",
sample_status="ycj",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
db.add(
BizProtocolSample(
id="sb",
collection_protocol_id="p1",
sample_code="B001",
sample_status="ycj",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
db.add(
BizSampleReception(
id="ra",
protocol_sample_id="sa",
collection_protocol_id="p1",
reception_time=now,
accept_conclusion="js",
reception_source="cell_storage",
sample_code="A001",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
check_packaging=0,
check_sealing=0,
check_no_damage=0,
check_no_leakage=0,
check_color=0,
check_tying_rope=0,
check_no_stratification=0,
)
)
db.commit()
void_sample_manually(
db,
source="cell_storage",
tenant_no="tenant-a",
void_desc="质检发现污染",
user_id="u1",
sample_id="sa",
)
a = db.query(BizProtocolSample).filter(BizProtocolSample.id == "sa").one()
b = db.query(BizProtocolSample).filter(BizProtocolSample.id == "sb").one()
proto = db.query(BizCollectionProtocol).filter(BizCollectionProtocol.id == "p1").one()
rec = db.query(BizSampleReception).filter(BizSampleReception.id == "ra").one()
self.assertEqual(a.sample_status, SAMPLE_VOID_STATUS)
self.assertEqual(a.void_desc, "质检发现污染")
self.assertTrue((a.void_date or "").strip())
self.assertEqual(b.sample_status, "ycj")
self.assertEqual(proto.protocol_status, "sxz")
self.assertEqual(rec.accept_conclusion, "js")
def test_void_all_samples_auto_voids_protocol_without_reception_change(self):
db = _session()
now = _now()
db.add(
BizCollectionProtocol(
id="p2",
protocol_no="CP-2",
protocol_status="sxz",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
for sid, code in (("s1", "C001"), ("s2", "C002")):
db.add(
BizProtocolSample(
id=sid,
collection_protocol_id="p2",
sample_code=code,
sample_status="ycj",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
db.add(
BizSampleReception(
id="r1",
protocol_sample_id="s1",
collection_protocol_id="p2",
reception_time=now,
accept_conclusion="js",
reception_source="cell_storage",
sample_code="C001",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
check_packaging=0,
check_sealing=0,
check_no_damage=0,
check_no_leakage=0,
check_color=0,
check_tying_rope=0,
check_no_stratification=0,
)
)
db.commit()
void_sample_manually(
db,
source="cell_storage",
tenant_no="tenant-a",
void_desc="原因1",
sample_id="s1",
commit=True,
)
void_sample_manually(
db,
source="cell_storage",
tenant_no="tenant-a",
void_desc="原因2",
sample_id="s2",
commit=True,
)
proto = db.query(BizCollectionProtocol).filter(BizCollectionProtocol.id == "p2").one()
rec = db.query(BizSampleReception).filter(BizSampleReception.id == "r1").one()
self.assertEqual(proto.protocol_status, "yzf")
self.assertEqual(proto.void_type, LAB_VOID_TYPE_CODE)
self.assertEqual(rec.accept_conclusion, "js")
if __name__ == "__main__":
unittest.main()
@@ -99,12 +99,20 @@ def test_specialist_sees_shared_batch_but_only_own_items_and_count():
from app.services.market_freight import get_freight_detail, list_freights from app.services.market_freight import get_freight_detail, list_freights
db = _session() db = _session()
own, own_parent = _sample(db, 'own') own, own_parent = _sample(db, 'own')
own.sample_status = 'yzf'
own.void_desc = '冷链中断'
db.commit()
other, other_parent = _sample(db, 'other', sales='u2') other, other_parent = _sample(db, 'other', sales='u2')
freight = _freight(db, 'mixed', [('cell_storage', own, own_parent), ('cell_storage', other, other_parent)]) freight = _freight(db, 'mixed', [('cell_storage', own, own_parent), ('cell_storage', other, other_parent)])
rows, total = list_freights(db, ctx=_ctx(), user_info=_user(), include_items=True) rows, total = list_freights(db, ctx=_ctx(), user_info=_user(), include_items=True)
detail = get_freight_detail(db, freight.id, ctx=_ctx(), user_info=_user()) detail = get_freight_detail(db, freight.id, ctx=_ctx(), user_info=_user())
assert total == 1 and rows[0]['visibleItemCount'] == 1 assert total == 1 and rows[0]['visibleItemCount'] == 1
assert [item['sampleCode'] for item in rows[0]['items']] == ['C-own'] assert [item['sampleCode'] for item in rows[0]['items']] == ['C-own']
assert rows[0]['items'][0]['sampleStatus'] == 'yzf'
assert rows[0]['items'][0]['sampleStatusLabel'] == '已作废'
assert rows[0]['items'][0]['voidDesc'] == '冷链中断'
assert detail['items'][0]['sampleStatus'] == 'yzf'
assert detail['items'][0]['voidDesc'] == '冷链中断'
assert [item['sampleCode'] for item in detail['items']] == ['C-own'] assert [item['sampleCode'] for item in detail['items']] == ['C-own']
assert rows[0]['createBy'] == detail['createBy'] == 'u1' assert rows[0]['createBy'] == detail['createBy'] == 'u1'
assert rows[0]['createByName'] == detail['createByName'] == '专员' assert rows[0]['createByName'] == detail['createByName'] == '专员'
+27
View File
@@ -674,6 +674,33 @@ def test_chase_filters_counts_orders_and_pages_in_sql_before_materialization():
) )
def test_payment_and_chase_lists_include_sample_status_when_coded():
from app.services.market_payment import list_payment_chase, list_payments
db = _session()
today = date(2026, 10, 11)
_payment_tree(db, 'void-sample', due_date=today.strftime('%Y%m%d'))
sample = db.get(BizProtocolSample, 'sample-void-sample')
sample.sample_status = 'yzf'
sample.void_desc = '客户放弃'
db.commit()
payments, payment_total = list_payments(db, ctx=_ctx(), user_info=_user())
chase, chase_total = list_payment_chase(
db, ctx=_ctx(), user_info=_user(), today=today
)
assert payment_total == 1
assert payments[0]['sampleCode'] == 'S-void-sample'
assert payments[0]['sampleStatus'] == 'yzf'
assert payments[0]['sampleStatusLabel'] == '已作废'
assert payments[0]['voidDesc'] == '客户放弃'
assert chase_total == 1
assert chase[0]['sampleStatus'] == 'yzf'
assert chase[0]['sampleStatusLabel'] == '已作废'
assert chase[0]['voidDesc'] == '客户放弃'
def test_payment_list_includes_legacy_models_and_uses_parent_scope_not_transfer_department(): def test_payment_list_includes_legacy_models_and_uses_parent_scope_not_transfer_department():
from app.services.market_payment import list_payments from app.services.market_payment import list_payments
+52
View File
@@ -3604,6 +3604,10 @@ def test_protocol_list_contains_mobile_card_fields():
assert items[0]['deliveryMode'] == 'sc' assert items[0]['deliveryMode'] == 'sc'
assert items[0]['newbornWeightGram'] == 3200 assert items[0]['newbornWeightGram'] == 3200
assert items[0]['salesUserName'] == '当前用户' assert items[0]['salesUserName'] == '当前用户'
assert items[0]['sampleStatus'] == ''
assert items[0]['sampleStatusLabel'] == ''
assert items[0]['sampleVoidDesc'] == ''
assert items[0]['voidDesc'] == ''
by_customer, customer_total = list_protocols( by_customer, customer_total = list_protocols(
db, ctx=_ctx('specialist'), user_info=_user(), keyword='李安然' db, ctx=_ctx('specialist'), user_info=_user(), keyword='李安然'
@@ -3626,6 +3630,54 @@ def test_protocol_list_contains_mobile_card_fields():
} == {row.id} } == {row.id}
def test_protocol_list_returns_sample_status_without_replacing_donation_void_desc():
from app.services.market_protocol import list_protocols
db = _session()
cell = _cell(db, 'status-cell')
db.add(
BizProtocolSample(
id='sample-status-cell',
collection_protocol_id=cell.id,
sample_code='S-CELL',
sample_status='yzf',
void_desc='试管破裂',
tenant_no='tenant-a',
create_dept_id='',
del_flag=0,
)
)
donation = _donation(db, 'status-don')
donation.void_desc = '协议作废说明'
db.add(
BizResearchDonationSample(
id='sample-status-don',
research_donation_id=donation.id,
sample_code='S-DON',
sample_status='yrk',
void_desc='样本溶血',
tenant_no='tenant-a',
create_dept_id='',
del_flag=0,
)
)
db.commit()
items, total = list_protocols(db, ctx=_ctx('specialist'), user_info=_user())
assert total == 2
by_id = {item['id']: item for item in items}
assert by_id['status-cell']['sampleCode'] == 'S-CELL'
assert by_id['status-cell']['sampleStatus'] == 'yzf'
assert by_id['status-cell']['sampleStatusLabel'] == '已作废'
assert by_id['status-cell']['voidDesc'] == '试管破裂'
assert by_id['status-cell']['sampleVoidDesc'] == '试管破裂'
assert by_id['status-don']['sampleStatus'] == 'yrk'
assert by_id['status-don']['sampleStatusLabel'] == '已入库'
assert by_id['status-don']['voidDesc'] == '协议作废说明'
assert by_id['status-don']['sampleVoidDesc'] == '样本溶血'
@pytest.mark.parametrize('source', ['cell_storage', 'research_donation']) @pytest.mark.parametrize('source', ['cell_storage', 'research_donation'])
def test_protocol_list_and_detail_resolve_tenant_void_type_label(source): def test_protocol_list_and_detail_resolve_tenant_void_type_label(source):
from app.services.market_protocol import get_protocol, list_protocols from app.services.market_protocol import get_protocol, list_protocols
@@ -23,6 +23,7 @@ from app.models.research_donation import (
) )
from app.services.protocol_reception_discard_sync import ( from app.services.protocol_reception_discard_sync import (
LAB_VOID_TYPE_CODE, LAB_VOID_TYPE_CODE,
SAMPLE_VOID_STATUS,
after_protocol_voided, after_protocol_voided,
after_sample_reception_saved, after_sample_reception_saved,
ensure_lab_void_type, ensure_lab_void_type,
@@ -77,6 +78,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
id="p1", id="p1",
protocol_no="CP-1", protocol_no="CP-1",
protocol_status="sxz", protocol_status="sxz",
void_time=now,
tenant_no="tenant-a", tenant_no="tenant-a",
create_dept_id="", create_dept_id="",
create_time=now, create_time=now,
@@ -89,6 +91,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
id="s1", id="s1",
collection_protocol_id="p1", collection_protocol_id="p1",
sample_code="ZK001", sample_code="ZK001",
sample_status="yrk",
tenant_no="tenant-a", tenant_no="tenant-a",
create_dept_id="", create_dept_id="",
create_time=now, create_time=now,
@@ -101,6 +104,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
id="s2", id="s2",
collection_protocol_id="p1", collection_protocol_id="p1",
sample_code="ZK002", sample_code="ZK002",
sample_status="jcz",
tenant_no="tenant-a", tenant_no="tenant-a",
create_dept_id="", create_dept_id="",
create_time=now, create_time=now,
@@ -152,6 +156,16 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
self.assertEqual(by_code["ZK001"], "bj") self.assertEqual(by_code["ZK001"], "bj")
self.assertEqual(by_code["ZK002"], "bj") self.assertEqual(by_code["ZK002"], "bj")
samples = (
db.query(BizProtocolSample)
.filter(BizProtocolSample.collection_protocol_id == "p1")
.all()
)
self.assertEqual(len(samples), 2)
for s in samples:
self.assertEqual(s.sample_status, SAMPLE_VOID_STATUS)
self.assertEqual(s.void_date, "20261105")
def test_all_samples_discarded_auto_voids_protocol_with_lab_type(self): def test_all_samples_discarded_auto_voids_protocol_with_lab_type(self):
db = _session() db = _session()
now = _now() now = _now()
@@ -172,6 +186,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
id="s3", id="s3",
collection_protocol_id="p2", collection_protocol_id="p2",
sample_code="ZK003", sample_code="ZK003",
sample_status="ycj",
tenant_no="tenant-a", tenant_no="tenant-a",
create_dept_id="", create_dept_id="",
create_time=now, create_time=now,
@@ -212,6 +227,9 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
self.assertEqual(proto.protocol_status, "yzf") self.assertEqual(proto.protocol_status, "yzf")
self.assertEqual(proto.void_type, LAB_VOID_TYPE_CODE) self.assertEqual(proto.void_type, LAB_VOID_TYPE_CODE)
self.assertIn("全部样本接收", proto.void_desc or "") self.assertIn("全部样本接收", proto.void_desc or "")
sample = db.query(BizProtocolSample).filter(BizProtocolSample.id == "s3").one()
self.assertEqual(sample.sample_status, SAMPLE_VOID_STATUS)
self.assertTrue((sample.void_date or "").strip())
def test_partial_discard_does_not_void_protocol(self): def test_partial_discard_does_not_void_protocol(self):
db = _session() db = _session()
@@ -282,6 +300,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
id="d1", id="d1",
donation_no="RD-1", donation_no="RD-1",
donation_status="sxz", donation_status="sxz",
void_time=now,
tenant_no="tenant-a", tenant_no="tenant-a",
create_dept_id="", create_dept_id="",
create_time=now, create_time=now,
@@ -294,6 +313,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
id="ds1", id="ds1",
research_donation_id="d1", research_donation_id="d1",
sample_code="RD001", sample_code="RD001",
sample_status="yrk",
tenant_no="tenant-a", tenant_no="tenant-a",
create_dept_id="", create_dept_id="",
create_time=now, create_time=now,
@@ -322,6 +342,199 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
) )
self.assertEqual(rec.accept_conclusion, "bj") self.assertEqual(rec.accept_conclusion, "bj")
self.assertEqual(rec.research_donation_id, "d1") self.assertEqual(rec.research_donation_id, "d1")
sample = (
db.query(BizResearchDonationSample)
.filter(BizResearchDonationSample.id == "ds1")
.one()
)
self.assertEqual(sample.sample_status, SAMPLE_VOID_STATUS)
self.assertEqual(sample.void_date, "20261105")
def test_sdfq_also_voids_sample_status(self):
db = _session()
now = _now()
db.add(
BizCollectionProtocol(
id="p-sdfq",
protocol_no="CP-SDFQ",
protocol_status="sdfq",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
db.add(
BizProtocolSample(
id="s-sdfq",
collection_protocol_id="p-sdfq",
sample_code="ZKSDFQ",
sample_status="ycj",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
db.commit()
after_protocol_voided(
db,
source="cell_storage",
protocol_id="p-sdfq",
tenant_no="tenant-a",
user_id="u1",
)
db.commit()
sample = db.query(BizProtocolSample).filter(BizProtocolSample.id == "s-sdfq").one()
self.assertEqual(sample.sample_status, SAMPLE_VOID_STATUS)
self.assertTrue((sample.void_date or "").strip())
rec = (
db.query(BizSampleReception)
.filter(BizSampleReception.sample_code == "ZKSDFQ")
.one()
)
self.assertEqual(rec.accept_conclusion, "bj")
def test_single_reception_discard_voids_only_that_sample(self):
db = _session()
now = _now()
db.add(
BizCollectionProtocol(
id="p-multi",
protocol_no="CP-MULTI",
protocol_status="sxz",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
for sid, code, status in (
("sa", "ZKA", "ycj"),
("sb", "ZKB", "ycj"),
("sc", "ZKC", "ycj"),
):
db.add(
BizProtocolSample(
id=sid,
collection_protocol_id="p-multi",
sample_code=code,
sample_status=status,
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
rec_a = BizSampleReception(
id="ra",
protocol_sample_id="sa",
collection_protocol_id="p-multi",
reception_time=now,
accept_conclusion="bj",
reception_source="cell_storage",
sample_code="ZKA",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
check_packaging=0,
check_sealing=0,
check_no_damage=0,
check_no_leakage=0,
check_color=0,
check_tying_rope=0,
check_no_stratification=0,
)
db.add(rec_a)
db.commit()
after_sample_reception_saved(
db, reception=rec_a, tenant_no="tenant-a", user_id="u1"
)
db.commit()
proto = db.query(BizCollectionProtocol).filter(BizCollectionProtocol.id == "p-multi").one()
self.assertEqual(proto.protocol_status, "sxz")
by_id = {
s.id: s
for s in db.query(BizProtocolSample)
.filter(BizProtocolSample.collection_protocol_id == "p-multi")
.all()
}
self.assertEqual(by_id["sa"].sample_status, SAMPLE_VOID_STATUS)
self.assertEqual(by_id["sa"].void_date, "20261105")
self.assertEqual(by_id["sb"].sample_status, "ycj")
self.assertEqual(by_id["sc"].sample_status, "ycj")
def test_reception_accept_clears_sample_void_when_protocol_active(self):
db = _session()
now = _now()
db.add(
BizCollectionProtocol(
id="p-clear",
protocol_no="CP-CLEAR",
protocol_status="sxz",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
db.add(
BizProtocolSample(
id="s-clear",
collection_protocol_id="p-clear",
sample_code="ZKCLR",
sample_status=SAMPLE_VOID_STATUS,
void_date="20261101",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
)
)
rec = BizSampleReception(
id="r-clear",
protocol_sample_id="s-clear",
collection_protocol_id="p-clear",
reception_time=now,
accept_conclusion="js",
reception_source="cell_storage",
sample_code="ZKCLR",
tenant_no="tenant-a",
create_dept_id="",
create_time=now,
update_time=now,
del_flag=0,
check_packaging=0,
check_sealing=0,
check_no_damage=0,
check_no_leakage=0,
check_color=0,
check_tying_rope=0,
check_no_stratification=0,
)
db.add(rec)
db.commit()
after_sample_reception_saved(
db, reception=rec, tenant_no="tenant-a", user_id="u1"
)
db.commit()
sample = db.query(BizProtocolSample).filter(BizProtocolSample.id == "s-clear").one()
self.assertFalse((sample.sample_status or "").strip())
self.assertFalse((sample.void_date or "").strip())
if __name__ == "__main__": if __name__ == "__main__":
@@ -0,0 +1,174 @@
"""入库质检工单列表:从协议/捐赠采集信息补齐母血采集时间。"""
import unittest
from datetime import datetime
from unittest import mock
import app.crud.qc_task # noqa: F401 先加载任务模块,避免与工单模块循环导入
from app.crud import qc_work_order as qc_wo
from app.crud.qc_work_order import _enrich_work_order_list_items
from app.models.models import (
BizCollectionProtocol,
BizProtocolCollectionInfo,
BizProtocolPartyCustomer,
BizSampleReception,
)
from app.models.research_donation import (
BizResearchDonation,
BizResearchDonationCollection,
BizResearchDonationParty,
)
def _item(**kwargs):
data = {
"id": "wo-1",
"workOrderType": "inbound",
"receptionId": "rec-1",
"sampleCode": "S001",
"collectionProtocolId": "proto-1",
"receptionSource": "cell_storage",
"protocolSampleId": "",
"maternalBloodCollectTime": "",
}
data.update(kwargs)
return data
def _query_router(mapping):
def _query(*entities):
q = mock.Mock()
q.filter.return_value = q
q.order_by.return_value = q
model = entities[0]
# db.query(Model.col, ...) → first entity is InstrumentedAttribute
cls = getattr(model, "class_", model)
key = getattr(cls, "__name__", str(cls))
rows = mapping.get(key, [])
q.all.return_value = rows
return q
return _query
class TestEnrichWorkOrderMaternalBlood(unittest.TestCase):
def test_cell_storage_fills_maternal_blood_collect_time(self):
rec = mock.Mock(
id="rec-1",
sample_code="S001",
reception_source="cell_storage",
collection_protocol_id="proto-1",
research_donation_id="",
protocol_sample_id="",
donation_sample_id="",
reception_time=datetime(2026, 11, 8, 13, 30, 41),
handler_name="质检员",
lab_storage_code="",
)
coll = mock.Mock(
collection_protocol_id="proto-1",
maternal_blood_collect_time=datetime(2026, 11, 7, 9, 15, 0),
del_flag=0,
)
db = mock.Mock()
db.query.side_effect = _query_router(
{
BizSampleReception.__name__: [rec],
BizProtocolCollectionInfo.__name__: [coll],
BizProtocolPartyCustomer.__name__: [],
BizCollectionProtocol.__name__: [],
}
)
with mock.patch.object(
qc_wo, "_enrich_protocol_sibling_samples", side_effect=lambda _db, items: items
), mock.patch.object(
qc_wo, "apply_special_to_item_from_samples", side_effect=lambda item, **_k: item
):
items = _enrich_work_order_list_items(db, [_item()])
self.assertEqual(items[0]["maternalBloodCollectTime"], "2026-11-07 09:15:00")
def test_missing_maternal_blood_stays_empty(self):
rec = mock.Mock(
id="rec-1",
sample_code="S001",
reception_source="cell_storage",
collection_protocol_id="proto-1",
research_donation_id="",
protocol_sample_id="",
donation_sample_id="",
reception_time=datetime(2026, 11, 8, 13, 30, 41),
handler_name="质检员",
lab_storage_code="",
)
db = mock.Mock()
db.query.side_effect = _query_router(
{
BizSampleReception.__name__: [rec],
BizProtocolCollectionInfo.__name__: [],
BizProtocolPartyCustomer.__name__: [],
BizCollectionProtocol.__name__: [],
}
)
with mock.patch.object(
qc_wo, "_enrich_protocol_sibling_samples", side_effect=lambda _db, items: items
), mock.patch.object(
qc_wo, "apply_special_to_item_from_samples", side_effect=lambda item, **_k: item
):
items = _enrich_work_order_list_items(db, [_item()])
self.assertEqual(items[0]["maternalBloodCollectTime"], "")
def test_research_donation_fills_maternal_blood_collect_time(self):
rec = mock.Mock(
id="rec-2",
sample_code="D001",
reception_source="research_donation",
collection_protocol_id="",
research_donation_id="don-1",
protocol_sample_id="",
donation_sample_id="",
reception_time=datetime(2026, 11, 8, 10, 0, 0),
handler_name="质检员",
lab_storage_code="",
)
coll = mock.Mock(
research_donation_id="don-1",
maternal_blood_collect_time=datetime(2026, 11, 6, 8, 0, 0),
del_flag=0,
)
db = mock.Mock()
db.query.side_effect = _query_router(
{
BizSampleReception.__name__: [rec],
BizResearchDonationCollection.__name__: [coll],
BizResearchDonationParty.__name__: [],
BizResearchDonation.__name__: [],
}
)
with mock.patch.object(
qc_wo, "_enrich_protocol_sibling_samples", side_effect=lambda _db, items: items
), mock.patch.object(
qc_wo, "apply_special_to_item_from_samples", side_effect=lambda item, **_k: item
):
items = _enrich_work_order_list_items(
db,
[
_item(
id="wo-2",
receptionId="rec-2",
sampleCode="D001",
collectionProtocolId="don-1",
receptionSource="research_donation",
)
],
)
self.assertEqual(items[0]["maternalBloodCollectTime"], "2026-11-06 08:00:00")
if __name__ == "__main__":
unittest.main()
@@ -1,7 +1,8 @@
-- UC 入库编码自动派发:脐带MSC原代培养(内置模版)5 步 -- UC 入库编码自动派发:脐带MSC原代培养(内置模版)5 步
-- 步骤:原代培养 → 半换液 → 二次贴壁 → 重铺 → 冻存(不含传代) -- 步骤:原代培养 → 半换液 → 二次贴壁 → 重铺 → 冻存(不含传代)
-- 内容从既有「干细胞培养(内置模版)」/ MSC培养-BUILTIN 按 process_code 拷贝 -- 内容从既有「干细胞培养(内置模版)」/ MSC培养-BUILTIN 按 process_code 拷贝
-- 幂等:已存在同名内置集合则跳过主数据创建-- 生产历史空任务工单回补(二选一,勿重复对同一工单各跑一遍): -- 幂等:已存在同名内置集合则跳过主数据创建-- 兼容:跨表比较统一 COLLATE utf8mb4_unicode_ci,避免 unicode_ci/general_ci 混用失败
-- 生产历史空任务工单回补(二选一,勿重复对同一工单各跑一遍):
-- SQL:docs/sql/migrations/2026-11-13-uc-msc-production-task-backfill.sql -- SQL:docs/sql/migrations/2026-11-13-uc-msc-production-task-backfill.sql
-- 或 Python: -- 或 Python:
-- cd backend && python -m scripts.backfill_uc_msc_production_tasks -- cd backend && python -m scripts.backfill_uc_msc_production_tasks
@@ -46,7 +47,7 @@ WHERE src.del_flag = 0
) )
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 FROM biz_process_route x SELECT 1 FROM biz_process_route x
WHERE x.tenant_no = src.tenant_no WHERE x.tenant_no COLLATE utf8mb4_unicode_ci = src.tenant_no COLLATE utf8mb4_unicode_ci
AND x.route_code = 'MSC原代-UC-BUILTIN' AND x.route_code = 'MSC原代-UC-BUILTIN'
AND x.del_flag = 0 AND x.del_flag = 0
) )
@@ -67,7 +68,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 1, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 1, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-003-E01-01' AND s.process_code = 'SOP-SC-003-E01-01'
AND ( AND (
@@ -97,7 +100,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 2, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 2, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-004-E01-01' AND s.process_code = 'SOP-SC-004-E01-01'
AND ( AND (
@@ -127,7 +132,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 3, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 3, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-006-E01-01' AND s.process_code = 'SOP-SC-006-E01-01'
AND ( AND (
@@ -157,7 +164,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 4, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 4, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-005-E01-01' AND s.process_code = 'SOP-SC-005-E01-01'
AND ( AND (
@@ -187,7 +196,9 @@ SELECT
s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content, s.description, s.equipment_ids, s.equipment_name, s.estimated_duration, s.sop_ids, s.sop_content,
s.tenant_no, 5, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0 s.tenant_no, 5, s.remark, s.create_by, IFNULL(s.create_dept_id, ''), NOW(), s.update_by, NOW(), 0
FROM biz_process_route_step s FROM biz_process_route_step s
JOIN biz_process_route r ON r.id = s.route_id AND r.del_flag = 0 JOIN biz_process_route r
ON r.id COLLATE utf8mb4_unicode_ci = s.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0
WHERE s.del_flag = 0 WHERE s.del_flag = 0
AND s.process_code = 'SOP-SC-008-E01-01' AND s.process_code = 'SOP-SC-008-E01-01'
AND ( AND (
@@ -228,7 +239,7 @@ WHERE r.id = 'UCMSCROUTEA5CC11F194118AC54085447A'
AND r.del_flag = 0 AND r.del_flag = 0
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 FROM biz_production_task_set x SELECT 1 FROM biz_production_task_set x
WHERE x.tenant_no = r.tenant_no WHERE x.tenant_no COLLATE utf8mb4_unicode_ci = r.tenant_no COLLATE utf8mb4_unicode_ci
AND x.set_name = '脐带MSC原代培养(内置模版)' AND x.set_name = '脐带MSC原代培养(内置模版)'
AND x.is_builtin = '1' AND x.is_builtin = '1'
AND x.del_flag = 0 AND x.del_flag = 0
@@ -261,5 +272,6 @@ WHERE s.set_name = '脐带MSC原代培养(内置模版)'
AND s.del_flag = 0 AND s.del_flag = 0
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 FROM biz_production_task_set_item x SELECT 1 FROM biz_production_task_set_item x
WHERE x.set_id = s.id AND x.del_flag = 0 WHERE x.set_id COLLATE utf8mb4_unicode_ci = s.id COLLATE utf8mb4_unicode_ci
AND x.del_flag = 0
); );
@@ -16,6 +16,10 @@
-- 幂等:已有有效任务的工单不会进入候选;重复执行影响行数应为 0。 -- 幂等:已有有效任务的工单不会进入候选;重复执行影响行数应为 0。
-- 前置:biz_process_route.route_code='MSC原代-UC-BUILTIN'(或固定 id UCMSCROUTE…)及 5 步须已存在。 -- 前置:biz_process_route.route_code='MSC原代-UC-BUILTIN'(或固定 id UCMSCROUTE…)及 5 步须已存在。
-- MySQL 5.7 / utf8mb4。未在生产库执行;执行前请先跑下方「预览」SELECT。 -- MySQL 5.7 / utf8mb4。未在生产库执行;执行前请先跑下方「预览」SELECT。
-- 兼容:
-- 1) 跨表等值统一 COLLATE utf8mb4_general_ci,避免 unicode_ci/general_ci 混用失败
-- 2) 多行 ID 用 MD5(业务键) 生成,避免同语句多行 UUID() 撞主键
-- 3) task_no 序号用 UNSIGNED 整数拼接,避免用户变量浮点变成 RW…2.00
SET NAMES utf8mb4; SET NAMES utf8mb4;
@@ -43,7 +47,7 @@ SET @uc_route_id := (
SET @uc_step_count := ( SET @uc_step_count := (
SELECT COUNT(*) SELECT COUNT(*)
FROM biz_process_route_step s FROM biz_process_route_step s
WHERE s.route_id = @uc_route_id WHERE s.route_id COLLATE utf8mb4_unicode_ci = @uc_route_id COLLATE utf8mb4_unicode_ci
AND s.del_flag = 0 AND s.del_flag = 0
); );
@@ -70,7 +74,7 @@ CREATE TEMPORARY TABLE tmp_uc_wo_backfill (
route_id VARCHAR(64) NULL, route_id VARCHAR(64) NULL,
PRIMARY KEY (seq), PRIMARY KEY (seq),
UNIQUE KEY uk_wo (work_order_id) UNIQUE KEY uk_wo (work_order_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
INSERT INTO tmp_uc_wo_backfill ( INSERT INTO tmp_uc_wo_backfill (
work_order_id, reception_id, lab_storage_code, tenant_no, sample_code, route_id work_order_id, reception_id, lab_storage_code, tenant_no, sample_code, route_id
@@ -84,8 +88,8 @@ SELECT
@uc_route_id @uc_route_id
FROM biz_production_work_order wo FROM biz_production_work_order wo
INNER JOIN biz_sample_reception rec INNER JOIN biz_sample_reception rec
ON rec.id = wo.reception_id ON rec.id COLLATE utf8mb4_general_ci = wo.reception_id COLLATE utf8mb4_general_ci
AND rec.tenant_no = wo.tenant_no AND rec.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
AND rec.del_flag = 0 AND rec.del_flag = 0
WHERE @uc_ready = 1 WHERE @uc_ready = 1
AND wo.del_flag = 0 AND wo.del_flag = 0
@@ -101,8 +105,8 @@ WHERE @uc_ready = 1
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 SELECT 1
FROM biz_production_task t FROM biz_production_task t
WHERE t.work_order_id = wo.id WHERE t.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
AND t.tenant_no = wo.tenant_no AND t.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
AND t.del_flag = 0 AND t.del_flag = 0
) )
ORDER BY rec.reception_time ASC, wo.create_time ASC; ORDER BY rec.reception_time ASC, wo.create_time ASC;
@@ -125,12 +129,13 @@ SET @task_day := DATE_FORMAT(NOW(), '%Y%m%d');
SET @task_no_base := ( SET @task_no_base := (
SELECT IFNULL(MAX(CAST(SUBSTRING(t.task_no, 11) AS UNSIGNED)), 0) SELECT IFNULL(MAX(CAST(SUBSTRING(t.task_no, 11) AS UNSIGNED)), 0)
FROM biz_production_task t FROM biz_production_task t
WHERE t.task_no LIKE CONCAT('RW', @task_day, '%') WHERE t.task_no REGEXP CONCAT('^RW', @task_day, '[0-9]{4}$')
); );
SET @task_no_base := CAST(IFNULL(@task_no_base, 0) AS UNSIGNED);
UPDATE tmp_uc_wo_backfill UPDATE tmp_uc_wo_backfill
SET SET
task_id = UPPER(REPLACE(UUID(), '-', '')), task_id = UPPER(MD5(CONCAT('uc-msc-backfill-task:', work_order_id))),
task_no = CONCAT('RW', @task_day, LPAD(@task_no_base + seq, 4, '0')); task_no = CONCAT('RW', @task_day, LPAD(@task_no_base + seq, 4, '0'));
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
@@ -170,14 +175,14 @@ SELECT
0 0
FROM tmp_uc_wo_backfill c FROM tmp_uc_wo_backfill c
INNER JOIN biz_process_route r INNER JOIN biz_process_route r
ON r.id = c.route_id ON r.id COLLATE utf8mb4_unicode_ci = c.route_id COLLATE utf8mb4_unicode_ci
AND r.del_flag = 0 AND r.del_flag = 0
WHERE @uc_ready = 1 WHERE @uc_ready = 1
AND c.task_id IS NOT NULL AND c.task_id IS NOT NULL
AND NOT EXISTS ( AND NOT EXISTS (
SELECT 1 FROM biz_production_task t SELECT 1 FROM biz_production_task t
WHERE t.work_order_id = c.work_order_id WHERE t.work_order_id COLLATE utf8mb4_general_ci = c.work_order_id COLLATE utf8mb4_general_ci
AND t.tenant_no = c.tenant_no AND t.tenant_no COLLATE utf8mb4_general_ci = c.tenant_no COLLATE utf8mb4_general_ci
AND t.del_flag = 0 AND t.del_flag = 0
); );
@@ -195,7 +200,7 @@ CREATE TEMPORARY TABLE tmp_uc_step_map (
PRIMARY KEY (task_id, route_step_id), PRIMARY KEY (task_id, route_step_id),
KEY ix_route_step (route_step_id), KEY ix_route_step (route_step_id),
KEY ix_task_step (task_step_id) KEY ix_task_step (task_step_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
INSERT INTO tmp_uc_step_map ( INSERT INTO tmp_uc_step_map (
task_id, work_order_id, tenant_no, route_step_id, task_step_id, step_order task_id, work_order_id, tenant_no, route_step_id, task_step_id, step_order
@@ -205,16 +210,17 @@ SELECT
c.work_order_id, c.work_order_id,
c.tenant_no, c.tenant_no,
rs.id, rs.id,
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-step:', c.work_order_id, ':', rs.id))),
rs.step_order rs.step_order
FROM tmp_uc_wo_backfill c FROM tmp_uc_wo_backfill c
INNER JOIN biz_process_route_step rs INNER JOIN biz_process_route_step rs
ON rs.route_id = c.route_id ON rs.route_id COLLATE utf8mb4_unicode_ci = c.route_id COLLATE utf8mb4_unicode_ci
AND rs.del_flag = 0 AND rs.del_flag = 0
WHERE @uc_ready = 1 WHERE @uc_ready = 1
AND EXISTS ( AND EXISTS (
SELECT 1 FROM biz_production_task t SELECT 1 FROM biz_production_task t
WHERE t.id = c.task_id AND t.del_flag = 0 WHERE t.id COLLATE utf8mb4_general_ci = c.task_id COLLATE utf8mb4_general_ci
AND t.del_flag = 0
); );
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
@@ -257,11 +263,11 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step rs INNER JOIN biz_process_route_step rs
ON rs.id = m.route_step_id ON rs.id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND rs.del_flag = 0 AND rs.del_flag = 0
WHERE NOT EXISTS ( WHERE NOT EXISTS (
SELECT 1 FROM biz_production_task_step x SELECT 1 FROM biz_production_task_step x
WHERE x.id = m.task_step_id WHERE x.id COLLATE utf8mb4_general_ci = m.task_step_id COLLATE utf8mb4_general_ci
); );
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
@@ -273,7 +279,7 @@ INSERT INTO biz_production_task_step_reagent (
create_by, create_dept_id, create_time, update_by, update_time, del_flag create_by, create_dept_id, create_time, update_by, update_time, del_flag
) )
SELECT SELECT
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-reag:', m.task_step_id, ':', src.id))),
m.task_step_id, m.task_step_id,
src.reagent_code, src.reagent_code,
src.reagent_name, src.reagent_name,
@@ -292,7 +298,7 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step_reagent src INNER JOIN biz_process_route_step_reagent src
ON src.step_id = m.route_step_id ON src.step_id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND src.del_flag = 0; AND src.del_flag = 0;
INSERT INTO biz_production_task_step_consumable ( INSERT INTO biz_production_task_step_consumable (
@@ -301,7 +307,7 @@ INSERT INTO biz_production_task_step_consumable (
create_by, create_dept_id, create_time, update_by, update_time, del_flag create_by, create_dept_id, create_time, update_by, update_time, del_flag
) )
SELECT SELECT
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-cons:', m.task_step_id, ':', src.id))),
m.task_step_id, m.task_step_id,
src.consumable_code, src.consumable_code,
src.consumable_name, src.consumable_name,
@@ -320,7 +326,7 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step_consumable src INNER JOIN biz_process_route_step_consumable src
ON src.step_id = m.route_step_id ON src.step_id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND src.del_flag = 0; AND src.del_flag = 0;
INSERT INTO biz_production_task_step_output ( INSERT INTO biz_production_task_step_output (
@@ -329,7 +335,7 @@ INSERT INTO biz_production_task_step_output (
create_by, create_dept_id, create_time, update_by, update_time, del_flag create_by, create_dept_id, create_time, update_by, update_time, del_flag
) )
SELECT SELECT
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-out:', m.task_step_id, ':', src.id))),
m.task_step_id, m.task_step_id,
src.output_type_id, src.output_type_id,
src.output_name, src.output_name,
@@ -345,7 +351,7 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step_output src INNER JOIN biz_process_route_step_output src
ON src.step_id = m.route_step_id ON src.step_id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND src.del_flag = 0; AND src.del_flag = 0;
INSERT INTO biz_production_task_step_data_collection ( INSERT INTO biz_production_task_step_data_collection (
@@ -353,7 +359,7 @@ INSERT INTO biz_production_task_step_data_collection (
create_by, create_dept_id, create_time, update_by, update_time, del_flag create_by, create_dept_id, create_time, update_by, update_time, del_flag
) )
SELECT SELECT
UPPER(REPLACE(UUID(), '-', '')), UPPER(MD5(CONCAT('uc-msc-backfill-dc:', m.task_step_id, ':', src.id))),
m.task_step_id, m.task_step_id,
src.collection_name, src.collection_name,
src.unit, src.unit,
@@ -368,14 +374,15 @@ SELECT
0 0
FROM tmp_uc_step_map m FROM tmp_uc_step_map m
INNER JOIN biz_process_route_step_data_collection src INNER JOIN biz_process_route_step_data_collection src
ON src.step_id = m.route_step_id ON src.step_id COLLATE utf8mb4_unicode_ci = m.route_step_id COLLATE utf8mb4_unicode_ci
AND src.del_flag = 0; AND src.del_flag = 0;
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
-- 6. 回写工单状态:有任务则 jxz(不改 ywc) -- 6. 回写工单状态:有任务则 jxz(不改 ywc)
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
UPDATE biz_production_work_order wo UPDATE biz_production_work_order wo
INNER JOIN tmp_uc_wo_backfill c ON c.work_order_id = wo.id INNER JOIN tmp_uc_wo_backfill c
ON c.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
SET SET
wo.work_order_status = 'jxz', wo.work_order_status = 'jxz',
wo.update_time = NOW() wo.update_time = NOW()
@@ -383,8 +390,8 @@ WHERE wo.del_flag = 0
AND wo.work_order_status = 'dpz' AND wo.work_order_status = 'dpz'
AND EXISTS ( AND EXISTS (
SELECT 1 FROM biz_production_task t SELECT 1 FROM biz_production_task t
WHERE t.work_order_id = wo.id WHERE t.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
AND t.tenant_no = wo.tenant_no AND t.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
AND t.del_flag = 0 AND t.del_flag = 0
); );
@@ -399,10 +406,18 @@ SELECT
t.id AS task_id, t.id AS task_id,
t.task_no, t.task_no,
t.task_name, t.task_name,
(SELECT COUNT(*) FROM biz_production_task_step s WHERE s.task_id = t.id AND s.del_flag = 0) AS step_count (
SELECT COUNT(*)
FROM biz_production_task_step s
WHERE s.task_id COLLATE utf8mb4_general_ci = t.id COLLATE utf8mb4_general_ci
AND s.del_flag = 0
) AS step_count
FROM tmp_uc_wo_backfill c FROM tmp_uc_wo_backfill c
LEFT JOIN biz_production_work_order wo ON wo.id = c.work_order_id LEFT JOIN biz_production_work_order wo
LEFT JOIN biz_production_task t ON t.id = c.task_id AND t.del_flag = 0 ON wo.id COLLATE utf8mb4_general_ci = c.work_order_id COLLATE utf8mb4_general_ci
LEFT JOIN biz_production_task t
ON t.id COLLATE utf8mb4_general_ci = c.task_id COLLATE utf8mb4_general_ci
AND t.del_flag = 0
ORDER BY c.seq; ORDER BY c.seq;
DROP TEMPORARY TABLE IF EXISTS tmp_uc_step_map; DROP TEMPORARY TABLE IF EXISTS tmp_uc_step_map;
@@ -0,0 +1,54 @@
-- Issue #127:已作废 / 属地废弃协议下样本状态回刷为已作废
-- 细胞存储 + 科研捐赠;可重复执行。
-- 规则:协议 status 为 yzf/sdfq 且样本未删除时,sample_status 置 yzf,
-- void_date 为空时按协议 void_time / update_time 补齐 YYYYMMDD。
-- 细胞存储协议样本
UPDATE biz_protocol_sample s
INNER JOIN biz_collection_protocol p
ON p.id = s.collection_protocol_id
AND p.tenant_no = s.tenant_no
AND p.del_flag = 0
SET
s.sample_status = 'yzf',
s.void_date = CASE
WHEN s.void_date IS NOT NULL AND TRIM(s.void_date) <> '' THEN s.void_date
WHEN p.void_time IS NOT NULL THEN DATE_FORMAT(p.void_time, '%Y%m%d')
WHEN p.update_time IS NOT NULL THEN DATE_FORMAT(p.update_time, '%Y%m%d')
ELSE DATE_FORMAT(NOW(), '%Y%m%d')
END,
s.update_time = NOW()
WHERE s.del_flag = 0
AND p.protocol_status IN ('yzf', 'sdfq')
AND (
s.sample_status IS NULL
OR TRIM(s.sample_status) = ''
OR s.sample_status <> 'yzf'
OR s.void_date IS NULL
OR TRIM(s.void_date) = ''
);
-- 科研捐赠样本
UPDATE biz_research_donation_sample s
INNER JOIN biz_research_donation d
ON d.id = s.research_donation_id
AND d.tenant_no = s.tenant_no
AND d.del_flag = 0
SET
s.sample_status = 'yzf',
s.void_date = CASE
WHEN s.void_date IS NOT NULL AND TRIM(s.void_date) <> '' THEN s.void_date
WHEN d.void_time IS NOT NULL THEN DATE_FORMAT(d.void_time, '%Y%m%d')
WHEN d.update_time IS NOT NULL THEN DATE_FORMAT(d.update_time, '%Y%m%d')
ELSE DATE_FORMAT(NOW(), '%Y%m%d')
END,
s.update_time = NOW()
WHERE s.del_flag = 0
AND d.donation_status IN ('yzf', 'sdfq')
AND (
s.sample_status IS NULL
OR TRIM(s.sample_status) = ''
OR s.sample_status <> 'yzf'
OR s.void_date IS NULL
OR TRIM(s.void_date) = ''
);
@@ -0,0 +1,67 @@
-- Issue #129:样本接收结论已为废弃(bj)、但样本状态尚未作废的历史回刷
-- 细胞存储 / 科研捐赠;可重复执行。
-- 仅处理协议仍有效(非 yzf/sdfq)的样本行;已作废协议样本由 #127 回刷脚本覆盖。
-- 细胞存储
UPDATE biz_protocol_sample s
INNER JOIN biz_sample_reception r
ON r.tenant_no = s.tenant_no
AND r.del_flag = 0
AND r.reception_source = 'cell_storage'
AND r.accept_conclusion = 'bj'
AND r.sample_code = s.sample_code
AND r.collection_protocol_id = s.collection_protocol_id
INNER JOIN biz_collection_protocol p
ON p.id = s.collection_protocol_id
AND p.tenant_no = s.tenant_no
AND p.del_flag = 0
SET
s.sample_status = 'yzf',
s.void_date = CASE
WHEN s.void_date IS NOT NULL AND TRIM(s.void_date) <> '' THEN s.void_date
WHEN r.reception_time IS NOT NULL THEN DATE_FORMAT(r.reception_time, '%Y%m%d')
WHEN s.update_time IS NOT NULL THEN DATE_FORMAT(s.update_time, '%Y%m%d')
ELSE DATE_FORMAT(NOW(), '%Y%m%d')
END,
s.update_time = NOW()
WHERE s.del_flag = 0
AND p.protocol_status NOT IN ('yzf', 'sdfq')
AND (
s.sample_status IS NULL
OR TRIM(s.sample_status) = ''
OR s.sample_status <> 'yzf'
OR s.void_date IS NULL
OR TRIM(s.void_date) = ''
);
-- 科研捐赠
UPDATE biz_research_donation_sample s
INNER JOIN biz_sample_reception r
ON r.tenant_no = s.tenant_no
AND r.del_flag = 0
AND r.reception_source = 'research_donation'
AND r.accept_conclusion = 'bj'
AND r.sample_code = s.sample_code
AND r.research_donation_id = s.research_donation_id
INNER JOIN biz_research_donation d
ON d.id = s.research_donation_id
AND d.tenant_no = s.tenant_no
AND d.del_flag = 0
SET
s.sample_status = 'yzf',
s.void_date = CASE
WHEN s.void_date IS NOT NULL AND TRIM(s.void_date) <> '' THEN s.void_date
WHEN r.reception_time IS NOT NULL THEN DATE_FORMAT(r.reception_time, '%Y%m%d')
WHEN s.update_time IS NOT NULL THEN DATE_FORMAT(s.update_time, '%Y%m%d')
ELSE DATE_FORMAT(NOW(), '%Y%m%d')
END,
s.update_time = NOW()
WHERE s.del_flag = 0
AND d.donation_status NOT IN ('yzf', 'sdfq')
AND (
s.sample_status IS NULL
OR TRIM(s.sample_status) = ''
OR s.sample_status <> 'yzf'
OR s.void_date IS NULL
OR TRIM(s.void_date) = ''
);
@@ -0,0 +1,26 @@
-- Issue #131:样本作废原因字段 void_desc
-- 细胞存储 / 科研捐赠样本表;按列是否已存在可重复执行。
SET @db := DATABASE();
SET @exists := (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'biz_protocol_sample' AND COLUMN_NAME = 'void_desc'
);
SET @sql := IF(
@exists = 0,
'ALTER TABLE biz_protocol_sample ADD COLUMN void_desc VARCHAR(512) NULL COMMENT ''样本作废原因'' AFTER void_date',
'SELECT 1'
);
PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
SET @exists := (
SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = @db AND TABLE_NAME = 'biz_research_donation_sample' AND COLUMN_NAME = 'void_desc'
);
SET @sql := IF(
@exists = 0,
'ALTER TABLE biz_research_donation_sample ADD COLUMN void_desc VARCHAR(512) NULL COMMENT ''样本作废原因'' AFTER void_date',
'SELECT 1'
);
PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+11
View File
@@ -25,6 +25,17 @@ export function fetchCreateReceiveAccount(data) {
return post('/web/admin/oa-approval/receive-accounts', data) return post('/web/admin/oa-approval/receive-accounts', data)
} }
export function fetchUpdateReceiveAccount(id, data) {
return put(`/web/admin/oa-approval/receive-accounts/${id}`, data)
}
export function fetchDeleteReceiveAccount(id) {
return request({
url: `/web/admin/oa-approval/receive-accounts/${id}`,
method: 'DELETE'
})
}
export function fetchRelatedCandidates(params) { export function fetchRelatedCandidates(params) {
return get('/web/admin/oa-approval/related-candidates', params) return get('/web/admin/oa-approval/related-candidates', params)
} }
@@ -23,23 +23,11 @@
</header> </header>
<div class="market-list-card__fields"> <div class="market-list-card__fields">
<div <MarketListField
v-for="field in previewFields" v-for="field in previewFields"
:key="`${field.label}:${field.value}`" :key="`${field.label}:${field.value}`"
class="market-list-card__field" :field="field"
:class="{ 'is-wide': field.wide }" />
>
<span>{{ field.label }}</span>
<van-tag
v-if="field.tag"
class="market-tag"
:type="resolveStatusTone(field.value, field.tagType)"
size="medium"
round
:title="field.value"
>{{ field.value }}</van-tag>
<b v-else :class="{ 'is-money': field.money }">{{ field.value }}</b>
</div>
</div> </div>
<!-- 每一期缴费:始终展示在「展开更多」上方,不收进总折叠 --> <!-- 每一期缴费:始终展示在「展开更多」上方,不收进总折叠 -->
@@ -70,15 +58,11 @@
</button> </button>
<div v-show="periodOpenKeys[block.key]" class="market-list-card__period-body"> <div v-show="periodOpenKeys[block.key]" class="market-list-card__period-body">
<div class="market-list-card__fields market-list-card__fields--compact"> <div class="market-list-card__fields market-list-card__fields--compact">
<div <MarketListField
v-for="field in block.fields" v-for="field in block.fields"
:key="`${block.key}:${field.label}`" :key="`${block.key}:${field.label}`"
class="market-list-card__field" :field="field"
:class="{ 'is-wide': field.wide }" />
>
<span>{{ field.label }}</span>
<b :class="{ 'is-money': field.money }">{{ field.value }}</b>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -102,44 +86,20 @@
<van-icon class="market-list-card__fields-toggle-chevron" name="arrow-down" /> <van-icon class="market-list-card__fields-toggle-chevron" name="arrow-down" />
</button> </button>
<div v-show="fieldsOpen && collapsedFields.length" class="market-list-card__fields market-list-card__fields--folded"> <div v-show="fieldsOpen && collapsedFields.length" class="market-list-card__fields market-list-card__fields--folded">
<div <MarketListField
v-for="field in collapsedFields" v-for="field in collapsedFields"
:key="`more:${field.label}:${field.value}`" :key="`more:${field.label}:${field.value}`"
class="market-list-card__field" :field="field"
:class="{ 'is-wide': field.wide }" />
>
<span>{{ field.label }}</span>
<van-tag
v-if="field.tag"
class="market-tag"
:type="resolveStatusTone(field.value, field.tagType)"
size="medium"
round
:title="field.value"
>{{ field.value }}</van-tag>
<b v-else :class="{ 'is-money': field.money }">{{ field.value }}</b>
</div>
</div> </div>
</div> </div>
<div v-if="card.footerFields?.length && showFoldedFooter" class="market-list-card__fields"> <div v-if="card.footerFields?.length && showFoldedFooter" class="market-list-card__fields">
<div <MarketListField
v-for="field in card.footerFields" v-for="field in card.footerFields"
:key="`footer:${field.label}:${field.value}`" :key="`footer:${field.label}:${field.value}`"
class="market-list-card__field" :field="field"
:class="{ 'is-wide': field.wide }" />
>
<span>{{ field.label }}</span>
<van-tag
v-if="field.tag"
class="market-tag"
:type="resolveStatusTone(field.value, field.tagType)"
size="medium"
round
:title="field.value"
>{{ field.value }}</van-tag>
<b v-else :class="{ 'is-money': field.money }">{{ field.value }}</b>
</div>
</div> </div>
<div <div
@@ -181,15 +141,11 @@
>{{ block.status }}</van-tag> >{{ block.status }}</van-tag>
</div> </div>
<div class="market-list-card__fields market-list-card__fields--compact"> <div class="market-list-card__fields market-list-card__fields--compact">
<div <MarketListField
v-for="field in block.fields" v-for="field in block.fields"
:key="`${block.key}:${field.label}`" :key="`${block.key}:${field.label}`"
class="market-list-card__field" :field="field"
:class="{ 'is-wide': field.wide }" />
>
<span>{{ field.label }}</span>
<b>{{ field.value }}</b>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -222,6 +178,7 @@
import { computed, ref, watch } from 'vue' import { computed, ref, watch } from 'vue'
import { actionLabel, buildMarketCard } from '../list-presenter.js' import { actionLabel, buildMarketCard } from '../list-presenter.js'
import { resolveStatusTone } from '../status-tone.js' import { resolveStatusTone } from '../status-tone.js'
import MarketListField from './MarketListField.vue'
const props = defineProps({ const props = defineProps({
item: { type: Object, required: true }, item: { type: Object, required: true },
@@ -0,0 +1,44 @@
<template>
<div class="market-list-card__field" :class="{ 'is-wide': field.wide }">
<span>{{ field.label }}</span>
<span class="market-list-card__value">
<van-tag
v-if="field.tag"
class="market-tag"
:type="resolveStatusTone(field.value, field.tagType)"
size="medium"
round
:title="field.value"
>{{ field.value }}</van-tag>
<b v-else :class="{ 'is-money': field.money }">{{ field.value }}</b>
<button
v-if="field.helpTitle"
type="button"
class="market-list-card__help"
:aria-label="`查看${field.helpTitle}`"
:title="field.helpTitle"
@click="showHelp"
>
<van-icon name="question-o" />
</button>
</span>
</div>
</template>
<script setup>
import { showDialog } from 'vant'
import { resolveStatusTone } from '../status-tone.js'
const props = defineProps({
field: { type: Object, required: true }
})
function showHelp() {
showDialog({
title: props.field.helpTitle || '作废原因',
message: props.field.helpText || '—',
messageAlign: 'left',
confirmButtonText: '知道了'
})
}
</script>
+30 -1
View File
@@ -2,6 +2,7 @@ import { formatMoney } from './money.js'
import { import {
resolveStatusTag, resolveStatusTag,
samplePaymentProgress, samplePaymentProgress,
sampleStatus,
payMode, payMode,
protocolStatus, protocolStatus,
donationStatus, donationStatus,
@@ -94,6 +95,30 @@ const personName = (name, id) => {
: referenceId ? '未知人员' : '—' : referenceId ? '未知人员' : '—'
} }
const field = (labelText, value, options = {}) => ({ label: labelText, value: text(value), ...options }) const field = (labelText, value, options = {}) => ({ label: labelText, value: text(value), ...options })
function sampleVoidReason(item) {
if (item && Object.prototype.hasOwnProperty.call(item, 'sampleVoidDesc')) {
return String(item.sampleVoidDesc ?? '').trim()
}
return String(item?.voidDesc ?? '').trim()
}
/** 样本编码旁的样本状态;已作废时附带作废原因,供卡片问号展开 */
function sampleStatusField(item) {
const provided = String(item?.sampleStatusLabel ?? '').trim()
const code = String(item?.sampleStatus ?? '').trim()
if (!code && !provided) return field('样本状态', '')
const resolved = resolveStatusTag(sampleStatus, code)
const display = provided || resolved.label
const voided = code === 'yzf' || display === '已作废'
return field('样本状态', display, {
tag: true,
tagType: voided ? 'danger' : (code ? resolved.tagType : 'info'),
...(voided
? { helpTitle: '作废原因', helpText: sampleVoidReason(item) || '—' }
: {})
})
}
export function money(value) { export function money(value) {
return formatMoney(value) return formatMoney(value)
} }
@@ -134,6 +159,7 @@ function protocolCard(item) {
field('所属项目', item.projectName || item.basic?.projectName || ((item.projectId || item.basic?.projectId) ? '历史项目' : '未归属')), field('所属项目', item.projectName || item.basic?.projectName || ((item.projectId || item.basic?.projectId) ? '历史项目' : '未归属')),
field('项目组', item.teamName || item.basic?.teamName), field('项目组', item.teamName || item.basic?.teamName),
field('样本编码', item.sampleCode || item.labStorageCode), field('样本编码', item.sampleCode || item.labStorageCode),
sampleStatusField(item),
field('采集日期', collectDate || item.donationDate), field('采集日期', collectDate || item.donationDate),
field('当月核量号', item.monthlyVerifyNo), field('当月核量号', item.monthlyVerifyNo),
field('实验室流转编号', item.labStorageCode || item.sampleCode), field('实验室流转编号', item.labStorageCode || item.sampleCode),
@@ -172,6 +198,7 @@ function protocolCard(item) {
field('所属项目', item.projectName || item.basic?.projectName || ((item.projectId || item.basic?.projectId) ? '历史项目' : '未归属')), field('所属项目', item.projectName || item.basic?.projectName || ((item.projectId || item.basic?.projectId) ? '历史项目' : '未归属')),
field('项目组', item.teamName || item.basic?.teamName), field('项目组', item.teamName || item.basic?.teamName),
field('样本编码', item.sampleCode), field('样本编码', item.sampleCode),
sampleStatusField(item),
field('登记日期', item.registerDate || item.donationDate), field('登记日期', item.registerDate || item.donationDate),
field('母亲电话', item.motherPhone), field('母亲电话', item.motherPhone),
field('母亲身份证号', item.motherIdCard), field('母亲身份证号', item.motherIdCard),
@@ -212,6 +239,7 @@ function chaseCard(item) {
field('客户', item.motherName), field('客户', item.motherName),
field('联系电话', item.motherPhone), field('联系电话', item.motherPhone),
field('样本编码', item.sampleCode), field('样本编码', item.sampleCode),
sampleStatusField(item),
field('市场专员', personName(item.salesUserName, item.salesUserId)), field('市场专员', personName(item.salesUserName, item.salesUserId)),
field('缴费方式', mode.label, { tag: true, tagType: mode.tagType }), field('缴费方式', mode.label, { tag: true, tagType: mode.tagType }),
field('期次', `第 ${text(item.scheduleNo, '1')} 期`), field('期次', `第 ${text(item.scheduleNo, '1')} 期`),
@@ -281,7 +309,7 @@ function paymentCard(item) {
statusTone: progress.tagType, statusTone: progress.tagType,
fields: [ fields: [
field('姓名', item.motherName), field('手机号', item.motherPhone), field('姓名', item.motherName), field('手机号', item.motherPhone),
field('样本编码', item.sampleCode), field('签署日期', item.signDate), field('样本编码', item.sampleCode), sampleStatusField(item), field('签署日期', item.signDate),
field('存储项目', item.sampleTypeName), field('合同总额', money(item.contractAmount), { money: true }), field('存储项目', item.sampleTypeName), field('合同总额', money(item.contractAmount), { money: true }),
field('缴费方式', mode.label, { tag: true, tagType: mode.tagType }), field('缴费方式', mode.label, { tag: true, tagType: mode.tagType }),
field('应收总额', money(item.receivableAmount), { money: true }) field('应收总额', money(item.receivableAmount), { money: true })
@@ -311,6 +339,7 @@ function freightSampleBlock(row, index) {
field('母亲姓名', row?.motherName), field('母亲姓名', row?.motherName),
field('子女姓名', row?.newbornName), field('子女姓名', row?.newbornName),
field('样本编码', row?.sampleCode, { wide: true }), field('样本编码', row?.sampleCode, { wide: true }),
sampleStatusField(row),
field('样本类型', row?.sampleTypeName, { wide: true }) field('样本类型', row?.sampleTypeName, { wide: true })
] ]
} }
+60 -1
View File
@@ -112,7 +112,7 @@ test('research donation protocol card matches excel-parity field set', () => {
const labels = card.fields.map((f) => f.label) const labels = card.fields.map((f) => f.label)
assert.equal(labels[2], '样本编码') assert.equal(labels[2], '样本编码')
for (const label of [ for (const label of [
'样本编码', '当月核量号', '实验室流转编号', '废弃原因', '样本类型', '样本编码', '样本状态', '当月核量号', '实验室流转编号', '废弃原因', '样本类型',
'采集地区', '采集医院', '分娩时间', '采集时间', '市场专员', '地区经理', '采集地区', '采集医院', '分娩时间', '采集时间', '市场专员', '地区经理',
'运输方式', '新生儿性别', '新生儿体重', '分娩方式', '胎次', '母血采集时间', '运输方式', '新生儿性别', '新生儿体重', '分娩方式', '胎次', '母血采集时间',
'知情同意书', '传染病检测报告', '协议书', '备注' '知情同意书', '传染病检测报告', '协议书', '备注'
@@ -245,11 +245,70 @@ test('freight card shows the scope-safe visible count and collapsible sample blo
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '母亲姓名').value, '周雨桐') assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '母亲姓名').value, '周雨桐')
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '子女姓名').value, '宝宝乙') assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '子女姓名').value, '宝宝乙')
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本编码').value, 'S-2') assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本编码').value, 'S-2')
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本状态').value, '—')
assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本类型').value, '脐带') assert.equal(manager.sampleBlocks[1].fields.find((field) => field.label === '样本类型').value, '脐带')
assert.ok(manager.fields.some((field) => field.label === '更新时间' && field.value === '2026-10-13 10:00:00')) assert.ok(manager.fields.some((field) => field.label === '更新时间' && field.value === '2026-10-13 10:00:00'))
assert.ok(manager.fields.some((field) => field.label === '备注' && field.value === '同批送达')) assert.ok(manager.fields.some((field) => field.label === '备注' && field.value === '同批送达'))
}) })
test('sample-coded list cards show sample status and a void reason affordance', () => {
const cases = [
['protocol', { source: 'cell_storage', sampleCode: 'S-1', sampleStatus: 'yrk', sampleStatusLabel: '已入库' }],
['payment-chase', { sampleCode: 'S-1', sampleStatus: 'jcz' }],
['payment', { sampleCode: 'S-1', motherName: '周雨桐', sampleStatus: 'ycj', sampleStatusLabel: '已采集' }]
]
for (const [module, item] of cases) {
const card = buildMarketCard(module, 'specialist', item)
const status = card.fields.find((field) => field.label === '样本状态')
assert.ok(status, module)
assert.equal(status.tag, true)
assert.equal(status.helpTitle, undefined)
}
assert.equal(
buildMarketCard('protocol', 'specialist', {
source: 'cell_storage', sampleCode: 'S-1', sampleStatus: 'yrk', sampleStatusLabel: '已入库'
}).fields.find((field) => field.label === '样本状态').value,
'已入库'
)
assert.equal(
buildMarketCard('payment-chase', 'specialist', {
sampleCode: 'S-1', sampleStatus: 'jcz'
}).fields.find((field) => field.label === '样本状态').value,
'检测中'
)
const voided = buildMarketCard('payment', 'specialist', {
motherName: '作废客户',
sampleCode: 'S-VOID',
sampleStatus: 'yzf',
voidDesc: '客户放弃存储'
})
const voidField = voided.fields.find((field) => field.label === '样本状态')
assert.equal(voidField.value, '已作废')
assert.equal(voidField.tagType, 'danger')
assert.equal(voidField.helpTitle, '作废原因')
assert.equal(voidField.helpText, '客户放弃存储')
const donation = buildMarketCard('protocol', 'specialist', {
source: 'research_donation',
sampleCode: 'S-D',
sampleStatus: 'yzf',
sampleStatusLabel: '已作废',
voidDesc: '协议级废弃说明',
sampleVoidDesc: '样本溶血'
})
assert.equal(donation.fields.find((field) => field.label === '废弃原因').value, '协议级废弃说明')
assert.equal(donation.fields.find((field) => field.label === '样本状态').helpText, '样本溶血')
const freight = buildMarketCard('freight', 'manager', {
freightNo: 'YF-VOID',
items: [{ sampleCode: 'S-V', sampleStatus: 'yzf', voidDesc: '运输破损' }]
})
const sampleStatus = freight.sampleBlocks[0].fields.find((field) => field.label === '样本状态')
assert.equal(sampleStatus.value, '已作废')
assert.equal(sampleStatus.helpText, '运输破损')
})
test('action labels cover module-specific operations', () => { test('action labels cover module-specific operations', () => {
assert.equal(actionLabel('link'), '关联样本') assert.equal(actionLabel('link'), '关联样本')
assert.equal(actionLabel('unlink'), '取消样本关联') assert.equal(actionLabel('unlink'), '取消样本关联')
@@ -84,6 +84,7 @@ test('market list visual contract keeps search white, tags filled and actions ri
'./components/MarketDetailSection.vue', './components/MarketDetailSection.vue',
'./components/MarketDetailNestedCard.vue', './components/MarketDetailNestedCard.vue',
'./components/MarketListCard.vue', './components/MarketListCard.vue',
'./components/MarketListField.vue',
'./components/PresignOrderCard.vue', './components/PresignOrderCard.vue',
'./components/PresignTransferCard.vue', './components/PresignTransferCard.vue',
'./components/ProtocolSamplePaymentPanel.vue', './components/ProtocolSamplePaymentPanel.vue',
@@ -541,6 +542,16 @@ test('payment detail hosts PaymentDetailTransfersPanel and hides transfer bottom
assert.match(panel, /应缴批次/) assert.match(panel, /应缴批次/)
}) })
test('voided sample status uses a question icon and vant dialog', () => {
const field = source('./components/MarketListField.vue')
const card = source('./components/MarketListCard.vue')
assert.match(field, /name="question-o"/)
assert.match(field, /showDialog/)
assert.match(field, /field\.helpTitle/)
assert.match(field, /class="market-tag"/)
assert.match(card, /MarketListField/)
})
test('payment cards reproduce the Web Excel columns and operation labels', () => { test('payment cards reproduce the Web Excel columns and operation labels', () => {
const presenter = source('./list-presenter.js') const presenter = source('./list-presenter.js')
const card = source('./components/MarketListCard.vue') const card = source('./components/MarketListCard.vue')
@@ -590,7 +601,7 @@ test('protocol cards expose the same business fields as the web list', async ()
}) })
assert.deepEqual(card.fields.map((field) => field.label), [ assert.deepEqual(card.fields.map((field) => field.label), [
'所属项目', '项目组', '样本编码', '登记日期', '母亲电话', '母亲身份证号', '父亲姓名', '所属项目', '项目组', '样本编码', '样本状态', '登记日期', '母亲电话', '母亲身份证号', '父亲姓名',
'新生儿性别', '分娩方式', '新生儿体重(克)', '采集地区', '采集医院', '新生儿性别', '分娩方式', '新生儿体重(克)', '采集地区', '采集医院',
'市场专员', '样本采集时间', '创建时间' '市场专员', '样本采集时间', '创建时间'
]) ])
@@ -106,6 +106,14 @@ export const receptionSource = createRegistry({
basic_experiment: { label: '基础实验', tagType: 'primary' } basic_experiment: { label: '基础实验', tagType: 'primary' }
}) })
/** 协议/捐赠样本状态;与 Web sampleStatus 保持一致 */
export const sampleStatus = createRegistry({
ycj: { label: '已采集', tagType: 'primary' },
jcz: { label: '检测中', tagType: 'warning' },
yrk: { label: '已入库', tagType: 'success' },
yzf: { label: '已作废', tagType: 'danger' }
})
export const presignOrderStatus = createRegistry({ export const presignOrderStatus = createRegistry({
draft: { label: '草稿', tagType: 'info' }, draft: { label: '草稿', tagType: 'info' },
active: { label: '进行中', tagType: 'warning' }, active: { label: '进行中', tagType: 'warning' },
@@ -8,10 +8,19 @@ import {
payMode, payMode,
presignOrderStatus, presignOrderStatus,
receptionSource, receptionSource,
sampleStatus,
transportType, transportType,
auditStatus auditStatus
} from './status-tag-registry.js' } from './status-tag-registry.js'
test('sample status yzf is 已作废/danger', () => {
assert.deepEqual(resolveStatusTag(sampleStatus, 'yzf'), {
label: '已作废',
tagType: 'danger'
})
assert.equal(resolveStatusTag(sampleStatus, 'yrk').label, '已入库')
})
test('sample progress dfj is 待缴费/info not 待缴清', () => { test('sample progress dfj is 待缴费/info not 待缴清', () => {
assert.deepEqual(resolveStatusTag(samplePaymentProgress, 'dfj'), { assert.deepEqual(resolveStatusTag(samplePaymentProgress, 'dfj'), {
label: '待缴费', label: '待缴费',
@@ -150,6 +150,7 @@ import {
uploadAttachment uploadAttachment
} from '../../api/oa.js' } from '../../api/oa.js'
import OaCommentFileCards from './OaCommentFileCards.vue' import OaCommentFileCards from './OaCommentFileCards.vue'
import { hasOaCommentDraft } from '../oa-comment-draft.js'
import { attachmentFullUrl } from '../../utils/attachment.js' import { attachmentFullUrl } from '../../utils/attachment.js'
import { isHarmonyWechat } from '../../utils/harmony-file-picker.js' import { isHarmonyWechat } from '../../utils/harmony-file-picker.js'
import HarmonyFileSource from '../../components/HarmonyFileSource.vue' import HarmonyFileSource from '../../components/HarmonyFileSource.vue'
@@ -516,12 +517,25 @@ function confirmMention() {
mentionVisible.value = false mentionVisible.value = false
} }
async function onSend() { function draftPending() {
const content = draft.value.trim() return hasOaCommentDraft({
if (!content && !mentionUsers.value.length && !picked.value.length) { content: draft.value,
showToast('请填写评论、@人员或添加附件') mentionCount: mentionUsers.value.length,
return attachmentCount: picked.value.length
})
}
/**
* 审批动作前冲刷未发送草稿:无草稿直接成功;有草稿则等同点击「发送」。
* @returns {Promise<boolean>} false 表示发送失败或忙碌,调用方应中止审批动作
*/
async function flushDraft(opts = {}) {
if (!draftPending()) return true
if (sending.value || uploading.value) {
showToast(uploading.value ? '附件上传中,请稍后再试' : '评论发送中,请稍后再试')
return false
} }
const content = draft.value.trim()
sending.value = true sending.value = true
try { try {
await fetchCreateOaComment(props.instanceId, { await fetchCreateOaComment(props.instanceId, {
@@ -533,15 +547,27 @@ async function onSend() {
picked.value = [] picked.value = []
mentionUsers.value = [] mentionUsers.value = []
closeAtSuggest() closeAtSuggest()
showToast('已发送') if (!opts.quiet) showToast('已发送')
emit('refresh') emit('refresh')
return true
} catch (e) { } catch (e) {
showToast(e?.message || '发送失败') showToast(e?.message || '发送失败')
return false
} finally { } finally {
sending.value = false sending.value = false
} }
} }
async function onSend() {
if (!draftPending()) {
showToast('请填写评论、@人员或添加附件')
return
}
await flushDraft()
}
defineExpose({ flushDraft, draftPending })
onMounted(() => { onMounted(() => {
void ensureUserCache() void ensureUserCache()
}) })
@@ -52,6 +52,24 @@
<div class="oa-sheet-row__title">{{ a.label }}</div> <div class="oa-sheet-row__title">{{ a.label }}</div>
<div v-if="a.sub" class="oa-sheet-row__meta">{{ a.sub }}</div> <div v-if="a.sub" class="oa-sheet-row__meta">{{ a.sub }}</div>
</div> </div>
<div class="oa-sheet-row__actions" @click.stop>
<button
type="button"
class="oa-sheet-row__icon is-edit"
aria-label="编辑"
@click="openEdit(a.id)"
>
<van-icon name="edit" />
</button>
<button
type="button"
class="oa-sheet-row__icon is-delete"
aria-label="删除"
@click="confirmDelete(a.id)"
>
<van-icon name="delete-o" />
</button>
</div>
</div> </div>
</van-checkbox-group> </van-checkbox-group>
<van-empty v-if="!loading && !filtered.length" description="暂无本人的收款账户" /> <van-empty v-if="!loading && !filtered.length" description="暂无本人的收款账户" />
@@ -63,17 +81,17 @@
</div> </div>
</van-popup> </van-popup>
<van-popup v-model:show="createVisible" position="bottom" round> <van-popup v-model:show="formVisible" position="bottom" round>
<div class="oa-recv__sheet oa-recv__sheet--create"> <div class="oa-recv__sheet oa-recv__sheet--create">
<div class="oa-recv__hd"> <div class="oa-recv__hd">
<span @click="createVisible = false">取消</span> <span @click="formVisible = false">取消</span>
<strong>新增收款账户</strong> <strong>{{ formTitle }}</strong>
<span <span
class="oa-recv__ok" class="oa-recv__ok"
:class="{ 'is-busy': createLoading }" :class="{ 'is-busy': formLoading }"
@click="submitCreate" @click="submitForm"
> >
{{ createLoading ? '提交中' : '确定' }} {{ formLoading ? '提交中' : '确定' }}
</span> </span>
</div> </div>
<div class="oa-recv__form"> <div class="oa-recv__form">
@@ -87,45 +105,45 @@
<label class="oa-recv-field"> <label class="oa-recv-field">
<span class="oa-recv-field__label">户名<b>*</b></span> <span class="oa-recv-field__label">户名<b>*</b></span>
<span class="oa-recv-field__box"> <span class="oa-recv-field__box">
<input v-model="createForm.accountName" maxlength="128" placeholder="请输入户名" /> <input v-model="formModel.accountName" maxlength="128" placeholder="请输入户名" />
</span> </span>
</label> </label>
<label class="oa-recv-field"> <label class="oa-recv-field">
<span class="oa-recv-field__label">账号<b>*</b></span> <span class="oa-recv-field__label">账号<b>*</b></span>
<span class="oa-recv-field__box"> <span class="oa-recv-field__box">
<input v-model="createForm.accountNo" maxlength="128" placeholder="请输入账号" /> <input v-model="formModel.accountNo" maxlength="128" placeholder="请输入账号" />
</span> </span>
</label> </label>
<template v-if="createForm.accountType !== 'alipay'"> <template v-if="formModel.accountType !== 'alipay'">
<label class="oa-recv-field"> <label class="oa-recv-field">
<span class="oa-recv-field__label">银行<b>*</b></span> <span class="oa-recv-field__label">银行<b>*</b></span>
<span class="oa-recv-field__box"> <span class="oa-recv-field__box">
<input v-model="createForm.bankName" maxlength="128" placeholder="如:中国工商银行" /> <input v-model="formModel.bankName" maxlength="128" placeholder="如:中国工商银行" />
</span> </span>
</label> </label>
<label class="oa-recv-field"> <label class="oa-recv-field">
<span class="oa-recv-field__label">银行所在省<b>*</b></span> <span class="oa-recv-field__label">银行所在省<b>*</b></span>
<span class="oa-recv-field__box"> <span class="oa-recv-field__box">
<input v-model="createForm.bankProvince" maxlength="64" placeholder="如:安徽省" /> <input v-model="formModel.bankProvince" maxlength="64" placeholder="如:安徽省" />
</span> </span>
</label> </label>
<label class="oa-recv-field"> <label class="oa-recv-field">
<span class="oa-recv-field__label">银行所在市<b>*</b></span> <span class="oa-recv-field__label">银行所在市<b>*</b></span>
<span class="oa-recv-field__box"> <span class="oa-recv-field__box">
<input v-model="createForm.bankCity" maxlength="64" placeholder="如:合肥市" /> <input v-model="formModel.bankCity" maxlength="64" placeholder="如:合肥市" />
</span> </span>
</label> </label>
<label class="oa-recv-field"> <label class="oa-recv-field">
<span class="oa-recv-field__label">银行支行<b>*</b></span> <span class="oa-recv-field__label">银行支行<b>*</b></span>
<span class="oa-recv-field__box"> <span class="oa-recv-field__box">
<input v-model="createForm.bankBranch" maxlength="256" placeholder="请输入开户支行全称" /> <input v-model="formModel.bankBranch" maxlength="256" placeholder="请输入开户支行全称" />
</span> </span>
</label> </label>
</template> </template>
<label class="oa-recv-field"> <label class="oa-recv-field">
<span class="oa-recv-field__label">备注</span> <span class="oa-recv-field__label">备注</span>
<span class="oa-recv-field__box oa-recv-field__box--area"> <span class="oa-recv-field__box oa-recv-field__box--area">
<textarea v-model="createForm.remark" maxlength="512" rows="2" placeholder="选填" /> <textarea v-model="formModel.remark" maxlength="512" rows="2" placeholder="选填" />
</span> </span>
</label> </label>
</div> </div>
@@ -135,7 +153,7 @@
<van-popup v-model:show="typePickerVisible" position="bottom" round> <van-popup v-model:show="typePickerVisible" position="bottom" round>
<van-picker <van-picker
:columns="accountTypeColumns" :columns="accountTypeColumns"
:model-value="[createForm.accountType]" :model-value="[formModel.accountType]"
@confirm="onTypeConfirm" @confirm="onTypeConfirm"
@cancel="typePickerVisible = false" @cancel="typePickerVisible = false"
/> />
@@ -145,8 +163,13 @@
<script setup> <script setup>
import { computed, onMounted, ref } from 'vue' import { computed, onMounted, ref } from 'vue'
import { showToast } from 'vant' import { showConfirmDialog, showToast } from 'vant'
import { fetchCreateReceiveAccount, fetchReceiveAccountOptions } from '../../api/oa.js' import {
fetchCreateReceiveAccount,
fetchDeleteReceiveAccount,
fetchReceiveAccountOptions,
fetchUpdateReceiveAccount
} from '../../api/oa.js'
import { import {
ACCOUNT_TYPE_LABEL, ACCOUNT_TYPE_LABEL,
formatReceiveAccountLine, formatReceiveAccountLine,
@@ -170,17 +193,19 @@ const keyword = ref('')
const pendingIds = ref([]) const pendingIds = ref([])
const snapshotMap = ref(new Map()) const snapshotMap = ref(new Map())
const accountOptions = ref([]) const accountOptions = ref([])
const createVisible = ref(false) const formVisible = ref(false)
const createLoading = ref(false) const formLoading = ref(false)
const formMode = ref('create')
const editingId = ref('')
const typePickerVisible = ref(false) const typePickerVisible = ref(false)
const accountTypeColumns = [ const accountTypeColumns = [
{ text: '支付宝', value: 'alipay' }, { text: '支付宝', value: 'alipay' },
{ text: '个人银行卡', value: 'personal' }, { text: '个人银行卡', value: 'personal' },
{ text: '对公银行账户', value: 'corporate' } { text: '对公银行账户', value: 'corporate' }
] ]
const createForm = ref(emptyCreateForm()) const formModel = ref(emptyForm())
function emptyCreateForm() { function emptyForm() {
return { return {
accountType: 'alipay', accountType: 'alipay',
accountName: '', accountName: '',
@@ -193,8 +218,12 @@ function emptyCreateForm() {
} }
} }
const formTitle = computed(() =>
formMode.value === 'edit' ? '编辑收款账户' : '新增收款账户'
)
const accountTypeLabel = computed( const accountTypeLabel = computed(
() => ACCOUNT_TYPE_LABEL[createForm.value.accountType] || '' () => ACCOUNT_TYPE_LABEL[formModel.value.accountType] || ''
) )
const normalized = computed(() => normalizeReceiveAccountModelValue(props.modelValue)) const normalized = computed(() => normalizeReceiveAccountModelValue(props.modelValue))
@@ -260,26 +289,78 @@ function optionFromSnap(snap) {
} }
} }
function upsertLocalSnap(snap) {
if (!snap.id) return
const map = new Map(snapshotMap.value)
map.set(snap.id, snap)
snapshotMap.value = map
const opt = optionFromSnap(snap)
const idx = accountOptions.value.findIndex((x) => x.id === snap.id)
if (idx >= 0) {
const next = [...accountOptions.value]
next[idx] = opt
accountOptions.value = next
} else {
accountOptions.value = [...accountOptions.value, opt]
}
}
function fillFormFromSnap(snap) {
const form = {
accountType: snap.accountType || 'alipay',
accountName: snap.accountName || '',
accountNo: snap.accountNo || '',
bankName: snap.bankName || '',
bankProvince: snap.bankProvince || '',
bankCity: snap.bankCity || '',
bankBranch: snap.bankBranch || '',
remark: snap.remark || ''
}
if (form.accountType === 'alipay') {
form.bankName = ''
form.bankProvince = ''
form.bankCity = ''
form.bankBranch = ''
}
formModel.value = form
}
function openCreate() { function openCreate() {
createForm.value = emptyCreateForm() formMode.value = 'create'
editingId.value = ''
formModel.value = emptyForm()
typePickerVisible.value = false typePickerVisible.value = false
createVisible.value = true formVisible.value = true
}
function openEdit(id) {
const tid = String(id || '').trim()
const snap = snapshotMap.value.get(tid)
if (!snap) {
showToast('账户不存在或已删除')
return
}
formMode.value = 'edit'
editingId.value = tid
fillFormFromSnap(snap)
typePickerVisible.value = false
formVisible.value = true
} }
function onTypeConfirm({ selectedOptions }) { function onTypeConfirm({ selectedOptions }) {
const next = selectedOptions?.[0]?.value || 'alipay' const next = selectedOptions?.[0]?.value || 'alipay'
const form = { ...createForm.value, accountType: next } const form = { ...formModel.value, accountType: next }
if (next === 'alipay') { if (next === 'alipay') {
form.bankName = '' form.bankName = ''
form.bankProvince = '' form.bankProvince = ''
form.bankCity = '' form.bankCity = ''
form.bankBranch = '' form.bankBranch = ''
} }
createForm.value = form formModel.value = form
typePickerVisible.value = false typePickerVisible.value = false
} }
function validateCreate(form) { function validateForm(form) {
if (!form.accountName.trim()) return '请输入户名' if (!form.accountName.trim()) return '请输入户名'
if (!form.accountNo.trim()) return '请输入账号' if (!form.accountNo.trim()) return '请输入账号'
if (form.accountType !== 'alipay') { if (form.accountType !== 'alipay') {
@@ -291,14 +372,7 @@ function validateCreate(form) {
return '' return ''
} }
async function submitCreate() { function buildPayload(form) {
if (createLoading.value) return
const form = createForm.value
const invalid = validateCreate(form)
if (invalid) {
showToast(invalid)
return
}
const payload = { const payload = {
accountType: form.accountType, accountType: form.accountType,
accountName: form.accountName.trim(), accountName: form.accountName.trim(),
@@ -316,36 +390,80 @@ async function submitCreate() {
payload.bankCity = form.bankCity.trim() payload.bankCity = form.bankCity.trim()
payload.bankBranch = form.bankBranch.trim() payload.bankBranch = form.bankBranch.trim()
} }
createLoading.value = true return payload
}
async function submitForm() {
if (formLoading.value) return
const form = formModel.value
const invalid = validateForm(form)
if (invalid) {
showToast(invalid)
return
}
const payload = buildPayload(form)
formLoading.value = true
try { try {
const created = await fetchCreateReceiveAccount(payload) const row =
const snap = snapshotFromRow(created) formMode.value === 'edit' && editingId.value
? await fetchUpdateReceiveAccount(editingId.value, payload)
: await fetchCreateReceiveAccount(payload)
const snap = snapshotFromRow(row)
if (!snap.id) { if (!snap.id) {
showToast('创建成功但未返回账户 ID') showToast(formMode.value === 'edit' ? '更新成功但未返回账户 ID' : '创建成功但未返回账户 ID')
return return
} }
await loadOptions() await loadOptions()
if (!snapshotMap.value.has(snap.id)) { upsertLocalSnap(snap)
const map = new Map(snapshotMap.value) if (formMode.value === 'edit') {
map.set(snap.id, snap) const selected = normalized.value.map((x) => x.id)
snapshotMap.value = map if (selected.includes(snap.id)) {
if (!accountOptions.value.some((x) => x.id === snap.id)) { emitItems(selected.map((id) => snapshotMap.value.get(id)).filter(Boolean))
accountOptions.value = [...accountOptions.value, optionFromSnap(snap)]
} }
showToast('更新成功')
} else {
const selected = new Set(normalized.value.map((x) => x.id))
selected.add(snap.id)
emitItems([...selected].map((id) => snapshotMap.value.get(id)).filter(Boolean))
if (!pendingIds.value.includes(snap.id)) {
pendingIds.value = [...pendingIds.value, snap.id]
}
keyword.value = ''
showToast('创建成功')
} }
const selected = new Set(normalized.value.map((x) => x.id)) formVisible.value = false
selected.add(snap.id)
emitItems([...selected].map((id) => snapshotMap.value.get(id)).filter(Boolean))
if (!pendingIds.value.includes(snap.id)) {
pendingIds.value = [...pendingIds.value, snap.id]
}
keyword.value = ''
createVisible.value = false
showToast('创建成功')
} catch (e) { } catch (e) {
showToast(e?.message || '新增收款账户失败') showToast(e?.message || (formMode.value === 'edit' ? '编辑收款账户失败' : '新增收款账户失败'))
} finally { } finally {
createLoading.value = false formLoading.value = false
}
}
async function confirmDelete(id) {
const tid = String(id || '').trim()
const snap = snapshotMap.value.get(tid)
const name = snap?.accountName || tid
try {
await showConfirmDialog({
title: '删除收款账户',
message: `确定删除收款账户「${name}」吗?删除后不可再选;已提交单据中的账户快照仍保留。`
})
} catch {
return
}
try {
await fetchDeleteReceiveAccount(tid)
await loadOptions()
const nextSelected = normalized.value
.map((x) => x.id)
.filter((x) => x !== tid)
.map((x) => snapshotMap.value.get(x))
.filter(Boolean)
emitItems(nextSelected)
pendingIds.value = pendingIds.value.filter((x) => x !== tid)
showToast('删除成功')
} catch (e) {
showToast(e?.message || '删除收款账户失败')
} }
} }
@@ -411,6 +529,39 @@ onMounted(() => {
line-height: 1.5; line-height: 1.5;
} }
.oa-sheet-row__actions {
display: inline-flex;
flex: none;
gap: 6px;
align-items: center;
margin-left: 4px;
}
.oa-sheet-row__icon {
display: inline-flex;
align-items: center;
justify-content: center;
width: 36px;
height: 36px;
margin: 0;
padding: 0;
border: 0;
border-radius: 8px;
background: transparent;
font-size: 18px;
cursor: pointer;
}
.oa-sheet-row__icon.is-edit {
background: #ecfdf5;
color: var(--brand-green-dark, #16a34a);
}
.oa-sheet-row__icon.is-delete {
background: #fef2f2;
color: #dc2626;
}
.oa-recv__add { .oa-recv__add {
display: flex; display: flex;
gap: 6px; gap: 6px;
+7
View File
@@ -0,0 +1,7 @@
/** 评论区是否有未发送草稿(文字 / @ / 附件) */
export function hasOaCommentDraft(input = {}) {
const content = String(input.content || '').trim()
const mentionCount = Number(input.mentionCount || 0)
const attachmentCount = Number(input.attachmentCount || 0)
return !!(content || mentionCount > 0 || attachmentCount > 0)
}
@@ -0,0 +1,14 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import { hasOaCommentDraft } from './oa-comment-draft.js'
test('empty draft is false', () => {
assert.equal(hasOaCommentDraft({}), false)
assert.equal(hasOaCommentDraft({ content: ' ', mentionCount: 0, attachmentCount: 0 }), false)
})
test('text / mention / attachment counts as draft', () => {
assert.equal(hasOaCommentDraft({ content: '@test' }), true)
assert.equal(hasOaCommentDraft({ mentionCount: 1 }), true)
assert.equal(hasOaCommentDraft({ attachmentCount: 2 }), true)
})
+23
View File
@@ -631,6 +631,29 @@ body.van-toast--unclickable .presign-order-page * {
font-weight: 700; font-weight: 700;
} }
.market-list-card__value {
display: flex;
min-width: 0;
align-items: center;
gap: 0;
}
.market-list-card__help {
display: inline-flex;
width: 44px;
height: 44px;
flex: 0 0 44px;
align-items: center;
justify-content: center;
margin: -10px -8px -10px -4px;
padding: 0;
border: 0;
background: transparent;
color: var(--market-primary-dark, #087f57);
font-size: 18px;
cursor: pointer;
}
.market-list-card__samples { .market-list-card__samples {
margin: 0 0 12px; margin: 0 0 12px;
overflow: hidden; overflow: hidden;
+11 -1
View File
@@ -29,6 +29,7 @@
@refresh="reloadDetail" @refresh="reloadDetail"
/> />
<OaCommentComposer <OaCommentComposer
ref="commentComposerRef"
:instance-id="instanceId" :instance-id="instanceId"
:instance-status="detail?.status || ''" :instance-status="detail?.status || ''"
@refresh="reloadDetail" @refresh="reloadDetail"
@@ -238,6 +239,7 @@ const currentUserId = ref('')
const currentUserName = ref('') const currentUserName = ref('')
const autoPrinted = ref(false) const autoPrinted = ref(false)
const commentComposerRef = ref(null)
const commentVisible = ref(false) const commentVisible = ref(false)
const commentKind = ref('approve') // approve | reject | return const commentKind = ref('approve') // approve | reject | return
const commentText = ref('') const commentText = ref('')
@@ -492,8 +494,16 @@ function goCopyRestart() {
}) })
} }
function openComment(kind) { /** 同意/拒绝/打回前先发送评论区未提交草稿 */
async function flushPendingComment() {
const flush = commentComposerRef.value?.flushDraft
if (!flush) return true
return await flush()
}
async function openComment(kind) {
if (!myPendingTask.value) return if (!myPendingTask.value) return
if (!(await flushPendingComment())) return
commentKind.value = kind commentKind.value = kind
commentText.value = defaultComment(kind) commentText.value = defaultComment(kind)
commentVisible.value = true commentVisible.value = true
+27
View File
@@ -0,0 +1,27 @@
import request from '@/utils/http'
export type SampleVoidTarget = {
receptionSource: 'cell_storage' | 'research_donation'
sampleId?: string
sampleCode?: string
protocolId?: string
}
export type VoidBusinessSamplePayload = SampleVoidTarget & {
voidDesc: string
}
export type VoidBusinessSampleResult = {
id: string
sampleCode: string
sampleStatus: string
voidDate: string
voidDesc: string
}
export function fetchVoidBusinessSample(data: VoidBusinessSamplePayload) {
return request.put<VoidBusinessSampleResult>({
url: '/web/admin/business-samples/void',
data
})
}
@@ -17,6 +17,10 @@ export interface ProductionWorkOrderItem {
workOrderType?: string workOrderType?: string
protocolNo?: string protocolNo?: string
sampleCode?: string sampleCode?: string
sampleStatus?: string
voidDesc?: string
protocolSampleId?: string
collectionProtocolId?: string
receptionSource?: string receptionSource?: string
receptionSourceLabel?: string receptionSourceLabel?: string
sampleTypeName?: string sampleTypeName?: string
+4
View File
@@ -100,6 +100,8 @@ export type QcWorkOrder = {
collectionProtocolId: string collectionProtocolId: string
protocolNo: string protocolNo: string
sampleCode: string sampleCode: string
sampleStatus?: string
voidDesc?: string
labStorageCode?: string labStorageCode?: string
receptionSource?: string receptionSource?: string
receptionSourceLabel?: string receptionSourceLabel?: string
@@ -141,6 +143,8 @@ export type QcWorkOrder = {
patientName?: string patientName?: string
/** 入库工单(细胞存储/科研捐赠):母亲姓名 */ /** 入库工单(细胞存储/科研捐赠):母亲姓名 */
motherName?: string motherName?: string
/** 协议单母血采集时间;未录入时为空,前端展示为 — */
maternalBloodCollectTime?: string
/** 入库工单(细胞存储/科研捐赠):新生儿姓名 */ /** 入库工单(细胞存储/科研捐赠):新生儿姓名 */
newbornName?: string newbornName?: string
/** 出库工单:当前为第几次输注计划 */ /** 出库工单:当前为第几次输注计划 */
+2
View File
@@ -5,6 +5,8 @@ export type SampleFreightItem = {
sampleId: string sampleId: string
protocolId?: string protocolId?: string
sampleCode?: string sampleCode?: string
sampleStatus?: string
voidDesc?: string
protocolNo?: string protocolNo?: string
sampleTypeName?: string sampleTypeName?: string
motherName?: string motherName?: string
@@ -0,0 +1,69 @@
<!-- 样本状态:标签 + 作废原因 -->
<template>
<span class="sample-status-tag">
<el-tag :type="tagType" size="small">{{ label }}</el-tag>
<el-popover placement="top" trigger="click" :width="240">
<template #reference>
<button type="button" class="sample-status-tag__q" aria-label="作废原因" @click.stop>
<el-icon><QuestionFilled /></el-icon>
</button>
</template>
<div class="sample-status-tag__reason">
<div class="sample-status-tag__reason-title">作废原因</div>
<div>{{ reasonText }}</div>
</div>
</el-popover>
</span>
</template>
<script setup lang="ts">
import { computed } from 'vue'
import { QuestionFilled } from '@element-plus/icons-vue'
import { sampleStatusLabel, sampleStatusTagType } from '@/utils/status-tag-registry'
defineOptions({ name: 'SampleStatusTag' })
const props = defineProps<{
status?: string | null
voidDesc?: string | null
}>()
const code = computed(() => String(props.status || '').trim())
const label = computed(() => (code.value ? sampleStatusLabel(code.value) : '—'))
const tagType = computed(() => (code.value ? sampleStatusTagType(code.value) : 'info'))
const reasonText = computed(() => String(props.voidDesc || '').trim() || '暂无作废原因')
</script>
<style scoped lang="scss">
.sample-status-tag {
display: inline-flex;
align-items: center;
justify-content: center;
gap: 4px;
max-width: 100%;
vertical-align: middle;
}
.sample-status-tag__q {
display: inline-flex;
align-items: center;
justify-content: center;
padding: 0;
border: none;
background: transparent;
color: var(--mint-text-muted, #64748b);
cursor: pointer;
line-height: 1;
font-size: 14px;
&:hover {
color: #059669;
}
}
.sample-status-tag__reason-title {
margin-bottom: 4px;
font-size: 12px;
color: var(--mint-text-muted, #64748b);
}
</style>
@@ -0,0 +1,139 @@
<!-- 样本废弃:填写作废原因后提交 -->
<template>
<el-dialog
v-model="dialogVisible"
title="样本废弃"
width="560px"
class="dialog-form-layout"
align-center
append-to-body
modal-class="protocol-dialog-mask"
destroy-on-close
:close-on-click-modal="false"
@close="handleClose"
>
<el-form
ref="formRef"
:model="form"
:rules="rules"
label-position="top"
class="biz-dialog-form"
>
<div class="form-grid-2">
<el-form-item v-if="sampleCode" label="样本编码" class="form-col-span-2">
<span class="sample-void-dialog__code">{{ sampleCode }}</span>
</el-form-item>
<el-form-item label="作废原因" prop="voidDesc" class="form-col-span-2">
<el-input
v-model="form.voidDesc"
type="textarea"
:rows="4"
maxlength="512"
show-word-limit
placeholder="请填写作废原因"
/>
</el-form-item>
</div>
</el-form>
<template #footer>
<el-button class="btn-ghost" @click="handleClose">
<el-icon><Close /></el-icon>取消
</el-button>
<el-button class="btn-main" type="primary" :loading="submitting" @click="handleSubmit">
<el-icon><Check /></el-icon>确定
</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { computed, reactive, ref, watch } from 'vue'
import { Check, Close } from '@element-plus/icons-vue'
import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
import { fetchVoidBusinessSample, type SampleVoidTarget } from '@/api/business-sample'
defineOptions({ name: 'SampleVoidDialog' })
const props = defineProps<{
visible: boolean
target: SampleVoidTarget | null
}>()
const emit = defineEmits<{
'update:visible': [visible: boolean]
success: []
}>()
const dialogVisible = ref(false)
const submitting = ref(false)
const formRef = ref<FormInstance>()
const form = reactive({
voidDesc: ''
})
const rules: FormRules = {
voidDesc: [
{
required: true,
validator: (_rule, value, callback) => {
if (!String(value || '').trim()) callback(new Error('请填写作废原因'))
else callback()
},
trigger: 'blur'
}
]
}
const sampleCode = computed(() => String(props.target?.sampleCode || '').trim())
watch(
() => props.visible,
(visible) => {
dialogVisible.value = visible
if (visible) form.voidDesc = ''
},
{ immediate: true }
)
watch(dialogVisible, (visible) => {
emit('update:visible', visible)
})
function handleClose() {
dialogVisible.value = false
}
async function handleSubmit() {
const target = props.target
if (!target?.receptionSource || (!target.sampleId && !target.sampleCode)) {
ElMessage.warning('缺少样本信息,无法废弃')
return
}
const valid = await formRef.value?.validate().catch(() => false)
if (!valid) return
submitting.value = true
try {
await fetchVoidBusinessSample({
receptionSource: target.receptionSource,
sampleId: target.sampleId,
sampleCode: target.sampleCode,
protocolId: target.protocolId,
voidDesc: form.voidDesc.trim()
})
ElMessage.success('样本已废弃')
emit('success')
handleClose()
} finally {
submitting.value = false
}
}
</script>
<style scoped lang="scss">
.sample-void-dialog__code {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
font-size: 14px;
font-weight: 600;
color: #1e293b;
}
</style>
@@ -192,6 +192,7 @@
} from '@/api/oaApproval' } from '@/api/oaApproval'
import OaCommentFileCards from '@/components/oa-approval/OaCommentFileCards.vue' import OaCommentFileCards from '@/components/oa-approval/OaCommentFileCards.vue'
import { attachmentFullUrl } from '@/composables/useAttachmentActions' import { attachmentFullUrl } from '@/composables/useAttachmentActions'
import { hasOaCommentDraft } from '@/utils/oa-comment-draft'
import { isOaUploadImageFile, isOaUploadVideoFile } from '@/utils/oa-upload-file-type' import { isOaUploadImageFile, isOaUploadVideoFile } from '@/utils/oa-upload-file-type'
defineOptions({ name: 'OaCommentPanel' }) defineOptions({ name: 'OaCommentPanel' })
@@ -546,12 +547,25 @@
} }
} }
async function onSend() { function draftPending() {
const content = draft.value.trim() return hasOaCommentDraft({
if (!content && !mentionUsers.value.length && !picked.value.length) { content: draft.value,
ElMessage.warning('请填写评论、@人员或添加附件') mentionCount: mentionUsers.value.length,
return attachmentCount: picked.value.length
})
}
/**
* 审批动作前冲刷未发送草稿:无草稿直接成功;有草稿则等同点击「发送」。
* @returns false 表示发送失败或忙碌,调用方应中止审批动作
*/
async function flushDraft(opts?: { quiet?: boolean }): Promise<boolean> {
if (!draftPending()) return true
if (sending.value || uploading.value) {
ElMessage.warning(uploading.value ? '附件上传中,请稍后再试' : '评论发送中,请稍后再试')
return false
} }
const content = draft.value.trim()
sending.value = true sending.value = true
try { try {
await fetchCreateOaComment(props.instanceId, { await fetchCreateOaComment(props.instanceId, {
@@ -565,15 +579,27 @@
picked.value = [] picked.value = []
mentionUsers.value = [] mentionUsers.value = []
closeAtSuggest() closeAtSuggest()
ElMessage.success('已发送') if (!opts?.quiet) ElMessage.success('已发送')
emit('refresh') emit('refresh')
return true
} catch (e: any) { } catch (e: any) {
ElMessage.error(e?.message || '发送失败') ElMessage.error(e?.message || '发送失败')
return false
} finally { } finally {
sending.value = false sending.value = false
} }
} }
async function onSend() {
if (!draftPending()) {
ElMessage.warning('请填写评论、@人员或添加附件')
return
}
await flushDraft()
}
defineExpose({ flushDraft, draftPending })
onMounted(() => { onMounted(() => {
void ensureUserCache() void ensureUserCache()
}) })
@@ -40,17 +40,39 @@
class="oa-receive-account-select__search" class="oa-receive-account-select__search"
/> />
<div class="oa-receive-account-select__list"> <div class="oa-receive-account-select__list">
<label <div
v-for="a in filteredOptions" v-for="a in filteredOptions"
:key="a.id" :key="a.id"
class="oa-receive-account-select__row" class="oa-receive-account-select__row"
> >
<el-checkbox <label class="oa-receive-account-select__row-main">
:model-value="pendingIds.includes(a.id)" <el-checkbox
@change="(v: boolean | string | number) => onNarrowCheck(a.id, !!v)" :model-value="pendingIds.includes(a.id)"
/> @change="(v: boolean | string | number) => onNarrowCheck(a.id, !!v)"
<span class="oa-receive-account-select__row-label">{{ a.label }}</span> />
</label> <span class="oa-receive-account-select__row-label">{{ a.label }}</span>
</label>
<div class="oa-receive-account-select__row-actions">
<button
type="button"
class="oa-receive-account-select__icon-btn is-edit"
title="编辑"
aria-label="编辑"
@click="openEditDialog(a.id)"
>
<el-icon><Edit /></el-icon>
</button>
<button
type="button"
class="oa-receive-account-select__icon-btn is-delete"
title="删除"
aria-label="删除"
@click="confirmDelete(a.id)"
>
<el-icon><Delete /></el-icon>
</button>
</div>
</div>
<div v-if="!filteredOptions.length" class="oa-receive-account-select__empty"> <div v-if="!filteredOptions.length" class="oa-receive-account-select__empty">
暂无本人的收款账户 暂无本人的收款账户
</div> </div>
@@ -92,7 +114,31 @@
:key="a.id" :key="a.id"
:label="a.label" :label="a.label"
:value="a.id" :value="a.id"
/> >
<div class="oa-receive-account-select__option">
<span class="oa-receive-account-select__option-label">{{ a.label }}</span>
<span class="oa-receive-account-select__option-actions" @mousedown.prevent @click.stop>
<button
type="button"
class="oa-receive-account-select__icon-btn is-edit"
title="编辑"
aria-label="编辑"
@click="openEditDialog(a.id)"
>
<el-icon><Edit /></el-icon>
</button>
<button
type="button"
class="oa-receive-account-select__icon-btn is-delete"
title="删除"
aria-label="删除"
@click="confirmDelete(a.id)"
>
<el-icon><Delete /></el-icon>
</button>
</span>
</div>
</el-option>
<template #empty> <template #empty>
<div class="oa-receive-account-select__empty"> <div class="oa-receive-account-select__empty">
{{ accountOptions.length === 0 ? '暂无本人的收款账户' : '无匹配数据' }} {{ accountOptions.length === 0 ? '暂无本人的收款账户' : '无匹配数据' }}
@@ -120,8 +166,8 @@
</template> </template>
<el-dialog <el-dialog
v-model="createVisible" v-model="formVisible"
title="新增收款账户" :title="formTitle"
width="720px" width="720px"
class="dialog-form-layout" class="dialog-form-layout"
align-center align-center
@@ -131,9 +177,9 @@
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-form <el-form
ref="createFormRef" ref="formRef"
:model="createForm" :model="formModel"
:rules="createRules" :rules="formRules"
label-position="top" label-position="top"
scroll-to-error scroll-to-error
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }" :scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
@@ -141,9 +187,9 @@
<div class="form-grid-2"> <div class="form-grid-2">
<el-form-item label="账户类型" prop="accountType" class="form-col-span-2"> <el-form-item label="账户类型" prop="accountType" class="form-col-span-2">
<el-select <el-select
v-model="createForm.accountType" v-model="formModel.accountType"
placeholder="请选择" placeholder="请选择"
@change="onCreateTypeChange" @change="onFormTypeChange"
> >
<el-option <el-option
v-for="(label, value) in ACCOUNT_TYPE_LABEL" v-for="(label, value) in ACCOUNT_TYPE_LABEL"
@@ -154,22 +200,22 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="户名" prop="accountName"> <el-form-item label="户名" prop="accountName">
<el-input v-model="createForm.accountName" placeholder="请输入户名" maxlength="128" /> <el-input v-model="formModel.accountName" placeholder="请输入户名" maxlength="128" />
</el-form-item> </el-form-item>
<el-form-item label="账号" prop="accountNo"> <el-form-item label="账号" prop="accountNo">
<el-input v-model="createForm.accountNo" placeholder="请输入账号" maxlength="128" /> <el-input v-model="formModel.accountNo" placeholder="请输入账号" maxlength="128" />
</el-form-item> </el-form-item>
<template v-if="createForm.accountType !== 'alipay'"> <template v-if="formModel.accountType !== 'alipay'">
<el-form-item label="银行" prop="bankName"> <el-form-item label="银行" prop="bankName">
<el-input <el-input
v-model="createForm.bankName" v-model="formModel.bankName"
placeholder="如:中国工商银行" placeholder="如:中国工商银行"
maxlength="128" maxlength="128"
/> />
</el-form-item> </el-form-item>
<el-form-item label="银行所在省" prop="bankProvince"> <el-form-item label="银行所在省" prop="bankProvince">
<el-input <el-input
v-model="createForm.bankProvince" v-model="formModel.bankProvince"
placeholder="如:安徽省" placeholder="如:安徽省"
maxlength="64" maxlength="64"
clearable clearable
@@ -177,7 +223,7 @@
</el-form-item> </el-form-item>
<el-form-item label="银行所在市" prop="bankCity"> <el-form-item label="银行所在市" prop="bankCity">
<el-input <el-input
v-model="createForm.bankCity" v-model="formModel.bankCity"
placeholder="如:合肥市" placeholder="如:合肥市"
maxlength="64" maxlength="64"
clearable clearable
@@ -185,7 +231,7 @@
</el-form-item> </el-form-item>
<el-form-item label="银行支行" prop="bankBranch" class="form-col-span-2"> <el-form-item label="银行支行" prop="bankBranch" class="form-col-span-2">
<el-input <el-input
v-model="createForm.bankBranch" v-model="formModel.bankBranch"
placeholder="请输入开户支行全称" placeholder="请输入开户支行全称"
maxlength="256" maxlength="256"
/> />
@@ -193,7 +239,7 @@
</template> </template>
<el-form-item label="备注" class="form-col-span-2"> <el-form-item label="备注" class="form-col-span-2">
<el-input <el-input
v-model="createForm.remark" v-model="formModel.remark"
type="textarea" type="textarea"
:rows="2" :rows="2"
placeholder="选填" placeholder="选填"
@@ -203,15 +249,15 @@
</div> </div>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button class="btn-ghost" @click="createVisible = false"> <el-button class="btn-ghost" @click="formVisible = false">
<el-icon><Close /></el-icon> <el-icon><Close /></el-icon>
取消 取消
</el-button> </el-button>
<el-button <el-button
class="btn-main" class="btn-main"
type="primary" type="primary"
:loading="createLoading" :loading="formLoading"
@click="submitCreate" @click="submitForm"
> >
<el-icon><Check /></el-icon> <el-icon><Check /></el-icon>
确定 确定
@@ -223,11 +269,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue' import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
import { Check, Close, Plus } from '@element-plus/icons-vue' import { Check, Close, Delete, Edit, Plus } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { import {
fetchCreateOaReceiveAccount, fetchCreateOaReceiveAccount,
fetchOaReceiveAccountOptions fetchDeleteOaReceiveAccount,
fetchOaReceiveAccountOptions,
fetchUpdateOaReceiveAccount
} from '@/api/oaApproval' } from '@/api/oaApproval'
import { import {
ACCOUNT_TYPE_LABEL, ACCOUNT_TYPE_LABEL,
@@ -253,6 +301,7 @@
}>() }>()
type AccountOpt = { id: string; label: string } type AccountOpt = { id: string; label: string }
type FormMode = 'create' | 'edit'
const snapshotMap = ref(new Map<string, ReceiveAccountSnapshot>()) const snapshotMap = ref(new Map<string, ReceiveAccountSnapshot>())
const accountOptions = ref<AccountOpt[]>([]) const accountOptions = ref<AccountOpt[]>([])
@@ -263,10 +312,12 @@
const selectRef = ref<{ blur?: () => void } | null>(null) const selectRef = ref<{ blur?: () => void } | null>(null)
let mql: MediaQueryList | null = null let mql: MediaQueryList | null = null
const createVisible = ref(false) const formVisible = ref(false)
const createLoading = ref(false) const formLoading = ref(false)
const createFormRef = ref() const formMode = ref<FormMode>('create')
const createForm = reactive({ const editingId = ref('')
const formRef = ref()
const formModel = reactive({
accountType: 'alipay' as ReceiveAccountType, accountType: 'alipay' as ReceiveAccountType,
accountName: '', accountName: '',
accountNo: '', accountNo: '',
@@ -277,8 +328,12 @@
remark: '' remark: ''
}) })
const formTitle = computed(() =>
formMode.value === 'edit' ? '编辑收款账户' : '新增收款账户'
)
const requireWhenBank = (_rule: any, value: string, callback: (e?: Error) => void) => { const requireWhenBank = (_rule: any, value: string, callback: (e?: Error) => void) => {
if (createForm.accountType === 'alipay') { if (formModel.accountType === 'alipay') {
callback() callback()
return return
} }
@@ -289,7 +344,7 @@
callback() callback()
} }
const createRules = computed(() => ({ const formRules = computed(() => ({
accountType: [{ required: true, message: '请选择账户类型', trigger: 'change' }], accountType: [{ required: true, message: '请选择账户类型', trigger: 'change' }],
accountName: [{ required: true, message: '请输入户名', trigger: 'blur' }], accountName: [{ required: true, message: '请输入户名', trigger: 'blur' }],
accountNo: [{ required: true, message: '请输入账号', trigger: 'blur' }], accountNo: [{ required: true, message: '请输入账号', trigger: 'blur' }],
@@ -358,90 +413,161 @@
drawerVisible.value = false drawerVisible.value = false
} }
function clearCreateBankFields() { function clearBankFields() {
createForm.bankName = '' formModel.bankName = ''
createForm.bankProvince = '' formModel.bankProvince = ''
createForm.bankCity = '' formModel.bankCity = ''
createForm.bankBranch = '' formModel.bankBranch = ''
} }
function resetCreateForm() { function resetFormModel() {
createForm.accountType = 'alipay' formModel.accountType = 'alipay'
createForm.accountName = '' formModel.accountName = ''
createForm.accountNo = '' formModel.accountNo = ''
clearCreateBankFields() clearBankFields()
createForm.remark = '' formModel.remark = ''
} }
function onCreateTypeChange() { function fillFormFromSnap(snap: ReceiveAccountSnapshot) {
if (createForm.accountType === 'alipay') clearCreateBankFields() formModel.accountType = snap.accountType
createFormRef.value?.clearValidate?.() formModel.accountName = snap.accountName
formModel.accountNo = snap.accountNo
formModel.bankName = snap.bankName
formModel.bankProvince = snap.bankProvince
formModel.bankCity = snap.bankCity
formModel.bankBranch = snap.bankBranch
formModel.remark = snap.remark
if (formModel.accountType === 'alipay') clearBankFields()
}
function onFormTypeChange() {
if (formModel.accountType === 'alipay') clearBankFields()
formRef.value?.clearValidate?.()
}
function buildPayload() {
const payload: Record<string, unknown> = {
accountType: formModel.accountType,
accountName: formModel.accountName.trim(),
accountNo: formModel.accountNo.trim(),
remark: formModel.remark?.trim() || undefined
}
if (formModel.accountType === 'alipay') {
payload.bankName = ''
payload.bankProvince = ''
payload.bankCity = ''
payload.bankBranch = ''
} else {
payload.bankName = formModel.bankName.trim()
payload.bankProvince = formModel.bankProvince.trim()
payload.bankCity = formModel.bankCity.trim()
payload.bankBranch = formModel.bankBranch.trim()
}
return payload
}
function upsertLocalSnap(snap: ReceiveAccountSnapshot) {
if (!snap.id) return
const map = new Map(snapshotMap.value)
map.set(snap.id, snap)
snapshotMap.value = map
const label = optionLabelFromRow(snap)
const idx = accountOptions.value.findIndex((x) => x.id === snap.id)
if (idx >= 0) {
const next = [...accountOptions.value]
next[idx] = { id: snap.id, label }
accountOptions.value = next
} else {
accountOptions.value = [...accountOptions.value, { id: snap.id, label }]
}
} }
function openCreateDialog() { function openCreateDialog() {
selectRef.value?.blur?.() selectRef.value?.blur?.()
resetCreateForm() formMode.value = 'create'
createVisible.value = true editingId.value = ''
nextTick(() => createFormRef.value?.clearValidate?.()) resetFormModel()
formVisible.value = true
nextTick(() => formRef.value?.clearValidate?.())
} }
async function submitCreate() { function openEditDialog(id: string) {
const tid = String(id || '').trim()
const snap = snapshotMap.value.get(tid)
if (!snap) {
ElMessage.error('账户不存在或已删除')
return
}
selectRef.value?.blur?.()
formMode.value = 'edit'
editingId.value = tid
fillFormFromSnap(snap)
formVisible.value = true
nextTick(() => formRef.value?.clearValidate?.())
}
async function submitForm() {
try { try {
await createFormRef.value?.validate?.() await formRef.value?.validate?.()
} catch { } catch {
ElMessageBox.alert('请完善必填项后再提交', '提示', { type: 'warning' }) ElMessageBox.alert('请完善必填项后再提交', '提示', { type: 'warning' })
return return
} }
createLoading.value = true formLoading.value = true
try { try {
const payload: Record<string, unknown> = { const payload = buildPayload()
accountType: createForm.accountType, let row: any
accountName: createForm.accountName.trim(), if (formMode.value === 'edit' && editingId.value) {
accountNo: createForm.accountNo.trim(), row = await fetchUpdateOaReceiveAccount(editingId.value, payload)
remark: createForm.remark?.trim() || undefined
}
if (createForm.accountType === 'alipay') {
payload.bankName = ''
payload.bankProvince = ''
payload.bankCity = ''
payload.bankBranch = ''
} else { } else {
payload.bankName = createForm.bankName.trim() row = await fetchCreateOaReceiveAccount(payload)
payload.bankProvince = createForm.bankProvince.trim()
payload.bankCity = createForm.bankCity.trim()
payload.bankBranch = createForm.bankBranch.trim()
} }
const created = await fetchCreateOaReceiveAccount(payload) const snap = snapshotFromRow(row)
const snap = snapshotFromRow(created)
if (!snap.id) { if (!snap.id) {
ElMessage.error('创建成功但未返回账户 ID') ElMessage.error(formMode.value === 'edit' ? '更新成功但未返回账户 ID' : '创建成功但未返回账户 ID')
return return
} }
await loadOptions() await loadOptions()
// 确保新账户在 map 中(options 可能短暂未刷新) upsertLocalSnap(snap)
if (!snapshotMap.value.has(snap.id)) { if (formMode.value === 'edit') {
const map = new Map(snapshotMap.value) if (selectModel.value.includes(snap.id)) {
map.set(snap.id, snap) emitFromIds(selectModel.value)
snapshotMap.value = map }
if (!accountOptions.value.some((x) => x.id === snap.id)) { } else {
accountOptions.value = [ const nextIds = [...selectModel.value]
...accountOptions.value, if (!nextIds.includes(snap.id)) nextIds.push(snap.id)
{ id: snap.id, label: optionLabelFromRow(snap) } emitFromIds(nextIds)
] if (drawerVisible.value && !pendingIds.value.includes(snap.id)) {
pendingIds.value = [...pendingIds.value, snap.id]
} }
} }
const nextIds = [...selectModel.value] formVisible.value = false
if (!nextIds.includes(snap.id)) nextIds.push(snap.id)
emitFromIds(nextIds)
if (drawerVisible.value && !pendingIds.value.includes(snap.id)) {
pendingIds.value = [...pendingIds.value, snap.id]
}
createVisible.value = false
} finally { } finally {
createLoading.value = false formLoading.value = false
} }
} }
async function confirmDelete(id: string) {
const tid = String(id || '').trim()
const snap = snapshotMap.value.get(tid)
const name = snap?.accountName || tid
try {
await ElMessageBox.confirm(
`确定删除收款账户「${name}」吗?删除后不可再选;已提交单据中的账户快照仍保留。`,
'删除收款账户',
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' }
)
} catch {
return
}
selectRef.value?.blur?.()
await fetchDeleteOaReceiveAccount(tid)
await loadOptions()
const nextSelected = selectModel.value.filter((x) => x !== tid)
emitFromIds(nextSelected)
pendingIds.value = pendingIds.value.filter((x) => x !== tid)
}
async function loadOptions() { async function loadOptions() {
try { try {
const res = await fetchOaReceiveAccountOptions() const res = await fetchOaReceiveAccountOptions()
@@ -512,6 +638,53 @@
min-height: 40px; min-height: 40px;
} }
.oa-receive-account-select__option {
display: flex;
gap: 8px;
align-items: center;
justify-content: space-between;
width: 100%;
min-width: 0;
}
.oa-receive-account-select__option-label {
flex: 1;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.oa-receive-account-select__option-actions,
.oa-receive-account-select__row-actions {
display: inline-flex;
flex-shrink: 0;
gap: 4px;
align-items: center;
}
.oa-receive-account-select__icon-btn {
display: inline-flex;
align-items: center;
justify-content: center;
width: 28px;
height: 28px;
padding: 0;
border: 0;
border-radius: 6px;
cursor: pointer;
}
.oa-receive-account-select__icon-btn.is-edit {
background: var(--mint-primary-bg, #ecfdf5);
color: var(--mint-primary-dark, #059669);
}
.oa-receive-account-select__icon-btn.is-delete {
background: #fef2f2;
color: #dc2626;
}
.oa-receive-account-select__add-footer { .oa-receive-account-select__add-footer {
padding: 4px 8px 8px; padding: 4px 8px 8px;
border-top: 1px solid var(--mint-border, #d9e8e2); border-top: 1px solid var(--mint-border, #d9e8e2);
@@ -597,6 +770,14 @@
align-items: center; align-items: center;
min-height: 44px; min-height: 44px;
padding: 6px 4px; padding: 6px 4px;
}
.oa-receive-account-select__row-main {
display: flex;
flex: 1;
gap: 8px;
align-items: center;
min-width: 0;
cursor: pointer; cursor: pointer;
} }
@@ -630,5 +811,10 @@
.oa-receive-account-select__trigger { .oa-receive-account-select__trigger {
min-height: 44px; min-height: 44px;
} }
.oa-receive-account-select__icon-btn {
width: 36px;
height: 36px;
}
} }
</style> </style>
@@ -40,6 +40,7 @@ export const LAB_PROCESS_TABS: Array<{
const CELL_HSC_COLUMNS: LabColumn[] = [ const CELL_HSC_COLUMNS: LabColumn[] = [
{ prop: 'cellCode', label: '细胞编码', minWidth: 140 }, { prop: 'cellCode', label: '细胞编码', minWidth: 140 },
{ prop: 'sampleStatus', label: '样本状态', minWidth: 140 },
{ prop: 'motherName', label: '准妈妈姓名', minWidth: 110 }, { prop: 'motherName', label: '准妈妈姓名', minWidth: 110 },
{ prop: 'collectionTime', label: '采集时间', minWidth: 200 }, { prop: 'collectionTime', label: '采集时间', minWidth: 200 },
{ prop: 'hospitalName', label: '采集医院', minWidth: 140 }, { prop: 'hospitalName', label: '采集医院', minWidth: 140 },
@@ -72,6 +73,7 @@ const CELL_HSC_COLUMNS: LabColumn[] = [
const DONATION_HSC_COLUMNS: LabColumn[] = [ const DONATION_HSC_COLUMNS: LabColumn[] = [
{ prop: 'cellCode', label: '细胞编码', minWidth: 140 }, { prop: 'cellCode', label: '细胞编码', minWidth: 140 },
{ prop: 'sampleStatus', label: '样本状态', minWidth: 140 },
{ prop: 'motherName', label: '准妈妈姓名', minWidth: 110 }, { prop: 'motherName', label: '准妈妈姓名', minWidth: 110 },
{ prop: 'labMaterialCode', label: '实验室物料编码', minWidth: 130 }, { prop: 'labMaterialCode', label: '实验室物料编码', minWidth: 130 },
{ prop: 'inboundCode', label: '入库编码', minWidth: 140 }, { prop: 'inboundCode', label: '入库编码', minWidth: 140 },
@@ -98,6 +100,7 @@ const DONATION_HSC_COLUMNS: LabColumn[] = [
const MSC_COLUMNS: LabColumn[] = [ const MSC_COLUMNS: LabColumn[] = [
{ prop: 'labFlowCode', label: '实验室流转编码', minWidth: 140 }, { prop: 'labFlowCode', label: '实验室流转编码', minWidth: 140 },
{ prop: 'sampleStatus', label: '样本状态', minWidth: 140 },
{ prop: 'motherName', label: '母亲姓名', minWidth: 110 }, { prop: 'motherName', label: '母亲姓名', minWidth: 110 },
{ prop: 'cordCollectTime', label: '脐带采集时间', minWidth: 200 }, { prop: 'cordCollectTime', label: '脐带采集时间', minWidth: 200 },
{ prop: 'transportTempC', label: '运输温度/℃', minWidth: 110 }, { prop: 'transportTempC', label: '运输温度/℃', minWidth: 110 },
@@ -0,0 +1,16 @@
import { describe, it } from 'node:test'
import assert from 'node:assert/strict'
import { hasOaCommentDraft } from './oa-comment-draft.ts'
describe('hasOaCommentDraft', () => {
it('treats blank content without mentions/files as empty', () => {
assert.equal(hasOaCommentDraft({}), false)
assert.equal(hasOaCommentDraft({ content: ' ', mentionCount: 0, attachmentCount: 0 }), false)
})
it('detects text, mentions and attachments', () => {
assert.equal(hasOaCommentDraft({ content: '@test' }), true)
assert.equal(hasOaCommentDraft({ mentionCount: 1 }), true)
assert.equal(hasOaCommentDraft({ attachmentCount: 2 }), true)
})
})
+12
View File
@@ -0,0 +1,12 @@
/** 评论区是否有未发送草稿(文字 / @ / 附件) */
export function hasOaCommentDraft(input: {
content?: string | null
mentionCount?: number
attachmentCount?: number
}): boolean {
return !!(
String(input.content || '').trim() ||
(input.mentionCount || 0) > 0 ||
(input.attachmentCount || 0) > 0
)
}
@@ -14,7 +14,7 @@ import type { ProductionWorkOrderTabKey } from '@/utils/production-work-order-ta
import { resolveTabKeyFromWorkOrder } from '@/utils/production-work-order-tabs' import { resolveTabKeyFromWorkOrder } from '@/utils/production-work-order-tabs'
import { formatMoneyDisplay } from '@/utils/money-format' import { formatMoneyDisplay } from '@/utils/money-format'
export type CardMetaFieldKind = 'text' | 'tag' export type CardMetaFieldKind = 'text' | 'tag' | 'sample-status'
export type CardMetaField = { export type CardMetaField = {
label: string label: string
@@ -84,6 +84,11 @@ function buildInboundMetaFields(tabKey: ProductionWorkOrderTabKey): CardMetaFiel
return [ return [
{ label: '实验室入库编码', getValue: (row) => row.labStorageCode || '—' }, { label: '实验室入库编码', getValue: (row) => row.labStorageCode || '—' },
{ label: '样本类型', getValue: (row) => row.sampleTypeName || '—' }, { label: '样本类型', getValue: (row) => row.sampleTypeName || '—' },
{
label: '样本状态',
kind: 'sample-status',
getValue: (row) => String(row.sampleStatus || '')
},
{ label: '接收经手人', getValue: (row) => row.handlerName || '—' }, { label: '接收经手人', getValue: (row) => row.handlerName || '—' },
{ label: '接收时间', getValue: (row) => formatDisplayOrDash(row.receptionTime) }, { label: '接收时间', getValue: (row) => formatDisplayOrDash(row.receptionTime) },
{ {
@@ -63,6 +63,19 @@ describe('flattenProtocolAuditRows', () => {
assert.equal(rows[0].sampleCode, 'ZKZX34000199') assert.equal(rows[0].sampleCode, 'ZKZX34000199')
}) })
it('passes sample status and sample void reason from sample items', () => {
const rows = flattenProtocolAuditRows([
{
id: 'p-status',
voidDesc: '协议作废',
sampleItems: [{ sampleCode: 'S-VOID', sampleStatus: 'yzf', voidDesc: '样本破损' }]
}
])
assert.equal(rows[0].voidDesc, '协议作废')
assert.equal(rows[0].sampleStatus, 'yzf')
assert.equal(rows[0].sampleVoidDesc, '样本破损')
})
it('zero samples → one placeholder row, not co-stored', () => { it('zero samples → one placeholder row, not co-stored', () => {
const rows = flattenProtocolAuditRows([{ id: 'p2', protocolNo: 'ZKZX2', sampleItems: [] }]) const rows = flattenProtocolAuditRows([{ id: 'p2', protocolNo: 'ZKZX2', sampleItems: [] }])
assert.equal(rows.length, 1) assert.equal(rows.length, 1)
@@ -34,6 +34,9 @@ export type ProtocolAuditFlatRow = {
regionManagerUserName: string regionManagerUserName: string
sampleTypeName: string sampleTypeName: string
sampleCode: string sampleCode: string
sampleStatus: string
/** 样本作废原因;协议作废原因仍用 voidDesc */
sampleVoidDesc: string
labStorageCode: string labStorageCode: string
transportType: string transportType: string
transportLabel: string transportLabel: string
@@ -120,6 +123,8 @@ export function flattenProtocolAuditRows(
regionManagerUserName: str(protocol.regionManagerUserName), regionManagerUserName: str(protocol.regionManagerUserName),
sampleTypeName: str(rec.sampleTypeName), sampleTypeName: str(rec.sampleTypeName),
sampleCode: str(rec.sampleCode), sampleCode: str(rec.sampleCode),
sampleStatus: str(rec.sampleStatus),
sampleVoidDesc: str(rec.voidDesc),
labStorageCode: str(rec.labStorageCode), labStorageCode: str(rec.labStorageCode),
transportType, transportType,
transportLabel: '', transportLabel: '',
+15 -2
View File
@@ -16,7 +16,7 @@ import {
type QcWorkOrderProtocolGroupModel type QcWorkOrderProtocolGroupModel
} from '@/utils/qc-work-order-groups' } from '@/utils/qc-work-order-groups'
export type CardMetaFieldKind = 'text' | 'tag' export type CardMetaFieldKind = 'text' | 'tag' | 'sample-status'
export type CardMetaField = { export type CardMetaField = {
label: string label: string
@@ -127,18 +127,29 @@ const inboundGroupedFields: CardMetaField[] = [
{ label: '母亲姓名', getValue: (row) => row.motherName || '—', visible: isInboundUserInfoRow }, { label: '母亲姓名', getValue: (row) => row.motherName || '—', visible: isInboundUserInfoRow },
{ label: '新生儿姓名', getValue: (row) => row.newbornName || '—', visible: isInboundUserInfoRow }, { label: '新生儿姓名', getValue: (row) => row.newbornName || '—', visible: isInboundUserInfoRow },
inboundProtocolStatusField, inboundProtocolStatusField,
{ label: '质检对象', getValue: formatQcTarget, colSpan: 2 }, { label: '质检对象', getValue: formatQcTarget },
{ {
label: '关联生产工单', label: '关联生产工单',
getValue: (row) => row.productionWorkOrderNo || '—', getValue: (row) => row.productionWorkOrderNo || '—',
visible: (row) => (row.triggerSource || 'reception') === 'production' visible: (row) => (row.triggerSource || 'reception') === 'production'
}, },
{ label: '样本编码', getValue: (row) => row.sampleCode || '—', visible: isInboundUserInfoRow }, { label: '样本编码', getValue: (row) => row.sampleCode || '—', visible: isInboundUserInfoRow },
{
label: '样本状态',
kind: 'sample-status',
getValue: (row) => String(row.sampleStatus || ''),
visible: isInboundUserInfoRow
},
{ {
label: '样本类型', label: '样本类型',
getValue: (row) => row.sampleTypeName || '—', getValue: (row) => row.sampleTypeName || '—',
visible: isInboundUserInfoRow visible: isInboundUserInfoRow
}, },
{
label: '母血采集时间',
getValue: (row) => formatDisplayOrDash(row.maternalBloodCollectTime),
visible: isInboundUserInfoRow
},
...commonTailFields ...commonTailFields
] ]
@@ -197,6 +208,7 @@ function buildCellStorageGroupContext(row: QcWorkOrder): string[] {
if (row.newbornName) parts.push(`新生儿 ${row.newbornName}`) if (row.newbornName) parts.push(`新生儿 ${row.newbornName}`)
if (row.sampleTypeName) parts.push(row.sampleTypeName) if (row.sampleTypeName) parts.push(row.sampleTypeName)
if (row.receptionTime) parts.push(`接收 ${row.receptionTime}`) if (row.receptionTime) parts.push(`接收 ${row.receptionTime}`)
parts.push(`母血采集 ${formatDisplayOrDash(row.maternalBloodCollectTime)}`)
if (row.handlerName) parts.push(row.handlerName) if (row.handlerName) parts.push(row.handlerName)
return parts return parts
} }
@@ -207,6 +219,7 @@ function buildDonationGroupContext(row: QcWorkOrder): string[] {
if (row.newbornName) parts.push(`新生儿 ${row.newbornName}`) if (row.newbornName) parts.push(`新生儿 ${row.newbornName}`)
if (row.sampleTypeName) parts.push(row.sampleTypeName) if (row.sampleTypeName) parts.push(row.sampleTypeName)
if (row.receptionTime) parts.push(`接收 ${row.receptionTime}`) if (row.receptionTime) parts.push(`接收 ${row.receptionTime}`)
parts.push(`母血采集 ${formatDisplayOrDash(row.maternalBloodCollectTime)}`)
if (row.handlerName) parts.push(row.handlerName) if (row.handlerName) parts.push(row.handlerName)
return parts return parts
} }
@@ -21,6 +21,8 @@ export type SampleFreightFlatRow = {
motherName?: string motherName?: string
newbornName?: string newbornName?: string
sampleCode?: string sampleCode?: string
sampleStatus?: string
voidDesc?: string
sampleTypeName?: string sampleTypeName?: string
sampleId?: string sampleId?: string
protocolId?: string protocolId?: string
@@ -53,6 +55,8 @@ export function flattenSampleFreights(list: SampleFreight[]): SampleFreightFlatR
motherName: it?.motherName, motherName: it?.motherName,
newbornName: it?.newbornName, newbornName: it?.newbornName,
sampleCode: it?.sampleCode, sampleCode: it?.sampleCode,
sampleStatus: it?.sampleStatus,
voidDesc: it?.voidDesc,
sampleTypeName: it?.sampleTypeName, sampleTypeName: it?.sampleTypeName,
sampleId: it?.sampleId, sampleId: it?.sampleId,
protocolId: it?.protocolId, protocolId: it?.protocolId,
+41
View File
@@ -0,0 +1,41 @@
import { describe, it } from 'node:test'
import assert from 'node:assert/strict'
import { isSampleAlreadyVoided, resolveSampleVoidTarget } from './sample-void'
describe('resolveSampleVoidTarget', () => {
it('uses protocol sample id, code and protocol id', () => {
const target = resolveSampleVoidTarget({
receptionSource: 'cell_storage',
protocolSampleId: 'ps-1',
sampleCode: 'S1',
collectionProtocolId: 'p-1'
})
assert.deepEqual(target, {
receptionSource: 'cell_storage',
sampleId: 'ps-1',
sampleCode: 'S1',
protocolId: 'p-1'
})
})
it('falls back to tab source when row source is empty', () => {
const target = resolveSampleVoidTarget({
sampleCode: 'S2',
fallbackSource: 'research_donation'
})
assert.equal(target?.receptionSource, 'research_donation')
assert.equal(target?.sampleCode, 'S2')
})
it('returns null without a sample identifier', () => {
assert.equal(resolveSampleVoidTarget({ receptionSource: 'cell_storage' }), null)
})
})
describe('isSampleAlreadyVoided', () => {
it('matches yzf only', () => {
assert.equal(isSampleAlreadyVoided('yzf'), true)
assert.equal(isSampleAlreadyVoided(' yzf '), true)
assert.equal(isSampleAlreadyVoided('ycj'), false)
})
})
+29
View File
@@ -0,0 +1,29 @@
import type { SampleVoidTarget } from '../api/business-sample'
export function isSampleAlreadyVoided(status?: string | null): boolean {
return String(status || '').trim() === 'yzf'
}
export function resolveSampleVoidTarget(input: {
receptionSource?: string | null
protocolSampleId?: string | null
sampleCode?: string | null
collectionProtocolId?: string | null
fallbackSource?: string | null
}): SampleVoidTarget | null {
let source = String(input.receptionSource || '').trim()
if (source !== 'cell_storage' && source !== 'research_donation') {
source = String(input.fallbackSource || '').trim()
}
if (source !== 'cell_storage' && source !== 'research_donation') return null
const sampleId = String(input.protocolSampleId || '').trim()
const sampleCode = String(input.sampleCode || '').trim()
const protocolId = String(input.collectionProtocolId || '').trim()
if (!sampleId && !sampleCode) return null
return {
receptionSource: source,
sampleId: sampleId || undefined,
sampleCode: sampleCode || undefined,
protocolId: protocolId || undefined
}
}
@@ -82,6 +82,11 @@
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column label="样本状态" min-width="140" align="center">
<template #default="{ row }">
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
</template>
</el-table-column>
<el-table-column label="市场专员" min-width="110" align="center"> <el-table-column label="市场专员" min-width="110" align="center">
<template #default="{ row }">{{ row.salesUserName || '—' }}</template> <template #default="{ row }">{{ row.salesUserName || '—' }}</template>
</el-table-column> </el-table-column>
@@ -265,6 +270,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { Search, RefreshLeft, Document, Close } from '@element-plus/icons-vue' import { Search, RefreshLeft, Document, Close } from '@element-plus/icons-vue'
import ProtocolViewDialog from '../protocol/ProtocolViewDialog.vue' import ProtocolViewDialog from '../protocol/ProtocolViewDialog.vue'
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
import ProtocolAttachmentReadonly from '../protocol/ProtocolAttachmentReadonly.vue' import ProtocolAttachmentReadonly from '../protocol/ProtocolAttachmentReadonly.vue'
import { downloadAttachmentFile } from '@/utils/download-attachment' import { downloadAttachmentFile } from '@/utils/download-attachment'
import { import {
@@ -90,6 +90,11 @@
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column label="样本状态" min-width="140" align="center">
<template #default="{ row }">
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
</template>
</el-table-column>
<el-table-column label="签署日期" min-width="110" align="center"> <el-table-column label="签署日期" min-width="110" align="center">
<template #default="{ row }">{{ row.signDate || '—' }}</template> <template #default="{ row }">{{ row.signDate || '—' }}</template>
</el-table-column> </el-table-column>
@@ -295,6 +300,7 @@
import ProtocolViewDialog from '../protocol/ProtocolViewDialog.vue' import ProtocolViewDialog from '../protocol/ProtocolViewDialog.vue'
import ProtocolAttachmentReadonly from '../protocol/ProtocolAttachmentReadonly.vue' import ProtocolAttachmentReadonly from '../protocol/ProtocolAttachmentReadonly.vue'
import SamplePaymentDetailDialog from '@/components/business/sample-payment-detail-dialog/index.vue' import SamplePaymentDetailDialog from '@/components/business/sample-payment-detail-dialog/index.vue'
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
import { downloadAttachmentFile } from '@/utils/download-attachment' import { downloadAttachmentFile } from '@/utils/download-attachment'
import { fetchSamplePaymentList, fetchSamplePaymentDetail } from '@/api/protocol-sample-payment' import { fetchSamplePaymentList, fetchSamplePaymentDetail } from '@/api/protocol-sample-payment'
import { type CollectionProtocolRow } from '@/api/collection-protocol' import { type CollectionProtocolRow } from '@/api/collection-protocol'
@@ -175,6 +175,11 @@
<span class="mono">{{ row.labStorageCode || '—' }}</span> <span class="mono">{{ row.labStorageCode || '—' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="样本状态" min-width="140" align="center" header-align="center">
<template #default="{ row }">
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.sampleVoidDesc" />
</template>
</el-table-column>
<el-table-column label="协议状态" min-width="100" align="center" header-align="center"> <el-table-column label="协议状态" min-width="100" align="center" header-align="center">
<template #default="{ row }"> <template #default="{ row }">
<el-tag :type="donationStatusTagType(row.donationStatus)" size="small"> <el-tag :type="donationStatusTagType(row.donationStatus)" size="small">
@@ -415,6 +420,7 @@
<script setup lang="ts"> <script setup lang="ts">
import ProjectSelect from '@/components/business/ProjectSelect.vue' import ProjectSelect from '@/components/business/ProjectSelect.vue'
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
const projectFilter = ref('') const projectFilter = ref('')
const teamFilter = ref('') const teamFilter = ref('')
import { formatDisplayOrDash } from '@/utils/datetime-display' import { formatDisplayOrDash } from '@/utils/datetime-display'
@@ -197,6 +197,11 @@
<span class="mono">{{ row.sampleCode || '—' }}</span> <span class="mono">{{ row.sampleCode || '—' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="样本状态" min-width="140" align="center" header-align="center">
<template #default="{ row }">
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.sampleVoidDesc" />
</template>
</el-table-column>
<el-table-column <el-table-column
prop="sampleTypeName" prop="sampleTypeName"
label="样本类型" label="样本类型"
@@ -383,6 +388,7 @@
<script setup lang="ts"> <script setup lang="ts">
import ProjectSelect from '@/components/business/ProjectSelect.vue' import ProjectSelect from '@/components/business/ProjectSelect.vue'
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
const projectFilter = ref('') const projectFilter = ref('')
const teamFilter = ref('') const teamFilter = ref('')
import { formatDisplayOrDash } from '@/utils/datetime-display' import { formatDisplayOrDash } from '@/utils/datetime-display'
@@ -206,6 +206,11 @@
<span class="cell-wrap-text">{{ row.sampleCode || '—' }}</span> <span class="cell-wrap-text">{{ row.sampleCode || '—' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="样本状态" min-width="140" align="center" header-align="center">
<template #default="{ row }">
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
</template>
</el-table-column>
<el-table-column <el-table-column
prop="sampleTypeName" prop="sampleTypeName"
label="样本类型" label="样本类型"
@@ -320,6 +325,7 @@
sampleFreightSpanMethod, sampleFreightSpanMethod,
type SampleFreightFlatRow type SampleFreightFlatRow
} from '@/utils/sample-freight-flatten' } from '@/utils/sample-freight-flatten'
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
import FreightConfigDialog from './FreightConfigDialog.vue' import FreightConfigDialog from './FreightConfigDialog.vue'
import FreightEditDialog from './FreightEditDialog.vue' import FreightEditDialog from './FreightEditDialog.vue'
@@ -207,6 +207,11 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="样本状态" min-width="140" align="center">
<template #default="{ row }">
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
</template>
</el-table-column>
<el-table-column prop="motherName" label="母亲姓名" min-width="100" align="center" /> <el-table-column prop="motherName" label="母亲姓名" min-width="100" align="center" />
<el-table-column prop="motherPhone" label="母亲电话" min-width="120" align="center"> <el-table-column prop="motherPhone" label="母亲电话" min-width="120" align="center">
<template #default="{ row }">{{ row.motherPhone || '—' }}</template> <template #default="{ row }">{{ row.motherPhone || '—' }}</template>
@@ -368,6 +373,11 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="样本状态" min-width="140" align="center">
<template #default="{ row }">
<SampleStatusTag :status="row.sampleStatus" :void-desc="row.voidDesc" />
</template>
</el-table-column>
<el-table-column prop="labStorageCode" label="实验室入库编码" min-width="150" align="center"> <el-table-column prop="labStorageCode" label="实验室入库编码" min-width="150" align="center">
<template #default="{ row }">{{ row.labStorageCode || '—' }}</template> <template #default="{ row }">{{ row.labStorageCode || '—' }}</template>
</el-table-column> </el-table-column>
@@ -503,6 +513,7 @@
import ProtocolViewDialog from '@/views/cell-storage/protocol/ProtocolViewDialog.vue' import ProtocolViewDialog from '@/views/cell-storage/protocol/ProtocolViewDialog.vue'
import DonationViewDialog from '@/views/research-donation/list/DonationViewDialog.vue' import DonationViewDialog from '@/views/research-donation/list/DonationViewDialog.vue'
import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue' import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
import SampleInfoQuickRegisterDialog from './SampleInfoQuickRegisterDialog.vue' import SampleInfoQuickRegisterDialog from './SampleInfoQuickRegisterDialog.vue'
import SampleCodeCorrectionDialog from './SampleCodeCorrectionDialog.vue' import SampleCodeCorrectionDialog from './SampleCodeCorrectionDialog.vue'
import { import {
@@ -99,6 +99,7 @@
/> />
<OaCommentPanel <OaCommentPanel
v-if="detail?.id" v-if="detail?.id"
ref="commentPanelRef"
:instance-id="detail.id" :instance-id="detail.id"
:instance-status="detail.status || ''" :instance-status="detail.status || ''"
@refresh="load" @refresh="load"
@@ -236,6 +237,9 @@
const userStore = useUserStore() const userStore = useUserStore()
const loading = ref(false) const loading = ref(false)
const acting = ref(false) const acting = ref(false)
const commentPanelRef = ref<{ flushDraft?: (opts?: { quiet?: boolean }) => Promise<boolean> } | null>(
null
)
const detail = ref<any>(null) const detail = ref<any>(null)
const viewFormData = ref<Record<string, any>>({}) const viewFormData = ref<Record<string, any>>({})
const viewRule = ref<any[]>([]) const viewRule = ref<any[]>([])
@@ -392,9 +396,17 @@
} }
} }
/** 同意/拒绝/打回前先发送评论区未提交草稿 */
async function flushPendingComment(): Promise<boolean> {
const flush = commentPanelRef.value?.flushDraft
if (!flush) return true
return await flush()
}
async function act(kind: 'approve' | 'reject') { async function act(kind: 'approve' | 'reject') {
const task = myPendingTask.value const task = myPendingTask.value
if (!task) return if (!task) return
if (!(await flushPendingComment())) return
let comment = '' let comment = ''
try { try {
const res = await ElMessageBox.prompt( const res = await ElMessageBox.prompt(
@@ -436,6 +448,7 @@
async function doReturn() { async function doReturn() {
const task = myPendingTask.value const task = myPendingTask.value
if (!task) return if (!task) return
if (!(await flushPendingComment())) return
let comment = '' let comment = ''
try { try {
const res = await ElMessageBox.prompt('请填写打回意见(必填)', '打回', { const res = await ElMessageBox.prompt('请填写打回意见(必填)', '打回', {
@@ -105,6 +105,13 @@
> >
<el-icon><EditPen /></el-icon>样本接收信息填写 <el-icon><EditPen /></el-icon>样本接收信息填写
</el-button> </el-button>
<el-button
v-if="showSampleVoidButton(row)"
class="btn-op-item"
@click="openSampleVoidDialog(row)"
>
<el-icon><Delete /></el-icon>样本废弃
</el-button>
<el-button <el-button
v-if="showCardComplete(row) && canComplete(row)" v-if="showCardComplete(row) && canComplete(row)"
class="btn-op-item" class="btn-op-item"
@@ -169,8 +176,13 @@
> >
<dt>{{ field.label }}</dt> <dt>{{ field.label }}</dt>
<dd> <dd>
<SampleStatusTag
v-if="field.kind === 'sample-status'"
:status="row.sampleStatus"
:void-desc="row.voidDesc"
/>
<el-tag <el-tag
v-if="field.kind === 'tag'" v-else-if="field.kind === 'tag'"
:type="field.getTagType?.(row) || 'info'" :type="field.getTagType?.(row) || 'info'"
size="small" size="small"
:class="{ :class="{
@@ -319,6 +331,11 @@
:sample-code="storageCertQcSampleCode" :sample-code="storageCertQcSampleCode"
:sample-type-name="storageCertQcSampleTypeName" :sample-type-name="storageCertQcSampleTypeName"
/> />
<SampleVoidDialog
v-model:visible="sampleVoidVisible"
:target="sampleVoidTarget"
@success="emit('sample-voided')"
/>
</div> </div>
</template> </template>
@@ -342,7 +359,11 @@
import type { OutboundQcDetailProduct } from '@/api/qc-work-order' import type { OutboundQcDetailProduct } from '@/api/qc-work-order'
import type { ProductionWorkOrderCardMetaConfig } from '@/utils/production-work-order-card-meta' import type { ProductionWorkOrderCardMetaConfig } from '@/utils/production-work-order-card-meta'
import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue' import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
import SampleVoidDialog from '@/components/business/sample-void-dialog/index.vue'
import type { SampleVoidTarget } from '@/api/business-sample'
import StorageCertQcDialog from '@/components/business/storage-cert-qc-dialog/index.vue' import StorageCertQcDialog from '@/components/business/storage-cert-qc-dialog/index.vue'
import { isSampleAlreadyVoided, resolveSampleVoidTarget } from '@/utils/sample-void'
import { supportsStorageCertQc } from '@/utils/storage-cert-qc-fields' import { supportsStorageCertQc } from '@/utils/storage-cert-qc-fields'
import { import {
getCardMetaConfigForLegacyTab, getCardMetaConfigForLegacyTab,
@@ -411,6 +432,8 @@
const storageCertQcVisible = ref(false) const storageCertQcVisible = ref(false)
const storageCertQcSampleCode = ref('') const storageCertQcSampleCode = ref('')
const storageCertQcSampleTypeName = ref('') const storageCertQcSampleTypeName = ref('')
const sampleVoidVisible = ref(false)
const sampleVoidTarget = ref<SampleVoidTarget | null>(null)
function showStorageCertQcButton(row: ProductionWorkOrderItem) { function showStorageCertQcButton(row: ProductionWorkOrderItem) {
const tabKey = resolveEffectiveRowTabKey(listTabKey.value, row) const tabKey = resolveEffectiveRowTabKey(listTabKey.value, row)
@@ -463,6 +486,37 @@
return INBOUND_SAMPLE_TITLE_TAB_KEYS.has(effectiveTabKey) return INBOUND_SAMPLE_TITLE_TAB_KEYS.has(effectiveTabKey)
} }
function productionVoidFallbackSource(row: ProductionWorkOrderItem) {
const tabKey = resolveEffectiveRowTabKey(listTabKey.value, row)
if (tabKey === 'inbound_research_donation') return 'research_donation'
if (tabKey === 'inbound_cell_storage') return 'cell_storage'
return ''
}
function showSampleVoidButton(row: ProductionWorkOrderItem) {
if (!isInboundSampleTitle(row) || isSampleAlreadyVoided(row.sampleStatus)) return false
return !!resolveSampleVoidTarget({
receptionSource: row.receptionSource,
protocolSampleId: row.protocolSampleId,
sampleCode: row.sampleCode,
collectionProtocolId: row.collectionProtocolId,
fallbackSource: productionVoidFallbackSource(row)
})
}
function openSampleVoidDialog(row: ProductionWorkOrderItem) {
const target = resolveSampleVoidTarget({
receptionSource: row.receptionSource,
protocolSampleId: row.protocolSampleId,
sampleCode: row.sampleCode,
collectionProtocolId: row.collectionProtocolId,
fallbackSource: productionVoidFallbackSource(row)
})
if (!target) return
sampleVoidTarget.value = target
sampleVoidVisible.value = true
}
function inboundCardTitleLab(row: ProductionWorkOrderItem) { function inboundCardTitleLab(row: ProductionWorkOrderItem) {
return (row.labStorageCode || '').trim() || '—' return (row.labStorageCode || '').trim() || '—'
} }
@@ -500,6 +554,7 @@
'page-change': [page: number] 'page-change': [page: number]
'page-size-change': [size: number] 'page-size-change': [size: number]
'open-sample-reception': [row: ProductionWorkOrderItem] 'open-sample-reception': [row: ProductionWorkOrderItem]
'sample-voided': []
}>() }>()
const showCardOpsRow = computed(() => true) const showCardOpsRow = computed(() => true)
@@ -198,6 +198,7 @@
@tasks-changed="onTasksChanged" @tasks-changed="onTasksChanged"
@counts-changed="onCountsChanged" @counts-changed="onCountsChanged"
@open-sample-reception="handleOpenSampleReception" @open-sample-reception="handleOpenSampleReception"
@sample-voided="handleSampleVoided"
@page-change="onWorkOrderPageChange" @page-change="onWorkOrderPageChange"
@page-size-change="onWorkOrderPageSizeChange" @page-size-change="onWorkOrderPageSizeChange"
/> />
@@ -371,6 +372,11 @@
emit('data-changed') emit('data-changed')
} }
function handleSampleVoided() {
loadData()
emit('data-changed')
}
defineExpose({ defineExpose({
reload: loadData, reload: loadData,
bumpTaskRefresh, bumpTaskRefresh,
@@ -93,9 +93,16 @@
:min-width="col.minWidth || 120" :min-width="col.minWidth || 120"
align="center" align="center"
header-align="center" header-align="center"
show-overflow-tooltip :show-overflow-tooltip="col.prop !== 'sampleStatus'"
> >
<template #default="{ row }">{{ displayCell(row[col.prop]) }}</template> <template #default="{ row }">
<SampleStatusTag
v-if="col.prop === 'sampleStatus'"
:status="String(row.sampleStatus || '')"
:void-desc="String(row.voidDesc || '')"
/>
<template v-else>{{ displayCell(row[col.prop]) }}</template>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
@@ -178,11 +185,13 @@
saveLabSampleProcessSupplement, saveLabSampleProcessSupplement,
type LabSampleProcessTabKey type LabSampleProcessTabKey
} from '@/api/lab-sample-process' } from '@/api/lab-sample-process'
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
import { import {
LAB_PROCESS_COLUMNS, LAB_PROCESS_COLUMNS,
LAB_PROCESS_TABS, LAB_PROCESS_TABS,
SUPPLEMENT_FIELD_LABELS SUPPLEMENT_FIELD_LABELS
} from '@/utils/lab-sample-process-columns' } from '@/utils/lab-sample-process-columns'
import { sampleStatusLabel } from '@/utils/status-tag-registry'
defineOptions({ name: 'QualityInspectionLabSampleProcess' }) defineOptions({ name: 'QualityInspectionLabSampleProcess' })
@@ -274,9 +283,9 @@
supplementForm.receptionSource = meta.source supplementForm.receptionSource = meta.source
supplementForm.sampleTypeName = meta.sampleTypeName supplementForm.sampleTypeName = meta.sampleTypeName
supplementForm.remark = '' supplementForm.remark = ''
const keys = supplementKeys.value.length const keys = (
? supplementKeys.value supplementKeys.value.length ? supplementKeys.value : currentColumns.value.map((c) => c.prop)
: currentColumns.value.map((c) => c.prop) ).filter((k) => k !== 'sampleStatus' && k !== 'voidDesc')
const payload: Record<string, string> = {} const payload: Record<string, string> = {}
keys.forEach((k) => { keys.forEach((k) => {
payload[k] = '' payload[k] = ''
@@ -324,6 +333,10 @@
} }
cols.forEach((c) => { cols.forEach((c) => {
const v = row[c.prop] const v = row[c.prop]
if (c.prop === 'sampleStatus') {
line[c.label] = v ? sampleStatusLabel(String(v)) : ''
return
}
line[c.label] = v === null || v === undefined || v === '' ? '' : String(v) line[c.label] = v === null || v === undefined || v === '' ? '' : String(v)
}) })
return line return line
@@ -25,6 +25,7 @@
@command="(cmd, row) => emit('command', cmd, row)" @command="(cmd, row) => emit('command', cmd, row)"
@tasks-changed="emit('tasks-changed')" @tasks-changed="emit('tasks-changed')"
@sample-special-changed="emit('sample-special-changed')" @sample-special-changed="emit('sample-special-changed')"
@sample-voided="emit('sample-voided')"
/> />
<QcWorkOrderSampleGroup <QcWorkOrderSampleGroup
v-for="ins in insertedCardsAfter(allTabInboundAnchorId(item.group))" v-for="ins in insertedCardsAfter(allTabInboundAnchorId(item.group))"
@@ -49,6 +50,7 @@
@command="(cmd, row) => emit('command', cmd, row)" @command="(cmd, row) => emit('command', cmd, row)"
@tasks-changed="emit('tasks-changed')" @tasks-changed="emit('tasks-changed')"
@sample-special-changed="emit('sample-special-changed')" @sample-special-changed="emit('sample-special-changed')"
@sample-voided="emit('sample-voided')"
/> />
</template> </template>
<QcWorkOrderSingleCard <QcWorkOrderSingleCard
@@ -69,6 +71,7 @@
@command="(cmd, row) => emit('command', cmd, row)" @command="(cmd, row) => emit('command', cmd, row)"
@tasks-changed="emit('tasks-changed')" @tasks-changed="emit('tasks-changed')"
@sample-special-changed="emit('sample-special-changed')" @sample-special-changed="emit('sample-special-changed')"
@sample-voided="emit('sample-voided')"
/> />
</template> </template>
</template> </template>
@@ -96,6 +99,7 @@
@command="(cmd, row) => emit('command', cmd, row)" @command="(cmd, row) => emit('command', cmd, row)"
@tasks-changed="emit('tasks-changed')" @tasks-changed="emit('tasks-changed')"
@sample-special-changed="emit('sample-special-changed')" @sample-special-changed="emit('sample-special-changed')"
@sample-voided="emit('sample-voided')"
/> />
<QcWorkOrderSampleGroup <QcWorkOrderSampleGroup
v-for="ins in insertedCardsAfter(item.cardAnchorId)" v-for="ins in insertedCardsAfter(item.cardAnchorId)"
@@ -120,6 +124,7 @@
@command="(cmd, row) => emit('command', cmd, row)" @command="(cmd, row) => emit('command', cmd, row)"
@tasks-changed="emit('tasks-changed')" @tasks-changed="emit('tasks-changed')"
@sample-special-changed="emit('sample-special-changed')" @sample-special-changed="emit('sample-special-changed')"
@sample-voided="emit('sample-voided')"
/> />
</template> </template>
</template> </template>
@@ -141,6 +146,7 @@
@command="(cmd, row) => emit('command', cmd, row)" @command="(cmd, row) => emit('command', cmd, row)"
@tasks-changed="emit('tasks-changed')" @tasks-changed="emit('tasks-changed')"
@sample-special-changed="emit('sample-special-changed')" @sample-special-changed="emit('sample-special-changed')"
@sample-voided="emit('sample-voided')"
/> />
</template> </template>
</template> </template>
@@ -163,6 +169,7 @@
@command="(cmd, row) => emit('command', cmd, row)" @command="(cmd, row) => emit('command', cmd, row)"
@tasks-changed="emit('tasks-changed')" @tasks-changed="emit('tasks-changed')"
@sample-special-changed="emit('sample-special-changed')" @sample-special-changed="emit('sample-special-changed')"
@sample-voided="emit('sample-voided')"
/> />
</template> </template>
<el-empty <el-empty
@@ -252,6 +259,7 @@
command: [cmd: string, row: QcWorkOrder] command: [cmd: string, row: QcWorkOrder]
'tasks-changed': [] 'tasks-changed': []
'sample-special-changed': [] 'sample-special-changed': []
'sample-voided': []
'page-change': [page: number] 'page-change': [page: number]
'page-size-change': [size: number] 'page-size-change': [size: number]
'sibling-navigate': [payload: InboundSiblingNavigatePayload] 'sibling-navigate': [payload: InboundSiblingNavigatePayload]
@@ -115,6 +115,7 @@
@command="(cmd, row) => emit('command', cmd, row)" @command="(cmd, row) => emit('command', cmd, row)"
@tasks-changed="emit('tasks-changed')" @tasks-changed="emit('tasks-changed')"
@sample-special-changed="emit('sample-special-changed')" @sample-special-changed="emit('sample-special-changed')"
@sample-voided="emit('sample-voided')"
/> />
<SampleSpecialMarkDialog <SampleSpecialMarkDialog
@@ -181,6 +182,7 @@
command: [cmd: string, row: QcWorkOrder] command: [cmd: string, row: QcWorkOrder]
'tasks-changed': [] 'tasks-changed': []
'sample-special-changed': [] 'sample-special-changed': []
'sample-voided': []
}>() }>()
const sampleSpecialDialogVisible = ref(false) const sampleSpecialDialogVisible = ref(false)
@@ -117,6 +117,7 @@
@command="(cmd, row) => emit('command', cmd, row)" @command="(cmd, row) => emit('command', cmd, row)"
@tasks-changed="emit('tasks-changed')" @tasks-changed="emit('tasks-changed')"
@sample-special-changed="emit('sample-special-changed')" @sample-special-changed="emit('sample-special-changed')"
@sample-voided="emit('sample-voided')"
/> />
<SampleSpecialMarkDialog <SampleSpecialMarkDialog
@@ -201,6 +202,7 @@
command: [cmd: string, row: QcWorkOrder] command: [cmd: string, row: QcWorkOrder]
'tasks-changed': [] 'tasks-changed': []
'sample-special-changed': [] 'sample-special-changed': []
'sample-voided': []
'sibling-navigate': [payload: InboundSiblingNavigatePayload] 'sibling-navigate': [payload: InboundSiblingNavigatePayload]
}>() }>()
@@ -64,8 +64,13 @@
> >
<dt>{{ field.label }}</dt> <dt>{{ field.label }}</dt>
<dd> <dd>
<SampleStatusTag
v-if="field.kind === 'sample-status'"
:status="row.sampleStatus"
:void-desc="row.voidDesc"
/>
<el-tag <el-tag
v-if="field.kind === 'tag'" v-else-if="field.kind === 'tag'"
:type="field.getTagType?.(row) || 'info'" :type="field.getTagType?.(row) || 'info'"
size="small" size="small"
> >
@@ -162,6 +167,13 @@
> >
<el-icon><EditPen /></el-icon>特殊样本 <el-icon><EditPen /></el-icon>特殊样本
</el-button> </el-button>
<el-button
v-if="showSampleVoidButton"
class="btn-op-item"
@click="openSampleVoidDialog"
>
<el-icon><Delete /></el-icon>样本废弃
</el-button>
<el-button <el-button
v-if="showStorageCertQcButton" v-if="showStorageCertQcButton"
class="btn-op-item" class="btn-op-item"
@@ -190,6 +202,13 @@
> >
<el-icon><EditPen /></el-icon>特殊样本 <el-icon><EditPen /></el-icon>特殊样本
</el-button> </el-button>
<el-button
v-if="showSampleVoidButton"
class="btn-op-item"
@click="openSampleVoidDialog"
>
<el-icon><Delete /></el-icon>样本废弃
</el-button>
<el-button <el-button
v-if="showStorageCertQcButton" v-if="showStorageCertQcButton"
class="btn-op-item" class="btn-op-item"
@@ -254,6 +273,11 @@
:target="sampleSpecialMarkTarget" :target="sampleSpecialMarkTarget"
@success="emit('sample-special-changed')" @success="emit('sample-special-changed')"
/> />
<SampleVoidDialog
v-model:visible="sampleVoidDialogVisible"
:target="sampleVoidTarget"
@success="emit('sample-voided')"
/>
<StorageCertQcDialog <StorageCertQcDialog
v-model:visible="storageCertQcVisible" v-model:visible="storageCertQcVisible"
mode="edit" mode="edit"
@@ -302,7 +326,11 @@
import QcWorkOrderProtocolPaymentPanel from './QcWorkOrderProtocolPaymentPanel.vue' import QcWorkOrderProtocolPaymentPanel from './QcWorkOrderProtocolPaymentPanel.vue'
import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue' import SampleCodeWithSpecialDisplay from '@/components/business/sample-code-with-special-display/index.vue'
import SampleSpecialMarkDialog from '@/components/business/sample-special-mark-dialog/index.vue' import SampleSpecialMarkDialog from '@/components/business/sample-special-mark-dialog/index.vue'
import SampleStatusTag from '@/components/business/sample-status-tag/index.vue'
import SampleVoidDialog from '@/components/business/sample-void-dialog/index.vue'
import type { SampleVoidTarget } from '@/api/business-sample'
import { resolveInboundSampleSpecialMarkTargetFromRow } from '@/utils/inbound-sample-special-mark' import { resolveInboundSampleSpecialMarkTargetFromRow } from '@/utils/inbound-sample-special-mark'
import { isSampleAlreadyVoided, resolveSampleVoidTarget } from '@/utils/sample-void'
import QcWorkOrderSelectCheckbox from './QcWorkOrderSelectCheckbox.vue' import QcWorkOrderSelectCheckbox from './QcWorkOrderSelectCheckbox.vue'
defineOptions({ name: 'QcWorkOrderSingleCard' }) defineOptions({ name: 'QcWorkOrderSingleCard' })
@@ -340,9 +368,12 @@
command: [cmd: string, row: QcWorkOrder] command: [cmd: string, row: QcWorkOrder]
'tasks-changed': [] 'tasks-changed': []
'sample-special-changed': [] 'sample-special-changed': []
'sample-voided': []
}>() }>()
const sampleSpecialDialogVisible = ref(false) const sampleSpecialDialogVisible = ref(false)
const sampleVoidDialogVisible = ref(false)
const sampleVoidTarget = ref<SampleVoidTarget | null>(null)
const storageCertQcVisible = ref(false) const storageCertQcVisible = ref(false)
const showStorageCertQcButton = computed(() => { const showStorageCertQcButton = computed(() => {
@@ -377,6 +408,32 @@
resolveEffectiveRowTabKey(props.cardMetaConfig.tabKey, props.row) resolveEffectiveRowTabKey(props.cardMetaConfig.tabKey, props.row)
) )
function inboundVoidFallbackSource() {
if (effectiveRowTabKey.value === 'inbound_research_donation') return 'research_donation'
if (effectiveRowTabKey.value === 'inbound_cell_storage') return 'cell_storage'
return ''
}
const sampleVoidResolved = computed(() =>
resolveSampleVoidTarget({
receptionSource: props.row.receptionSource,
protocolSampleId: props.row.protocolSampleId,
sampleCode: props.row.sampleCode,
collectionProtocolId: props.row.collectionProtocolId,
fallbackSource: inboundVoidFallbackSource()
})
)
const showSampleVoidButton = computed(
() => !!sampleVoidResolved.value && !isSampleAlreadyVoided(props.row.sampleStatus)
)
function openSampleVoidDialog() {
if (!sampleVoidResolved.value) return
sampleVoidTarget.value = sampleVoidResolved.value
sampleVoidDialogVisible.value = true
}
const visibleMetaFields = computed(() => const visibleMetaFields = computed(() =>
effectiveCardMeta.value.metaFields.filter((field) => !field.visible || field.visible(props.row)) effectiveCardMeta.value.metaFields.filter((field) => !field.visible || field.visible(props.row))
) )
@@ -362,6 +362,7 @@
@command="handleCommand" @command="handleCommand"
@tasks-changed="onWorkOrderTasksChanged" @tasks-changed="onWorkOrderTasksChanged"
@sample-special-changed="onSampleSpecialChanged" @sample-special-changed="onSampleSpecialChanged"
@sample-voided="onSampleVoided"
@page-change="handleWorkOrderPageChange" @page-change="handleWorkOrderPageChange"
@page-size-change="handleWorkOrderPageSizeChange" @page-size-change="handleWorkOrderPageSizeChange"
/> />
@@ -560,6 +561,11 @@
emit('data-changed') emit('data-changed')
} }
async function onSampleVoided() {
await loadData()
emit('data-changed')
}
function handleCommand(command: string, row: QcWorkOrder) { function handleCommand(command: string, row: QcWorkOrder) {
if (command === 'view') { if (command === 'view') {
handleView(row) handleView(row)