提交
This commit is contained in:
1 parent
973176d508
commit
cdaa0ac273
327 files changed
+32861
-25627
No files matched your search
@@ -36,6 +36,7 @@ export type MineWorkOrderSearchFilters = {
|
||||
infusionTimeStart?: string
|
||||
infusionTimeEnd?: string
|
||||
tabKey: QcWorkOrderTabKey
|
||||
sampleTypeName?: string
|
||||
}
|
||||
|
||||
export type MineWorkOrderEntry = {
|
||||
@@ -113,6 +114,8 @@ export function filterMineEntriesByWorkOrderSearch(
|
||||
}
|
||||
const keywordTabKey = isAllQcWorkOrderTab(tabKey) ? resolveTabKeyFromWorkOrder(row) : tabKey
|
||||
if (!keywordMatchesWorkOrder(row, filters.keyword || '', keywordTabKey)) return false
|
||||
const sampleTypeName = (filters.sampleTypeName || '').trim()
|
||||
if (sampleTypeName && (row.sampleTypeName || '').trim() !== sampleTypeName) return false
|
||||
if (isAllQcWorkOrderTab(tabKey) || !tabUsesInfusionTimeFilter(tab)) {
|
||||
if (!dateInRange(row.createTime, filters.createTimeStart, filters.createTimeEnd)) {
|
||||
return false
|
||||
@@ -224,8 +227,9 @@ export function buildWorkOrderFromTasks(tasks: QcTask[]): QcWorkOrder {
|
||||
cellProductSpecName: t.cellProductSpecName,
|
||||
sampleTypeName: t.sampleTypeName,
|
||||
isSpecial: tasks.some((x) => x.isSpecial) || !!t.isSpecial,
|
||||
specialRemark:
|
||||
String(tasks.find((x) => x.isSpecial)?.specialRemark || t.specialRemark || '').trim(),
|
||||
specialRemark: String(
|
||||
tasks.find((x) => x.isSpecial)?.specialRemark || t.specialRemark || ''
|
||||
).trim(),
|
||||
receptionTime: t.receptionTime,
|
||||
handlerName: t.handlerName,
|
||||
hasLab: t.hasLab ?? tasks.some((x) => x.taskType === 'sysz'),
|
||||
@@ -255,6 +259,7 @@ export function buildWorkOrderFromTasks(tasks: QcTask[]): QcWorkOrder {
|
||||
protocolStatusLabel: t.protocolStatusLabel,
|
||||
paymentSummary: t.paymentSummary,
|
||||
feeSummary: t.feeSummary,
|
||||
protocolSiblingSamples: t.protocolSiblingSamples,
|
||||
remark: t.workOrderRemark || t.remark,
|
||||
unfinishedBadgeCount: t.unfinishedBadgeCount
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user