提交
This commit is contained in:
1 parent
a7fbaa8fd9
commit
d2792174b5
55 files changed
+1863
-1419
No files matched your search
@@ -319,7 +319,7 @@ async def list_env_detect_records(
|
||||
query = apply_data_scope(query, BizEnvDetectRecord, user, db, tenant_no)
|
||||
total = query.count()
|
||||
items = (
|
||||
query.order_by(BizEnvDetectRecord.create_time.desc())
|
||||
query.order_by(BizEnvDetectRecord.detect_time.desc())
|
||||
.offset((page - 1) * pageSize)
|
||||
.limit(pageSize)
|
||||
.all()
|
||||
|
||||
@@ -170,7 +170,7 @@ def list_env_detect_records(
|
||||
page_size = min(max(1, page_size), 100)
|
||||
rows = (
|
||||
_filtered()
|
||||
.order_by(BizEnvDetectRecord.create_time.desc())
|
||||
.order_by(BizEnvDetectRecord.detect_time.desc())
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
"""入库质检列表:按实验室入库编码排序的辅助逻辑。"""
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Optional
|
||||
|
||||
from sqlalchemy import and_, func, literal, select
|
||||
from sqlalchemy.sql import ColumnElement
|
||||
|
||||
from app.core.db_collation import eq_unicode, unicode_ci
|
||||
from app.models.models import BizQcWorkOrder, BizSampleReception
|
||||
|
||||
_INBOUND_LAB_SORT_SOURCES = frozenset({"cell_storage", "research_donation"})
|
||||
|
||||
|
||||
def uses_inbound_lab_storage_list_sort(reception_source: Optional[str]) -> bool:
|
||||
return (reception_source or "").strip() in _INBOUND_LAB_SORT_SOURCES
|
||||
|
||||
|
||||
def compare_lab_storage_then_create_time_desc(
|
||||
code_a: Optional[str],
|
||||
time_a: Optional[str],
|
||||
code_b: Optional[str],
|
||||
time_b: Optional[str],
|
||||
) -> int:
|
||||
"""列表序比较:编码 DESC,同编码时间 DESC。返回负值表示 a 应排在 b 前。"""
|
||||
ca = (code_a or "").strip()
|
||||
cb = (code_b or "").strip()
|
||||
if ca != cb:
|
||||
# DESC: 较大字符串在前
|
||||
return -1 if ca > cb else 1
|
||||
ta = (time_a or "").strip()
|
||||
tb = (time_b or "").strip()
|
||||
if ta != tb:
|
||||
return -1 if ta > tb else 1
|
||||
return 0
|
||||
|
||||
|
||||
def lab_storage_code_expr_for_work_order() -> ColumnElement:
|
||||
"""相关子查询:优先 reception_id,否则同租户 sample_code 最新一条接收记录的编码。
|
||||
|
||||
子查询结果与空串字面量统一 utf8mb4_unicode_ci,避免 ORDER BY COALESCE
|
||||
触发 Illegal mix of collations(unicode_ci vs general_ci)。
|
||||
"""
|
||||
by_id = (
|
||||
select(unicode_ci(BizSampleReception.lab_storage_code))
|
||||
.where(
|
||||
and_(
|
||||
eq_unicode(BizSampleReception.id, BizQcWorkOrder.reception_id),
|
||||
BizSampleReception.del_flag == 0,
|
||||
)
|
||||
)
|
||||
.correlate(BizQcWorkOrder)
|
||||
.scalar_subquery()
|
||||
)
|
||||
by_sample = (
|
||||
select(unicode_ci(BizSampleReception.lab_storage_code))
|
||||
.where(
|
||||
and_(
|
||||
eq_unicode(BizSampleReception.sample_code, BizQcWorkOrder.sample_code),
|
||||
eq_unicode(BizSampleReception.tenant_no, BizQcWorkOrder.tenant_no),
|
||||
BizSampleReception.del_flag == 0,
|
||||
BizQcWorkOrder.sample_code.isnot(None),
|
||||
unicode_ci(BizQcWorkOrder.sample_code) != "",
|
||||
)
|
||||
)
|
||||
.order_by(BizSampleReception.create_time.desc())
|
||||
.limit(1)
|
||||
.correlate(BizQcWorkOrder)
|
||||
.scalar_subquery()
|
||||
)
|
||||
empty = unicode_ci(literal(""))
|
||||
return func.coalesce(by_id, by_sample, empty)
|
||||
|
||||
|
||||
def inbound_lab_storage_order_by_clauses():
|
||||
"""供 Query.order_by(*clauses) 使用。"""
|
||||
code = lab_storage_code_expr_for_work_order()
|
||||
return (
|
||||
code.desc(),
|
||||
BizQcWorkOrder.create_time.desc(),
|
||||
)
|
||||
@@ -24,6 +24,10 @@ from app.crud.qc_work_order import (
|
||||
from app.core.db_collation import eq_unicode, unicode_ci
|
||||
from app.utils.sample_special import apply_special_to_item_from_samples
|
||||
from app.crud import qc_task_assignee as assignee_svc
|
||||
from app.crud.qc_inbound_lab_storage_sort import (
|
||||
inbound_lab_storage_order_by_clauses,
|
||||
uses_inbound_lab_storage_list_sort,
|
||||
)
|
||||
from app.models.models import (
|
||||
BizAttachment,
|
||||
BizCollectionProtocol,
|
||||
@@ -633,13 +637,21 @@ def list_mine_tasks(
|
||||
total = _filtered().order_by(None).with_entities(func.count(BizQcTask.id)).scalar() or 0
|
||||
page = max(1, page)
|
||||
page_size = min(max(1, page_size), 100)
|
||||
rows = (
|
||||
_filtered()
|
||||
.order_by(
|
||||
q_page = _filtered()
|
||||
if uses_inbound_lab_storage_list_sort(reception_source):
|
||||
q_page = q_page.order_by(
|
||||
*inbound_lab_storage_order_by_clauses(),
|
||||
BizQcWorkOrder.work_order_no.desc(),
|
||||
BizQcTask.task_no.asc(),
|
||||
)
|
||||
else:
|
||||
q_page = q_page.order_by(
|
||||
BizQcTask.create_time.desc(),
|
||||
BizQcWorkOrder.work_order_no.desc(),
|
||||
BizQcTask.task_no.asc(),
|
||||
)
|
||||
rows = (
|
||||
q_page
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
|
||||
@@ -16,6 +16,10 @@ from app.crud import qc_task as task_svc
|
||||
from app.crud import qc_task_assignee as assignee_svc
|
||||
from app.crud import qc_third_party_item as third_item_svc
|
||||
from app.crud.qc_third_party_company import get_company
|
||||
from app.crud.qc_inbound_lab_storage_sort import (
|
||||
inbound_lab_storage_order_by_clauses,
|
||||
uses_inbound_lab_storage_list_sort,
|
||||
)
|
||||
from app.crud.collection_protocol import urls_to_attachment_list
|
||||
from app.utils.sample_special import apply_special_to_item_from_samples
|
||||
from app.crud import sample_reception as sample_reception_svc
|
||||
@@ -1706,9 +1710,13 @@ def list_work_orders(
|
||||
total = _filtered().order_by(None).with_entities(func.count(BizQcWorkOrder.id)).scalar() or 0
|
||||
page = max(1, page)
|
||||
page_size = min(max(1, page_size), 100)
|
||||
q_page = _filtered()
|
||||
if uses_inbound_lab_storage_list_sort(reception_source):
|
||||
q_page = q_page.order_by(*inbound_lab_storage_order_by_clauses())
|
||||
else:
|
||||
q_page = q_page.order_by(BizQcWorkOrder.create_time.desc())
|
||||
rows = (
|
||||
_filtered()
|
||||
.order_by(BizQcWorkOrder.create_time.desc())
|
||||
q_page
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
|
||||
@@ -771,6 +771,38 @@ def _apply_slot_select_query_filters(
|
||||
return filtered.filter(BizStorageFacilitySlot.id.in_(matched_ids))
|
||||
|
||||
|
||||
def _load_slot_select_include_rows(query, include_slot_ids: Optional[List[str]]):
|
||||
"""按传入顺序加载需强制保留的储物格(编辑态当前选中格)。"""
|
||||
include_ids = [
|
||||
str(x).strip()
|
||||
for x in (include_slot_ids or [])
|
||||
if str(x).strip()
|
||||
]
|
||||
if not include_ids:
|
||||
return []
|
||||
rows_by_id = {
|
||||
row.id: row
|
||||
for row in query.filter(BizStorageFacilitySlot.id.in_(include_ids)).all()
|
||||
}
|
||||
return [rows_by_id[sid] for sid in include_ids if sid in rows_by_id]
|
||||
|
||||
|
||||
def _merge_slot_select_rows_with_includes(
|
||||
page_rows: List[BizStorageFacilitySlot],
|
||||
include_rows: List[BizStorageFacilitySlot],
|
||||
) -> List[BizStorageFacilitySlot]:
|
||||
"""将 include 格置顶合并进当前页,避免分页把当前选中格挤出导致下拉显示 id。"""
|
||||
merged: List[BizStorageFacilitySlot] = []
|
||||
seen: set[str] = set()
|
||||
for row in list(include_rows or []) + list(page_rows or []):
|
||||
sid = row.id
|
||||
if not sid or sid in seen:
|
||||
continue
|
||||
seen.add(sid)
|
||||
merged.append(row)
|
||||
return merged
|
||||
|
||||
|
||||
def list_slot_select_options(
|
||||
db: Session,
|
||||
*,
|
||||
@@ -789,6 +821,7 @@ def list_slot_select_options(
|
||||
1,
|
||||
)
|
||||
need_count = page * page_size
|
||||
include_rows = _load_slot_select_include_rows(query, include_slot_ids)
|
||||
|
||||
filtered = _apply_slot_select_base_filters(
|
||||
query,
|
||||
@@ -811,11 +844,13 @@ def list_slot_select_options(
|
||||
)
|
||||
total = len(matched_ids)
|
||||
page_ids = matched_ids[(page - 1) * page_size : page * page_size]
|
||||
if not page_ids:
|
||||
return [], total
|
||||
rows_by_id = {
|
||||
row.id: row
|
||||
for row in filtered.filter(BizStorageFacilitySlot.id.in_(page_ids)).all()
|
||||
for row in (
|
||||
filtered.filter(BizStorageFacilitySlot.id.in_(page_ids)).all()
|
||||
if page_ids
|
||||
else []
|
||||
)
|
||||
}
|
||||
rows = [rows_by_id[sid] for sid in page_ids if sid in rows_by_id]
|
||||
else:
|
||||
@@ -832,6 +867,7 @@ def list_slot_select_options(
|
||||
.all()
|
||||
)
|
||||
|
||||
rows = _merge_slot_select_rows_with_includes(rows, include_rows)
|
||||
if not rows:
|
||||
return [], int(total)
|
||||
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
"""入库质检列表:实验室入库编码排序语义。"""
|
||||
import unittest
|
||||
|
||||
from app.crud.qc_inbound_lab_storage_sort import (
|
||||
compare_lab_storage_then_create_time_desc,
|
||||
uses_inbound_lab_storage_list_sort,
|
||||
)
|
||||
|
||||
|
||||
class TestUsesInboundLabStorageListSort(unittest.TestCase):
|
||||
def test_cell_storage_and_research_donation(self):
|
||||
self.assertTrue(uses_inbound_lab_storage_list_sort("cell_storage"))
|
||||
self.assertTrue(uses_inbound_lab_storage_list_sort("research_donation"))
|
||||
|
||||
def test_other_sources_false(self):
|
||||
self.assertFalse(uses_inbound_lab_storage_list_sort(""))
|
||||
self.assertFalse(uses_inbound_lab_storage_list_sort(None))
|
||||
self.assertFalse(uses_inbound_lab_storage_list_sort("temporary"))
|
||||
|
||||
|
||||
class TestCompareLabStorageThenCreateTimeDesc(unittest.TestCase):
|
||||
def test_code_desc_empty_as_empty_string(self):
|
||||
# '' < 'B0000001' lexicographically → DESC 时有编码在前
|
||||
self.assertEqual(
|
||||
compare_lab_storage_then_create_time_desc("B0000001", "2026-01-01", "", "2026-12-01"),
|
||||
-1,
|
||||
)
|
||||
self.assertEqual(
|
||||
compare_lab_storage_then_create_time_desc("", "2026-12-01", "B0000001", "2026-01-01"),
|
||||
1,
|
||||
)
|
||||
|
||||
def test_same_code_newer_create_time_first(self):
|
||||
self.assertEqual(
|
||||
compare_lab_storage_then_create_time_desc(
|
||||
"B1", "2026-08-02 10:00:00", "B1", "2026-08-01 10:00:00"
|
||||
),
|
||||
-1,
|
||||
)
|
||||
|
||||
def test_higher_code_first(self):
|
||||
self.assertEqual(
|
||||
compare_lab_storage_then_create_time_desc("B2", "t", "B1", "t"),
|
||||
-1,
|
||||
)
|
||||
@@ -1,13 +0,0 @@
|
||||
-- 员工微信服务号 openid / unionid 绑定字段(OA 审批通知)
|
||||
-- MySQL 5.7:唯一索引允许多个 NULL
|
||||
|
||||
ALTER TABLE `sys_user`
|
||||
ADD COLUMN `wx_mp_openid` varchar(64) DEFAULT NULL COMMENT '微信服务号 openid' AFTER `wx_openid`,
|
||||
ADD COLUMN `wx_unionid` varchar(64) DEFAULT NULL COMMENT '微信开放平台 unionid' AFTER `wx_mp_openid`,
|
||||
ADD COLUMN `wx_mp_bind_time` datetime DEFAULT NULL COMMENT '服务号绑定时间' AFTER `wx_unionid`;
|
||||
|
||||
ALTER TABLE `sys_user`
|
||||
ADD UNIQUE INDEX `uk_sys_user_wx_mp_openid` (`wx_mp_openid`);
|
||||
|
||||
ALTER TABLE `sys_user`
|
||||
ADD INDEX `idx_sys_user_wx_unionid` (`wx_unionid`);
|
||||
@@ -1,322 +0,0 @@
|
||||
-- 质检:检测项目模版(建表 + C 菜单 + 4 F 按钮 + 角色授权)
|
||||
-- 幂等:可重复执行
|
||||
-- 授权:已有【质检基础信息】QCB 下任一有效子菜单,或已有质检工单菜单的角色
|
||||
-- → 授予 TOP + QCB + 本 C/F
|
||||
|
||||
SET @tenant_no = CONVERT('zkxw' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @top_id = CONVERT('TOP00000000000000000000000000003' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @qcb_id = CONVERT('QCB00000000000000000000000000001' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @wo_menu = CONVERT('70000000000000000000000000000007' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @menu_c = CONVERT('95300000000000000000000000000001' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @menu_f_list = CONVERT('95300000000000000000000000000002' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @menu_f_add = CONVERT('95300000000000000000000000000003' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @menu_f_edit = CONVERT('95300000000000000000000000000004' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @menu_f_remove = CONVERT('95300000000000000000000000000005' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
|
||||
-- 0) 建表
|
||||
CREATE TABLE IF NOT EXISTS `biz_qc_inspection_item_template` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`template_name` varchar(200) NOT NULL COMMENT '模版名称',
|
||||
`lab_item_ids` varchar(2000) NOT NULL DEFAULT '' COMMENT '实验室项目ID逗号分隔',
|
||||
`third_party_item_ids` varchar(2000) NOT NULL DEFAULT '' COMMENT '第三方项目ID逗号分隔',
|
||||
`status` char(1) NOT NULL DEFAULT '1' COMMENT '1启用 0停用',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
KEY `idx_qc_iit_tenant_status` (`tenant_no`,`del_flag`,`status`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='质检检测项目模版';
|
||||
|
||||
-- 1) C 菜单
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
@menu_c,
|
||||
'检测项目模版',
|
||||
@qcb_id,
|
||||
'C',
|
||||
'inspection-item-template',
|
||||
'/quality-inspection/inspection-item-template/index',
|
||||
'biz:qcInspectionItemTemplate:list',
|
||||
1, '1', '1', @tenant_no, 5,
|
||||
'质检基础信息:检测项目模版主数据',
|
||||
NULL, '', NOW(), NULL, NOW(), 0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu m
|
||||
WHERE m.id COLLATE utf8mb4_unicode_ci = @menu_c
|
||||
);
|
||||
|
||||
UPDATE sys_menu
|
||||
SET
|
||||
menu_name = '检测项目模版',
|
||||
parent_id = @qcb_id,
|
||||
menu_type = 'C',
|
||||
path = 'inspection-item-template',
|
||||
component = '/quality-inspection/inspection-item-template/index',
|
||||
perms = 'biz:qcInspectionItemTemplate:list',
|
||||
visible = '1',
|
||||
status = '1',
|
||||
order_num = 5,
|
||||
remark = '质检基础信息:检测项目模版主数据',
|
||||
del_flag = 0,
|
||||
update_time = NOW()
|
||||
WHERE id COLLATE utf8mb4_unicode_ci = @menu_c;
|
||||
|
||||
-- 2) F 按钮:list
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
@menu_f_list,
|
||||
'检测项目模版查询',
|
||||
@menu_c,
|
||||
'F',
|
||||
'',
|
||||
'',
|
||||
'biz:qcInspectionItemTemplate:list',
|
||||
1, '0', '1', @tenant_no, 1,
|
||||
'检测项目模版列表查询',
|
||||
NULL, '', NOW(), NULL, NOW(), 0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu m
|
||||
WHERE m.id COLLATE utf8mb4_unicode_ci = @menu_f_list
|
||||
);
|
||||
|
||||
UPDATE sys_menu
|
||||
SET
|
||||
menu_name = '检测项目模版查询',
|
||||
parent_id = @menu_c,
|
||||
menu_type = 'F',
|
||||
path = '',
|
||||
component = '',
|
||||
perms = 'biz:qcInspectionItemTemplate:list',
|
||||
visible = '0',
|
||||
status = '1',
|
||||
order_num = 1,
|
||||
remark = '检测项目模版列表查询',
|
||||
del_flag = 0,
|
||||
update_time = NOW()
|
||||
WHERE id COLLATE utf8mb4_unicode_ci = @menu_f_list;
|
||||
|
||||
-- 2b) F 按钮:add
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
@menu_f_add,
|
||||
'检测项目模版新增',
|
||||
@menu_c,
|
||||
'F',
|
||||
'',
|
||||
'',
|
||||
'biz:qcInspectionItemTemplate:add',
|
||||
1, '0', '1', @tenant_no, 2,
|
||||
'检测项目模版新增',
|
||||
NULL, '', NOW(), NULL, NOW(), 0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu m
|
||||
WHERE m.id COLLATE utf8mb4_unicode_ci = @menu_f_add
|
||||
);
|
||||
|
||||
UPDATE sys_menu
|
||||
SET
|
||||
menu_name = '检测项目模版新增',
|
||||
parent_id = @menu_c,
|
||||
menu_type = 'F',
|
||||
path = '',
|
||||
component = '',
|
||||
perms = 'biz:qcInspectionItemTemplate:add',
|
||||
visible = '0',
|
||||
status = '1',
|
||||
order_num = 2,
|
||||
remark = '检测项目模版新增',
|
||||
del_flag = 0,
|
||||
update_time = NOW()
|
||||
WHERE id COLLATE utf8mb4_unicode_ci = @menu_f_add;
|
||||
|
||||
-- 2c) F 按钮:edit
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
@menu_f_edit,
|
||||
'检测项目模版修改',
|
||||
@menu_c,
|
||||
'F',
|
||||
'',
|
||||
'',
|
||||
'biz:qcInspectionItemTemplate:edit',
|
||||
1, '0', '1', @tenant_no, 3,
|
||||
'检测项目模版修改(含启停)',
|
||||
NULL, '', NOW(), NULL, NOW(), 0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu m
|
||||
WHERE m.id COLLATE utf8mb4_unicode_ci = @menu_f_edit
|
||||
);
|
||||
|
||||
UPDATE sys_menu
|
||||
SET
|
||||
menu_name = '检测项目模版修改',
|
||||
parent_id = @menu_c,
|
||||
menu_type = 'F',
|
||||
path = '',
|
||||
component = '',
|
||||
perms = 'biz:qcInspectionItemTemplate:edit',
|
||||
visible = '0',
|
||||
status = '1',
|
||||
order_num = 3,
|
||||
remark = '检测项目模版修改(含启停)',
|
||||
del_flag = 0,
|
||||
update_time = NOW()
|
||||
WHERE id COLLATE utf8mb4_unicode_ci = @menu_f_edit;
|
||||
|
||||
-- 2d) F 按钮:remove
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
@menu_f_remove,
|
||||
'检测项目模版删除',
|
||||
@menu_c,
|
||||
'F',
|
||||
'',
|
||||
'',
|
||||
'biz:qcInspectionItemTemplate:remove',
|
||||
1, '0', '1', @tenant_no, 4,
|
||||
'检测项目模版删除',
|
||||
NULL, '', NOW(), NULL, NOW(), 0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu m
|
||||
WHERE m.id COLLATE utf8mb4_unicode_ci = @menu_f_remove
|
||||
);
|
||||
|
||||
UPDATE sys_menu
|
||||
SET
|
||||
menu_name = '检测项目模版删除',
|
||||
parent_id = @menu_c,
|
||||
menu_type = 'F',
|
||||
path = '',
|
||||
component = '',
|
||||
perms = 'biz:qcInspectionItemTemplate:remove',
|
||||
visible = '0',
|
||||
status = '1',
|
||||
order_num = 4,
|
||||
remark = '检测项目模版删除',
|
||||
del_flag = 0,
|
||||
update_time = NOW()
|
||||
WHERE id COLLATE utf8mb4_unicode_ci = @menu_f_remove;
|
||||
|
||||
-- 3) 目标角色:已有 QCB 下任一有效子菜单,或已有质检工单菜单
|
||||
-- MySQL 5.7:UPDATE 目标表不可在同句 FROM/EXISTS 中直接引用自身,须用派生表
|
||||
|
||||
-- 3a) 恢复软删的 TOP / QCB / C / F 授权
|
||||
UPDATE sys_role_menu rm
|
||||
INNER JOIN sys_role r
|
||||
ON r.id COLLATE utf8mb4_unicode_ci = rm.role_id COLLATE utf8mb4_unicode_ci
|
||||
AND r.del_flag = 0
|
||||
AND r.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
INNER JOIN (
|
||||
SELECT DISTINCT rm2.role_id AS role_id
|
||||
FROM sys_role_menu rm2
|
||||
INNER JOIN sys_menu m2
|
||||
ON m2.id COLLATE utf8mb4_unicode_ci = rm2.menu_id COLLATE utf8mb4_unicode_ci
|
||||
AND m2.del_flag = 0
|
||||
AND (
|
||||
m2.parent_id COLLATE utf8mb4_unicode_ci = @qcb_id
|
||||
OR m2.id COLLATE utf8mb4_unicode_ci = @wo_menu
|
||||
)
|
||||
WHERE rm2.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND rm2.del_flag = 0
|
||||
) eligible
|
||||
ON eligible.role_id COLLATE utf8mb4_unicode_ci = r.id COLLATE utf8mb4_unicode_ci
|
||||
SET
|
||||
rm.del_flag = 0,
|
||||
rm.update_time = NOW(),
|
||||
rm.remark = 'grant qc inspection item template to QCB/WO roles'
|
||||
WHERE rm.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND rm.del_flag = 1
|
||||
AND rm.menu_id COLLATE utf8mb4_unicode_ci IN (
|
||||
@top_id, @qcb_id, @menu_c,
|
||||
@menu_f_list, @menu_f_add, @menu_f_edit, @menu_f_remove
|
||||
);
|
||||
|
||||
-- 3b) 插入缺失授权(TOP + QCB + C + 4 F)
|
||||
INSERT INTO sys_role_menu (
|
||||
id, role_id, menu_id, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
UPPER(MD5(CONCAT(src.role_id, '|', src.menu_id))),
|
||||
src.role_id,
|
||||
src.menu_id,
|
||||
@tenant_no,
|
||||
0,
|
||||
'grant qc inspection item template to QCB/WO roles',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM (
|
||||
SELECT
|
||||
r.id AS role_id,
|
||||
x.menu_id AS menu_id
|
||||
FROM sys_role r
|
||||
INNER JOIN (
|
||||
SELECT @top_id AS menu_id
|
||||
UNION ALL SELECT @qcb_id
|
||||
UNION ALL SELECT @menu_c
|
||||
UNION ALL SELECT @menu_f_list
|
||||
UNION ALL SELECT @menu_f_add
|
||||
UNION ALL SELECT @menu_f_edit
|
||||
UNION ALL SELECT @menu_f_remove
|
||||
) x
|
||||
INNER JOIN (
|
||||
SELECT DISTINCT rm2.role_id AS role_id
|
||||
FROM sys_role_menu rm2
|
||||
INNER JOIN sys_menu m2
|
||||
ON m2.id COLLATE utf8mb4_unicode_ci = rm2.menu_id COLLATE utf8mb4_unicode_ci
|
||||
AND m2.del_flag = 0
|
||||
AND (
|
||||
m2.parent_id COLLATE utf8mb4_unicode_ci = @qcb_id
|
||||
OR m2.id COLLATE utf8mb4_unicode_ci = @wo_menu
|
||||
)
|
||||
WHERE rm2.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND rm2.del_flag = 0
|
||||
) eligible
|
||||
ON eligible.role_id COLLATE utf8mb4_unicode_ci = r.id COLLATE utf8mb4_unicode_ci
|
||||
INNER JOIN sys_menu m
|
||||
ON m.id COLLATE utf8mb4_unicode_ci = x.menu_id
|
||||
AND m.del_flag = 0
|
||||
WHERE r.del_flag = 0
|
||||
AND r.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
) src
|
||||
LEFT JOIN sys_role_menu existing
|
||||
ON existing.role_id COLLATE utf8mb4_unicode_ci = src.role_id COLLATE utf8mb4_unicode_ci
|
||||
AND existing.menu_id COLLATE utf8mb4_unicode_ci = src.menu_id COLLATE utf8mb4_unicode_ci
|
||||
AND existing.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND existing.del_flag = 0
|
||||
WHERE existing.id IS NULL;
|
||||
@@ -1,166 +0,0 @@
|
||||
-- 生产管理:预产及在途样本(独立页面 + 独立权限码)
|
||||
-- 幂等:可重复执行
|
||||
-- 授权:已有【生产管理】PRM 下任一有效子菜单的角色 → 授予本 C/F,并补授 PRM 祖先
|
||||
|
||||
SET @tenant_no = CONVERT('zkxw' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @prm_id = CONVERT('PRM00000000000000000000000000001' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @menu_c = CONVERT('95200000000000000000000000000001' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @menu_f = CONVERT('95200000000000000000000000000002' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
|
||||
-- 1) C 菜单
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
@menu_c,
|
||||
'预产及在途样本',
|
||||
@prm_id,
|
||||
'C',
|
||||
'pre-transit-sample',
|
||||
'/production/pre-transit-sample/index',
|
||||
'production:preTransitSample:list',
|
||||
1, '1', '1', @tenant_no, 0,
|
||||
'生产看板:在途样本与预产协议(协议单维度只读;与质检页代码独立)',
|
||||
NULL, '', NOW(), NULL, NOW(), 0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu m
|
||||
WHERE m.id COLLATE utf8mb4_unicode_ci = @menu_c
|
||||
);
|
||||
|
||||
UPDATE sys_menu
|
||||
SET
|
||||
menu_name = '预产及在途样本',
|
||||
parent_id = @prm_id,
|
||||
menu_type = 'C',
|
||||
path = 'pre-transit-sample',
|
||||
component = '/production/pre-transit-sample/index',
|
||||
perms = 'production:preTransitSample:list',
|
||||
visible = '1',
|
||||
status = '1',
|
||||
order_num = 0,
|
||||
remark = '生产看板:在途样本与预产协议(协议单维度只读;与质检页代码独立)',
|
||||
del_flag = 0,
|
||||
update_time = NOW()
|
||||
WHERE id COLLATE utf8mb4_unicode_ci = @menu_c;
|
||||
|
||||
-- 2) F 按钮
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
@menu_f,
|
||||
'预产及在途查询',
|
||||
@menu_c,
|
||||
'F',
|
||||
'',
|
||||
'',
|
||||
'production:preTransitSample:list',
|
||||
1, '0', '1', @tenant_no, 1,
|
||||
'生产侧预产及在途样本列表查询',
|
||||
NULL, '', NOW(), NULL, NOW(), 0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu m
|
||||
WHERE m.id COLLATE utf8mb4_unicode_ci = @menu_f
|
||||
);
|
||||
|
||||
UPDATE sys_menu
|
||||
SET
|
||||
menu_name = '预产及在途查询',
|
||||
parent_id = @menu_c,
|
||||
menu_type = 'F',
|
||||
path = '',
|
||||
component = '',
|
||||
perms = 'production:preTransitSample:list',
|
||||
visible = '0',
|
||||
status = '1',
|
||||
order_num = 1,
|
||||
remark = '生产侧预产及在途样本列表查询',
|
||||
del_flag = 0,
|
||||
update_time = NOW()
|
||||
WHERE id COLLATE utf8mb4_unicode_ci = @menu_f;
|
||||
|
||||
-- 3) 目标角色:已有 PRM 下任一有效子菜单授权
|
||||
-- MySQL 5.7:UPDATE 目标表不可在同句 FROM/EXISTS 中直接引用自身,须用派生表
|
||||
|
||||
-- 3a) 恢复软删的 PRM / C / F 授权
|
||||
UPDATE sys_role_menu rm
|
||||
INNER JOIN sys_role r
|
||||
ON r.id COLLATE utf8mb4_unicode_ci = rm.role_id COLLATE utf8mb4_unicode_ci
|
||||
AND r.del_flag = 0
|
||||
AND r.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
INNER JOIN (
|
||||
SELECT DISTINCT rm2.role_id AS role_id
|
||||
FROM sys_role_menu rm2
|
||||
INNER JOIN sys_menu m2
|
||||
ON m2.id COLLATE utf8mb4_unicode_ci = rm2.menu_id COLLATE utf8mb4_unicode_ci
|
||||
AND m2.del_flag = 0
|
||||
AND m2.parent_id COLLATE utf8mb4_unicode_ci = @prm_id
|
||||
WHERE rm2.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND rm2.del_flag = 0
|
||||
) eligible
|
||||
ON eligible.role_id COLLATE utf8mb4_unicode_ci = r.id COLLATE utf8mb4_unicode_ci
|
||||
SET
|
||||
rm.del_flag = 0,
|
||||
rm.update_time = NOW(),
|
||||
rm.remark = 'grant production pre-transit to PRM roles'
|
||||
WHERE rm.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND rm.del_flag = 1
|
||||
AND rm.menu_id COLLATE utf8mb4_unicode_ci IN (@prm_id, @menu_c, @menu_f);
|
||||
|
||||
-- 3b) 插入缺失授权(PRM + C + F)
|
||||
INSERT INTO sys_role_menu (
|
||||
id, role_id, menu_id, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
UPPER(MD5(CONCAT(src.role_id, '|', src.menu_id))),
|
||||
src.role_id,
|
||||
src.menu_id,
|
||||
@tenant_no,
|
||||
0,
|
||||
'grant production pre-transit to PRM roles',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM (
|
||||
SELECT
|
||||
r.id AS role_id,
|
||||
x.menu_id AS menu_id
|
||||
FROM sys_role r
|
||||
INNER JOIN (
|
||||
SELECT @prm_id AS menu_id
|
||||
UNION ALL SELECT @menu_c
|
||||
UNION ALL SELECT @menu_f
|
||||
) x
|
||||
INNER JOIN (
|
||||
SELECT DISTINCT rm2.role_id AS role_id
|
||||
FROM sys_role_menu rm2
|
||||
INNER JOIN sys_menu m2
|
||||
ON m2.id COLLATE utf8mb4_unicode_ci = rm2.menu_id COLLATE utf8mb4_unicode_ci
|
||||
AND m2.del_flag = 0
|
||||
AND m2.parent_id COLLATE utf8mb4_unicode_ci = @prm_id
|
||||
WHERE rm2.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND rm2.del_flag = 0
|
||||
) eligible
|
||||
ON eligible.role_id COLLATE utf8mb4_unicode_ci = r.id COLLATE utf8mb4_unicode_ci
|
||||
INNER JOIN sys_menu m
|
||||
ON m.id COLLATE utf8mb4_unicode_ci = x.menu_id
|
||||
AND m.del_flag = 0
|
||||
WHERE r.del_flag = 0
|
||||
AND r.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
) src
|
||||
LEFT JOIN sys_role_menu existing
|
||||
ON existing.role_id COLLATE utf8mb4_unicode_ci = src.role_id COLLATE utf8mb4_unicode_ci
|
||||
AND existing.menu_id COLLATE utf8mb4_unicode_ci = src.menu_id COLLATE utf8mb4_unicode_ci
|
||||
AND existing.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND existing.del_flag = 0
|
||||
WHERE existing.id IS NULL;
|
||||
@@ -1,57 +0,0 @@
|
||||
-- 将「开启微信通知」(OA007) 授予全部未删除角色
|
||||
-- 前置:已执行 docs/sql/mobile_menu_oa_wechat_notify.sql(菜单须已存在)
|
||||
-- 幂等:可重复执行;已有有效授权跳过;软删则恢复
|
||||
-- 说明:
|
||||
-- 1) 用户变量显式 utf8mb4_unicode_ci,避免 collation 混用报错 1267
|
||||
-- 2) 主键用 MD5(role_id|menu_id),避免 INSERT…SELECT 中 UUID() 只算一次导致重复主键
|
||||
|
||||
SET @menu_id = CONVERT('MINI000000000000000000000000OA007' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
SET @tenant_no = CONVERT('zkxw' USING utf8mb4) COLLATE utf8mb4_unicode_ci;
|
||||
|
||||
-- 1) 恢复历史上已软删的授权(按 role_id + menu_id)
|
||||
UPDATE sys_role_menu rm
|
||||
INNER JOIN sys_role r
|
||||
ON r.id COLLATE utf8mb4_unicode_ci = rm.role_id COLLATE utf8mb4_unicode_ci
|
||||
AND r.del_flag = 0
|
||||
AND r.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
SET
|
||||
rm.del_flag = 0,
|
||||
rm.update_time = NOW(),
|
||||
rm.remark = 'grant wechat-notify to all roles'
|
||||
WHERE rm.menu_id COLLATE utf8mb4_unicode_ci = @menu_id
|
||||
AND rm.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND rm.del_flag = 1;
|
||||
|
||||
-- 2) 为尚未关联该菜单的角色新增授权
|
||||
INSERT INTO sys_role_menu (
|
||||
id, role_id, menu_id, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
UPPER(MD5(CONCAT(r.id, '|', @menu_id))),
|
||||
r.id,
|
||||
@menu_id,
|
||||
@tenant_no,
|
||||
0,
|
||||
'grant wechat-notify to all roles',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM sys_role r
|
||||
WHERE r.del_flag = 0
|
||||
AND r.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM sys_menu m
|
||||
WHERE m.id COLLATE utf8mb4_unicode_ci = @menu_id
|
||||
AND m.del_flag = 0
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM sys_role_menu rm
|
||||
WHERE rm.role_id COLLATE utf8mb4_unicode_ci = r.id COLLATE utf8mb4_unicode_ci
|
||||
AND rm.menu_id COLLATE utf8mb4_unicode_ci = @menu_id
|
||||
AND rm.tenant_no COLLATE utf8mb4_unicode_ci = @tenant_no
|
||||
AND rm.del_flag = 0
|
||||
);
|
||||
@@ -1,39 +0,0 @@
|
||||
-- 小程序「发起审批」菜单种子(挂在「移动端菜单」根下)
|
||||
-- 执行前请确认移动端根存在;角色授权请在 Web「角色管理」勾选本菜单。
|
||||
|
||||
SET @mini_root = (
|
||||
SELECT id FROM sys_menu
|
||||
WHERE del_flag = 0 AND parent_id = '0' AND menu_name LIKE '%移动端%'
|
||||
LIMIT 1
|
||||
);
|
||||
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
'MINI000000000000000000000000OA001',
|
||||
'发起审批',
|
||||
@mini_root,
|
||||
'C',
|
||||
'/pages/oa/start/index',
|
||||
NULL,
|
||||
'mini:oa:start',
|
||||
1,
|
||||
'1',
|
||||
'1',
|
||||
'zkxw',
|
||||
10,
|
||||
'小程序发起审批',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM DUAL
|
||||
WHERE @mini_root IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu WHERE id = 'MINI000000000000000000000000OA001' AND del_flag = 0
|
||||
);
|
||||
@@ -1,169 +0,0 @@
|
||||
-- 小程序 OA 五中心菜单种子(挂在「移动端菜单」根下)
|
||||
-- 前置:docs/sql/mobile_menu_oa_start.sql(发起审批 OA001)可已执行
|
||||
-- 角色授权请在 Web「角色管理」勾选本菜单。
|
||||
|
||||
SET @mini_root = (
|
||||
SELECT id FROM sys_menu
|
||||
WHERE del_flag = 0 AND parent_id = '0' AND menu_name LIKE '%移动端%'
|
||||
LIMIT 1
|
||||
);
|
||||
|
||||
-- 草稿箱
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
'MINI000000000000000000000000OA002',
|
||||
'草稿箱',
|
||||
@mini_root,
|
||||
'C',
|
||||
'/pages/oa/drafts/index',
|
||||
NULL,
|
||||
'mini:oa:drafts',
|
||||
1,
|
||||
'1',
|
||||
'1',
|
||||
'zkxw',
|
||||
20,
|
||||
'小程序草稿箱',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM DUAL
|
||||
WHERE @mini_root IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu WHERE id = 'MINI000000000000000000000000OA002' AND del_flag = 0
|
||||
);
|
||||
|
||||
-- 待办中心
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
'MINI000000000000000000000000OA003',
|
||||
'待办中心',
|
||||
@mini_root,
|
||||
'C',
|
||||
'/pages/oa/pending/index',
|
||||
NULL,
|
||||
'mini:oa:pending',
|
||||
1,
|
||||
'1',
|
||||
'1',
|
||||
'zkxw',
|
||||
30,
|
||||
'小程序待办中心',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM DUAL
|
||||
WHERE @mini_root IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu WHERE id = 'MINI000000000000000000000000OA003' AND del_flag = 0
|
||||
);
|
||||
|
||||
-- 已办中心
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
'MINI000000000000000000000000OA004',
|
||||
'已办中心',
|
||||
@mini_root,
|
||||
'C',
|
||||
'/pages/oa/done/index',
|
||||
NULL,
|
||||
'mini:oa:done',
|
||||
1,
|
||||
'1',
|
||||
'1',
|
||||
'zkxw',
|
||||
40,
|
||||
'小程序已办中心',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM DUAL
|
||||
WHERE @mini_root IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu WHERE id = 'MINI000000000000000000000000OA004' AND del_flag = 0
|
||||
);
|
||||
|
||||
-- 我发起的
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
'MINI000000000000000000000000OA005',
|
||||
'我发起的',
|
||||
@mini_root,
|
||||
'C',
|
||||
'/pages/oa/mine/index',
|
||||
NULL,
|
||||
'mini:oa:mine',
|
||||
1,
|
||||
'1',
|
||||
'1',
|
||||
'zkxw',
|
||||
50,
|
||||
'小程序我发起的',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM DUAL
|
||||
WHERE @mini_root IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu WHERE id = 'MINI000000000000000000000000OA005' AND del_flag = 0
|
||||
);
|
||||
|
||||
-- 抄送我的
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
'MINI000000000000000000000000OA006',
|
||||
'抄送我的',
|
||||
@mini_root,
|
||||
'C',
|
||||
'/pages/oa/cc/index',
|
||||
NULL,
|
||||
'mini:oa:cc',
|
||||
1,
|
||||
'1',
|
||||
'1',
|
||||
'zkxw',
|
||||
60,
|
||||
'小程序抄送我的',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM DUAL
|
||||
WHERE @mini_root IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu WHERE id = 'MINI000000000000000000000000OA006' AND del_flag = 0
|
||||
);
|
||||
@@ -1,40 +0,0 @@
|
||||
-- 小程序「开启微信通知」菜单(抄送我的之后)
|
||||
-- 前置:docs/sql/mobile_menu_oa_task_centers.sql(OA006)可已执行
|
||||
-- 角色授权请在 Web「角色管理」勾选本菜单。
|
||||
|
||||
SET @mini_root = (
|
||||
SELECT id FROM sys_menu
|
||||
WHERE del_flag = 0 AND parent_id = '0' AND menu_name LIKE '%移动端%'
|
||||
LIMIT 1
|
||||
);
|
||||
|
||||
INSERT INTO sys_menu (
|
||||
id, menu_name, parent_id, menu_type, path, component, perms,
|
||||
is_frame, visible, status, tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
'MINI000000000000000000000000OA007',
|
||||
'开启微信通知',
|
||||
@mini_root,
|
||||
'C',
|
||||
'/pages/oa/wechat-notify/index',
|
||||
NULL,
|
||||
'mini:oa:wechat-notify',
|
||||
1,
|
||||
'1',
|
||||
'1',
|
||||
'zkxw',
|
||||
70,
|
||||
'小程序开启微信通知(关注+绑定)',
|
||||
'admin',
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM DUAL
|
||||
WHERE @mini_root IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM sys_menu WHERE id = 'MINI000000000000000000000000OA007' AND del_flag = 0
|
||||
);
|
||||
@@ -0,0 +1,614 @@
|
||||
# 入库质检列表按实验室入库编码排序 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 【质检工单】与【我的质检任务】的「细胞存储」「科研捐赠」Tab,按实验室入库编码倒序、同编码按创建时间倒序分页与展示,跨页一致。
|
||||
|
||||
**Architecture:** 后端在入库两 Tab 的列表查询上用相关子查询解析 `lab_storage_code`(优先 `reception_id`,否则按样本编码),`ORDER BY COALESCE(code,'') DESC, create_time DESC`;前端入库卡片与我的任务聚合排序对齐同一比较规则;出库组内排序不动。
|
||||
|
||||
**Tech Stack:** FastAPI / SQLAlchemy 2.0 / Vue 3 / TypeScript;设计依据 `docs/superpowers/specs/2026-08-17-qc-inbound-lab-storage-code-sort-design.md`。
|
||||
|
||||
**Spec:** `docs/superpowers/specs/2026-08-17-qc-inbound-lab-storage-code-sort-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File map
|
||||
|
||||
| File | Responsibility |
|
||||
|------|----------------|
|
||||
| Create: `backend/app/crud/qc_inbound_lab_storage_sort.py` | 判断是否启用编码排序、相关子查询表达式、`order_by` 元组 |
|
||||
| Modify: `backend/app/crud/qc_work_order.py` | `list_work_orders` 入库两 Tab 使用新 `order_by` |
|
||||
| Modify: `backend/app/crud/qc_task.py` | `list_mine_tasks` 入库两 Tab 使用新 `order_by` |
|
||||
| Create: `backend/tests/test_qc_inbound_lab_storage_sort.py` | 纯函数:来源判断 + 排序键比较语义 |
|
||||
| Create: `web-admin/src/utils/qc-inbound-lab-storage-sort.ts` | 前端统一比较:编码 DESC → 时间 DESC |
|
||||
| Modify: `web-admin/src/utils/qc-work-order-groups.ts` | 仅入库组内改为时间倒序 |
|
||||
| Modify: `web-admin/src/utils/qc-work-order-inbound-sample-cards.ts` | 卡片列表主序改为编码/时间 |
|
||||
| Modify: `web-admin/src/utils/qc-mine-task-groups.ts` | 导出按编码排序的工单条目 |
|
||||
| Modify: `web-admin/src/views/quality-inspection/qc-work-order/composables/useQcWorkOrderTabPage.ts` | mine 模式分页前调用排序 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 后端纯函数 — 来源判断与比较语义
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/qc_inbound_lab_storage_sort.py`
|
||||
- Create: `backend/tests/test_qc_inbound_lab_storage_sort.py`
|
||||
|
||||
- [ ] **Step 1: Write the failing test**
|
||||
|
||||
```python
|
||||
# backend/tests/test_qc_inbound_lab_storage_sort.py
|
||||
"""入库质检列表:实验室入库编码排序语义。"""
|
||||
import unittest
|
||||
|
||||
from app.crud.qc_inbound_lab_storage_sort import (
|
||||
compare_lab_storage_then_create_time_desc,
|
||||
uses_inbound_lab_storage_list_sort,
|
||||
)
|
||||
|
||||
|
||||
class TestUsesInboundLabStorageListSort(unittest.TestCase):
|
||||
def test_cell_storage_and_research_donation(self):
|
||||
self.assertTrue(uses_inbound_lab_storage_list_sort("cell_storage"))
|
||||
self.assertTrue(uses_inbound_lab_storage_list_sort("research_donation"))
|
||||
|
||||
def test_other_sources_false(self):
|
||||
self.assertFalse(uses_inbound_lab_storage_list_sort(""))
|
||||
self.assertFalse(uses_inbound_lab_storage_list_sort(None))
|
||||
self.assertFalse(uses_inbound_lab_storage_list_sort("temporary"))
|
||||
|
||||
|
||||
class TestCompareLabStorageThenCreateTimeDesc(unittest.TestCase):
|
||||
def test_code_desc_empty_as_empty_string(self):
|
||||
# '' < 'B0000001' lexicographically → DESC 时有编码在前
|
||||
self.assertEqual(
|
||||
compare_lab_storage_then_create_time_desc("B0000001", "2026-01-01", "", "2026-12-01"),
|
||||
-1,
|
||||
)
|
||||
self.assertEqual(
|
||||
compare_lab_storage_then_create_time_desc("", "2026-12-01", "B0000001", "2026-01-01"),
|
||||
1,
|
||||
)
|
||||
|
||||
def test_same_code_newer_create_time_first(self):
|
||||
self.assertEqual(
|
||||
compare_lab_storage_then_create_time_desc(
|
||||
"B1", "2026-08-02 10:00:00", "B1", "2026-08-01 10:00:00"
|
||||
),
|
||||
-1,
|
||||
)
|
||||
|
||||
def test_higher_code_first(self):
|
||||
self.assertEqual(
|
||||
compare_lab_storage_then_create_time_desc("B2", "t", "B1", "t"),
|
||||
-1,
|
||||
)
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Run test to verify it fails**
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python -m pytest tests/test_qc_inbound_lab_storage_sort.py -v
|
||||
```
|
||||
|
||||
Expected: FAIL(模块不存在或导入失败)
|
||||
|
||||
- [ ] **Step 3: Write minimal implementation**
|
||||
|
||||
```python
|
||||
# backend/app/crud/qc_inbound_lab_storage_sort.py
|
||||
"""入库质检列表:按实验室入库编码排序的辅助逻辑。"""
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Optional
|
||||
|
||||
from sqlalchemy import and_, func, select
|
||||
from sqlalchemy.sql import ColumnElement
|
||||
|
||||
from app.models.models import BizQcWorkOrder, BizSampleReception
|
||||
|
||||
_INBOUND_LAB_SORT_SOURCES = frozenset({"cell_storage", "research_donation"})
|
||||
|
||||
|
||||
def uses_inbound_lab_storage_list_sort(reception_source: Optional[str]) -> bool:
|
||||
return (reception_source or "").strip() in _INBOUND_LAB_SORT_SOURCES
|
||||
|
||||
|
||||
def compare_lab_storage_then_create_time_desc(
|
||||
code_a: Optional[str],
|
||||
time_a: Optional[str],
|
||||
code_b: Optional[str],
|
||||
time_b: Optional[str],
|
||||
) -> int:
|
||||
"""列表序比较:编码 DESC,同编码时间 DESC。返回负值表示 a 应排在 b 前。"""
|
||||
ca = (code_a or "").strip()
|
||||
cb = (code_b or "").strip()
|
||||
if ca != cb:
|
||||
# DESC: 较大字符串在前
|
||||
return -1 if ca > cb else 1
|
||||
ta = (time_a or "").strip()
|
||||
tb = (time_b or "").strip()
|
||||
if ta != tb:
|
||||
return -1 if ta > tb else 1
|
||||
return 0
|
||||
|
||||
|
||||
def lab_storage_code_expr_for_work_order() -> ColumnElement:
|
||||
"""相关子查询:优先 reception_id,否则同租户 sample_code 最新一条接收记录的编码。"""
|
||||
by_id = (
|
||||
select(BizSampleReception.lab_storage_code)
|
||||
.where(
|
||||
and_(
|
||||
BizSampleReception.id == BizQcWorkOrder.reception_id,
|
||||
BizSampleReception.del_flag == 0,
|
||||
)
|
||||
)
|
||||
.correlate(BizQcWorkOrder)
|
||||
.scalar_subquery()
|
||||
)
|
||||
by_sample = (
|
||||
select(BizSampleReception.lab_storage_code)
|
||||
.where(
|
||||
and_(
|
||||
BizSampleReception.sample_code == BizQcWorkOrder.sample_code,
|
||||
BizSampleReception.tenant_no == BizQcWorkOrder.tenant_no,
|
||||
BizSampleReception.del_flag == 0,
|
||||
BizQcWorkOrder.sample_code.isnot(None),
|
||||
BizQcWorkOrder.sample_code != "",
|
||||
)
|
||||
)
|
||||
.order_by(BizSampleReception.create_time.desc())
|
||||
.limit(1)
|
||||
.correlate(BizQcWorkOrder)
|
||||
.scalar_subquery()
|
||||
)
|
||||
return func.coalesce(by_id, by_sample, "")
|
||||
|
||||
|
||||
def inbound_lab_storage_order_by_clauses():
|
||||
"""供 Query.order_by(*clauses) 使用。"""
|
||||
code = lab_storage_code_expr_for_work_order()
|
||||
return (
|
||||
code.desc(),
|
||||
BizQcWorkOrder.create_time.desc(),
|
||||
)
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Run tests to verify they pass**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python -m pytest tests/test_qc_inbound_lab_storage_sort.py -v
|
||||
```
|
||||
|
||||
Expected: PASS
|
||||
|
||||
- [ ] **Step 5: Commit**(仅当用户明确要求提交时执行)
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/qc_inbound_lab_storage_sort.py backend/tests/test_qc_inbound_lab_storage_sort.py
|
||||
git commit -m "$(cat <<'EOF'
|
||||
feat: add inbound QC list sort helpers by lab storage code
|
||||
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 2: `list_work_orders` 应用入库排序
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/qc_work_order.py`(`list_work_orders` 中约 1706–1715 行的 `order_by`)
|
||||
|
||||
- [ ] **Step 1: Wire order_by**
|
||||
|
||||
在 `list_work_orders` 文件顶部附近增加导入:
|
||||
|
||||
```python
|
||||
from app.crud.qc_inbound_lab_storage_sort import (
|
||||
inbound_lab_storage_order_by_clauses,
|
||||
uses_inbound_lab_storage_list_sort,
|
||||
)
|
||||
```
|
||||
|
||||
将:
|
||||
|
||||
```python
|
||||
rows = (
|
||||
_filtered()
|
||||
.order_by(BizQcWorkOrder.create_time.desc())
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
)
|
||||
```
|
||||
|
||||
替换为:
|
||||
|
||||
```python
|
||||
q_page = _filtered()
|
||||
if uses_inbound_lab_storage_list_sort(reception_source):
|
||||
q_page = q_page.order_by(*inbound_lab_storage_order_by_clauses())
|
||||
else:
|
||||
q_page = q_page.order_by(BizQcWorkOrder.create_time.desc())
|
||||
rows = (
|
||||
q_page
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
)
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Sanity import check**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python -c "from app.crud.qc_work_order import list_work_orders; print('ok')"
|
||||
```
|
||||
|
||||
Expected: `ok`
|
||||
|
||||
- [ ] **Step 3: Commit**(仅当用户明确要求提交时执行)
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/qc_work_order.py
|
||||
git commit -m "$(cat <<'EOF'
|
||||
feat: order inbound QC work orders by lab storage code then create time
|
||||
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 3: `list_mine_tasks` 应用入库排序
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/qc_task.py`(`list_mine_tasks` 的 `order_by`,约 637–644 行)
|
||||
|
||||
- [ ] **Step 1: Wire order_by**
|
||||
|
||||
增加导入:
|
||||
|
||||
```python
|
||||
from app.crud.qc_inbound_lab_storage_sort import (
|
||||
inbound_lab_storage_order_by_clauses,
|
||||
uses_inbound_lab_storage_list_sort,
|
||||
)
|
||||
```
|
||||
|
||||
将 `list_mine_tasks` 内:
|
||||
|
||||
```python
|
||||
rows = (
|
||||
_filtered()
|
||||
.order_by(
|
||||
BizQcTask.create_time.desc(),
|
||||
BizQcWorkOrder.work_order_no.desc(),
|
||||
BizQcTask.task_no.asc(),
|
||||
)
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
)
|
||||
```
|
||||
|
||||
替换为:
|
||||
|
||||
```python
|
||||
q_page = _filtered()
|
||||
if uses_inbound_lab_storage_list_sort(reception_source):
|
||||
q_page = q_page.order_by(
|
||||
*inbound_lab_storage_order_by_clauses(),
|
||||
BizQcWorkOrder.work_order_no.desc(),
|
||||
BizQcTask.task_no.asc(),
|
||||
)
|
||||
else:
|
||||
q_page = q_page.order_by(
|
||||
BizQcTask.create_time.desc(),
|
||||
BizQcWorkOrder.work_order_no.desc(),
|
||||
BizQcTask.task_no.asc(),
|
||||
)
|
||||
rows = (
|
||||
q_page
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
)
|
||||
```
|
||||
|
||||
注意:确认 `list_mine_tasks` 形参名确为 `reception_source`(与现有签名一致)。
|
||||
|
||||
- [ ] **Step 2: Sanity import check**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python -c "from app.crud.qc_task import list_mine_tasks; print('ok')"
|
||||
```
|
||||
|
||||
Expected: `ok`
|
||||
|
||||
- [ ] **Step 3: Commit**(仅当用户明确要求提交时执行)
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/qc_task.py
|
||||
git commit -m "$(cat <<'EOF'
|
||||
feat: order mine QC tasks by lab storage code on inbound tabs
|
||||
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 前端统一比较工具
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/utils/qc-inbound-lab-storage-sort.ts`
|
||||
|
||||
web-admin 无单测 runner;用纯函数 + 节点内联断言冒烟(或手动对照设计文档)。
|
||||
|
||||
- [ ] **Step 1: Add compare helpers**
|
||||
|
||||
```typescript
|
||||
// web-admin/src/utils/qc-inbound-lab-storage-sort.ts
|
||||
|
||||
/** 编码 DESC → 时间 DESC;负值表示 a 排在 b 前(与后端一致) */
|
||||
export function compareLabStorageThenCreateTimeDesc(
|
||||
codeA: string | null | undefined,
|
||||
timeA: string | null | undefined,
|
||||
codeB: string | null | undefined,
|
||||
timeB: string | null | undefined
|
||||
): number {
|
||||
const ca = String(codeA || '').trim()
|
||||
const cb = String(codeB || '').trim()
|
||||
if (ca !== cb) {
|
||||
return ca > cb ? -1 : 1
|
||||
}
|
||||
const ta = String(timeA || '').trim()
|
||||
const tb = String(timeB || '').trim()
|
||||
if (ta !== tb) {
|
||||
return ta > tb ? -1 : 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
export function resolveGroupLabStorageCode(
|
||||
rows: { labStorageCode?: string | null }[]
|
||||
): string {
|
||||
for (const row of rows) {
|
||||
const code = String(row.labStorageCode || '').trim()
|
||||
if (code) return code
|
||||
}
|
||||
return ''
|
||||
}
|
||||
|
||||
export function resolveGroupMaxCreateTime(
|
||||
rows: { createTime?: string | null }[]
|
||||
): string {
|
||||
let max = ''
|
||||
for (const row of rows) {
|
||||
const t = String(row.createTime || '')
|
||||
if (t > max) max = t
|
||||
}
|
||||
return max
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Smoke-check in Node(可选)**
|
||||
|
||||
在仓库根用短脚本确认比较方向(复制函数体或通过构建后的 bundle 非必须;优先在实现后浏览器验)。
|
||||
|
||||
- [ ] **Step 3: Commit**(仅当用户明确要求提交时执行)
|
||||
|
||||
```bash
|
||||
git add web-admin/src/utils/qc-inbound-lab-storage-sort.ts
|
||||
git commit -m "$(cat <<'EOF'
|
||||
feat: add frontend inbound lab storage sort compare helpers
|
||||
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 入库组内与样本卡片排序
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/utils/qc-work-order-groups.ts`
|
||||
- Modify: `web-admin/src/utils/qc-work-order-inbound-sample-cards.ts`
|
||||
|
||||
- [ ] **Step 1: Inbound-only within-group sort**
|
||||
|
||||
在 `qc-work-order-groups.ts`:
|
||||
|
||||
保留现有 `sortWorkOrdersInGroup`(出库继续用)。新增:
|
||||
|
||||
```typescript
|
||||
function sortWorkOrdersInInboundGroup(rows: QcWorkOrder[]) {
|
||||
return [...rows].sort((a, b) =>
|
||||
compareLabStorageThenCreateTimeDesc(
|
||||
'', // 同组编码相同,仅比时间;传空避免干扰
|
||||
a.createTime,
|
||||
'',
|
||||
b.createTime
|
||||
)
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
更直接:
|
||||
|
||||
```typescript
|
||||
function sortWorkOrdersInInboundGroup(rows: QcWorkOrder[]) {
|
||||
return [...rows].sort((a, b) =>
|
||||
String(b.createTime || '').localeCompare(String(a.createTime || ''))
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
将 `groupInboundQcWorkOrders` 内 `sortWorkOrdersInGroup(workOrders)` 改为 `sortWorkOrdersInInboundGroup(workOrders)`。
|
||||
|
||||
`groupOutboundQcWorkOrders` 仍调用 `sortWorkOrdersInGroup`。
|
||||
|
||||
顶部增加(若用 compare 工具则 import;若仅 localeCompare 可省略):
|
||||
|
||||
```typescript
|
||||
// 无需改 outbound
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Card list order in `buildInboundSampleListItems`**
|
||||
|
||||
在 `qc-work-order-inbound-sample-cards.ts` 增加 import:
|
||||
|
||||
```typescript
|
||||
import {
|
||||
compareLabStorageThenCreateTimeDesc,
|
||||
resolveGroupLabStorageCode,
|
||||
resolveGroupMaxCreateTime
|
||||
} from '@/utils/qc-inbound-lab-storage-sort'
|
||||
```
|
||||
|
||||
将末尾:
|
||||
|
||||
```typescript
|
||||
const sortedGroups = [...groups].sort((a, b) => {
|
||||
const headA = a.workOrders[0]
|
||||
const headB = b.workOrders[0]
|
||||
if (!headA || !headB) return 0
|
||||
const protocolA = resolveInboundProtocolGroupKey(headA)
|
||||
const protocolB = resolveInboundProtocolGroupKey(headB)
|
||||
if (protocolA !== protocolB) {
|
||||
return protocolSortTime(b).localeCompare(protocolSortTime(a))
|
||||
}
|
||||
return (a.sampleCode || '').localeCompare(b.sampleCode || '')
|
||||
})
|
||||
```
|
||||
|
||||
替换为:
|
||||
|
||||
```typescript
|
||||
const sortedGroups = [...groups].sort((a, b) =>
|
||||
compareLabStorageThenCreateTimeDesc(
|
||||
resolveGroupLabStorageCode(a.workOrders),
|
||||
resolveGroupMaxCreateTime(a.workOrders),
|
||||
resolveGroupLabStorageCode(b.workOrders),
|
||||
resolveGroupMaxCreateTime(b.workOrders)
|
||||
)
|
||||
)
|
||||
```
|
||||
|
||||
若 `protocolSortTime` 不再被本文件使用,删除该死函数。
|
||||
|
||||
同协议胶囊内按 `sampleCode` 的排序(`buildLinksFromVisibleGroups` 等)**保持不变**。
|
||||
|
||||
- [ ] **Step 3: Commit**(仅当用户明确要求提交时执行)
|
||||
|
||||
```bash
|
||||
git add web-admin/src/utils/qc-work-order-groups.ts web-admin/src/utils/qc-work-order-inbound-sample-cards.ts
|
||||
git commit -m "$(cat <<'EOF'
|
||||
feat: sort inbound QC sample cards by lab storage code then create time
|
||||
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 6: 我的质检任务分页前排序
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/utils/qc-mine-task-groups.ts`
|
||||
- Modify: `web-admin/src/views/quality-inspection/qc-work-order/composables/useQcWorkOrderTabPage.ts`
|
||||
|
||||
- [ ] **Step 1: Export sorter**
|
||||
|
||||
在 `qc-mine-task-groups.ts` 增加:
|
||||
|
||||
```typescript
|
||||
import { compareLabStorageThenCreateTimeDesc } from '@/utils/qc-inbound-lab-storage-sort'
|
||||
import { isInboundSampleQcTab } from '@/utils/qc-work-order-tabs'
|
||||
|
||||
export function sortMineEntriesForInboundLabStorage(
|
||||
entries: MineWorkOrderEntry[]
|
||||
): MineWorkOrderEntry[] {
|
||||
return [...entries].sort((a, b) =>
|
||||
compareLabStorageThenCreateTimeDesc(
|
||||
a.workOrder.labStorageCode,
|
||||
a.workOrder.createTime,
|
||||
b.workOrder.labStorageCode,
|
||||
b.workOrder.createTime
|
||||
)
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
确认 `isInboundSampleQcTab` 已从 tabs 导出;若已有同类 import,合并到现有 import 块。
|
||||
|
||||
- [ ] **Step 2: Call before paginate in mine `loadData`**
|
||||
|
||||
在 `useQcWorkOrderTabPage.ts` 的 mine 分支,在 `filterMineEntriesByWorkOrderSearch` 之后、`paginateMineEntries` 之前:
|
||||
|
||||
```typescript
|
||||
let entries = groupMineTasksByWorkOrder(tasks)
|
||||
entries = filterMineEntriesByWorkOrderSearch(entries, buildMineWorkOrderSearchFilters())
|
||||
if (isInboundSampleQcTab(tabKey.value)) {
|
||||
entries = sortMineEntriesForInboundLabStorage(entries)
|
||||
}
|
||||
const pageResult = paginateMineEntries(entries, pagination.page, pagination.pageSize)
|
||||
```
|
||||
|
||||
补充 import:`sortMineEntriesForInboundLabStorage`、`isInboundSampleQcTab`(后者可能已导入)。
|
||||
|
||||
- [ ] **Step 3: Commit**(仅当用户明确要求提交时执行)
|
||||
|
||||
```bash
|
||||
git add web-admin/src/utils/qc-mine-task-groups.ts web-admin/src/views/quality-inspection/qc-work-order/composables/useQcWorkOrderTabPage.ts
|
||||
git commit -m "$(cat <<'EOF'
|
||||
feat: sort mine inbound QC entries by lab storage code before paging
|
||||
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 7: 图谱更新与手工验收
|
||||
|
||||
**Files:**
|
||||
- 无业务代码;跑 `scripts/update-graph.sh`
|
||||
|
||||
- [ ] **Step 1: Update knowledge graph**
|
||||
|
||||
```bash
|
||||
./scripts/update-graph.sh all
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Manual QA checklist**
|
||||
|
||||
1. 打开 `/#/quality-group/quality-manage/qc-work-order?tab=inbound_cell_storage`:卡片标题(实验室入库编码)整体倒序;同编码时创建时间新的在上;翻页后仍符合该序。
|
||||
2. 切换 `inbound_research_donation`:同上。
|
||||
3. `/#/quality-group/quality-manage/my-qc-task` 对应两 Tab:同上。
|
||||
4. 无编码卡片按空串参与倒序(相对有编码的位置与字符串 DESC 一致)。
|
||||
5. 「全部 / 出库 / 临时」Tab 顺序与交互无明显回归;同协议样本胶囊顺序仍按样本编码。
|
||||
|
||||
- [ ] **Step 3: Mark design status(可选)**
|
||||
|
||||
将 `docs/superpowers/specs/2026-08-17-qc-inbound-lab-storage-code-sort-design.md` 状态改为 `已实现`。
|
||||
|
||||
---
|
||||
|
||||
## Spec coverage (self-review)
|
||||
|
||||
| Spec 项 | Task |
|
||||
|---------|------|
|
||||
| 仅两页两 Tab | Task 2/3 条件 `uses_inbound_*`;Task 5/6 仅 inbound |
|
||||
| 编码 DESC + 时间 DESC | Task 1–6 |
|
||||
| 空串参与倒序 | Task 1 测试 + COALESCE/COALESCE |
|
||||
| 后端分页 | Task 2 |
|
||||
| 我的任务 | Task 3 + Task 6 |
|
||||
| 组内时间倒序、出库不变 | Task 5 |
|
||||
| 互链不改 | Task 5 明确保留 |
|
||||
| 无 DB 迁移 | 全程 JOIN/子查询 |
|
||||
|
||||
无 TBD 占位;前后端比较函数命名与语义一致(负值 = a 在前)。
|
||||
@@ -0,0 +1,26 @@
|
||||
# 样本接收协议费用按需展示 Implementation Plan
|
||||
|
||||
> **For agentic workers:** 单文件小改动,可直接按任务执行。
|
||||
|
||||
**Goal:** 样本接收卡片右上角「协议费用」按钮,点击弹窗查看完整费用。
|
||||
|
||||
**Architecture:** `SampleReceptionCardList` 标题行右侧按钮 + 单例 `el-dialog` 嵌入 `QcWorkOrderProtocolPaymentPanel`。
|
||||
|
||||
**Tech Stack:** Vue 3 + Element Plus(web-admin)
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 弹窗模式 + 右上角按钮
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/quality-inspection/sample-reception/SampleReceptionCardList.vue`
|
||||
|
||||
- [x] 标题行右上角「协议费用」按钮(`margin-left: auto`)
|
||||
- [x] 点击打开弹窗,展示完整协议费用面板(`embedded`)
|
||||
- [x] 移除卡片内联展开/收起逻辑
|
||||
|
||||
### Task 2: 手动验收
|
||||
|
||||
- [ ] 按钮在卡片右上角
|
||||
- [ ] 点击弹出费用明细;关闭后卡片无费用区域
|
||||
- [ ] 科研捐献卡片仍无协议费用入口
|
||||
@@ -0,0 +1,38 @@
|
||||
# 质检工单配置检测 · 批次名称默认值 — 设计文档
|
||||
|
||||
> 日期:2026-08-17
|
||||
> 状态:已实现
|
||||
> 范围:`web-admin` 【质检工单】配置检测 / 调整检测弹窗
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景
|
||||
|
||||
当前新增检测批次时,【批次名称】默认 `YYYYMMDD检测`(冲突加 `-2`、`-3`…)。
|
||||
细胞存储 / 科研捐赠质检希望默认使用工单上的**实验室入库编码**(如 `B0000090`、`BC0000015`)。
|
||||
|
||||
## 2. 已确认规则
|
||||
|
||||
| 条件 | 新增批次默认「批次名称」 |
|
||||
|------|--------------------------|
|
||||
| `receptionSource` 为 `cell_storage` 或 `research_donation`,且有 `labStorageCode` | 一律用该编码;多批次相同;允许用户再改 |
|
||||
| 同上,但无 `labStorageCode` | 空字符串,用户自填 |
|
||||
| 其它来源(临时 / 出库等) | 保持 `YYYYMMDD检测`,冲突加 `-2`、`-3`… |
|
||||
|
||||
覆盖点:打开弹窗时的首个默认批次 +「添加批次」。
|
||||
不改已保存批次名;不改后端接口。
|
||||
|
||||
## 3. 实现要点(方案 1)
|
||||
|
||||
1. 在 `qc-inspection-batch.ts` 抽取 `resolveDefaultQcBatchName(...)` 作为唯一默认名规则。
|
||||
2. `index.vue` 打开配置弹窗时记住当前工单的 `receptionSource`、`labStorageCode`,并传给 `QcWorkOrderConfigureBatches`;首个默认批次走同一规则。
|
||||
3. `QcWorkOrderConfigureBatches` 的「添加批次」调用同一规则(入库类型不做名称去重后缀)。
|
||||
|
||||
## 5. 批次负责人默认值(补充)
|
||||
|
||||
点击「添加批次」时:
|
||||
|
||||
1. 弹窗内已有批次 → 复制**列表最后一批**的 `assigneeUserIds`(多选原样带上)
|
||||
2. 弹窗内无批次 → 仍为:当前登录用户在「质检专员」下拉里则默认自己,否则空
|
||||
|
||||
打开弹窗首个空默认批次(无历史)仍走规则 2。
|
||||
@@ -0,0 +1,78 @@
|
||||
# 入库质检列表按实验室入库编码排序 — 设计文档
|
||||
|
||||
> 日期:2026-08-17
|
||||
> 状态:已实现
|
||||
> 范围:【质检工单】【我的质检任务】的「细胞存储」「科研捐赠」Tab
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景
|
||||
|
||||
当前入库列表后端按工单 `create_time DESC` 分页;前端卡片再按「协议组最新创建时间 + 样本编码」重排,组内工单另按触发来源权重 + 创建时间升序。用户希望细胞存储 / 科研捐赠统一按**实验室入库编码倒序**,同编码下按**创建时间倒序**,且跨页一致。
|
||||
|
||||
## 2. 已确认规则
|
||||
|
||||
| 项 | 约定 |
|
||||
|----|------|
|
||||
| 页面 | 仅【质检工单】+【我的质检任务】 |
|
||||
| Tab | 仅 `inbound_cell_storage`、`inbound_research_donation` |
|
||||
| 主排序 | `lab_storage_code` / `labStorageCode` 字符串倒序 |
|
||||
| 次排序 | 工单 `create_time` / `createTime` 倒序 |
|
||||
| 空编码 | 按空字符串 `''` 直接参与倒序比较 |
|
||||
| 分页 | 后端按上述规则排序后再分页(跨页一致) |
|
||||
| 其它 Tab | 「全部 / 出库 / 临时」等不改 |
|
||||
|
||||
## 3. 方案(方案 1)
|
||||
|
||||
后端入库两 Tab 专用 `ORDER BY`(JOIN 样本接收取编码)+ 前端展示排序对齐同一规则。
|
||||
|
||||
不采用:仅前端页内重排;工单表冗余 `lab_storage_code`。
|
||||
|
||||
## 4. 后端
|
||||
|
||||
### 4.1 编码来源
|
||||
|
||||
`lab_storage_code` 在 `biz_sample_reception`,不在 `biz_qc_work_order`。列表排序通过 **LEFT JOIN** 取得,`COALESCE(lab_storage_code, '')`。
|
||||
|
||||
JOIN 对齐现有 enrich 语义:优先 `BizQcWorkOrder.reception_id`;无接收 ID 时再按 `sample_code + tenant`(及必要的 `del_flag`)关联,避免生产触发等无 `reception_id` 的工单编码全空导致乱序。
|
||||
|
||||
### 4.2 质检工单 `list_work_orders`
|
||||
|
||||
- 当 `reception_source ∈ {cell_storage, research_donation}`:
|
||||
`ORDER BY COALESCE(lab_storage_code, '') DESC, BizQcWorkOrder.create_time DESC`
|
||||
- 其它来源:保持 `create_time DESC`
|
||||
- 不改筛选条件与返回字段结构
|
||||
|
||||
### 4.3 我的质检任务 `list_mine_tasks`
|
||||
|
||||
- 查询已 JOIN 工单;当请求带入库两 Tab 的 `reception_source` 时:
|
||||
`ORDER BY COALESCE(lab_storage_code, '') DESC, BizQcWorkOrder.create_time DESC`,并以 `work_order_no` / `task_no` 作为稳定次序
|
||||
- 其它 Tab:保持现有任务 `create_time DESC` 等规则
|
||||
- 前端仍 `fetchAllMineTasks` 拉全量;聚合后按同一规则排序再客户端分页
|
||||
|
||||
## 5. 前端
|
||||
|
||||
| 文件 | 改动 |
|
||||
|------|------|
|
||||
| `qc-work-order-inbound-sample-cards.ts` | `buildInboundSampleListItems`:卡片序改为编码倒序 → 组内最大 `createTime` 倒序;去掉「协议组再样本编码」主序 |
|
||||
| `qc-work-order-groups.ts` | **仅入库路径**组内排序改为 `createTime` 倒序(取消触发来源权重);出库 `groupOutboundQcWorkOrders` 保持原组内规则不变 |
|
||||
| `qc-mine-task-groups.ts` | 入库两 Tab:分页前对工单条目按编码 DESC → 工单创建时间 DESC 排序 |
|
||||
|
||||
**不改**:同协议样本胶囊内按 `sampleCode` 的互链排序;全部 / 出库 / 临时展示逻辑。
|
||||
|
||||
卡片代表字段:
|
||||
|
||||
- 编码:组内首个非空 `labStorageCode`,否则 `''`
|
||||
- 时间:组内最大 `createTime`(同编码下新的在前)
|
||||
|
||||
## 6. 验收
|
||||
|
||||
1. 细胞存储、科研捐赠:两页列表均为「编码倒序,同编码创建时间倒序」;翻页顺序连续。
|
||||
2. 无编码按空串参与倒序;同一样本多工单时间新的在上。
|
||||
3. 其它 Tab 无回归。
|
||||
|
||||
## 7. 非目标
|
||||
|
||||
- 数据库迁移 / 工单表冗余字段
|
||||
- 修改「全部」Tab 中入库卡片的全局排序策略
|
||||
- 改变同协议互链胶囊的展示顺序规则
|
||||
@@ -0,0 +1,18 @@
|
||||
# 样本接收 · 协议费用按需展示
|
||||
|
||||
## 背景
|
||||
|
||||
样本接收列表卡片默认展示整块「协议费用」占用空间。改为按需查看。
|
||||
|
||||
## 决策
|
||||
|
||||
仅在 `SampleReceptionCardList.vue` 改造:
|
||||
|
||||
1. 「协议费用」按钮放在卡片标题行右上角(`margin-left: auto`)。
|
||||
2. 点击后以弹窗展示完整 `QcWorkOrderProtocolPaymentPanel`(非 compact、`embedded`,避免与弹窗标题重复)。
|
||||
3. 不改共享组件;质检工单等其它页保持原交互。
|
||||
|
||||
## 非目标
|
||||
|
||||
- 不改其它列表的协议费用交互。
|
||||
- 不新增后端字段或接口。
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 9.0 KiB |
@@ -237,22 +237,37 @@
|
||||
}
|
||||
.route-config-step-actions {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-direction: row;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
gap: 2px;
|
||||
justify-content: center;
|
||||
gap: 0;
|
||||
flex-shrink: 0;
|
||||
width: 48px;
|
||||
margin-left: auto;
|
||||
padding-top: 2px;
|
||||
|
||||
.el-tag {
|
||||
margin: 0;
|
||||
flex: 1 0 100%;
|
||||
justify-content: center;
|
||||
height: 18px;
|
||||
padding: 0 3px;
|
||||
font-size: 10px;
|
||||
line-height: 16px;
|
||||
}
|
||||
|
||||
.el-button.is-link {
|
||||
margin: 0;
|
||||
padding: 2px;
|
||||
height: auto;
|
||||
padding: 0;
|
||||
min-height: 20px;
|
||||
min-width: 20px;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
}
|
||||
|
||||
.el-icon {
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
import { describe, it } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { createEmptyStepOutputRow } from './production-step-output'
|
||||
|
||||
describe('createEmptyStepOutputRow', () => {
|
||||
it('defaults barcode to lab storage code', () => {
|
||||
const row = createEmptyStepOutputRow('LAB-001')
|
||||
assert.equal(row.outputBarcode, 'LAB-001')
|
||||
assert.equal(row.outputTypeId, '')
|
||||
assert.equal(row.outputName, '')
|
||||
assert.equal(row.remark, '')
|
||||
})
|
||||
|
||||
it('trims lab storage code', () => {
|
||||
assert.equal(createEmptyStepOutputRow(' LAB-002 ').outputBarcode, 'LAB-002')
|
||||
})
|
||||
|
||||
it('uses empty barcode when lab storage code is missing', () => {
|
||||
assert.equal(createEmptyStepOutputRow('').outputBarcode, '')
|
||||
assert.equal(createEmptyStepOutputRow(null).outputBarcode, '')
|
||||
assert.equal(createEmptyStepOutputRow(undefined).outputBarcode, '')
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,9 @@
|
||||
/** 工艺步骤「产出物」新增行:条码默认实验室入库编码。 */
|
||||
export function createEmptyStepOutputRow(labStorageCode?: string | null) {
|
||||
return {
|
||||
outputTypeId: '',
|
||||
outputName: '',
|
||||
outputBarcode: String(labStorageCode || '').trim(),
|
||||
remark: ''
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
/** 编码 DESC → 时间 DESC;负值表示 a 排在 b 前(与后端一致) */
|
||||
export function compareLabStorageThenCreateTimeDesc(
|
||||
codeA: string | null | undefined,
|
||||
timeA: string | null | undefined,
|
||||
codeB: string | null | undefined,
|
||||
timeB: string | null | undefined
|
||||
): number {
|
||||
const ca = String(codeA || '').trim()
|
||||
const cb = String(codeB || '').trim()
|
||||
if (ca !== cb) {
|
||||
return ca > cb ? -1 : 1
|
||||
}
|
||||
const ta = String(timeA || '').trim()
|
||||
const tb = String(timeB || '').trim()
|
||||
if (ta !== tb) {
|
||||
return ta > tb ? -1 : 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
export function resolveGroupLabStorageCode(
|
||||
rows: { labStorageCode?: string | null }[]
|
||||
): string {
|
||||
for (const row of rows) {
|
||||
const code = String(row.labStorageCode || '').trim()
|
||||
if (code) return code
|
||||
}
|
||||
return ''
|
||||
}
|
||||
|
||||
export function resolveGroupMaxCreateTime(
|
||||
rows: { createTime?: string | null }[]
|
||||
): string {
|
||||
let max = ''
|
||||
for (const row of rows) {
|
||||
const t = String(row.createTime || '')
|
||||
if (t > max) max = t
|
||||
}
|
||||
return max
|
||||
}
|
||||
@@ -162,16 +162,49 @@ export function resolveBatchSections<T extends QcBatchTaskLike>(
|
||||
return []
|
||||
}
|
||||
|
||||
export function createEmptyInspectionBatch(defaultAssigneeUserIds?: string[]): QcInspectionBatchConfigureItem {
|
||||
/** 细胞存储 / 科研捐赠:批次名默认用实验室入库编码 */
|
||||
const INBOUND_LAB_CODE_BATCH_SOURCES = new Set(['cell_storage', 'research_donation'])
|
||||
|
||||
export type ResolveDefaultQcBatchNameOpts = {
|
||||
receptionSource?: string | null
|
||||
labStorageCode?: string | null
|
||||
/** 已占用名称;仅非入库类型做 YYYYMMDD检测 去重时使用 */
|
||||
usedNames?: Iterable<string>
|
||||
}
|
||||
|
||||
/**
|
||||
* 配置检测弹窗新增批次的默认名称。
|
||||
* - 细胞存储 / 科研捐赠:有实验室入库编码则用该编码(多批次相同);无则空串
|
||||
* - 其它类型:YYYYMMDD检测,冲突则 -2、-3…
|
||||
*/
|
||||
export function resolveDefaultQcBatchName(opts: ResolveDefaultQcBatchNameOpts = {}): string {
|
||||
const source = String(opts.receptionSource || '').trim()
|
||||
if (INBOUND_LAB_CODE_BATCH_SOURCES.has(source)) {
|
||||
return String(opts.labStorageCode || '').trim()
|
||||
}
|
||||
const today = new Date()
|
||||
const y = today.getFullYear()
|
||||
const m = String(today.getMonth() + 1).padStart(2, '0')
|
||||
const d = String(today.getDate()).padStart(2, '0')
|
||||
const base = `${y}${m}${d}检测`
|
||||
const used = new Set(
|
||||
[...(opts.usedNames || [])].map((n) => String(n || '').trim()).filter(Boolean)
|
||||
)
|
||||
if (!used.has(base)) return base
|
||||
let n = 2
|
||||
while (used.has(`${base}-${n}`)) n += 1
|
||||
return `${base}-${n}`
|
||||
}
|
||||
|
||||
export function createEmptyInspectionBatch(
|
||||
defaultAssigneeUserIds?: string[],
|
||||
nameOpts?: ResolveDefaultQcBatchNameOpts
|
||||
): QcInspectionBatchConfigureItem {
|
||||
const assigneeUserIds = (defaultAssigneeUserIds || [])
|
||||
.map((id) => String(id || '').trim())
|
||||
.filter(Boolean)
|
||||
return {
|
||||
batchName: `${y}${m}${d}检测`,
|
||||
batchName: resolveDefaultQcBatchName(nameOpts),
|
||||
assigneeUserIds,
|
||||
hasLab: false,
|
||||
hasThirdParty: false,
|
||||
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
workOrderMatchesCategory
|
||||
} from '@/utils/qc-work-order-category'
|
||||
import { matchesWorkOrderStatusFilter } from '@/utils/status-tag-registry'
|
||||
import { compareLabStorageThenCreateTimeDesc } from '@/utils/qc-inbound-lab-storage-sort'
|
||||
|
||||
export type QcTaskMineFilters = {
|
||||
keyword?: string
|
||||
@@ -173,6 +174,19 @@ export function paginateMineEntries<T>(items: T[], page: number, pageSize: numbe
|
||||
}
|
||||
}
|
||||
|
||||
export function sortMineEntriesForInboundLabStorage(
|
||||
entries: MineWorkOrderEntry[]
|
||||
): MineWorkOrderEntry[] {
|
||||
return [...entries].sort((a, b) =>
|
||||
compareLabStorageThenCreateTimeDesc(
|
||||
a.workOrder.labStorageCode,
|
||||
a.workOrder.createTime,
|
||||
b.workOrder.labStorageCode,
|
||||
b.workOrder.createTime
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
export function buildMineTableRows(pageEntries: MineWorkOrderEntry[]): {
|
||||
rows: QcWorkOrder[]
|
||||
presetTasksByWorkOrderId: Record<string, QcTask[]>
|
||||
|
||||
@@ -23,6 +23,12 @@ function sortWorkOrdersInGroup(rows: QcWorkOrder[]) {
|
||||
})
|
||||
}
|
||||
|
||||
function sortWorkOrdersInInboundGroup(rows: QcWorkOrder[]) {
|
||||
return [...rows].sort((a, b) =>
|
||||
String(b.createTime || '').localeCompare(String(a.createTime || ''))
|
||||
)
|
||||
}
|
||||
|
||||
/** 入库 Tab:按样本编码分组(前端分组,分页仍按工单条数) */
|
||||
export function groupInboundQcWorkOrders(rows: QcWorkOrder[]): QcWorkOrderSampleGroupModel[] {
|
||||
const map = new Map<string, QcWorkOrder[]>()
|
||||
@@ -33,7 +39,7 @@ export function groupInboundQcWorkOrders(rows: QcWorkOrder[]): QcWorkOrderSample
|
||||
else map.set(key, [row])
|
||||
}
|
||||
return Array.from(map.entries()).map(([groupKey, workOrders]) => {
|
||||
const sorted = sortWorkOrdersInGroup(workOrders)
|
||||
const sorted = sortWorkOrdersInInboundGroup(workOrders)
|
||||
return {
|
||||
groupKey,
|
||||
sampleCode: sorted[0]?.sampleCode || '',
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
import type { QcProtocolSiblingSample, QcWorkOrder } from '@/api/qc-work-order'
|
||||
import {
|
||||
compareLabStorageThenCreateTimeDesc,
|
||||
resolveGroupLabStorageCode,
|
||||
resolveGroupMaxCreateTime
|
||||
} from '@/utils/qc-inbound-lab-storage-sort'
|
||||
import {
|
||||
groupInboundQcWorkOrders,
|
||||
resolveInboundProtocolGroupKey,
|
||||
@@ -33,15 +38,6 @@ function sampleTypeNameForGroup(group: QcWorkOrderSampleGroupModel) {
|
||||
return (gate?.sampleTypeName || group.workOrders[0]?.sampleTypeName || '').trim()
|
||||
}
|
||||
|
||||
function protocolSortTime(group: QcWorkOrderSampleGroupModel): string {
|
||||
let max = ''
|
||||
for (const wo of group.workOrders) {
|
||||
const t = String(wo.createTime || '')
|
||||
if (t > max) max = t
|
||||
}
|
||||
return max
|
||||
}
|
||||
|
||||
function resolveProtocolSiblingSamplesForGroup(
|
||||
group: QcWorkOrderSampleGroupModel
|
||||
): QcProtocolSiblingSample[] {
|
||||
@@ -140,17 +136,14 @@ export function buildInboundSampleListItems(rows: QcWorkOrder[]): QcInboundSampl
|
||||
}
|
||||
}
|
||||
|
||||
const sortedGroups = [...groups].sort((a, b) => {
|
||||
const headA = a.workOrders[0]
|
||||
const headB = b.workOrders[0]
|
||||
if (!headA || !headB) return 0
|
||||
const protocolA = resolveInboundProtocolGroupKey(headA)
|
||||
const protocolB = resolveInboundProtocolGroupKey(headB)
|
||||
if (protocolA !== protocolB) {
|
||||
return protocolSortTime(b).localeCompare(protocolSortTime(a))
|
||||
}
|
||||
return (a.sampleCode || '').localeCompare(b.sampleCode || '')
|
||||
})
|
||||
const sortedGroups = [...groups].sort((a, b) =>
|
||||
compareLabStorageThenCreateTimeDesc(
|
||||
resolveGroupLabStorageCode(a.workOrders),
|
||||
resolveGroupMaxCreateTime(a.workOrders),
|
||||
resolveGroupLabStorageCode(b.workOrders),
|
||||
resolveGroupMaxCreateTime(b.workOrders)
|
||||
)
|
||||
)
|
||||
|
||||
return sortedGroups.map((group) => ({
|
||||
group,
|
||||
|
||||
@@ -130,7 +130,7 @@
|
||||
@click="handleBatchOutbound"
|
||||
>
|
||||
<el-icon><Top /></el-icon>
|
||||
出库已选
|
||||
批量出库
|
||||
</el-button>
|
||||
<el-button class="btn-ghost" :loading="clearSlotsLoading" @click="handleClearSlots">
|
||||
<el-icon><Delete /></el-icon>
|
||||
@@ -2538,6 +2538,7 @@
|
||||
.shelf-scroll-wrapper {
|
||||
overflow: auto;
|
||||
max-height: 100%;
|
||||
padding-top: 12px;
|
||||
}
|
||||
|
||||
.shelf-container {
|
||||
|
||||
@@ -1406,6 +1406,14 @@
|
||||
async function remoteSearchStorageSlots(query: string) {
|
||||
const token = ++storageSlotSearchToken
|
||||
const trimmed = (query ?? '').trim()
|
||||
// 先记下当前选中格的展示名,避免远程结果分页未带回时 el-select 回退显示 id
|
||||
const keepStubs = (storageSlotSearchOpts.value.includeSlotIds || [])
|
||||
.map((id) => String(id || '').trim())
|
||||
.filter(Boolean)
|
||||
.map((id) => {
|
||||
const hit = storageSlotOptions.value.find((o) => o.id === id)
|
||||
return { id, name: hit?.name }
|
||||
})
|
||||
if (trimmed) storageSlotOptions.value = []
|
||||
storageSlotOptionsLoading.value = true
|
||||
try {
|
||||
@@ -1414,10 +1422,10 @@
|
||||
includeSlotIds: storageSlotSearchOpts.value.includeSlotIds
|
||||
})
|
||||
if (token !== storageSlotSearchToken) return
|
||||
storageSlotOptions.value = list ?? []
|
||||
storageSlotOptions.value = ensureStorageSlotsInOptions(list ?? [], keepStubs)
|
||||
} catch {
|
||||
if (token !== storageSlotSearchToken) return
|
||||
storageSlotOptions.value = []
|
||||
storageSlotOptions.value = ensureStorageSlotsInOptions([], keepStubs)
|
||||
} finally {
|
||||
if (token === storageSlotSearchToken) {
|
||||
storageSlotOptionsLoading.value = false
|
||||
|
||||
@@ -16,9 +16,6 @@
|
||||
>
|
||||
<!-- 阶段一:表单 -->
|
||||
<div v-if="phase === 'form'" class="dispatch-dialog-work-order-info">
|
||||
<span
|
||||
>工单号:<b>{{ workOrderRow?.workOrderNo }}</b></span
|
||||
>
|
||||
<span
|
||||
>样本编码:<SampleCodeWithSpecialDisplay
|
||||
:sample-code="workOrderRow?.sampleCode"
|
||||
@@ -26,6 +23,9 @@
|
||||
:special-remark="workOrderRow?.specialRemark"
|
||||
monospace
|
||||
/></span>
|
||||
<span
|
||||
>实验室入库编码:<b>{{ headerLabStorageCode }}</b></span
|
||||
>
|
||||
</div>
|
||||
<el-form
|
||||
v-if="phase === 'form'"
|
||||
@@ -328,6 +328,17 @@
|
||||
const stepAssigneeText = productionStepAssigneeText
|
||||
const stepPlannedStartText = productionStepPlannedStartText
|
||||
|
||||
const headerLabStorageCode = computed(() => {
|
||||
const row = props.workOrderRow
|
||||
if (!row) return '—'
|
||||
const fromRow = String(row.labStorageCode || '').trim()
|
||||
if (fromRow) return fromRow
|
||||
const fromReception = String(
|
||||
(row.reception as Record<string, any> | undefined)?.labStorageCode || ''
|
||||
).trim()
|
||||
return fromReception || '—'
|
||||
})
|
||||
|
||||
function resolveCreatedTaskId(task: Record<string, any> | null | undefined) {
|
||||
const raw = task?.id ?? task?.taskId ?? task?.data?.id
|
||||
return String(raw || '').trim()
|
||||
|
||||
@@ -589,13 +589,13 @@
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="list-body list-wrap inner-table-wrap">
|
||||
<div class="list-body list-wrap inner-table-wrap inner-table-wrap--outputs">
|
||||
<el-table
|
||||
v-if="editor.selectedStep.value.outputs?.length"
|
||||
:data="editor.selectedStep.value.outputs"
|
||||
stripe
|
||||
class="list-table inner-table"
|
||||
max-height="240"
|
||||
max-height="360"
|
||||
>
|
||||
<el-table-column
|
||||
type="index"
|
||||
@@ -1014,4 +1014,8 @@
|
||||
font-size: 11px;
|
||||
}
|
||||
}
|
||||
|
||||
.inner-table-wrap--outputs {
|
||||
min-height: 320px;
|
||||
}
|
||||
</style>
|
||||
@@ -429,6 +429,14 @@
|
||||
async function remoteSearchStorageSlots(query: string) {
|
||||
const token = ++storageSlotSearchToken
|
||||
const trimmed = (query ?? '').trim()
|
||||
// 先记下当前选中格的展示名,避免远程结果分页未带回时 el-select 回退显示 id
|
||||
const keepStubs = (storageSlotSearchOpts.value.includeSlotIds || [])
|
||||
.map((id) => String(id || '').trim())
|
||||
.filter(Boolean)
|
||||
.map((id) => {
|
||||
const hit = storageSlotOptions.value.find((o) => o.id === id)
|
||||
return { id, name: hit?.name }
|
||||
})
|
||||
if (trimmed) storageSlotOptions.value = []
|
||||
storageSlotOptionsLoading.value = true
|
||||
try {
|
||||
@@ -437,10 +445,10 @@
|
||||
includeSlotIds: storageSlotSearchOpts.value.includeSlotIds
|
||||
})
|
||||
if (token !== storageSlotSearchToken) return
|
||||
storageSlotOptions.value = list ?? []
|
||||
storageSlotOptions.value = ensureStorageSlotsInOptions(list ?? [], keepStubs)
|
||||
} catch {
|
||||
if (token !== storageSlotSearchToken) return
|
||||
storageSlotOptions.value = []
|
||||
storageSlotOptions.value = ensureStorageSlotsInOptions([], keepStubs)
|
||||
} finally {
|
||||
if (token === storageSlotSearchToken) {
|
||||
storageSlotOptionsLoading.value = false
|
||||
|
||||
+5
-2
@@ -31,6 +31,9 @@ import { computeWorkOrderPlannedStartTimeRange } from '@/utils/production-labels
|
||||
|
||||
export type ProductionWorkOrderTabPageMode = 'manage' | 'mine'
|
||||
|
||||
/** 默认筛选:待配置 + 进行中(不含已完成 / 已作废) */
|
||||
const DEFAULT_WORK_ORDER_STATUS_FILTER = ['dpz', 'jxz']
|
||||
|
||||
export function useProductionWorkOrderTabPage(
|
||||
tabKey: Ref<ProductionWorkOrderTabKey>,
|
||||
pageMode: Ref<ProductionWorkOrderTabPageMode> | ProductionWorkOrderTabPageMode
|
||||
@@ -43,7 +46,7 @@ export function useProductionWorkOrderTabPage(
|
||||
const searchForm = reactive({
|
||||
productionCategory: '',
|
||||
keyword: '',
|
||||
workOrderStatus: [] as string[],
|
||||
workOrderStatus: [...DEFAULT_WORK_ORDER_STATUS_FILTER],
|
||||
taskStatus: '',
|
||||
excludeVoidProtocol: true
|
||||
})
|
||||
@@ -182,7 +185,7 @@ export function useProductionWorkOrderTabPage(
|
||||
function handleReset() {
|
||||
searchForm.productionCategory = ''
|
||||
searchForm.keyword = ''
|
||||
searchForm.workOrderStatus = []
|
||||
searchForm.workOrderStatus = [...DEFAULT_WORK_ORDER_STATUS_FILTER]
|
||||
searchForm.taskStatus = ''
|
||||
searchForm.excludeVoidProtocol = true
|
||||
plannedStartTimeRange.value = null
|
||||
|
||||
-4
@@ -30,8 +30,6 @@
|
||||
placeholder="全部"
|
||||
clearable
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
@@ -110,8 +108,6 @@
|
||||
placeholder="全部"
|
||||
clearable
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
|
||||
@@ -48,6 +48,7 @@ import type { FinanceAttachmentItem } from '@/components/business/protocol-finan
|
||||
import { financeAttachmentsToUrlString } from '@/components/business/protocol-finance-confirm-fields/finance-attachments'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import { normalizePlannedStartDate, extractProductionTaskSteps } from '@/utils/production-labels'
|
||||
import { createEmptyStepOutputRow } from '@/utils/production-step-output'
|
||||
import { resolveCellProductSpecDisplay } from '@/utils/cell-product-spec'
|
||||
import { countOutputsMissingStorageSlot } from '@/utils/storage-slot-options'
|
||||
import {
|
||||
@@ -1732,15 +1733,16 @@ export function useTaskStepEditor() {
|
||||
}
|
||||
}
|
||||
|
||||
function resolveTaskLabStorageCode() {
|
||||
const fromDetail = String(taskDetail.value?.labStorageCode || '').trim()
|
||||
if (fromDetail) return fromDetail
|
||||
return resolveLabStorageCodeFromOptions(String(taskDetail.value?.sampleCode || ''))
|
||||
}
|
||||
|
||||
function addOutputRow() {
|
||||
if (!selectedStep.value) return
|
||||
if (!selectedStep.value.outputs) selectedStep.value.outputs = []
|
||||
selectedStep.value.outputs.push({
|
||||
outputTypeId: '',
|
||||
outputName: '',
|
||||
outputBarcode: '',
|
||||
remark: ''
|
||||
})
|
||||
selectedStep.value.outputs.push(createEmptyStepOutputRow(resolveTaskLabStorageCode()))
|
||||
}
|
||||
function removeOutputRow(i: number) {
|
||||
selectedStep.value?.outputs?.splice(i, 1)
|
||||
|
||||
@@ -70,36 +70,6 @@
|
||||
>
|
||||
<template #default="{ row }">{{ displayCell(row.processName) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="taskNo"
|
||||
label="任务号"
|
||||
min-width="140"
|
||||
align="center"
|
||||
header-align="center"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="{ row }">{{ displayCell(row.taskNo) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="workOrderNo"
|
||||
label="工单号"
|
||||
min-width="140"
|
||||
align="center"
|
||||
header-align="center"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="{ row }">{{ displayCell(row.workOrderNo) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="sampleCode"
|
||||
label="样本编码"
|
||||
min-width="140"
|
||||
align="center"
|
||||
header-align="center"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template #default="{ row }">{{ displayCell(row.sampleCode) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="remark"
|
||||
label="备注"
|
||||
|
||||
@@ -141,7 +141,7 @@
|
||||
<el-dialog
|
||||
v-model="dialogVisible"
|
||||
:title="dialogTitle"
|
||||
width="720px"
|
||||
width="1080px"
|
||||
class="dialog-form-layout"
|
||||
align-center
|
||||
append-to-body
|
||||
@@ -168,28 +168,125 @@
|
||||
<el-radio value="0">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="实验室自检项目" class="form-col-span-2" prop="labItemIds">
|
||||
<el-checkbox-group v-model="formData.labItemIds" class="qc-config-check-group">
|
||||
<el-checkbox v-for="item in labOptions" :key="item.id" :value="item.id">
|
||||
{{ item.itemName }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
<p v-if="!labOptions.length" class="hint-muted">暂无启用的实验室项目</p>
|
||||
</el-form-item>
|
||||
<el-form-item label="第三方检测项目" class="form-col-span-2" prop="thirdPartyItemIds">
|
||||
<div v-for="group in thirdGroups" :key="group.companyId" class="tpl-third-group">
|
||||
<div class="tpl-third-group__name">{{ group.companyName || '未命名公司' }}</div>
|
||||
<el-checkbox-group v-model="formData.thirdPartyItemIds" class="qc-config-check-group">
|
||||
<el-checkbox v-for="item in group.items" :key="item.id" :value="item.id">
|
||||
{{ item.itemName }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</div>
|
||||
<p v-if="!thirdGroups.length" class="hint-muted">暂无启用的第三方项目</p>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" class="form-col-span-2">
|
||||
<el-input v-model="formData.remark" type="textarea" :rows="2" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item class="form-col-span-2 tpl-items-field" prop="labItemIds">
|
||||
<div class="tpl-items-picker">
|
||||
<section class="qc-batch-config__selected">
|
||||
<div class="qc-batch-config__selected-head">
|
||||
<span class="qc-batch-config__selected-title">已选项目</span>
|
||||
<span class="qc-batch-config__selected-count">共 {{ selectedItemCount }} 项</span>
|
||||
</div>
|
||||
<div v-if="selectedItemCount" class="qc-batch-config__selected-body">
|
||||
<div v-if="selectedLabItems.length" class="qc-batch-config__selected-group">
|
||||
<span class="qc-batch-config__selected-label">实验室自检</span>
|
||||
<div class="qc-batch-config__selected-tags">
|
||||
<el-tag
|
||||
v-for="item in selectedLabItems"
|
||||
:key="'sel-lab-' + item.id"
|
||||
type="success"
|
||||
size="small"
|
||||
closable
|
||||
@close="removeLabItem(item.id)"
|
||||
>
|
||||
{{ item.itemName }}
|
||||
</el-tag>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="selectedThirdGroups.length" class="qc-batch-config__selected-third">
|
||||
<span class="qc-batch-config__selected-label">第三方检测</span>
|
||||
<div class="qc-batch-config__selected-third-groups">
|
||||
<div
|
||||
v-for="group in selectedThirdGroups"
|
||||
:key="'sel-company-' + group.companyId"
|
||||
class="qc-batch-config__selected-company"
|
||||
>
|
||||
<span class="qc-batch-config__selected-company-name">{{
|
||||
group.companyName || '未命名公司'
|
||||
}}</span>
|
||||
<div class="qc-batch-config__selected-tags">
|
||||
<el-tag
|
||||
v-for="item in group.items"
|
||||
:key="'sel-third-' + item.id"
|
||||
type="primary"
|
||||
size="small"
|
||||
closable
|
||||
@close="removeThirdItem(item.id)"
|
||||
>
|
||||
{{ item.itemName }}
|
||||
</el-tag>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p v-else class="qc-batch-config__selected-empty hint-muted">暂未选择检测项目</p>
|
||||
</section>
|
||||
|
||||
<div class="qc-config-split">
|
||||
<div class="qc-config-split__panel">
|
||||
<div class="qc-config-split__title">实验室自检项目</div>
|
||||
<div class="qc-config-split__body">
|
||||
<el-checkbox-group
|
||||
v-model="formData.labItemIds"
|
||||
class="qc-config-check-group qc-config-check-group--single"
|
||||
@change="onItemsChange"
|
||||
>
|
||||
<el-checkbox v-for="item in labOptions" :key="item.id" :value="item.id">
|
||||
{{ item.itemName }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
<p v-if="!labOptions.length" class="hint-muted">暂无启用的实验室项目</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="qc-config-split__panel">
|
||||
<div class="qc-config-split__title">第三方检测项目</div>
|
||||
<div class="qc-config-split__body qc-config-split__body--third">
|
||||
<template v-if="thirdGroups.length">
|
||||
<div class="qc-config-third-split">
|
||||
<div class="qc-config-third-split__companies">
|
||||
<button
|
||||
v-for="group in thirdGroups"
|
||||
:key="group.companyId"
|
||||
type="button"
|
||||
class="qc-config-third-split__company"
|
||||
:class="{ 'is-active': selectedCompanyId === group.companyId }"
|
||||
@click="selectedCompanyId = group.companyId"
|
||||
>
|
||||
{{ group.companyName || '未命名公司' }}
|
||||
</button>
|
||||
</div>
|
||||
<div class="qc-config-third-split__items">
|
||||
<template v-if="activeThirdGroup">
|
||||
<el-checkbox-group
|
||||
v-model="formData.thirdPartyItemIds"
|
||||
class="qc-config-check-group qc-config-check-group--single"
|
||||
@change="onItemsChange"
|
||||
>
|
||||
<el-checkbox
|
||||
v-for="item in activeThirdGroup.items"
|
||||
:key="item.id"
|
||||
:value="item.id"
|
||||
>
|
||||
{{ item.itemName }}
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
<p v-if="!activeThirdGroup.items.length" class="hint-muted">
|
||||
该公司暂无检测项目
|
||||
</p>
|
||||
</template>
|
||||
<p v-else class="hint-muted">请选择左侧第三方公司</p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<p v-else class="hint-muted">暂无启用的第三方项目</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
@@ -249,6 +346,7 @@
|
||||
const editingId = ref<string | null>(null)
|
||||
const labOptions = ref<QcLabTestItem[]>([])
|
||||
const thirdOptions = ref<QcThirdPartyItem[]>([])
|
||||
const selectedCompanyId = ref('')
|
||||
|
||||
const thirdGroups = computed(() => {
|
||||
const map = new Map<string, { companyId: string; companyName: string; items: QcThirdPartyItem[] }>()
|
||||
@@ -266,6 +364,31 @@
|
||||
return Array.from(map.values())
|
||||
})
|
||||
|
||||
const activeThirdGroup = computed(
|
||||
() => thirdGroups.value.find((g) => g.companyId === selectedCompanyId.value) || null
|
||||
)
|
||||
|
||||
const selectedLabItems = computed(() =>
|
||||
formData.labItemIds
|
||||
.map((id) => labOptions.value.find((o) => o.id === id))
|
||||
.filter((item): item is QcLabTestItem => !!item)
|
||||
)
|
||||
|
||||
const selectedThirdGroups = computed(() => {
|
||||
const selectedSet = new Set(formData.thirdPartyItemIds)
|
||||
return thirdGroups.value
|
||||
.map((group) => ({
|
||||
companyId: group.companyId,
|
||||
companyName: group.companyName,
|
||||
items: group.items.filter((item) => selectedSet.has(item.id))
|
||||
}))
|
||||
.filter((group) => group.items.length > 0)
|
||||
})
|
||||
|
||||
const selectedItemCount = computed(
|
||||
() => formData.labItemIds.length + formData.thirdPartyItemIds.length
|
||||
)
|
||||
|
||||
const formData = reactive({
|
||||
templateName: '',
|
||||
status: '1',
|
||||
@@ -285,8 +408,31 @@
|
||||
const formRules = {
|
||||
templateName: [{ required: true, message: '请输入模版名称', trigger: 'blur' }],
|
||||
status: [{ required: true, message: '请选择状态', trigger: 'change' }],
|
||||
labItemIds: [{ validator: validateItems, trigger: 'change' }],
|
||||
thirdPartyItemIds: [{ validator: validateItems, trigger: 'change' }]
|
||||
labItemIds: [{ validator: validateItems, trigger: 'change' }]
|
||||
}
|
||||
|
||||
function ensureCompanySelection() {
|
||||
if (!thirdGroups.value.length) {
|
||||
selectedCompanyId.value = ''
|
||||
return
|
||||
}
|
||||
if (!thirdGroups.value.some((g) => g.companyId === selectedCompanyId.value)) {
|
||||
selectedCompanyId.value = thirdGroups.value[0].companyId
|
||||
}
|
||||
}
|
||||
|
||||
function onItemsChange() {
|
||||
formRef.value?.validateField?.('labItemIds').catch(() => undefined)
|
||||
}
|
||||
|
||||
function removeLabItem(itemId: string) {
|
||||
formData.labItemIds = formData.labItemIds.filter((id) => id !== itemId)
|
||||
onItemsChange()
|
||||
}
|
||||
|
||||
function removeThirdItem(itemId: string) {
|
||||
formData.thirdPartyItemIds = formData.thirdPartyItemIds.filter((id) => id !== itemId)
|
||||
onItemsChange()
|
||||
}
|
||||
|
||||
async function loadItemOptions() {
|
||||
@@ -296,6 +442,7 @@
|
||||
])
|
||||
labOptions.value = lab || []
|
||||
thirdOptions.value = third || []
|
||||
ensureCompanySelection()
|
||||
}
|
||||
|
||||
async function loadData() {
|
||||
@@ -333,6 +480,7 @@
|
||||
formData.thirdPartyItemIds = []
|
||||
formData.remark = ''
|
||||
editingId.value = null
|
||||
selectedCompanyId.value = ''
|
||||
}
|
||||
|
||||
async function handleAdd() {
|
||||
@@ -404,20 +552,271 @@
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.tpl-third-group {
|
||||
margin-bottom: 10px;
|
||||
|
||||
&__name {
|
||||
margin-bottom: 6px;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: var(--mint-text, #1e293b);
|
||||
}
|
||||
}
|
||||
|
||||
.hint-muted {
|
||||
margin: 0;
|
||||
font-size: 12px;
|
||||
color: var(--mint-text-muted, #94a3b8);
|
||||
}
|
||||
|
||||
.tpl-items-field :deep(.el-form-item__content) {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.tpl-items-picker {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.qc-config-split {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1fr) minmax(0, 2.2fr);
|
||||
gap: 16px;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
min-height: 360px;
|
||||
}
|
||||
|
||||
.qc-config-split__panel {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
border: 1px solid #e2e8f0;
|
||||
border-radius: 8px;
|
||||
background: #fff;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.qc-config-split__title {
|
||||
flex-shrink: 0;
|
||||
padding: 10px 14px;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: #1e293b;
|
||||
background: #f8fafc;
|
||||
border-bottom: 1px solid #e2e8f0;
|
||||
}
|
||||
|
||||
.qc-config-split__body {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
padding: 12px 14px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.qc-config-split__body--third {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.qc-config-third-split {
|
||||
display: grid;
|
||||
grid-template-columns: 168px minmax(0, 1fr);
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
min-height: 320px;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.qc-config-third-split__companies {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
width: 168px;
|
||||
min-width: 168px;
|
||||
max-width: 168px;
|
||||
padding: 10px 8px;
|
||||
border-right: 1px solid #e2e8f0;
|
||||
background: #f8fafc;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.qc-config-third-split__company {
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
padding: 8px 10px;
|
||||
border: none;
|
||||
border-radius: 6px;
|
||||
background: transparent;
|
||||
font-size: 13px;
|
||||
line-height: 1.4;
|
||||
text-align: left;
|
||||
color: #334155;
|
||||
cursor: pointer;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
transition:
|
||||
background 0.15s,
|
||||
color 0.15s;
|
||||
|
||||
&:hover:not(.is-active) {
|
||||
background: #ecfdf5;
|
||||
color: #065f46;
|
||||
}
|
||||
|
||||
&.is-active {
|
||||
background: var(--primary-bg, #ecfdf5);
|
||||
color: var(--primary-dark, #059669);
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
|
||||
.qc-config-third-split__items {
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
padding: 12px 14px;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.qc-config-check-group {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
gap: 8px;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.qc-config-check-group--single {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.qc-config-check-group :deep(.el-checkbox) {
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
margin-right: 0;
|
||||
height: auto;
|
||||
align-items: flex-start;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
.qc-config-check-group :deep(.el-checkbox__label) {
|
||||
white-space: normal;
|
||||
overflow-wrap: anywhere;
|
||||
word-break: break-word;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
margin-bottom: 16px;
|
||||
padding: 12px 14px;
|
||||
border: 1px solid #e2e8f0;
|
||||
border-radius: 8px;
|
||||
background: #f8fafc;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-title {
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: #1e293b;
|
||||
|
||||
&::before {
|
||||
content: '';
|
||||
display: inline-block;
|
||||
width: 4px;
|
||||
height: 12px;
|
||||
margin-right: 8px;
|
||||
border-radius: 999px;
|
||||
background: var(--primary-dark, #059669);
|
||||
vertical-align: -1px;
|
||||
}
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-count {
|
||||
font-size: 12px;
|
||||
color: var(--mint-text-muted, #64748b);
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-group {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: flex-start;
|
||||
gap: 8px 12px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-third {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: flex-start;
|
||||
gap: 8px 12px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-third-groups {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-company {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: flex-start;
|
||||
gap: 8px 10px;
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 8px 10px;
|
||||
background: #fff;
|
||||
border: 1px solid #e2e8f0;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-company-name {
|
||||
flex-shrink: 0;
|
||||
min-width: 72px;
|
||||
padding-top: 2px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
color: #334155;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-label {
|
||||
flex-shrink: 0;
|
||||
min-width: 72px;
|
||||
padding-top: 2px;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
color: var(--mint-text-muted, #64748b);
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-tags {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected-empty {
|
||||
margin: 0;
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
+99
-51
@@ -31,7 +31,10 @@
|
||||
:name="tabKey(batch, index)"
|
||||
:label="batchTabLabel(batch, index)"
|
||||
>
|
||||
<div class="form-grid-2 qc-batch-config__head-row">
|
||||
<div
|
||||
class="qc-batch-config__head-row"
|
||||
:class="canUseTemplate || canSaveTemplate ? 'form-grid-3' : 'form-grid-2'"
|
||||
>
|
||||
<el-form-item label="批次名称">
|
||||
<el-input v-model="batch.batchName" placeholder="如 20260625检测" clearable maxlength="200" />
|
||||
</el-form-item>
|
||||
@@ -51,35 +54,36 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="canUseTemplate || canSaveTemplate"
|
||||
class="qc-batch-config__template-bar"
|
||||
>
|
||||
<el-select
|
||||
v-if="canUseTemplate"
|
||||
:model-value="selectedTemplateIdByIndex[index] || ''"
|
||||
clearable
|
||||
filterable
|
||||
placeholder="选用检测项目模版"
|
||||
style="min-width: 240px; flex: 1"
|
||||
@change="(val) => onTemplateSelect(batch, index, val)"
|
||||
<el-form-item
|
||||
v-if="canUseTemplate || canSaveTemplate"
|
||||
label="检测项目模版"
|
||||
>
|
||||
<el-option
|
||||
v-for="t in templateOptions"
|
||||
:key="t.id"
|
||||
:label="t.templateName"
|
||||
:value="t.id"
|
||||
/>
|
||||
</el-select>
|
||||
<el-button
|
||||
v-if="canSaveTemplate"
|
||||
class="btn-ghost"
|
||||
@click="saveBatchAsTemplate(batch)"
|
||||
>
|
||||
<el-icon><DocumentAdd /></el-icon>存成新模版
|
||||
</el-button>
|
||||
<div class="qc-batch-config__template-field">
|
||||
<el-select
|
||||
v-if="canUseTemplate"
|
||||
:model-value="selectedTemplateIdByIndex[index] || ''"
|
||||
clearable
|
||||
filterable
|
||||
placeholder="选用检测项目模版"
|
||||
class="qc-batch-config__template-select"
|
||||
@change="(val) => onTemplateSelect(batch, index, val)"
|
||||
>
|
||||
<el-option
|
||||
v-for="t in templateOptions"
|
||||
:key="t.id"
|
||||
:label="t.templateName"
|
||||
:value="t.id"
|
||||
/>
|
||||
</el-select>
|
||||
<el-button
|
||||
v-if="canSaveTemplate"
|
||||
class="btn-ghost"
|
||||
@click="saveBatchAsTemplate(batch)"
|
||||
>
|
||||
<el-icon><DocumentAdd /></el-icon>存成新模版
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<section class="qc-batch-config__selected">
|
||||
@@ -239,6 +243,9 @@
|
||||
thirdOptions: ThirdOption[]
|
||||
thirdOptionsGrouped: ThirdGroup[]
|
||||
userOptions: UserOption[]
|
||||
/** 当前工单来源:细胞存储 / 科研捐赠时批次名默认用实验室入库编码 */
|
||||
receptionSource?: string
|
||||
labStorageCode?: string
|
||||
}>()
|
||||
|
||||
const activeTabKey = ref('')
|
||||
@@ -422,25 +429,26 @@
|
||||
syncBatchFlags(batch)
|
||||
}
|
||||
|
||||
function suggestNextBatchName() {
|
||||
const today = new Date()
|
||||
const y = today.getFullYear()
|
||||
const m = String(today.getMonth() + 1).padStart(2, '0')
|
||||
const d = String(today.getDate()).padStart(2, '0')
|
||||
const base = `${y}${m}${d}检测`
|
||||
const used = new Set(batches.value.map((b) => (b.batchName || '').trim()))
|
||||
if (!used.has(base)) return base
|
||||
let n = 2
|
||||
while (used.has(`${base}-${n}`)) n += 1
|
||||
return `${base}-${n}`
|
||||
function resolveDefaultAssigneeUserIds(): string[] {
|
||||
const last = batches.value[batches.value.length - 1]
|
||||
if (last) {
|
||||
return [...(last.assigneeUserIds || [])]
|
||||
.map((id) => String(id || '').trim())
|
||||
.filter(Boolean)
|
||||
}
|
||||
const uid = resolveCurrentUserId()
|
||||
const canDefaultSelf = !!uid && props.userOptions.some((u) => String(u.value) === uid)
|
||||
return canDefaultSelf ? [uid] : []
|
||||
}
|
||||
|
||||
function addBatch() {
|
||||
const uid = resolveCurrentUserId()
|
||||
batches.value.push({
|
||||
...createEmptyInspectionBatch(uid ? [uid] : undefined),
|
||||
batchName: suggestNextBatchName()
|
||||
})
|
||||
batches.value.push(
|
||||
createEmptyInspectionBatch(resolveDefaultAssigneeUserIds(), {
|
||||
receptionSource: props.receptionSource,
|
||||
labStorageCode: props.labStorageCode,
|
||||
usedNames: batches.value.map((b) => (b.batchName || '').trim())
|
||||
})
|
||||
)
|
||||
const idx = batches.value.length - 1
|
||||
ensureCompanySelection(idx)
|
||||
activeTabKey.value = tabKey(batches.value[idx], idx)
|
||||
@@ -528,25 +536,34 @@
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.qc-batch-config__template-bar {
|
||||
.qc-batch-config__template-field {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
margin-bottom: 12px;
|
||||
gap: 8px;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.qc-batch-config__template-select {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.qc-config-split {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
|
||||
grid-template-columns: minmax(0, 1fr) minmax(0, 2.2fr);
|
||||
gap: 16px;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
min-height: 360px;
|
||||
}
|
||||
|
||||
.qc-config-split__panel {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
border: 1px solid #e2e8f0;
|
||||
border-radius: 8px;
|
||||
background: #fff;
|
||||
@@ -577,22 +594,30 @@
|
||||
.qc-config-third-split {
|
||||
display: grid;
|
||||
grid-template-columns: 168px minmax(0, 1fr);
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
min-height: 320px;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.qc-config-third-split__companies {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
width: 168px;
|
||||
min-width: 168px;
|
||||
max-width: 168px;
|
||||
padding: 10px 8px;
|
||||
border-right: 1px solid #e2e8f0;
|
||||
background: #f8fafc;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.qc-config-third-split__company {
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
padding: 8px 10px;
|
||||
border: none;
|
||||
border-radius: 6px;
|
||||
@@ -602,6 +627,9 @@
|
||||
text-align: left;
|
||||
color: #334155;
|
||||
cursor: pointer;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
transition:
|
||||
background 0.15s,
|
||||
color 0.15s;
|
||||
@@ -620,14 +648,34 @@
|
||||
|
||||
.qc-config-third-split__items {
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
padding: 12px 14px;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.qc-config-check-group {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr;
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
gap: 8px;
|
||||
width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.qc-config-check-group :deep(.el-checkbox) {
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
margin-right: 0;
|
||||
height: auto;
|
||||
align-items: flex-start;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
.qc-config-check-group :deep(.el-checkbox__label) {
|
||||
white-space: normal;
|
||||
overflow-wrap: anywhere;
|
||||
word-break: break-word;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.qc-batch-config__selected {
|
||||
|
||||
@@ -305,6 +305,21 @@
|
||||
border-color: #a8d4c4;
|
||||
box-shadow: 0 2px 8px rgba(4, 120, 87, 0.08);
|
||||
}
|
||||
|
||||
&:has(.qc-work-order-card--completed) {
|
||||
border-color: #fcd34d;
|
||||
background: #fffbeb;
|
||||
|
||||
&:hover {
|
||||
border-color: #fbbf24;
|
||||
box-shadow: 0 4px 12px rgba(217, 119, 6, 0.1);
|
||||
}
|
||||
|
||||
.qc-protocol-row__ctx {
|
||||
background: linear-gradient(180deg, #fef3c7 0%, #fffbeb 100%);
|
||||
border-bottom-color: #fde68a;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.qc-protocol-row__ctx {
|
||||
|
||||
@@ -362,6 +362,26 @@
|
||||
border-color: var(--primary, #10b981);
|
||||
box-shadow: 0 0 0 2px rgb(16 185 129 / 18%);
|
||||
}
|
||||
|
||||
&:has(.qc-work-order-card--completed) {
|
||||
border-color: #fcd34d;
|
||||
background: #fffbeb;
|
||||
|
||||
&:hover {
|
||||
border-color: #fbbf24;
|
||||
box-shadow: 0 4px 12px rgba(217, 119, 6, 0.1);
|
||||
}
|
||||
|
||||
.qc-sample-row__ctx {
|
||||
background: linear-gradient(180deg, #fef3c7 0%, #fffbeb 100%);
|
||||
border-bottom-color: #fde68a;
|
||||
}
|
||||
|
||||
.qc-wo-indep-tabs {
|
||||
background: #fffbeb;
|
||||
border-bottom-color: #fde68a;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.qc-sample-row__protocol-inline {
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
<!-- 质检工单 · 单工单卡片(head + 任务区) -->
|
||||
<template>
|
||||
<article class="qc-work-order-card">
|
||||
<article
|
||||
class="qc-work-order-card"
|
||||
:class="{ 'qc-work-order-card--completed': isWorkOrderCompleted }"
|
||||
>
|
||||
<header class="qc-work-order-card__head">
|
||||
<div class="qc-work-order-card__head-inner">
|
||||
<div class="qc-work-order-card__head-main">
|
||||
@@ -435,6 +438,8 @@
|
||||
return triggerSourceTagType(row.triggerSource)
|
||||
}
|
||||
|
||||
const isWorkOrderCompleted = computed(() => props.row.workOrderStatus === 'ywc')
|
||||
|
||||
function workOrderStatusTagType(status: string): TagType {
|
||||
if (status === 'ywc') return 'success'
|
||||
if (status === 'ypz') return 'warning'
|
||||
@@ -478,6 +483,29 @@
|
||||
border-radius: 10px;
|
||||
background: #fff;
|
||||
overflow: hidden;
|
||||
transition:
|
||||
border-color 0.15s ease,
|
||||
box-shadow 0.15s ease;
|
||||
|
||||
&:hover {
|
||||
border-color: #a8d4c4;
|
||||
box-shadow: 0 4px 12px rgba(4, 120, 87, 0.1);
|
||||
}
|
||||
|
||||
&--completed {
|
||||
border-color: #fcd34d;
|
||||
background: #fffbeb;
|
||||
|
||||
&:hover {
|
||||
border-color: #fbbf24;
|
||||
box-shadow: 0 4px 12px rgba(217, 119, 6, 0.1);
|
||||
}
|
||||
|
||||
.qc-work-order-card__head,
|
||||
.qc-work-order-card__tasks {
|
||||
background: #fffbeb;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.qc-work-order-card__head {
|
||||
@@ -680,6 +708,10 @@
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.qc-work-order-card--completed :deep(.qc-work-order-card__fee-in-head .qc-protocol-payment__detail-chip) {
|
||||
border-color: #fde68a;
|
||||
}
|
||||
|
||||
.qc-work-order-card__tasks :deep(.qc-work-order-batch-sublist--embedded) {
|
||||
padding: 10px 14px 12px;
|
||||
background: transparent;
|
||||
|
||||
@@ -313,7 +313,6 @@
|
||||
<el-form-item label="任务状态" required>
|
||||
<el-radio-group v-model="resultSaveStatus">
|
||||
<el-radio value="dzx">待执行</el-radio>
|
||||
<el-radio value="jxz">进行中</el-radio>
|
||||
<el-radio value="ywc">已完成</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
+9
-2
@@ -6,6 +6,7 @@ import {
|
||||
fetchAllMineTasks,
|
||||
groupMineTasksByWorkOrder,
|
||||
filterMineEntriesByWorkOrderSearch,
|
||||
sortMineEntriesForInboundLabStorage,
|
||||
paginateMineEntries,
|
||||
buildMineTableRows
|
||||
} from '@/utils/qc-mine-task-groups'
|
||||
@@ -34,6 +35,9 @@ function shouldApplyTriggerSourceFilter(tabKey: QcWorkOrderTabKey, tabLayout: st
|
||||
|
||||
export type QcWorkOrderTabPageMode = 'manage' | 'mine'
|
||||
|
||||
/** 默认筛选:待配置 + 已配置(不含已完成 / 已作废) */
|
||||
const DEFAULT_WORK_ORDER_STATUS_FILTER = ['dpz', 'ypz']
|
||||
|
||||
export function useQcWorkOrderTabPage(
|
||||
tabKey: Ref<QcWorkOrderTabKey>,
|
||||
pageMode: Ref<QcWorkOrderTabPageMode> | QcWorkOrderTabPageMode
|
||||
@@ -47,7 +51,7 @@ export function useQcWorkOrderTabPage(
|
||||
const searchForm = reactive({
|
||||
qcCategory: '',
|
||||
keyword: '',
|
||||
workOrderStatus: [] as string[],
|
||||
workOrderStatus: [...DEFAULT_WORK_ORDER_STATUS_FILTER],
|
||||
triggerSource: '',
|
||||
sampleTypeId: '',
|
||||
taskStatus: '',
|
||||
@@ -142,6 +146,9 @@ export function useQcWorkOrderTabPage(
|
||||
})
|
||||
let entries = groupMineTasksByWorkOrder(tasks)
|
||||
entries = filterMineEntriesByWorkOrderSearch(entries, buildMineWorkOrderSearchFilters())
|
||||
if (isInboundSampleQcTab(tabKey.value)) {
|
||||
entries = sortMineEntriesForInboundLabStorage(entries)
|
||||
}
|
||||
const pageResult = paginateMineEntries(entries, pagination.page, pagination.pageSize)
|
||||
const tableModel = buildMineTableRows(pageResult.items)
|
||||
tableData.value = tableModel.rows
|
||||
@@ -203,7 +210,7 @@ export function useQcWorkOrderTabPage(
|
||||
function handleReset() {
|
||||
searchForm.qcCategory = ''
|
||||
searchForm.keyword = ''
|
||||
searchForm.workOrderStatus = []
|
||||
searchForm.workOrderStatus = [...DEFAULT_WORK_ORDER_STATUS_FILTER]
|
||||
searchForm.triggerSource = ''
|
||||
searchForm.sampleTypeId = ''
|
||||
searchForm.taskStatus = ''
|
||||
|
||||
@@ -40,6 +40,8 @@
|
||||
:third-options="thirdOptions"
|
||||
:third-options-grouped="thirdOptionsGrouped"
|
||||
:user-options="configureUserOptions"
|
||||
:reception-source="configureReceptionSource"
|
||||
:lab-storage-code="configureLabStorageCode"
|
||||
/>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
@@ -203,9 +205,17 @@
|
||||
return String(userStore.info?.id || userStore.info?.userId || '').trim()
|
||||
}
|
||||
|
||||
const configureReceptionSource = ref('')
|
||||
const configureLabStorageCode = ref('')
|
||||
|
||||
function createDefaultInspectionBatch(): QcInspectionBatchConfigureItem {
|
||||
const uid = resolveCurrentUserId()
|
||||
return createEmptyInspectionBatch(uid ? [uid] : undefined)
|
||||
const canDefaultSelf =
|
||||
!!uid && configureUserOptions.value.some((u) => String(u.value) === uid)
|
||||
return createEmptyInspectionBatch(canDefaultSelf ? [uid] : undefined, {
|
||||
receptionSource: configureReceptionSource.value,
|
||||
labStorageCode: configureLabStorageCode.value
|
||||
})
|
||||
}
|
||||
|
||||
type QcWorkOrderTabPanelExpose = {
|
||||
@@ -525,6 +535,8 @@
|
||||
async function handleConfigure(row: QcWorkOrder) {
|
||||
configuringId.value = row.id
|
||||
configureIsEdit.value = row.workOrderStatus !== 'dpz'
|
||||
configureReceptionSource.value = String(row.receptionSource || '').trim()
|
||||
configureLabStorageCode.value = String(row.labStorageCode || '').trim()
|
||||
const [labList, thirdList, users] = await Promise.all([
|
||||
fetchQcLabTestItemsActive(),
|
||||
fetchQcThirdPartyItemsActive(),
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
placeholder="全部"
|
||||
clearable
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
@@ -162,8 +160,6 @@
|
||||
placeholder="全部"
|
||||
clearable
|
||||
multiple
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
|
||||
+60
-38
@@ -57,6 +57,13 @@
|
||||
>
|
||||
{{ acceptConclusionLabel(String(row.acceptConclusion || '')) }}
|
||||
</el-tag>
|
||||
<el-button
|
||||
v-if="showProtocolPayment(row)"
|
||||
class="btn-op-item sample-reception-card__fee-trigger"
|
||||
@click.stop="openProtocolFeeDialog(row)"
|
||||
>
|
||||
<el-icon><Wallet /></el-icon>协议费用
|
||||
</el-button>
|
||||
</div>
|
||||
<dl class="sample-reception-card__meta">
|
||||
<div class="sample-reception-card__meta-item">
|
||||
@@ -143,6 +150,10 @@
|
||||
<dt>接收时间</dt>
|
||||
<dd>{{ formatDisplayOrDash(row.receptionTime) }}</dd>
|
||||
</div>
|
||||
<div class="sample-reception-card__meta-item">
|
||||
<dt>接收记录创建时间</dt>
|
||||
<dd>{{ formatDisplayOrDash(row.createTime) }}</dd>
|
||||
</div>
|
||||
<div class="sample-reception-card__meta-item">
|
||||
<dt>经手人</dt>
|
||||
<dd>{{ row.handlerName || '—' }}</dd>
|
||||
@@ -151,12 +162,6 @@
|
||||
</dl>
|
||||
</div>
|
||||
<div class="sample-reception-card__ops">
|
||||
<QcWorkOrderProtocolPaymentPanel
|
||||
v-if="showProtocolPayment(row)"
|
||||
:summary="protocolPaymentSummary(row)"
|
||||
compact
|
||||
class="sample-reception-card__ops-payment"
|
||||
/>
|
||||
<el-button
|
||||
v-if="activeTab === 'pending'"
|
||||
class="btn-op-item primary"
|
||||
@@ -198,19 +203,37 @@
|
||||
@current-change="(v) => emit('page-change', v)"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<el-dialog
|
||||
v-model="protocolFeeDialogVisible"
|
||||
title="协议费用"
|
||||
width="720px"
|
||||
class="dialog-form-layout sample-reception-fee-dialog"
|
||||
append-to-body
|
||||
align-center
|
||||
destroy-on-close
|
||||
modal-class="protocol-dialog-mask"
|
||||
@closed="protocolFeeDialogSummary = null"
|
||||
>
|
||||
<QcWorkOrderProtocolPaymentPanel :summary="protocolFeeDialogSummary" embedded />
|
||||
<template #footer>
|
||||
<el-button @click="protocolFeeDialogVisible = false">
|
||||
<el-icon><Close /></el-icon>关闭
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue'
|
||||
import { formatDisplayOrDash } from '@/utils/datetime-display'
|
||||
import { CircleCheck, View, EditPen } from '@element-plus/icons-vue'
|
||||
import { CircleCheck, Close, EditPen, View, Wallet } from '@element-plus/icons-vue'
|
||||
import {
|
||||
transportTypeLabel,
|
||||
acceptConclusionLabel,
|
||||
protocolStatusLabel,
|
||||
protocolStatusDisplayLabel,
|
||||
protocolStatusTagType,
|
||||
donationStatusLabel,
|
||||
donationStatusDisplayLabel,
|
||||
donationStatusTagType
|
||||
} from '@/utils/status-tag-registry'
|
||||
@@ -224,6 +247,9 @@
|
||||
|
||||
defineOptions({ name: 'SampleReceptionCardList' })
|
||||
|
||||
const protocolFeeDialogVisible = ref(false)
|
||||
const protocolFeeDialogSummary = ref<QcProtocolPaymentSummary | null>(null)
|
||||
|
||||
type ReceptionTab = 'pending' | 'received'
|
||||
|
||||
const props = withDefaults(
|
||||
@@ -317,6 +343,11 @@
|
||||
return summary as QcProtocolPaymentSummary
|
||||
}
|
||||
|
||||
function openProtocolFeeDialog(row: Record<string, unknown>) {
|
||||
protocolFeeDialogSummary.value = protocolPaymentSummary(row)
|
||||
protocolFeeDialogVisible.value = true
|
||||
}
|
||||
|
||||
function canEditReceived(row: Record<string, unknown>) {
|
||||
return props.canEditReceived(row)
|
||||
}
|
||||
@@ -389,6 +420,11 @@
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.sample-reception-card__fee-trigger {
|
||||
flex-shrink: 0;
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.sample-reception-card__checkbox {
|
||||
flex-shrink: 0;
|
||||
margin-right: -4px;
|
||||
@@ -465,36 +501,22 @@
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.sample-reception-card__ops-payment {
|
||||
flex: 1 1 240px;
|
||||
min-width: 0;
|
||||
margin-right: auto;
|
||||
|
||||
:deep(.qc-protocol-payment) {
|
||||
border: none;
|
||||
background: #e8f4ee;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
:deep(.qc-protocol-payment--compact) {
|
||||
width: 100%;
|
||||
padding: 10px 12px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
:deep(.qc-protocol-payment__compact-details) {
|
||||
border-top: none;
|
||||
margin-top: 8px;
|
||||
padding-top: 8px;
|
||||
}
|
||||
|
||||
:deep(.qc-protocol-payment__detail-chip) {
|
||||
border: none;
|
||||
background: rgb(255 255 255 / 60%);
|
||||
}
|
||||
}
|
||||
|
||||
.sample-reception-cards-empty {
|
||||
padding: 24px 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* append-to-body 弹窗:嵌入面板去掉顶部分割,避免与 dialog body 叠线 */
|
||||
.sample-reception-fee-dialog {
|
||||
.qc-protocol-payment {
|
||||
padding: 0;
|
||||
border-top: none;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.qc-protocol-payment--embedded {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 145 KiB |
@@ -1 +0,0 @@
|
||||
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1786436536718" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1712" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M645.51 854.33c15.49-57.33 86.49-42 86.49-42s-43.54-44.53-23-112.67c11.22-37.2 39.58-67.99 79.81-76.43 20.41-4.28 56.37-4.23 69.42 0.55 3.66-18.04 7.33-36.14 10.85-54.39l23.84-117.26c7.41-37.35 14.81-74.7 22.78-112.05 6.27-32.55 13.19-65.1 19.53-97.81 4.72-24.74 10.09-49.48 14.81-74.71 2.6-14.16 5.86-28.31 8.46-42.07 0.61-2.04 0.96-4.14 1.06-6.26-1.06-24.66-1.06-41.01-16.93-48.83-16.43-7.89-32.38-7.89-40.85 0-21.65 10.98-43.45 21.48-65.1 32.55-54.04 26.85-107.41 53.7-161.45 80.48L468.71 285.97c-59.16 29.46-118.4 60.46-178.21 88.78-45.57 21.56-90 45.81-135.08 67.38-19.53 9.44-40.2 15.79-59.73 25.71-15.79 7.97-31.25 20.02-31.25 39.55 0 8.87 1.63 21.48 8.95 27.83 2.68 2.03 5.94 3.58 8.46 5.69 40.28 22.14 78.44 48.42 117.58 72.67l76.17 47.2h0.57c16.44 7.98 32.31 7.98 48.74-7.81l0.49-0.57c0.49-0.57 0.98-0.57 0.98-1.05 0.65-0.49 1.71-1.06 2.2-2.04 1.14-1.14 2.11-1.63 3.25-2.68 0.98-1.06 2.61-2.04 3.66-3.17 1.63-1.55 3.17-2.61 4.23-4.15 1.62-1.73 3.39-3.31 5.29-4.72 2.11-1.63 3.66-3.66 5.77-5.29 2.2-2.11 4.31-3.66 6.35-5.7 2.11-2.19 4.8-4.23 6.91-6.43 2.68-2.03 4.8-4.72 7.49-6.83 2.61-2.61 5.21-4.72 7.81-7.32 2.77-2.61 5.86-5.29 8.46-7.89 3.25-2.61 5.86-5.21 9.03-7.89 3.25-2.61 6.35-5.86 9.52-8.38 3.25-3.26 6.43-5.86 10.09-8.95 3.17-3.17 6.91-6.35 10.09-8.95 3.67-3.17 6.84-6.34 10.58-9.44 3.76-3.08 7.3-6.43 10.58-10.01 3.66-3.17 7.32-6.92 11.15-10.09 3.66-3.1 7.33-6.76 11.07-9.93 3.66-3.66 7.97-6.83 11.64-10.5 3.74-3.66 7.98-6.84 11.72-10.58 3.66-3.66 7.81-6.83 11.64-10.41 4.07-3.74 7.89-7.32 12.13-10.58 4.23-3.67 7.97-7.33 12.21-10.58 4.15-3.58 7.89-7.32 12.21-10.98 4.15-3.66 7.89-7.32 12.12-10.98 4.15-3.74 7.98-7.4 12.13-10.58 3.74-3.58 7.65-7.08 11.72-10.41 3.66-3.74 7.89-6.83 11.64-10.58 3.66-3.67 7.89-6.84 11.64-10.5 3.66-3.74 7.32-6.83 11.64-10.58 3.66-3.09 7.32-6.75 11.15-9.93 3.66-3.25 7.32-6.83 11.07-10.01 3.67-3.01 7.25-6.19 10.58-9.44 3.74-3.17 6.83-6.35 10.58-9.52 3.25-3.1 6.83-6.27 10.09-8.95 3.25-3.17 6.34-5.7 9.52-8.87 3.17-2.68 6.35-5.78 9.52-8.46 3.25-2.6 5.86-5.21 8.95-7.89 2.68-2.6 5.86-5.21 8.54-7.89 2.6-2.6 5.21-4.72 7.89-7.32 2.64-2.11 5.14-4.39 7.49-6.83 2.03-2.12 4.72-4.23 6.83-6.35 2.11-2.11 4.23-3.66 6.34-5.69 2.12-1.63 3.66-3.26 5.86-5.29l4.72-4.72c1.62-1.14 2.6-2.68 4.23-3.74 1.05-0.98 2.19-2.11 3.66-3.09 1.13-1.14 2.19-1.63 2.68-2.69l3.17-3.09h0.57c2.68 0.98 5.29 2.53 7.89 3.58 1.63 0.65 2.69 1.63 4.23 2.2 0.57 0.49 1.14 0.49 2.12 0.98 0.56 0 2.11 0.57 2.11 1.14v0.49c-0.57 0.49-1.06 0.49-1.06 0.98l-1.62 1.63-6.84 6.83a76.647 76.647 0 0 0-8.95 10.01c-2.12 2.12-4.31 4.72-6.35 6.84a22.64 22.64 0 0 0-3.25 3.66l-1.55 1.62c-0.57 0.49-1.05 1.47-1.62 1.47-9.44 10.09-19.04 20.59-28.48 30.59l-74.7 78.94c-28.56 29.86-56.64 59.89-85.28 89.83-26.93 28.4-53.95 56.8-80.4 85.2-20.67 21.56-40.69 43.13-61.36 64.69-8.95 9.44-18.06 18.88-27.02 28.88l-0.57 0.57c-7.89 7.81-7.89 16.28-7.89 24.17v177.81c0 16.28 7.89 31.98 24.33 40.36 16.36 7.97 32.31 0 40.69-7.89l62.98-62.5c10.66-10.58 20.75-21.07 30.76-31.57 1.13-1.06 2.11-2.11 3.25-2.11 1.46-0.57 3.58 0.57 4.72 1.62 22.7 14.9 97.27 71.69 97.27 71.69s3.59-31.79 6.31-41.84z" p-id="1713" fill="#0a9f6d"></path><path d="M699.65 908.97H948.6c7.12 0 13.06-7.66 11.87-15.33l-4.75-28.07c-2.37-11.5-11.87-20.41-22.52-20.41h-76.72l-4.75-31.9c26.08-11.5 43.89-38.29 43.89-70.19 0-42.12-32.02-76.58-71.16-76.58-39.14 0-71.2 34.42-71.2 76.55 0 31.9 17.78 58.7 43.89 70.19l-3.56 31.9h-77.33c-10.68 0-21.34 8.94-22.52 20.41L689 893.61c-2.4 7.69 3.53 15.36 10.65 15.36z m248.89 19.12M944.08 960.22h-239.4c-9.34 0-16.92-7.58-16.92-16.92v-0.91c0-9.34 7.58-16.92 16.92-16.92h239.4c9.34 0 16.92 7.58 16.92 16.92v0.91c0 9.35-7.57 16.92-16.92 16.92z" p-id="1714" fill="#0a9f6d"></path></svg>
|
||||
|
Before Width: | Height: | Size: 3.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB |
@@ -1,10 +0,0 @@
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 10
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 11
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 12
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 13
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 14
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 15
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 16
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 17
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 18
|
||||
耐高温高筒布鞋蓝 洁净鞋袋 蓝条 已编 19
|
||||
@@ -1,253 +0,0 @@
|
||||
名称 规格型号 单位 批号 期初 2月入库 2月出库 2月结存 3月入库 3月出库 3月结存 4月入库 4月出库 4月结存 5月入库 5月出库 5月结存 6月入库 6月出库 6月结存 7月入库 7月出库 7月结存 8月入库 8月出库 8月结存 9月入库 9月出库 9月结存
|
||||
T25培养瓶 200个/箱 个 29624602 118 0 1 117 0 17 100 0 1 99 0 0 99
|
||||
T75培养瓶 100个/箱 个 22624601 97 0 1 96 0 6 90 0 10 80 0 10 70
|
||||
T175培养瓶 40个/箱 个 110125AH01 40 0 40 0 0 0 0 0 0 0 0 0 0
|
||||
T175(TC)培养瓶 40个/箱 个 120225AH01 280 280 40 520 0 200 320 0 320 0 0 0 0
|
||||
T175(TC)培养瓶 40个/箱 个 012126AH01 600 280 320 0 160 160
|
||||
T175(Non-TC)培养瓶 40个/箱 个 091025AH01 40 40 0 80 0 0 80 0 0 80 0 0 80
|
||||
T175培养瓶 50个/箱 个 251214-1974-F 50 50 50 50 0 0 50 0 0 50 0 0 50
|
||||
细胞培养皿(150mm) 0 包 0 1 0 0 1 0 1 0 0 0 0 0 0 0
|
||||
细胞培养皿(150mm) 120个/箱 个 251215-11168F 120 0 120 0 6 114 0 0 114
|
||||
70µm细胞筛网 200个/箱 个 250330-1300-A 0 400 100 300 0 100 200 0 200 0 0 0 0
|
||||
70µm细胞筛网 200个/箱 个 250925-2300-A 400 0 0 400 0 100 300 0 0 300 0 95 205
|
||||
70µm细胞筛网 200个/箱 个 250425-1300-A 1000 0 1000 0 0 1000
|
||||
针头过滤器 8盒/箱 盒 250824-052-A 6 0 0 6 0 1 5 0 0 5 0 0 5
|
||||
0.45µm滤头 25个/盒 个 0 24 0 0 24 0 0 24 0 0 24 0 0 24
|
||||
5ml移液管 800支/箱 个 105224062 800 0 0 800 0 50 750 0 150 600 0 20 580
|
||||
5ml移液管 200个/盒 个 251016-069-A 400 0 400 0 0 400 0 0 400
|
||||
5ml移液管 200个/盒 个 260103-069-A 1000 0 1000 0 0 1000
|
||||
10ml移液管 200支/箱 个 20250802-070-A 800 0 400 400 0 0 400 0 400 0 0 0 0
|
||||
10ml移液管 200支/箱 个 260329-070-A 2000 800 1200 0 100 1100
|
||||
25ml移液管 400支/箱 个 20240710 400 0 0 400 0 50 350 0 200 150 0 100 50
|
||||
25ml移液管 150支/箱 个 260111-071-A 300 300 300 300 300 100 500 750 150 1100 0 135 965
|
||||
细胞工厂 4个/箱 个 251218-2532-F 64 0 64 0 80 0 80 0 0 80 0 30 50
|
||||
细胞工厂 4个/箱 个 251211-2532-F 40 40 0 80 0 14 66 0 28 38 0 0 38
|
||||
细胞工厂 4个/箱 个 251225-2532-F 80 0 80 0 0 80
|
||||
15ml离心管 500个/箱 个 251224-6058-1A 1000 0 0 1000 0 500 500 0 500 0 0 0 0
|
||||
15ml离心管 500个/箱 个 251201-4058-1AA 1000 0 1000 0 0 1000
|
||||
50ml离心管 500个/箱 个 251227-7060-A 1000 0 500 500 0 0 500 0 500 0 0 0 0
|
||||
50ml离心管 500个/箱 个 260124-4060-A 1500 0 1500 0 225 1275
|
||||
250ml离心瓶 48个/箱 个 251103-1334-A 480 0 48 432 0 96 336 0 336 0 0 0 0
|
||||
250ml离心瓶 48个/箱 个 250611-1334-A 240 0 240 0 0 0 0 0 0 0 0 0 0
|
||||
250ml离心瓶 48个/箱 个 251020-1334-A 480 0 480 0 108 372
|
||||
巴氏吸管 4000个/箱 个 251217-133-A 4000 0 400 3600 0 500 3100 0 200 2900 0 47 2853
|
||||
巴氏吸管 4000个/箱 个 260113-133-A 4000 0 4000 0 0 4000
|
||||
5ml注射器 100支/包 个 K20250506 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
5ml注射器 120支/箱 个 20250601 120 0 0 120 0 0 120 0 20 100 0 0 100
|
||||
20ml注射器 600支/箱 个 20250511 360 0 0 360 0 0 360 0 28 332 0 0 332
|
||||
20ml注射器 100支/包 个 K20241227 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
50ml注射器 50支/盒;9盒/箱 支 251010 450 0 450 0 100 350 0 70 280
|
||||
沙氏琼脂平板 10个/包 包 20251217 2 0 2 0 0 0 0 0 0 0 0 0 0
|
||||
沙氏琼脂平板 10个/包 包 20251217 20 20 1 39 0 33 6 0 6 0 0 0 0
|
||||
沙氏琼脂平板 20包/箱 包 20260303 40 0 40 0 5 35 0 4 31
|
||||
血平皿 5个/包 包 20251209 5 0 5 0 0 0 0 0 0 0 0 0 0
|
||||
血平皿 5个/包 包 20251209 40 40 2 78 0 64 14 0 14 0 0 0 0
|
||||
血平皿 40包/箱 包 20260311 80 0 80 0 10 70 0 7 63
|
||||
透明塑料盒 0 个 0 50 0 0 50 0 0 50 0 0 50 0 0 50
|
||||
细胞工厂外壳 0 个 0 75 0 0 75 0 0 75 0 2 73 0 0 73
|
||||
细胞工厂外壳 0 个 0 21 0 0 21 0 0 21 0 0 21 0 0 21
|
||||
医用纱布敷料 20包/袋 包 250102 40 0 0 40 0 0 40 0 2 38 0 0 38
|
||||
内旋冷冻管 0 个 4A03296Z1527 32 0 0 32 0 0 32 0 1 31 0 31 0
|
||||
1.8ml冻存管 1800个/箱 个 181410 1800 0 0 1800 0 0 1800 0 100 1700 0 119 1581
|
||||
4.5ml冻存管 50个/包;24包/箱 个 181570 250 0 250 0 0 0 0 0 0 0 0 0 0
|
||||
4.5ml冻存管 50个/包;24包/箱 个 182465 2400 0 2400 0 50 2350 0 150 2200
|
||||
血袋冻存袋 50ml 个 7250700556 24 0 4 20 0 7 13 0 11 2 0 0 2
|
||||
血袋冻存袋 50ml 个 7250900533 24 0 24 0 1 23
|
||||
500ml血清瓶 80个/箱 个 0 360 0 40 320 0 140 180 400 0 580 0 92 488
|
||||
盖玻片 200片/包 片 0 142 0 2 140 0 0 140 0 0 140 0 0 140
|
||||
输血袋 0 片 20250111 385 0 9 376 0 14 362 0 14 348 0 0 348
|
||||
卫生棉球 30包/箱 包 25030201 27 0 3 24 0 3 21 0 2 19 0 2 17
|
||||
铝箔 0 个 / 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
无尘布 20包/箱 包 0 12 0 2 10 39 0 49 0 4 45 0 3 42
|
||||
封口膜 10.2cm*38.1m 盒 PM-996 2 0 2 0 0 2 0 0 2
|
||||
培养袋 0 个 25F23 33 0 1 32 0 2 30 0 0 30 0 0 30
|
||||
培养袋 1L 个 25H22 50 0 0 50 0 8 42 0 4 38 0 2 36
|
||||
二联管 0 个 0 50 0 10 40 500 7 533 0 32 501 0 0 501
|
||||
计数板 0 个 0 50 0 0 50 100 50 100 0 30 70 0 0 70
|
||||
96孔板 0 个 0 99 0 0 99 0 0 99 0 0 99 0 0 99
|
||||
24孔板 0 个 0 96 0 0 96 0 0 96 0 0 96 0 0 96
|
||||
10µl吸头 100盒/箱 盒 0 100 0 0 100 0 0 100 0 0 100 0 0 100
|
||||
10µl枪头(无菌) 0 盒 33624001 4 0 0 4 0 0 4 0 0 4 0 0 4
|
||||
10µl盒装吸头 0 盒 33624001 10 0 0 10 0 0 10 0 0 10 0 0 10
|
||||
200µl枪头(无菌) 0 盒 13624038 34 0 6 28 0 4 24 0 4 20 0 0 20
|
||||
200µl吸头 100盒/箱 盒 0 100 0 0 100 0 0 100 0 0 100 0 0 100
|
||||
200µl滤芯吸头 0 盒 0 0 0 0 0 0 0 0 0 0 0 0 0
|
||||
1ml枪头(无菌) 0 盒 21724017 4 0 0 4 0 0 4 0 0 4 0 0 4
|
||||
1ml盒装吸头 0 盒 21724017 10 0 0 10 0 0 10 0 0 10 0 0 10
|
||||
1ml吸头 40盒/箱 盒 0 40 0 0 40 0 0 40 0 0 40 0 0 40
|
||||
10ml滤芯吸头 30盒/箱 盒 0 30 0 0 30 0 4 26 0 0 26 0 4 22
|
||||
1.2mm斜面针 100个/盒 盒 20250215 18 0 0 18 0 0 18 0 0 18 0 0 18
|
||||
0.2ml 八联管 0 个 20241206 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
1.5ml样本管 0 个 1522366685 1 0 0 1 0 0 1 0 1 0 0 0 0
|
||||
1.5ml无菌离心管 0 个 2522315 10 0 0 10 0 0 10 0 0 10 0 1 9
|
||||
2.0mlEP管(非无菌) 0 个 1292372 2 0 2 0 0 0 0 0 0 0 0 0 0
|
||||
鲎试剂 10支/盒 盒 25061020 4 0 4 0 0 0 0 0 0 0 0 0 0
|
||||
鲎试剂 10支/盒 盒 25121039 5 0 0 5 0 3 2 0 2 0 0 0 0
|
||||
鲎试剂 10支/盒 盒 26021005 10 1 9 0 0 9
|
||||
Rh血型定型试剂 个 1 0 1 1 0 2
|
||||
青/链霉素(双抗) 100 ml 瓶 248243 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
青/链霉素(双抗)异常 100 ml 瓶 248243(异常) 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
青/链霉素(双抗) 100 ml 瓶 270608 1 1 0
|
||||
台盼蓝 100ml 瓶 3010983 1 0 1 0 0 0 0 0 0 0 0 0 0
|
||||
胰酶 100ml 瓶 15400-054 4 0 1 3 0 0 3 0 1 2 0 2 0
|
||||
胰酶 100ml 瓶 3108018 10 1 9 0 0 9 0 0 9
|
||||
无血清细胞冻存液 100ml 瓶 KSF250302 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
干细胞冻存液 20个/箱 箱 1250901 12 0 3 9 0 0 9 0 9 0 0 0 0
|
||||
干细胞冻存液 20个/箱 瓶 1260108 20 2 18 0 1 17
|
||||
无蛋白细胞保存液 100 ml 瓶 XB15-20241023 4 0 1 3 0 0 3 0 0 3 0 0 3
|
||||
Cryosure冻存液 50ml 瓶 USP25H1 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
Cryosure冻存液 50ml 瓶 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
冻存液 CP001A 瓶 25101301A 1 0 0 1 0 1 0 0 0 0 0 0 0
|
||||
冻存液 CP003B 瓶 25101401A 1 0 0 1 0 1 0 0 0 0 0 0 0
|
||||
NK冻存液 100ml/瓶 瓶 KPN250801 20 1 19 0 0 19
|
||||
DMSO 70ml 瓶 W24331 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
PBS 500 ml 瓶 GA2501011 1 0 0 1 0 0 1 0 1 0 0 0 0
|
||||
PBS 500 ml 瓶 1 0 1 0 0 0 0 0 0 0 0 0 0
|
||||
PBS 500ml 瓶 25061201 20 0 1 19 0 7 12 0 0 12 0 1 11
|
||||
DPBS 500ml 瓶 F8752888 3 0 3 0 0 0 0 0 0 0 0 0 0
|
||||
DPBS 500ml 瓶 602765A0 12 0 0 12 0 4 8 0 2 6 0 1 5
|
||||
DPBS 500ml 瓶 F8752888 8 0 0 8 0 0 8 0 0 8 0 0 8
|
||||
Ficoll 500 ml 瓶 10364852 2 0 0 2 0 0 2 0 1 1 0 0 1
|
||||
DEPC水 500 ml 瓶 P250320 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
血替 500ml 瓶 NHR505046 3 0 0 3 0 0 3 0 0 3 0 0 3
|
||||
胎牛血清 10支/盒 支 BC20250610 10 0 0 10 0 0 10 0 3 7 0 0 7
|
||||
0.9%氯化钠注射液(生理盐水) 30瓶/箱 瓶 39 0 39 0 0 0 0 0 0 0 0 0 0
|
||||
0.9%氯化钠注射液(生理盐水) 30瓶/箱 瓶 0 0 30 13 17 0 17 0 0 0 0 0 0 0
|
||||
0.9%氯化钠注射液(生理盐水) 30瓶/箱 瓶 C25112013 0 0 150 0 150 0 120 30 0 0 30
|
||||
0.9%氯化钠注射液(生理盐水) 30瓶/箱 瓶 250928101 90 12 78 0 57 21
|
||||
红细胞沉降液(6%羟乙基淀粉) 200ml 瓶 LOT20250121 5 0 1 4 0 2 2 0 0 2 0 0 2
|
||||
红细胞沉降液(6%羟乙基淀粉) 200ml 瓶 LOT20250807 5 1 4
|
||||
人血白蛋白 0 瓶 2025A02006 42 0 7 35 0 3 32 0 6 26 0 6 20
|
||||
HES 500ml 瓶 252317641 2 0 0 2 2 0 4 0 0 4 0 0 4
|
||||
NK扩增因子A 套 SN25F1006 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
NK扩增因子B 套 SN25F1006 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
NK培养试剂盒 套 01260401 1 0 1 0 0 1
|
||||
N500 无血清培养基 1L/瓶 瓶 22F7C943 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
激活剂 150微升/支 支 22F7C943 4 0 0 4 0 0 4 0 0 4 0 0 4
|
||||
活化剂 500微升/支 支 22F7C943 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
N500 无血清培养基 1L/瓶 套 E07C61F9 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
激活剂 150微升/支 支 E07C61F9 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
活化剂 500微升/支 支 E07C61F9 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
NK3.0套装 3L/套 套 E2F2DFAC 3 0 1 2 0 1 1 0 0 1 0 0 1
|
||||
活化剂 500微升/支 支 E2F3DFAC 3 0 1 2 0 0 2 0 0 2 0 0 2
|
||||
NK3.0培养基 1L/瓶 瓶 8DB2F51A 20 0 4 16 0 14 2 9 2 9 0 3 6
|
||||
活化剂 500微升/支 支 8DB2F51A 20 0 4 16 0 0 16 9 2 23 0 3 20
|
||||
MSC培养基 瓶 D57ECA70 14 0 0 14 0 1 13 0 0 13 0 0 13
|
||||
MSC培养基 500ml 瓶 2025120501 42 0 27 15 0 15 0 0 0 0 0 0 0
|
||||
MSC培养基 500ml 瓶 2025111701 52 52 0 0 0 0 0 7 -7
|
||||
MSC培养基 500ml 瓶 2025122601 32 18 14 84 66 32 22 32 22
|
||||
MSC添加剂 25ml 瓶 20251209 44 0 27 17 52 49 20 0 20 0 0 0 0
|
||||
MSC添加剂 25ml 瓶 20251229 32 13 19 52 46 25 0 23 2
|
||||
MSC添加剂 25ml 瓶 20251224 32 0 32 22 16 38
|
||||
84消毒液 500ml/瓶 瓶 2501002 2 0 2 0 0 0 0 0 0 0 0 0 0
|
||||
84消毒液 500ml/瓶 箱 30 0 0 30 0 14 16 0 2 14 0 0 14
|
||||
75%医用酒精消毒液 10瓶/箱 箱 20 0 20 0 0 0 0 0 0 0 0 0 0
|
||||
75%医用酒精消毒液 10瓶/箱 箱 0 10 0 10 20 14 16 30 9 37 0 8 29
|
||||
新洁尔灭 30瓶/箱 箱 30 0 0 30 0 2 28 0 0 28 0 0 28
|
||||
除孢子剂 500ml 瓶 2 0 2 0 0 2
|
||||
紫外灯管 个 ZW30S19W-Z894 4 0 4
|
||||
小号手套 25双/盒 盒 20250908 20 0 4 16 0 11 5 0 5 0 0 0 0
|
||||
小号手套 25双/盒 盒 R00500DS 60 0 60 0 0 60 0 0 60
|
||||
中号手套 20双/盒;20盒/箱 盒 20250508 14 0 2 12 0 1 11 0 0 11 0 0 11
|
||||
中号手套 25双/盒;20盒/箱 盒 R00500DM 60 0 60 0 20 40 0 0 40
|
||||
大号手套 25双/盒;20盒/箱 盒 R00500DL 20 0 20 0 0 20 0 0 20
|
||||
L号一次性检查手套 100双/盒 盒 20241108 2 0 2 0 0 0 0 0 0 0 0 0 0
|
||||
防冻手套 双 1 0 1 0 0 1 0 0 1
|
||||
绝缘手套 双 1 0 1 0 0 1 0 0 1
|
||||
医用外科口罩 50支/盒 盒 250206 12 0 1 11 0 3 8 0 2 6 0 0 6
|
||||
口罩 0 个 0 0 1000 0 1000 0 0 1000 0 0 1000 0 0 1000
|
||||
医用垃圾袋 0 个 0 95 500 15 580 0 5 575 0 50 525 0 0 525
|
||||
黑色垃圾袋 中号 个 100 0 100 0 10 90 0 0 90
|
||||
黑色垃圾袋 大号 个 100 5 95 0 0 95
|
||||
白色喷壶 个 1 0 1 16 0 17 0 0 17
|
||||
透明喷壶 个 14 0 14 0 0 14
|
||||
一次性无纺布短款大号鞋套 0 包 20221108 14 0 1 13 0 0 13 0 0 13 0 0 13
|
||||
鞋套 0 个 0 2000 1 1999 20 200 1819 0 600 1219 0 0 1219
|
||||
鞋套 个 0 0 0 0 0 0 0 0 0
|
||||
无纺布帽子 2000个/箱 个 20250318 2 0 2 0 0 0 0 0 0 0 0 0 0
|
||||
帽子 0 个 0 0 2000 0 2000 0 300 1700 0 300 1400 0 0 1400
|
||||
自封式灭菌呼吸袋 200个/盒 个 2501150150 18 0 0 18 0 0 18 0 0 18 0 0 18
|
||||
标签纸 黄色 70*80 卷 0 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
新华牌压力蒸汽灭菌指示标签 0 片 24N12 590 0 9 581 0 20 561 0 0 561 0 8 553
|
||||
洁净内衣 XL 套 0 20 0 0 20 0 0 20 0 0 20 0 0 20
|
||||
洁净内衣 2XL 套 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
洁净内衣 3XL 套 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
收口式洁净衣袋 XL 套 0 20 0 0 20 0 0 20 0 0 20 0 0 20
|
||||
收口式洁净衣袋 2XL 套 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
收口式洁净衣袋 3XL 套 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
四链体洁净服 XL 套 0 20 0 0 20 0 0 20 0 0 20 0 0 20
|
||||
四链体洁净服 2XL 套 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
四链体洁净服 3XL 套 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
鸭嘴形口罩 0 个 0 30 0 0 30 0 0 30 0 0 30 0 0 30
|
||||
二合一洁净衣袋 0 个 0 30 0 0 30 0 0 30 0 0 30 0 0 30
|
||||
耐高温高筒布鞋 41码 双 0 15 0 0 15 0 0 15 0 0 15 0 0 15
|
||||
耐高温高筒布鞋 42码 双 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
耐高温高筒布鞋 43码 双 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
耐高温高筒布鞋 44码 双 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
洁净鞋袋 0 个 0 30 0 0 30 0 0 30 0 0 30 0 0 30
|
||||
高分子镜片 0 个 0 30 0 0 30 0 0 30 0 0 30 0 0 30
|
||||
三连体洁净服(xl) xl 套 0 10 0 0 10 0 0 10 0 0 10 0 0 10
|
||||
双层洁净口罩 0 个 0 10 0 0 10 0 0 10 0 0 10 0 0 10
|
||||
收口式洁净衣袋(蓝) 0 个 0 10 0 0 10 0 0 10 0 0 10 0 0 10
|
||||
耐高温高筒布鞋(蓝) 41 双 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
耐高温高筒布鞋(蓝) 42 双 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
ZC343R手术剪 125mm,直尖 把 697350 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
ZC348R手术剪 180mm,直尖 把 781987 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
长柄剪刀 0 把 0 3 3 0 6 0 0 6 0 0 6 0 0 6
|
||||
ZD049R医用镊 160mm,直 把 715157 4 0 0 4 0 0 4 0 0 4 0 0 4
|
||||
ZD050R医用镊 160mm,直 把 685590 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
ZD052R医用镊 180mm,直 把 693486 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
不锈钢镊子筒 0 个 20190101 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
不锈钢方盘 11.5寸,有孔 个 0 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
药膏缸 12cm 个 0 4 0 0 4 0 0 4 0 0 4 0 0 4
|
||||
医疗垃圾桶 20 L 个 0 10 0 0 10 0 0 10 0 0 10 0 0 10
|
||||
医用组织镊 12.5cm 个 20240518 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
医用组织镊 16cm 个 20240812 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
止血钳 14cm 把 0 6 0 0 6 0 0 6 0 0 6 0 0 6
|
||||
止血钳 16cm 把 0 6 0 0 6 0 0 6 0 0 6 0 0 6
|
||||
游标卡尺 个 1 0 1
|
||||
扳手 把 1 0 1
|
||||
医用灭菌包布 80cm*80cm 个 / 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
程序降温盒 12孔 个 0 4 0 0 4 0 0 4 0 0 4 0 0 4
|
||||
EP管架96孔(绿色) 0 个 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
EP管架60孔(蓝色) 0 个 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
EP管架60孔(红色) 0 个 0 6 0 0 6 0 0 6 0 0 6 0 0 6
|
||||
不锈钢药勺 单头,18cm 个 0 10 0 0 10 0 0 10 0 0 10 0 0 10
|
||||
离心管架 50ml 个 0 10 0 0 10 0 0 10 0 0 10 0 0 10
|
||||
离心管架 250ml 个 0 6 0 0 6 0 0 6 0 0 6 0 0 6
|
||||
0.2mlPCR管盒 0 个 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
血球计数板 0 个 20231017 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
不锈钢弯盘 中号 个 0 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
不锈钢弯盘 大号 个 0 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
304汤盆 12cm 个 0 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
305汤盆 14cm 个 0 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
35cm防冻手套 0 双 0 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
55cm玻璃刮 0 个 0 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
实验室防滑工作拖鞋 30-40码 双 0 4 0 0 4 0 0 4 0 0 4 0 0 4
|
||||
实验室防滑工作拖鞋 43-44码 双 0 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
户外垃圾桶(240升) 0 个 0 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
设备标识牌 0 个 0 40 0 0 40 0 0 40 0 0 40 0 0 40
|
||||
b3s精臣打印机 0 台 0 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
收纳盒 0 个 0 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
医用手推车 0 个 0 6 0 0 6 0 0 6 0 0 6 0 0 6
|
||||
100孔冷冻盒 0 个 0 336 0 0 336 0 0 336 0 0 336 0 0 336
|
||||
组织镊 14cm 把 3 0 0 3 0 0 3 0 0 3 0 0 3
|
||||
组织镊 16cm 把 3 0 0 3 0 0 3 0 0 3 0 0 3
|
||||
梯度降温盒 12孔 个 / 6 0 0 6 0 0 6 0 0 6 0 0 6
|
||||
混悬仪 台 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
移液枪 0.2-2ul 把 4640110 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
移液枪 1-10ul 把 4640000 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
移液枪 10-100ul 把 4640040 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
移液枪 20-200ul 把 4640050 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
移液枪 100-1000ul 把 4640060 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
5ml冻存盒 个 16 0 0 16 0 0 16 0 0 16 0 0 16
|
||||
5ml梯度降温盒 个 157253421 5 0 0 5 0 0 5 0 0 5 0 0 5
|
||||
5ml冻存架 个 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
304药膏缸 个 10 0 0 10 0 0 10 0 0 10 0 0 10
|
||||
血袋冻存架 个 4 0 0 4 0 0 4 0 0 4 0 0 4
|
||||
利器盒 2L 个 10 0 0 10 0 0 10 0 10 0 0 0 0
|
||||
利器盒 2L 个 20 0 20 0 2 18
|
||||
利器盒 10L 个 1 0 0 1 0 0 1 0 0 1 0 0 1
|
||||
血袋冻存架 8层 套 2 0 0 2 0 0 2 0 0 2 0 0 2
|
||||
液位尺 个 0 0 0 0 1 0 1 0 0 1 0 0 1
|
||||
液氮罐底座 个 0 0 0 0 1 0 1 0 0 1 0 0 1
|
||||
@@ -1,53 +0,0 @@
|
||||
功能间 设备名称 数量 设备编号 设备型号 厂家 插座 功率(KW)
|
||||
污物清洗、灭菌 全自动洗衣机 1 XW001 XQB100-108 青岛海尔滚筒洗衣机有限公司
|
||||
污物清洗、灭菌 电热鼓风干燥箱 1 XW002 BJPX-HGZ88 山东博科科学仪器有限公司
|
||||
污物清洗、灭菌 BKQ-B50 II型立式压力蒸汽灭菌器 1 XW003 BKQ-B5011 山东博科消毒设备有限公司
|
||||
污物清洗、灭菌 BKQ-B50 II型立式压力蒸汽灭菌器 1 XW004 YXQ-LS-75SⅡ 山东博科消毒设备有限公司
|
||||
一更 干手器 1 XW005 81007 温州奥莎卫浴制品有限公司
|
||||
缓冲间 自动杀菌净手器 1 XW006 白A3000 温州奥莎卫浴制品有限公司
|
||||
细胞培养(自动) CO2 INCUBATOR/二氧化碳培养箱 1 XW007 HF240(HT) 上海力申科学仪器有限公司 DL1-6 0.75
|
||||
细胞培养(自动) CO2 INCUBATOR/二氧化碳培养箱 1 XW008 HF240(HT) 上海力申科学仪器有限公司 DL1-6 0.75
|
||||
细胞培养(自动) CO2 INCUBATOR/二氧化碳培养箱 1 XW009 HF240(HT) 上海力申科学仪器有限公司 DL1-6 0.75
|
||||
细胞培养(自动) CO2 INCUBATOR/二氧化碳培养箱 1 XW010 HF240(HT) 上海力申科学仪器有限公司 DL1-6 0.75
|
||||
细胞培养(自动) CO2 INCUBATOR/二氧化碳培养箱 1 XW011 HF240(HT) 上海力申科学仪器有限公司 DL1-6 0.75
|
||||
细胞培养(自动) CO2 INCUBATOR/二氧化碳培养箱 1 XW012 HF240(HT) 上海力申科学仪器有限公司 DL1-6 0.75
|
||||
细胞培养(自动) 全自动细胞制备系统 1 XW013 / 济南创泽生物医药科技有限公司 DL1-6 20
|
||||
细胞分离 蜂巢自动化培养系统 1 XW014 CZ-ABCS 济南创泽生物医药科技有限公司 3.5
|
||||
细胞分离 生物安全柜(单人) 1 XW015 BSC-1100IIA2-X 济南鑫贝西生物技术有限公司 DL-7 0.275
|
||||
细胞分离 低速冷冻离心机 1 XW016 L53R 湖南湘仪实验室仪器开发有限公司 DP-14 1.6
|
||||
细胞分离 电子天平 1 XW017 YP10002 杭州旌斐仪器科技有限公司
|
||||
细胞分离 全自动细胞荧光分析仪 1 XW018 CZ-CBL-A3 济南创泽生物医药科技有限公司
|
||||
细胞分离 倒置显微镜(含相机) 1 XW019 XD-202 南京江南永新光学有限公司
|
||||
细胞分离 全自动血液细胞分析仪 1 XW020 DF52CRP 深圳市帝迈生物技术有限公司
|
||||
细胞分离 血袋离心机 1 XW043
|
||||
细胞培养 全自动细胞复苏仪 1 XW021 CZ-CR5A 济南创泽生物医药科技有限公司
|
||||
细胞培养 生物安全柜(单人) 1 XW022 BSC-1100IIA2-X 济南鑫贝西生物技术有限公司 DL1-8 0.275
|
||||
细胞培养 二氧化碳培养箱 1 XW023 CZ-F240 济南创泽生物医药科技有限公司 DP-10 0.7
|
||||
细胞培养 二氧化碳培养箱 1 XW024 CZ-F240 济南创泽生物医药科技有限公司 DP-10 0.7
|
||||
细胞培养 数显恒温水浴锅 1 XW025 HH-6 国华(常州)仪器制造有限公司 DL1-8
|
||||
细胞培养 低速台式离心机 1 XW026 LT53 湖南湘仪实验室仪器开发有限公司 DL1-8 0.4
|
||||
细胞培养 倒置显微镜(含相机) 1 XW027 XD-202 南京江南永新光学有限公司
|
||||
细胞样本库 程序降温仪 1 XW028 CX-17 济南创泽生物医药科技有限公司
|
||||
细胞样本库 医用低温保存箱 1 XW029 BDF-86V348 济南鑫贝西生物技术有限公司 DP-6 7.725
|
||||
细胞样本库 不锈钢大口径液氮生物容器 1 XW030 济南创泽生物医药科技有限公司 DL-10
|
||||
细胞样本库 智能存储系统 1 济南创泽生物医药科技有限公司 DL-10
|
||||
细胞样本库 智能存储系统 1 济南创泽生物医药科技有限公司 DL-10
|
||||
物料暂存间 医用低温保存箱 1 XW031 BDF-25H226 济南鑫贝西生物技术有限公司
|
||||
物料暂存间 医用冷藏箱 1 XW032 BPR-5V298 济南鑫贝西生物技术有限公司
|
||||
物料暂存间 医用冷藏箱 1 XW033 BPR-5V298 济南鑫贝西生物技术有限公司
|
||||
物料暂存间 医用冷藏箱 1 XW034 BPR-5V298 济南鑫贝西生物技术有限公司
|
||||
样本接收间 消毒柜 1 XW035 / 泰州市金鑫医疗器械有限公司 DP-11
|
||||
内包间 GZR-III型高频热合机 1 XW036 GZR-III 苏州市医用仪器厂
|
||||
质控区 超净工作台 1 XW037 BBS-SDC 济南鑫贝西生物技术有限公司 DP-9 0.09
|
||||
质控区 医用冷藏箱 1 XW038 BPR5V29825250250C 济南鑫贝西生物技术有限公司
|
||||
质控区 医用荧光定量PCR仪 1 XW039 Archimed X4 鲲鹏(徐州)科学仪器有限公司
|
||||
质控区 生化培养箱 1 XW040 济南鑫贝西生物技术有限公司
|
||||
质控区 酶联免疫分析仪 1 XW041 BK-EL10A 山东博冠生物技术有限公司
|
||||
质控区 流式细胞仪 1 XW042 BeamCyte-1026M 常州必达科生物科技有限公司 DP-8
|
||||
闲置设备 光学显微镜 1 XSP-BM-20-K 上海彼爱姆光学仪器
|
||||
闲置设备 电泳仪 1 JY300C 君意东方电泳设备
|
||||
闲置设备 电泳槽 1 JY-SPCT 君意优品生物
|
||||
闲置设备 全自动微生物培养检测仪 1 LABSTAR 60 山东鑫科生物
|
||||
闲置设备 凝胶成像系统 1 OI 500 广州光仪生物
|
||||
闲置设备 恒温振荡器 1 SHA-C双数显
|
||||
闲置设备 GZR-III型高频热合机 1 GZR-III 苏州市医用仪器厂
|
||||
@@ -1,75 +0,0 @@
|
||||
ZKXW-QC-00007 APC-HLA-DR 125μl ul 90ul
|
||||
ZKXW-QC-00008 APC-Cy7-CD337 125μl ul 55ul
|
||||
ZKXW-QC-00009 APC-Cy7-CD337 500μl ul 500ul
|
||||
ZKXW-QC-00010 APC-Cy7-CD4 125μl ul 70ul
|
||||
ZKXW-QC-00011 APC-Cy7-CD4 500μl ul 500ul
|
||||
ZKXW-QC-00012 APC-Cy7-CD90 125μl ul 90ul
|
||||
ZKXW-QC-00013 APC-Cy7-CD90 500μl ul 500ul
|
||||
ZKXW-QC-00014 APC-Cy7-IFN-γ 125μl ul 90
|
||||
ZKXW-QC-00015 APC-Cy7-IFN-γ 500μl ul 500ul
|
||||
ZKXW-QC-00016 APC-Cy7-CD19 100μl/10T ul 90ul
|
||||
ZKXW-QC-00017 FITC-CD3 125μl ul 0
|
||||
ZKXW-QC-00018 FITC-CD3 500μl ul 500ul
|
||||
ZKXW-QC-00019 FITC-CD33 125μl ul 90ul
|
||||
ZKXW-QC-00020 FITC-CD34 500μl ul 90ul
|
||||
ZKXW-QC-00021 FITC-CD45 125μl ul 90ul
|
||||
ZKXW-QC-00022 FITC-CD69 125μl ul 90ul
|
||||
ZKXW-QC-00023 FITC-CD69 500μl ul 500ul
|
||||
ZKXW-QC-00024 FITC-CD73 125μl ul 90ul
|
||||
ZKXW-QC-00025 FITC-TNF-α 500μl ul 90ul
|
||||
ZKXW-QC-00026 PE-Annexin V细胞凋亡检测试剂盒(含7-ADD) 100Tμl ul 1支
|
||||
ZKXW-QC-00027 TGF-β 125μl ul 125ul
|
||||
ZKXW-QC-00028 PE-IL-6 125μl ul 125ul
|
||||
ZKXW-QC-00029 PE-CD107a 125μl ul 90ul
|
||||
ZKXW-QC-00030 PE-CD107a 500μl ul 500ul
|
||||
ZKXW-QC-00031 PE-CD16 500μl ul 90ul
|
||||
ZKXW-QC-00032 PE-CD16 125μl ul 10ul
|
||||
ZKXW-QC-00033 PE-CD19 125μl ul 90ul
|
||||
ZKXW-QC-00034 PE-CD19 500μl ul 500ul
|
||||
ZKXW-QC-00035 PE-HLA-DR 125μl ul 90ul
|
||||
ZKXW-QC-00036 PE-HLA-DR 500μl ul 500ul
|
||||
ZKXW-QC-00037 PE-Cy7-CD314 125μl ul 90ul
|
||||
ZKXW-QC-00038 PE-Cy7-CD314 500μl ul 500ul
|
||||
ZKXW-QC-00039 PE-Cy7-CD73 125μl ul 90ul
|
||||
ZKXW-QC-00040 PE-Cy7-CD73 500μl ul 500ul
|
||||
ZKXW-QC-00041 PE-Cy7-CD8 125μl ul 70ul
|
||||
ZKXW-QC-00042 PE-Cy7-CD8 500μl ul 500ul
|
||||
ZKXW-QC-00043 PE-Cy7-Granzyme B Recombinant 125μl ul 90ul
|
||||
ZKXW-QC-00044 PE-Cy7-Granzyme B Recombinant 500μl ul 500ul
|
||||
ZKXW-QC-00045 PE-Cy7-HLA-A2 125μl ul 90ul
|
||||
ZKXW-QC-00046 PE-Cy7-CD45 100μl/10T ul 90ul
|
||||
ZKXW-QC-00047 PerCP-CD45 500μl ul 90ul
|
||||
ZKXW-QC-00048 PerCP-CD8 100μl/10T ul 90ul
|
||||
ZKXW-QC-00049 磷酸盐缓冲液PBS(细胞级) 500ml ml 126.5ml
|
||||
ZKXW-QC-00050 红细胞裂解液 500ml ml 300ml
|
||||
ZKXW-QC-00051 DEPC处理水 500ml ml 1瓶
|
||||
ZKXW-QC-00052 DEPC处理水 100ml ml 2瓶
|
||||
ZKXW-QC-00053 Cocktail 100μl ml 1支
|
||||
ZKXW-QC-00054 TritonX-100 100ml ml 1瓶
|
||||
ZKXW-QC-00055 4%多聚甲醛固定液 100ml ml 1瓶
|
||||
ZKXW-QC-00056 小鼠血清(无菌过滤) 100ml ml 1瓶
|
||||
ZKXW-QC-00057 血型ABO定性试剂 40人份/盒 盒 1盒
|
||||
ZKXW-QC-00058 肺炎支原体IgM抗体检测试剂盒(胶体金法) 20人份/盒 盒 2盒
|
||||
ZKXW-QC-00059 解脲支原体IgG抗体检测试剂盒(胶体金法) 20人份/盒 盒 2盒
|
||||
ZKXW-QC-00060 血细胞溶血剂 500ml ml 1瓶
|
||||
ZKXW-QC-00061 CLE-P清洗液 50ml ml 1瓶
|
||||
ZKXW-QC-00062 DIL-C稀释液 20L/桶 桶 1桶
|
||||
ZKXW-QC-00063 流式细胞分析用鞘液 5L/桶 桶 1桶
|
||||
ZKXW-QC-00064 清洗液 5L/桶 桶 1桶
|
||||
ZKXW-QC-00065 TSA 9x10cm/包 包 15包
|
||||
ZKXW-QC-00066 HIV-HCV-TP-HBs 20人份/盒 盒 2盒
|
||||
ZKXW-QC-00067 15ml离心管袋装(灭菌) 25支/包 包 20包
|
||||
ZKXW-QC-00068 50ml离心管袋装(灭菌) 25支/包 包 20包
|
||||
ZKXW-QC-00069 1000ul蓝色盒装吸头 盒 7盒
|
||||
ZKXW-QC-00070 200ul黄色盒装吸头 盒 1盒
|
||||
ZKXW-QC-00071 10ul透明盒装吸头 96Tips/Rack;10Racks/Pock 盒 10盒
|
||||
ZKXW-QC-00072 1000ul加长型袋装吸头 1000支/包 包 0
|
||||
ZKXW-QC-00073 200ul袋装吸头 1000支/包 包 0
|
||||
ZKXW-QC-00074 10ul袋装吸头 1000支/包 包 0
|
||||
ZKXW-QC-00075 流式管 500个/袋 袋 1袋
|
||||
ZKXW-QC-00076 1.5mL离心管,蓝色 500个/袋 袋 1袋
|
||||
ZKXW-QC-00077 1.5mL离心管,绿色 500个/袋 袋 1袋
|
||||
ZKXW-QC-00078 1.5mL离心管,黄色 500个/袋 袋 1袋
|
||||
ZKXW-QC-00079 1.5mL离心管,粉色 500个/袋 袋 1袋
|
||||
ZKXW-QC-00080 1.5ml透明离心管, 500个/袋 袋 1袋
|
||||
ZKXW-QC-00081 带锁扣盖微量离心管 500支/袋 袋 1袋
|
||||
Reference in new issue
Block a user