Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f16a8ab3e | ||
|
|
14e733faf0 | ||
|
|
aac72e1fd9 | ||
|
|
f0a6abe538 | ||
|
|
a69dcc5bca | ||
|
|
0929164bf5 | ||
|
|
5ecde0c80d | ||
|
|
4024aad174 | ||
|
|
02811197c6 | ||
|
|
7b6a0523dd | ||
|
|
99562ee584 |
No files matched your search
@@ -2677,7 +2677,7 @@ def update_collection_protocol(
|
||||
next_status = protocol_status.strip()
|
||||
assert_protocol_status_transition(obj.protocol_status or "", next_status, kind="protocol")
|
||||
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
|
||||
if next_status == "yzf" and void_time is not None:
|
||||
if void_type is None or not str(void_type).strip():
|
||||
|
||||
@@ -49,6 +49,7 @@ from app.models.models import (
|
||||
BizPilotInfusionSchedule,
|
||||
BizPilotInfusionScheduleProduct,
|
||||
BizPilotPatient,
|
||||
BizProtocolCollectionInfo,
|
||||
BizProtocolPartyCustomer,
|
||||
BizProtocolSample,
|
||||
BizProductionTask,
|
||||
@@ -69,6 +70,7 @@ from app.models.models import (
|
||||
from app.models.qc_param import BizQcTaskResult
|
||||
from app.models.research_donation import (
|
||||
BizResearchDonation,
|
||||
BizResearchDonationCollection,
|
||||
BizResearchDonationParty,
|
||||
BizResearchDonationSample,
|
||||
)
|
||||
@@ -808,12 +810,39 @@ def _enrich_work_order_list_items(
|
||||
party.mother_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:
|
||||
if item.get("workOrderType") == "temporary":
|
||||
item["receptionSource"] = ""
|
||||
item["receptionSourceLabel"] = ""
|
||||
item["motherName"] = ""
|
||||
item["newbornName"] = ""
|
||||
item["maternalBloodCollectTime"] = ""
|
||||
continue
|
||||
rec = _resolve_reception(item)
|
||||
source = _effective_reception_source(item, rec)
|
||||
@@ -826,6 +855,7 @@ def _enrich_work_order_list_items(
|
||||
_mother, _newborn = donation_party_map.get(_did or "", ("", ""))
|
||||
item["motherName"] = _mother
|
||||
item["newbornName"] = _newborn
|
||||
item["maternalBloodCollectTime"] = donation_maternal_map.get(_did or "", "") or ""
|
||||
else:
|
||||
_pid = (
|
||||
(getattr(rec, "collection_protocol_id", None) if rec else None) or ""
|
||||
@@ -833,6 +863,7 @@ def _enrich_work_order_list_items(
|
||||
_mother, _newborn = cell_party_map.get(_pid or "", ("", ""))
|
||||
item["motherName"] = _mother
|
||||
item["newbornName"] = _newborn
|
||||
item["maternalBloodCollectTime"] = cell_maternal_map.get(_pid or "", "") or ""
|
||||
if not rec:
|
||||
item.setdefault("receptionTime", "")
|
||||
item.setdefault("handlerName", "")
|
||||
@@ -1140,6 +1171,7 @@ def _wo_to_dict(
|
||||
"receptionTime": "",
|
||||
"handlerName": "",
|
||||
"sampleTypeName": "",
|
||||
"maternalBloodCollectTime": "",
|
||||
"workOrderStatus": wo.work_order_status,
|
||||
"workOrderStatusLabel": _WORK_ORDER_STATUS_LABELS.get(
|
||||
wo.work_order_status or "", wo.work_order_status or ""
|
||||
@@ -2601,6 +2633,7 @@ def get_work_order_detail(
|
||||
"receptionSourceLabel": enriched.get("receptionSourceLabel", ""),
|
||||
"motherName": enriched.get("motherName", ""),
|
||||
"newbornName": enriched.get("newbornName", ""),
|
||||
"maternalBloodCollectTime": enriched.get("maternalBloodCollectTime", ""),
|
||||
"protocolStatus": enriched.get("protocolStatus", ""),
|
||||
"protocolStatusLabel": enriched.get("protocolStatusLabel", ""),
|
||||
"cellProductCode": enriched.get("cellProductCode", ""),
|
||||
|
||||
@@ -1702,7 +1702,8 @@ def change_status(
|
||||
)
|
||||
|
||||
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
|
||||
|
||||
after_protocol_voided(
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
"""市场协议作废 ↔ 质检样本接收废弃双向联动。
|
||||
"""市场协议无效态 ↔ 样本接收废弃 / 样本状态作废联动。
|
||||
|
||||
规则(细胞存储 / 科研捐赠):
|
||||
1. 协议变为已作废(yzf)时,协议下全部样本接收结论自动为废弃(bj)。
|
||||
1. 协议变为已作废(yzf)或属地废弃(sdfq)时:
|
||||
- 协议下全部样本接收结论自动为废弃(bj);
|
||||
- 协议下全部有效样本 `sample_status` 置为已作废(yzf),并写入 `void_date`。
|
||||
2. 协议下全部有效样本均已废弃/拒收(bj)时,协议自动已作废,作废类型为「实验室废弃」。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime
|
||||
from typing import List, Optional
|
||||
from typing import List, Optional, Union
|
||||
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.protocol_status_display import INACTIVE_PROTOCOL_STATUSES
|
||||
from app.core.utils import generate_uuid
|
||||
from app.models.models import (
|
||||
BizCollectionProtocol,
|
||||
@@ -23,11 +26,24 @@ from app.models.research_donation import BizResearchDonation, BizResearchDonatio
|
||||
LAB_VOID_TYPE_CODE = "sysfq"
|
||||
LAB_VOID_TYPE_LABEL = "实验室废弃"
|
||||
VOID_TYPE_DICT = "xyzflx"
|
||||
SAMPLE_VOID_STATUS = "yzf"
|
||||
|
||||
_AUTO_DISCARD_REMARK = "协议作废自动废弃"
|
||||
_AUTO_VOID_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:
|
||||
"""确保租户字典 xyzflx 存在「实验室废弃」,返回 dict_value。"""
|
||||
tenant = (tenant_no or "").strip()
|
||||
@@ -204,7 +220,7 @@ def discard_receptions_for_voided_protocol(
|
||||
tenant_no: str,
|
||||
user_id: Optional[str] = None,
|
||||
) -> int:
|
||||
"""协议已作废后,将其下样本接收全部置为废弃。返回处理样本数。"""
|
||||
"""协议无效后,将其下样本接收全部置为废弃。返回处理样本数。"""
|
||||
src = (source or "").strip()
|
||||
pid = (protocol_id or "").strip()
|
||||
tenant = (tenant_no or "").strip()
|
||||
@@ -242,6 +258,75 @@ def discard_receptions_for_voided_protocol(
|
||||
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(
|
||||
db: Session,
|
||||
*,
|
||||
@@ -299,7 +384,7 @@ def maybe_void_protocol_when_all_samples_discarded(
|
||||
if not obj:
|
||||
return False
|
||||
status = (obj.protocol_status or "").strip()
|
||||
if status in ("yzf", "sdfq"):
|
||||
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
|
||||
@@ -319,7 +404,8 @@ def maybe_void_protocol_when_all_samples_discarded(
|
||||
void_desc=_AUTO_VOID_DESC,
|
||||
void_type=void_type,
|
||||
commit=False,
|
||||
sync_reception_discard=False,
|
||||
# 接收已全部废弃;仍需同步样本状态为已作废
|
||||
sync_reception_discard=True,
|
||||
)
|
||||
return True
|
||||
|
||||
@@ -335,7 +421,7 @@ def maybe_void_protocol_when_all_samples_discarded(
|
||||
if not obj:
|
||||
return False
|
||||
status = (obj.donation_status or "").strip()
|
||||
if status in ("yzf", "sdfq"):
|
||||
if status in INACTIVE_PROTOCOL_STATUSES:
|
||||
return False
|
||||
|
||||
# 捐赠 change_status 默认 commit;此处内联等价逻辑避免提前提交。
|
||||
@@ -374,6 +460,14 @@ def maybe_void_protocol_when_all_samples_discarded(
|
||||
)
|
||||
db.add(obj)
|
||||
db.flush()
|
||||
# 接收已全部废弃;仍需同步样本状态为已作废
|
||||
after_protocol_voided(
|
||||
db,
|
||||
source="research_donation",
|
||||
protocol_id=pid,
|
||||
tenant_no=tenant,
|
||||
user_id=user_id,
|
||||
)
|
||||
return True
|
||||
|
||||
|
||||
@@ -411,7 +505,7 @@ def after_protocol_voided(
|
||||
tenant_no: str,
|
||||
user_id: Optional[str] = None,
|
||||
) -> None:
|
||||
"""协议作废后:同步废弃其下全部样本接收。"""
|
||||
"""协议作废/属地废弃后:同步废弃样本接收,并将样本状态置为已作废。"""
|
||||
discard_receptions_for_voided_protocol(
|
||||
db,
|
||||
source=source,
|
||||
@@ -419,3 +513,13 @@ def after_protocol_voided(
|
||||
tenant_no=tenant_no,
|
||||
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
|
||||
),
|
||||
)
|
||||
@@ -23,6 +23,7 @@ from app.models.research_donation import (
|
||||
)
|
||||
from app.services.protocol_reception_discard_sync import (
|
||||
LAB_VOID_TYPE_CODE,
|
||||
SAMPLE_VOID_STATUS,
|
||||
after_protocol_voided,
|
||||
after_sample_reception_saved,
|
||||
ensure_lab_void_type,
|
||||
@@ -77,6 +78,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
||||
id="p1",
|
||||
protocol_no="CP-1",
|
||||
protocol_status="sxz",
|
||||
void_time=now,
|
||||
tenant_no="tenant-a",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
@@ -89,6 +91,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
||||
id="s1",
|
||||
collection_protocol_id="p1",
|
||||
sample_code="ZK001",
|
||||
sample_status="yrk",
|
||||
tenant_no="tenant-a",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
@@ -101,6 +104,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
||||
id="s2",
|
||||
collection_protocol_id="p1",
|
||||
sample_code="ZK002",
|
||||
sample_status="jcz",
|
||||
tenant_no="tenant-a",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
@@ -152,6 +156,16 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
||||
self.assertEqual(by_code["ZK001"], "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):
|
||||
db = _session()
|
||||
now = _now()
|
||||
@@ -172,6 +186,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
||||
id="s3",
|
||||
collection_protocol_id="p2",
|
||||
sample_code="ZK003",
|
||||
sample_status="ycj",
|
||||
tenant_no="tenant-a",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
@@ -212,6 +227,9 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
||||
self.assertEqual(proto.protocol_status, "yzf")
|
||||
self.assertEqual(proto.void_type, LAB_VOID_TYPE_CODE)
|
||||
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):
|
||||
db = _session()
|
||||
@@ -282,6 +300,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
||||
id="d1",
|
||||
donation_no="RD-1",
|
||||
donation_status="sxz",
|
||||
void_time=now,
|
||||
tenant_no="tenant-a",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
@@ -294,6 +313,7 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
||||
id="ds1",
|
||||
research_donation_id="d1",
|
||||
sample_code="RD001",
|
||||
sample_status="yrk",
|
||||
tenant_no="tenant-a",
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
@@ -322,6 +342,62 @@ class TestProtocolReceptionDiscardSync(unittest.TestCase):
|
||||
)
|
||||
self.assertEqual(rec.accept_conclusion, "bj")
|
||||
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")
|
||||
|
||||
|
||||
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 步
|
||||
-- 步骤:原代培养 → 半换液 → 二次贴壁 → 重铺 → 冻存(不含传代)
|
||||
-- 内容从既有「干细胞培养(内置模版)」/ 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
|
||||
-- 或 Python:
|
||||
-- cd backend && python -m scripts.backfill_uc_msc_production_tasks
|
||||
@@ -46,7 +47,7 @@ WHERE src.del_flag = 0
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
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.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.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
|
||||
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
|
||||
AND s.process_code = 'SOP-SC-003-E01-01'
|
||||
AND (
|
||||
@@ -97,7 +100,9 @@ SELECT
|
||||
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
|
||||
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
|
||||
AND s.process_code = 'SOP-SC-004-E01-01'
|
||||
AND (
|
||||
@@ -127,7 +132,9 @@ SELECT
|
||||
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
|
||||
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
|
||||
AND s.process_code = 'SOP-SC-006-E01-01'
|
||||
AND (
|
||||
@@ -157,7 +164,9 @@ SELECT
|
||||
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
|
||||
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
|
||||
AND s.process_code = 'SOP-SC-005-E01-01'
|
||||
AND (
|
||||
@@ -187,7 +196,9 @@ SELECT
|
||||
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
|
||||
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
|
||||
AND s.process_code = 'SOP-SC-008-E01-01'
|
||||
AND (
|
||||
@@ -228,7 +239,7 @@ WHERE r.id = 'UCMSCROUTEA5CC11F194118AC54085447A'
|
||||
AND r.del_flag = 0
|
||||
AND NOT EXISTS (
|
||||
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.is_builtin = '1'
|
||||
AND x.del_flag = 0
|
||||
@@ -261,5 +272,6 @@ WHERE s.set_name = '脐带MSC原代培养(内置模版)'
|
||||
AND s.del_flag = 0
|
||||
AND NOT EXISTS (
|
||||
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。
|
||||
-- 前置:biz_process_route.route_code='MSC原代-UC-BUILTIN'(或固定 id UCMSCROUTE…)及 5 步须已存在。
|
||||
-- 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;
|
||||
|
||||
@@ -43,7 +47,7 @@ SET @uc_route_id := (
|
||||
SET @uc_step_count := (
|
||||
SELECT COUNT(*)
|
||||
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
|
||||
);
|
||||
|
||||
@@ -70,7 +74,7 @@ CREATE TEMPORARY TABLE tmp_uc_wo_backfill (
|
||||
route_id VARCHAR(64) NULL,
|
||||
PRIMARY KEY (seq),
|
||||
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 (
|
||||
work_order_id, reception_id, lab_storage_code, tenant_no, sample_code, route_id
|
||||
@@ -84,8 +88,8 @@ SELECT
|
||||
@uc_route_id
|
||||
FROM biz_production_work_order wo
|
||||
INNER JOIN biz_sample_reception rec
|
||||
ON rec.id = wo.reception_id
|
||||
AND rec.tenant_no = wo.tenant_no
|
||||
ON rec.id COLLATE utf8mb4_general_ci = wo.reception_id COLLATE utf8mb4_general_ci
|
||||
AND rec.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
|
||||
AND rec.del_flag = 0
|
||||
WHERE @uc_ready = 1
|
||||
AND wo.del_flag = 0
|
||||
@@ -101,8 +105,8 @@ WHERE @uc_ready = 1
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM biz_production_task t
|
||||
WHERE t.work_order_id = wo.id
|
||||
AND t.tenant_no = wo.tenant_no
|
||||
WHERE t.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
|
||||
AND t.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
|
||||
AND t.del_flag = 0
|
||||
)
|
||||
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 := (
|
||||
SELECT IFNULL(MAX(CAST(SUBSTRING(t.task_no, 11) AS UNSIGNED)), 0)
|
||||
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
|
||||
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'));
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
@@ -170,14 +175,14 @@ SELECT
|
||||
0
|
||||
FROM tmp_uc_wo_backfill c
|
||||
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
|
||||
WHERE @uc_ready = 1
|
||||
AND c.task_id IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM biz_production_task t
|
||||
WHERE t.work_order_id = c.work_order_id
|
||||
AND t.tenant_no = c.tenant_no
|
||||
WHERE t.work_order_id COLLATE utf8mb4_general_ci = c.work_order_id COLLATE utf8mb4_general_ci
|
||||
AND t.tenant_no COLLATE utf8mb4_general_ci = c.tenant_no COLLATE utf8mb4_general_ci
|
||||
AND t.del_flag = 0
|
||||
);
|
||||
|
||||
@@ -195,7 +200,7 @@ CREATE TEMPORARY TABLE tmp_uc_step_map (
|
||||
PRIMARY KEY (task_id, route_step_id),
|
||||
KEY ix_route_step (route_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 (
|
||||
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.tenant_no,
|
||||
rs.id,
|
||||
UPPER(REPLACE(UUID(), '-', '')),
|
||||
UPPER(MD5(CONCAT('uc-msc-backfill-step:', c.work_order_id, ':', rs.id))),
|
||||
rs.step_order
|
||||
FROM tmp_uc_wo_backfill c
|
||||
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
|
||||
WHERE @uc_ready = 1
|
||||
AND EXISTS (
|
||||
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
|
||||
FROM tmp_uc_step_map m
|
||||
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
|
||||
WHERE NOT EXISTS (
|
||||
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
|
||||
)
|
||||
SELECT
|
||||
UPPER(REPLACE(UUID(), '-', '')),
|
||||
UPPER(MD5(CONCAT('uc-msc-backfill-reag:', m.task_step_id, ':', src.id))),
|
||||
m.task_step_id,
|
||||
src.reagent_code,
|
||||
src.reagent_name,
|
||||
@@ -292,7 +298,7 @@ SELECT
|
||||
0
|
||||
FROM tmp_uc_step_map m
|
||||
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;
|
||||
|
||||
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
|
||||
)
|
||||
SELECT
|
||||
UPPER(REPLACE(UUID(), '-', '')),
|
||||
UPPER(MD5(CONCAT('uc-msc-backfill-cons:', m.task_step_id, ':', src.id))),
|
||||
m.task_step_id,
|
||||
src.consumable_code,
|
||||
src.consumable_name,
|
||||
@@ -320,7 +326,7 @@ SELECT
|
||||
0
|
||||
FROM tmp_uc_step_map m
|
||||
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;
|
||||
|
||||
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
|
||||
)
|
||||
SELECT
|
||||
UPPER(REPLACE(UUID(), '-', '')),
|
||||
UPPER(MD5(CONCAT('uc-msc-backfill-out:', m.task_step_id, ':', src.id))),
|
||||
m.task_step_id,
|
||||
src.output_type_id,
|
||||
src.output_name,
|
||||
@@ -345,7 +351,7 @@ SELECT
|
||||
0
|
||||
FROM tmp_uc_step_map m
|
||||
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;
|
||||
|
||||
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
|
||||
)
|
||||
SELECT
|
||||
UPPER(REPLACE(UUID(), '-', '')),
|
||||
UPPER(MD5(CONCAT('uc-msc-backfill-dc:', m.task_step_id, ':', src.id))),
|
||||
m.task_step_id,
|
||||
src.collection_name,
|
||||
src.unit,
|
||||
@@ -368,14 +374,15 @@ SELECT
|
||||
0
|
||||
FROM tmp_uc_step_map m
|
||||
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;
|
||||
|
||||
-- ---------------------------------------------------------------------------
|
||||
-- 6. 回写工单状态:有任务则 jxz(不改 ywc)
|
||||
-- ---------------------------------------------------------------------------
|
||||
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
|
||||
wo.work_order_status = 'jxz',
|
||||
wo.update_time = NOW()
|
||||
@@ -383,8 +390,8 @@ WHERE wo.del_flag = 0
|
||||
AND wo.work_order_status = 'dpz'
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM biz_production_task t
|
||||
WHERE t.work_order_id = wo.id
|
||||
AND t.tenant_no = wo.tenant_no
|
||||
WHERE t.work_order_id COLLATE utf8mb4_general_ci = wo.id COLLATE utf8mb4_general_ci
|
||||
AND t.tenant_no COLLATE utf8mb4_general_ci = wo.tenant_no COLLATE utf8mb4_general_ci
|
||||
AND t.del_flag = 0
|
||||
);
|
||||
|
||||
@@ -399,10 +406,18 @@ SELECT
|
||||
t.id AS task_id,
|
||||
t.task_no,
|
||||
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
|
||||
LEFT JOIN biz_production_work_order wo ON wo.id = c.work_order_id
|
||||
LEFT JOIN biz_production_task t ON t.id = c.task_id AND t.del_flag = 0
|
||||
LEFT JOIN biz_production_work_order wo
|
||||
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;
|
||||
|
||||
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) = ''
|
||||
);
|
||||
@@ -25,6 +25,17 @@ export function fetchCreateReceiveAccount(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) {
|
||||
return get('/web/admin/oa-approval/related-candidates', params)
|
||||
}
|
||||
|
||||
@@ -150,6 +150,7 @@ import {
|
||||
uploadAttachment
|
||||
} from '../../api/oa.js'
|
||||
import OaCommentFileCards from './OaCommentFileCards.vue'
|
||||
import { hasOaCommentDraft } from '../oa-comment-draft.js'
|
||||
import { attachmentFullUrl } from '../../utils/attachment.js'
|
||||
import { isHarmonyWechat } from '../../utils/harmony-file-picker.js'
|
||||
import HarmonyFileSource from '../../components/HarmonyFileSource.vue'
|
||||
@@ -516,12 +517,25 @@ function confirmMention() {
|
||||
mentionVisible.value = false
|
||||
}
|
||||
|
||||
async function onSend() {
|
||||
const content = draft.value.trim()
|
||||
if (!content && !mentionUsers.value.length && !picked.value.length) {
|
||||
showToast('请填写评论、@人员或添加附件')
|
||||
return
|
||||
function draftPending() {
|
||||
return hasOaCommentDraft({
|
||||
content: draft.value,
|
||||
mentionCount: mentionUsers.value.length,
|
||||
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
|
||||
try {
|
||||
await fetchCreateOaComment(props.instanceId, {
|
||||
@@ -533,15 +547,27 @@ async function onSend() {
|
||||
picked.value = []
|
||||
mentionUsers.value = []
|
||||
closeAtSuggest()
|
||||
showToast('已发送')
|
||||
if (!opts.quiet) showToast('已发送')
|
||||
emit('refresh')
|
||||
return true
|
||||
} catch (e) {
|
||||
showToast(e?.message || '发送失败')
|
||||
return false
|
||||
} finally {
|
||||
sending.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function onSend() {
|
||||
if (!draftPending()) {
|
||||
showToast('请填写评论、@人员或添加附件')
|
||||
return
|
||||
}
|
||||
await flushDraft()
|
||||
}
|
||||
|
||||
defineExpose({ flushDraft, draftPending })
|
||||
|
||||
onMounted(() => {
|
||||
void ensureUserCache()
|
||||
})
|
||||
|
||||
@@ -52,6 +52,24 @@
|
||||
<div class="oa-sheet-row__title">{{ a.label }}</div>
|
||||
<div v-if="a.sub" class="oa-sheet-row__meta">{{ a.sub }}</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>
|
||||
</van-checkbox-group>
|
||||
<van-empty v-if="!loading && !filtered.length" description="暂无本人的收款账户" />
|
||||
@@ -63,17 +81,17 @@
|
||||
</div>
|
||||
</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__hd">
|
||||
<span @click="createVisible = false">取消</span>
|
||||
<strong>新增收款账户</strong>
|
||||
<span @click="formVisible = false">取消</span>
|
||||
<strong>{{ formTitle }}</strong>
|
||||
<span
|
||||
class="oa-recv__ok"
|
||||
:class="{ 'is-busy': createLoading }"
|
||||
@click="submitCreate"
|
||||
:class="{ 'is-busy': formLoading }"
|
||||
@click="submitForm"
|
||||
>
|
||||
{{ createLoading ? '提交中' : '确定' }}
|
||||
{{ formLoading ? '提交中' : '确定' }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="oa-recv__form">
|
||||
@@ -87,45 +105,45 @@
|
||||
<label class="oa-recv-field">
|
||||
<span class="oa-recv-field__label">户名<b>*</b></span>
|
||||
<span class="oa-recv-field__box">
|
||||
<input v-model="createForm.accountName" maxlength="128" placeholder="请输入户名" />
|
||||
<input v-model="formModel.accountName" maxlength="128" placeholder="请输入户名" />
|
||||
</span>
|
||||
</label>
|
||||
<label class="oa-recv-field">
|
||||
<span class="oa-recv-field__label">账号<b>*</b></span>
|
||||
<span class="oa-recv-field__box">
|
||||
<input v-model="createForm.accountNo" maxlength="128" placeholder="请输入账号" />
|
||||
<input v-model="formModel.accountNo" maxlength="128" placeholder="请输入账号" />
|
||||
</span>
|
||||
</label>
|
||||
<template v-if="createForm.accountType !== 'alipay'">
|
||||
<template v-if="formModel.accountType !== 'alipay'">
|
||||
<label class="oa-recv-field">
|
||||
<span class="oa-recv-field__label">银行<b>*</b></span>
|
||||
<span class="oa-recv-field__box">
|
||||
<input v-model="createForm.bankName" maxlength="128" placeholder="如:中国工商银行" />
|
||||
<input v-model="formModel.bankName" maxlength="128" placeholder="如:中国工商银行" />
|
||||
</span>
|
||||
</label>
|
||||
<label class="oa-recv-field">
|
||||
<span class="oa-recv-field__label">银行所在省<b>*</b></span>
|
||||
<span class="oa-recv-field__box">
|
||||
<input v-model="createForm.bankProvince" maxlength="64" placeholder="如:安徽省" />
|
||||
<input v-model="formModel.bankProvince" maxlength="64" placeholder="如:安徽省" />
|
||||
</span>
|
||||
</label>
|
||||
<label class="oa-recv-field">
|
||||
<span class="oa-recv-field__label">银行所在市<b>*</b></span>
|
||||
<span class="oa-recv-field__box">
|
||||
<input v-model="createForm.bankCity" maxlength="64" placeholder="如:合肥市" />
|
||||
<input v-model="formModel.bankCity" maxlength="64" placeholder="如:合肥市" />
|
||||
</span>
|
||||
</label>
|
||||
<label class="oa-recv-field">
|
||||
<span class="oa-recv-field__label">银行支行<b>*</b></span>
|
||||
<span class="oa-recv-field__box">
|
||||
<input v-model="createForm.bankBranch" maxlength="256" placeholder="请输入开户支行全称" />
|
||||
<input v-model="formModel.bankBranch" maxlength="256" placeholder="请输入开户支行全称" />
|
||||
</span>
|
||||
</label>
|
||||
</template>
|
||||
<label class="oa-recv-field">
|
||||
<span class="oa-recv-field__label">备注</span>
|
||||
<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>
|
||||
</label>
|
||||
</div>
|
||||
@@ -135,7 +153,7 @@
|
||||
<van-popup v-model:show="typePickerVisible" position="bottom" round>
|
||||
<van-picker
|
||||
:columns="accountTypeColumns"
|
||||
:model-value="[createForm.accountType]"
|
||||
:model-value="[formModel.accountType]"
|
||||
@confirm="onTypeConfirm"
|
||||
@cancel="typePickerVisible = false"
|
||||
/>
|
||||
@@ -145,8 +163,13 @@
|
||||
|
||||
<script setup>
|
||||
import { computed, onMounted, ref } from 'vue'
|
||||
import { showToast } from 'vant'
|
||||
import { fetchCreateReceiveAccount, fetchReceiveAccountOptions } from '../../api/oa.js'
|
||||
import { showConfirmDialog, showToast } from 'vant'
|
||||
import {
|
||||
fetchCreateReceiveAccount,
|
||||
fetchDeleteReceiveAccount,
|
||||
fetchReceiveAccountOptions,
|
||||
fetchUpdateReceiveAccount
|
||||
} from '../../api/oa.js'
|
||||
import {
|
||||
ACCOUNT_TYPE_LABEL,
|
||||
formatReceiveAccountLine,
|
||||
@@ -170,17 +193,19 @@ const keyword = ref('')
|
||||
const pendingIds = ref([])
|
||||
const snapshotMap = ref(new Map())
|
||||
const accountOptions = ref([])
|
||||
const createVisible = ref(false)
|
||||
const createLoading = ref(false)
|
||||
const formVisible = ref(false)
|
||||
const formLoading = ref(false)
|
||||
const formMode = ref('create')
|
||||
const editingId = ref('')
|
||||
const typePickerVisible = ref(false)
|
||||
const accountTypeColumns = [
|
||||
{ text: '支付宝', value: 'alipay' },
|
||||
{ text: '个人银行卡', value: 'personal' },
|
||||
{ text: '对公银行账户', value: 'corporate' }
|
||||
]
|
||||
const createForm = ref(emptyCreateForm())
|
||||
const formModel = ref(emptyForm())
|
||||
|
||||
function emptyCreateForm() {
|
||||
function emptyForm() {
|
||||
return {
|
||||
accountType: 'alipay',
|
||||
accountName: '',
|
||||
@@ -193,8 +218,12 @@ function emptyCreateForm() {
|
||||
}
|
||||
}
|
||||
|
||||
const formTitle = computed(() =>
|
||||
formMode.value === 'edit' ? '编辑收款账户' : '新增收款账户'
|
||||
)
|
||||
|
||||
const accountTypeLabel = computed(
|
||||
() => ACCOUNT_TYPE_LABEL[createForm.value.accountType] || ''
|
||||
() => ACCOUNT_TYPE_LABEL[formModel.value.accountType] || ''
|
||||
)
|
||||
|
||||
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() {
|
||||
createForm.value = emptyCreateForm()
|
||||
formMode.value = 'create'
|
||||
editingId.value = ''
|
||||
formModel.value = emptyForm()
|
||||
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 }) {
|
||||
const next = selectedOptions?.[0]?.value || 'alipay'
|
||||
const form = { ...createForm.value, accountType: next }
|
||||
const form = { ...formModel.value, accountType: next }
|
||||
if (next === 'alipay') {
|
||||
form.bankName = ''
|
||||
form.bankProvince = ''
|
||||
form.bankCity = ''
|
||||
form.bankBranch = ''
|
||||
}
|
||||
createForm.value = form
|
||||
formModel.value = form
|
||||
typePickerVisible.value = false
|
||||
}
|
||||
|
||||
function validateCreate(form) {
|
||||
function validateForm(form) {
|
||||
if (!form.accountName.trim()) return '请输入户名'
|
||||
if (!form.accountNo.trim()) return '请输入账号'
|
||||
if (form.accountType !== 'alipay') {
|
||||
@@ -291,14 +372,7 @@ function validateCreate(form) {
|
||||
return ''
|
||||
}
|
||||
|
||||
async function submitCreate() {
|
||||
if (createLoading.value) return
|
||||
const form = createForm.value
|
||||
const invalid = validateCreate(form)
|
||||
if (invalid) {
|
||||
showToast(invalid)
|
||||
return
|
||||
}
|
||||
function buildPayload(form) {
|
||||
const payload = {
|
||||
accountType: form.accountType,
|
||||
accountName: form.accountName.trim(),
|
||||
@@ -316,36 +390,80 @@ async function submitCreate() {
|
||||
payload.bankCity = form.bankCity.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 {
|
||||
const created = await fetchCreateReceiveAccount(payload)
|
||||
const snap = snapshotFromRow(created)
|
||||
const row =
|
||||
formMode.value === 'edit' && editingId.value
|
||||
? await fetchUpdateReceiveAccount(editingId.value, payload)
|
||||
: await fetchCreateReceiveAccount(payload)
|
||||
const snap = snapshotFromRow(row)
|
||||
if (!snap.id) {
|
||||
showToast('创建成功但未返回账户 ID')
|
||||
showToast(formMode.value === 'edit' ? '更新成功但未返回账户 ID' : '创建成功但未返回账户 ID')
|
||||
return
|
||||
}
|
||||
await loadOptions()
|
||||
if (!snapshotMap.value.has(snap.id)) {
|
||||
const map = new Map(snapshotMap.value)
|
||||
map.set(snap.id, snap)
|
||||
snapshotMap.value = map
|
||||
if (!accountOptions.value.some((x) => x.id === snap.id)) {
|
||||
accountOptions.value = [...accountOptions.value, optionFromSnap(snap)]
|
||||
upsertLocalSnap(snap)
|
||||
if (formMode.value === 'edit') {
|
||||
const selected = normalized.value.map((x) => x.id)
|
||||
if (selected.includes(snap.id)) {
|
||||
emitItems(selected.map((id) => snapshotMap.value.get(id)).filter(Boolean))
|
||||
}
|
||||
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))
|
||||
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('创建成功')
|
||||
formVisible.value = false
|
||||
} catch (e) {
|
||||
showToast(e?.message || '新增收款账户失败')
|
||||
showToast(e?.message || (formMode.value === 'edit' ? '编辑收款账户失败' : '新增收款账户失败'))
|
||||
} 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;
|
||||
}
|
||||
|
||||
.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 {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
|
||||
@@ -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)
|
||||
})
|
||||
@@ -29,6 +29,7 @@
|
||||
@refresh="reloadDetail"
|
||||
/>
|
||||
<OaCommentComposer
|
||||
ref="commentComposerRef"
|
||||
:instance-id="instanceId"
|
||||
:instance-status="detail?.status || ''"
|
||||
@refresh="reloadDetail"
|
||||
@@ -238,6 +239,7 @@ const currentUserId = ref('')
|
||||
const currentUserName = ref('')
|
||||
const autoPrinted = ref(false)
|
||||
|
||||
const commentComposerRef = ref(null)
|
||||
const commentVisible = ref(false)
|
||||
const commentKind = ref('approve') // approve | reject | return
|
||||
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 (!(await flushPendingComment())) return
|
||||
commentKind.value = kind
|
||||
commentText.value = defaultComment(kind)
|
||||
commentVisible.value = true
|
||||
|
||||
@@ -141,6 +141,8 @@ export type QcWorkOrder = {
|
||||
patientName?: string
|
||||
/** 入库工单(细胞存储/科研捐赠):母亲姓名 */
|
||||
motherName?: string
|
||||
/** 协议单母血采集时间;未录入时为空,前端展示为 — */
|
||||
maternalBloodCollectTime?: string
|
||||
/** 入库工单(细胞存储/科研捐赠):新生儿姓名 */
|
||||
newbornName?: string
|
||||
/** 出库工单:当前为第几次输注计划 */
|
||||
|
||||
@@ -192,6 +192,7 @@
|
||||
} from '@/api/oaApproval'
|
||||
import OaCommentFileCards from '@/components/oa-approval/OaCommentFileCards.vue'
|
||||
import { attachmentFullUrl } from '@/composables/useAttachmentActions'
|
||||
import { hasOaCommentDraft } from '@/utils/oa-comment-draft'
|
||||
import { isOaUploadImageFile, isOaUploadVideoFile } from '@/utils/oa-upload-file-type'
|
||||
|
||||
defineOptions({ name: 'OaCommentPanel' })
|
||||
@@ -546,12 +547,25 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function onSend() {
|
||||
const content = draft.value.trim()
|
||||
if (!content && !mentionUsers.value.length && !picked.value.length) {
|
||||
ElMessage.warning('请填写评论、@人员或添加附件')
|
||||
return
|
||||
function draftPending() {
|
||||
return hasOaCommentDraft({
|
||||
content: draft.value,
|
||||
mentionCount: mentionUsers.value.length,
|
||||
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
|
||||
try {
|
||||
await fetchCreateOaComment(props.instanceId, {
|
||||
@@ -565,15 +579,27 @@
|
||||
picked.value = []
|
||||
mentionUsers.value = []
|
||||
closeAtSuggest()
|
||||
ElMessage.success('已发送')
|
||||
if (!opts?.quiet) ElMessage.success('已发送')
|
||||
emit('refresh')
|
||||
return true
|
||||
} catch (e: any) {
|
||||
ElMessage.error(e?.message || '发送失败')
|
||||
return false
|
||||
} finally {
|
||||
sending.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function onSend() {
|
||||
if (!draftPending()) {
|
||||
ElMessage.warning('请填写评论、@人员或添加附件')
|
||||
return
|
||||
}
|
||||
await flushDraft()
|
||||
}
|
||||
|
||||
defineExpose({ flushDraft, draftPending })
|
||||
|
||||
onMounted(() => {
|
||||
void ensureUserCache()
|
||||
})
|
||||
|
||||
@@ -40,17 +40,39 @@
|
||||
class="oa-receive-account-select__search"
|
||||
/>
|
||||
<div class="oa-receive-account-select__list">
|
||||
<label
|
||||
<div
|
||||
v-for="a in filteredOptions"
|
||||
:key="a.id"
|
||||
class="oa-receive-account-select__row"
|
||||
>
|
||||
<el-checkbox
|
||||
: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>
|
||||
<label class="oa-receive-account-select__row-main">
|
||||
<el-checkbox
|
||||
: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>
|
||||
<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>
|
||||
@@ -92,7 +114,31 @@
|
||||
:key="a.id"
|
||||
:label="a.label"
|
||||
: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>
|
||||
<div class="oa-receive-account-select__empty">
|
||||
{{ accountOptions.length === 0 ? '暂无本人的收款账户' : '无匹配数据' }}
|
||||
@@ -120,8 +166,8 @@
|
||||
</template>
|
||||
|
||||
<el-dialog
|
||||
v-model="createVisible"
|
||||
title="新增收款账户"
|
||||
v-model="formVisible"
|
||||
:title="formTitle"
|
||||
width="720px"
|
||||
class="dialog-form-layout"
|
||||
align-center
|
||||
@@ -131,9 +177,9 @@
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<el-form
|
||||
ref="createFormRef"
|
||||
:model="createForm"
|
||||
:rules="createRules"
|
||||
ref="formRef"
|
||||
:model="formModel"
|
||||
:rules="formRules"
|
||||
label-position="top"
|
||||
scroll-to-error
|
||||
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
|
||||
@@ -141,9 +187,9 @@
|
||||
<div class="form-grid-2">
|
||||
<el-form-item label="账户类型" prop="accountType" class="form-col-span-2">
|
||||
<el-select
|
||||
v-model="createForm.accountType"
|
||||
v-model="formModel.accountType"
|
||||
placeholder="请选择"
|
||||
@change="onCreateTypeChange"
|
||||
@change="onFormTypeChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="(label, value) in ACCOUNT_TYPE_LABEL"
|
||||
@@ -154,22 +200,22 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<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 label="账号" prop="accountNo">
|
||||
<el-input v-model="createForm.accountNo" placeholder="请输入账号" maxlength="128" />
|
||||
<el-input v-model="formModel.accountNo" placeholder="请输入账号" maxlength="128" />
|
||||
</el-form-item>
|
||||
<template v-if="createForm.accountType !== 'alipay'">
|
||||
<template v-if="formModel.accountType !== 'alipay'">
|
||||
<el-form-item label="银行" prop="bankName">
|
||||
<el-input
|
||||
v-model="createForm.bankName"
|
||||
v-model="formModel.bankName"
|
||||
placeholder="如:中国工商银行"
|
||||
maxlength="128"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="银行所在省" prop="bankProvince">
|
||||
<el-input
|
||||
v-model="createForm.bankProvince"
|
||||
v-model="formModel.bankProvince"
|
||||
placeholder="如:安徽省"
|
||||
maxlength="64"
|
||||
clearable
|
||||
@@ -177,7 +223,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="银行所在市" prop="bankCity">
|
||||
<el-input
|
||||
v-model="createForm.bankCity"
|
||||
v-model="formModel.bankCity"
|
||||
placeholder="如:合肥市"
|
||||
maxlength="64"
|
||||
clearable
|
||||
@@ -185,7 +231,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="银行支行" prop="bankBranch" class="form-col-span-2">
|
||||
<el-input
|
||||
v-model="createForm.bankBranch"
|
||||
v-model="formModel.bankBranch"
|
||||
placeholder="请输入开户支行全称"
|
||||
maxlength="256"
|
||||
/>
|
||||
@@ -193,7 +239,7 @@
|
||||
</template>
|
||||
<el-form-item label="备注" class="form-col-span-2">
|
||||
<el-input
|
||||
v-model="createForm.remark"
|
||||
v-model="formModel.remark"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
placeholder="选填"
|
||||
@@ -203,15 +249,15 @@
|
||||
</div>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button class="btn-ghost" @click="createVisible = false">
|
||||
<el-button class="btn-ghost" @click="formVisible = false">
|
||||
<el-icon><Close /></el-icon>
|
||||
取消
|
||||
</el-button>
|
||||
<el-button
|
||||
class="btn-main"
|
||||
type="primary"
|
||||
:loading="createLoading"
|
||||
@click="submitCreate"
|
||||
:loading="formLoading"
|
||||
@click="submitForm"
|
||||
>
|
||||
<el-icon><Check /></el-icon>
|
||||
确定
|
||||
@@ -223,11 +269,13 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
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 {
|
||||
fetchCreateOaReceiveAccount,
|
||||
fetchOaReceiveAccountOptions
|
||||
fetchDeleteOaReceiveAccount,
|
||||
fetchOaReceiveAccountOptions,
|
||||
fetchUpdateOaReceiveAccount
|
||||
} from '@/api/oaApproval'
|
||||
import {
|
||||
ACCOUNT_TYPE_LABEL,
|
||||
@@ -253,6 +301,7 @@
|
||||
}>()
|
||||
|
||||
type AccountOpt = { id: string; label: string }
|
||||
type FormMode = 'create' | 'edit'
|
||||
|
||||
const snapshotMap = ref(new Map<string, ReceiveAccountSnapshot>())
|
||||
const accountOptions = ref<AccountOpt[]>([])
|
||||
@@ -263,10 +312,12 @@
|
||||
const selectRef = ref<{ blur?: () => void } | null>(null)
|
||||
let mql: MediaQueryList | null = null
|
||||
|
||||
const createVisible = ref(false)
|
||||
const createLoading = ref(false)
|
||||
const createFormRef = ref()
|
||||
const createForm = reactive({
|
||||
const formVisible = ref(false)
|
||||
const formLoading = ref(false)
|
||||
const formMode = ref<FormMode>('create')
|
||||
const editingId = ref('')
|
||||
const formRef = ref()
|
||||
const formModel = reactive({
|
||||
accountType: 'alipay' as ReceiveAccountType,
|
||||
accountName: '',
|
||||
accountNo: '',
|
||||
@@ -277,8 +328,12 @@
|
||||
remark: ''
|
||||
})
|
||||
|
||||
const formTitle = computed(() =>
|
||||
formMode.value === 'edit' ? '编辑收款账户' : '新增收款账户'
|
||||
)
|
||||
|
||||
const requireWhenBank = (_rule: any, value: string, callback: (e?: Error) => void) => {
|
||||
if (createForm.accountType === 'alipay') {
|
||||
if (formModel.accountType === 'alipay') {
|
||||
callback()
|
||||
return
|
||||
}
|
||||
@@ -289,7 +344,7 @@
|
||||
callback()
|
||||
}
|
||||
|
||||
const createRules = computed(() => ({
|
||||
const formRules = computed(() => ({
|
||||
accountType: [{ required: true, message: '请选择账户类型', trigger: 'change' }],
|
||||
accountName: [{ required: true, message: '请输入户名', trigger: 'blur' }],
|
||||
accountNo: [{ required: true, message: '请输入账号', trigger: 'blur' }],
|
||||
@@ -358,90 +413,161 @@
|
||||
drawerVisible.value = false
|
||||
}
|
||||
|
||||
function clearCreateBankFields() {
|
||||
createForm.bankName = ''
|
||||
createForm.bankProvince = ''
|
||||
createForm.bankCity = ''
|
||||
createForm.bankBranch = ''
|
||||
function clearBankFields() {
|
||||
formModel.bankName = ''
|
||||
formModel.bankProvince = ''
|
||||
formModel.bankCity = ''
|
||||
formModel.bankBranch = ''
|
||||
}
|
||||
|
||||
function resetCreateForm() {
|
||||
createForm.accountType = 'alipay'
|
||||
createForm.accountName = ''
|
||||
createForm.accountNo = ''
|
||||
clearCreateBankFields()
|
||||
createForm.remark = ''
|
||||
function resetFormModel() {
|
||||
formModel.accountType = 'alipay'
|
||||
formModel.accountName = ''
|
||||
formModel.accountNo = ''
|
||||
clearBankFields()
|
||||
formModel.remark = ''
|
||||
}
|
||||
|
||||
function onCreateTypeChange() {
|
||||
if (createForm.accountType === 'alipay') clearCreateBankFields()
|
||||
createFormRef.value?.clearValidate?.()
|
||||
function fillFormFromSnap(snap: ReceiveAccountSnapshot) {
|
||||
formModel.accountType = snap.accountType
|
||||
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() {
|
||||
selectRef.value?.blur?.()
|
||||
resetCreateForm()
|
||||
createVisible.value = true
|
||||
nextTick(() => createFormRef.value?.clearValidate?.())
|
||||
formMode.value = 'create'
|
||||
editingId.value = ''
|
||||
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 {
|
||||
await createFormRef.value?.validate?.()
|
||||
await formRef.value?.validate?.()
|
||||
} catch {
|
||||
ElMessageBox.alert('请完善必填项后再提交', '提示', { type: 'warning' })
|
||||
return
|
||||
}
|
||||
createLoading.value = true
|
||||
formLoading.value = true
|
||||
try {
|
||||
const payload: Record<string, unknown> = {
|
||||
accountType: createForm.accountType,
|
||||
accountName: createForm.accountName.trim(),
|
||||
accountNo: createForm.accountNo.trim(),
|
||||
remark: createForm.remark?.trim() || undefined
|
||||
}
|
||||
if (createForm.accountType === 'alipay') {
|
||||
payload.bankName = ''
|
||||
payload.bankProvince = ''
|
||||
payload.bankCity = ''
|
||||
payload.bankBranch = ''
|
||||
const payload = buildPayload()
|
||||
let row: any
|
||||
if (formMode.value === 'edit' && editingId.value) {
|
||||
row = await fetchUpdateOaReceiveAccount(editingId.value, payload)
|
||||
} else {
|
||||
payload.bankName = createForm.bankName.trim()
|
||||
payload.bankProvince = createForm.bankProvince.trim()
|
||||
payload.bankCity = createForm.bankCity.trim()
|
||||
payload.bankBranch = createForm.bankBranch.trim()
|
||||
row = await fetchCreateOaReceiveAccount(payload)
|
||||
}
|
||||
const created = await fetchCreateOaReceiveAccount(payload)
|
||||
const snap = snapshotFromRow(created)
|
||||
const snap = snapshotFromRow(row)
|
||||
if (!snap.id) {
|
||||
ElMessage.error('创建成功但未返回账户 ID')
|
||||
ElMessage.error(formMode.value === 'edit' ? '更新成功但未返回账户 ID' : '创建成功但未返回账户 ID')
|
||||
return
|
||||
}
|
||||
await loadOptions()
|
||||
// 确保新账户在 map 中(options 可能短暂未刷新)
|
||||
if (!snapshotMap.value.has(snap.id)) {
|
||||
const map = new Map(snapshotMap.value)
|
||||
map.set(snap.id, snap)
|
||||
snapshotMap.value = map
|
||||
if (!accountOptions.value.some((x) => x.id === snap.id)) {
|
||||
accountOptions.value = [
|
||||
...accountOptions.value,
|
||||
{ id: snap.id, label: optionLabelFromRow(snap) }
|
||||
]
|
||||
upsertLocalSnap(snap)
|
||||
if (formMode.value === 'edit') {
|
||||
if (selectModel.value.includes(snap.id)) {
|
||||
emitFromIds(selectModel.value)
|
||||
}
|
||||
} else {
|
||||
const nextIds = [...selectModel.value]
|
||||
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]
|
||||
}
|
||||
}
|
||||
const nextIds = [...selectModel.value]
|
||||
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
|
||||
formVisible.value = false
|
||||
} 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() {
|
||||
try {
|
||||
const res = await fetchOaReceiveAccountOptions()
|
||||
@@ -512,6 +638,53 @@
|
||||
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 {
|
||||
padding: 4px 8px 8px;
|
||||
border-top: 1px solid var(--mint-border, #d9e8e2);
|
||||
@@ -597,6 +770,14 @@
|
||||
align-items: center;
|
||||
min-height: 44px;
|
||||
padding: 6px 4px;
|
||||
}
|
||||
|
||||
.oa-receive-account-select__row-main {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
min-width: 0;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@@ -630,5 +811,10 @@
|
||||
.oa-receive-account-select__trigger {
|
||||
min-height: 44px;
|
||||
}
|
||||
|
||||
.oa-receive-account-select__icon-btn {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -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)
|
||||
})
|
||||
})
|
||||
@@ -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
|
||||
)
|
||||
}
|
||||
@@ -127,7 +127,7 @@ const inboundGroupedFields: CardMetaField[] = [
|
||||
{ label: '母亲姓名', getValue: (row) => row.motherName || '—', visible: isInboundUserInfoRow },
|
||||
{ label: '新生儿姓名', getValue: (row) => row.newbornName || '—', visible: isInboundUserInfoRow },
|
||||
inboundProtocolStatusField,
|
||||
{ label: '质检对象', getValue: formatQcTarget, colSpan: 2 },
|
||||
{ label: '质检对象', getValue: formatQcTarget },
|
||||
{
|
||||
label: '关联生产工单',
|
||||
getValue: (row) => row.productionWorkOrderNo || '—',
|
||||
@@ -139,6 +139,11 @@ const inboundGroupedFields: CardMetaField[] = [
|
||||
getValue: (row) => row.sampleTypeName || '—',
|
||||
visible: isInboundUserInfoRow
|
||||
},
|
||||
{
|
||||
label: '母血采集时间',
|
||||
getValue: (row) => formatDisplayOrDash(row.maternalBloodCollectTime),
|
||||
visible: isInboundUserInfoRow
|
||||
},
|
||||
...commonTailFields
|
||||
]
|
||||
|
||||
@@ -197,6 +202,7 @@ function buildCellStorageGroupContext(row: QcWorkOrder): string[] {
|
||||
if (row.newbornName) parts.push(`新生儿 ${row.newbornName}`)
|
||||
if (row.sampleTypeName) parts.push(row.sampleTypeName)
|
||||
if (row.receptionTime) parts.push(`接收 ${row.receptionTime}`)
|
||||
parts.push(`母血采集 ${formatDisplayOrDash(row.maternalBloodCollectTime)}`)
|
||||
if (row.handlerName) parts.push(row.handlerName)
|
||||
return parts
|
||||
}
|
||||
@@ -207,6 +213,7 @@ function buildDonationGroupContext(row: QcWorkOrder): string[] {
|
||||
if (row.newbornName) parts.push(`新生儿 ${row.newbornName}`)
|
||||
if (row.sampleTypeName) parts.push(row.sampleTypeName)
|
||||
if (row.receptionTime) parts.push(`接收 ${row.receptionTime}`)
|
||||
parts.push(`母血采集 ${formatDisplayOrDash(row.maternalBloodCollectTime)}`)
|
||||
if (row.handlerName) parts.push(row.handlerName)
|
||||
return parts
|
||||
}
|
||||
|
||||
@@ -99,6 +99,7 @@
|
||||
/>
|
||||
<OaCommentPanel
|
||||
v-if="detail?.id"
|
||||
ref="commentPanelRef"
|
||||
:instance-id="detail.id"
|
||||
:instance-status="detail.status || ''"
|
||||
@refresh="load"
|
||||
@@ -236,6 +237,9 @@
|
||||
const userStore = useUserStore()
|
||||
const loading = ref(false)
|
||||
const acting = ref(false)
|
||||
const commentPanelRef = ref<{ flushDraft?: (opts?: { quiet?: boolean }) => Promise<boolean> } | null>(
|
||||
null
|
||||
)
|
||||
const detail = ref<any>(null)
|
||||
const viewFormData = ref<Record<string, 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') {
|
||||
const task = myPendingTask.value
|
||||
if (!task) return
|
||||
if (!(await flushPendingComment())) return
|
||||
let comment = ''
|
||||
try {
|
||||
const res = await ElMessageBox.prompt(
|
||||
@@ -436,6 +448,7 @@
|
||||
async function doReturn() {
|
||||
const task = myPendingTask.value
|
||||
if (!task) return
|
||||
if (!(await flushPendingComment())) return
|
||||
let comment = ''
|
||||
try {
|
||||
const res = await ElMessageBox.prompt('请填写打回意见(必填)', '打回', {
|
||||
|
||||
Reference in new issue
Block a user