feat(sample): 样本废弃弹窗展示实验室入库编码 (#140) #141

Merged
cykj merged 1 commits from codex/issue-140-void-dialog-lab-code-c1c551179e7e into V2.0 2026-11-19 07:05:42 +00:00
6 changed files with 16 additions and 0 deletions

No files matched your search

+2
View File
@@ -4,6 +4,8 @@ export type SampleVoidTarget = {
receptionSource: 'cell_storage' | 'research_donation'
sampleId?: string
sampleCode?: string
/** 仅弹窗展示,不参与作废请求 */
labStorageCode?: string
protocolId?: string
}
@@ -20,6 +20,9 @@
class="biz-dialog-form"
>
<div class="form-grid-2">
<el-form-item label="实验室入库编码" class="form-col-span-2">
<span class="sample-void-dialog__code">{{ labStorageCodeDisplay }}</span>
</el-form-item>
<el-form-item v-if="sampleCode" label="样本编码" class="form-col-span-2">
<span class="sample-void-dialog__code">{{ sampleCode }}</span>
</el-form-item>
@@ -84,6 +87,9 @@
]
}
const labStorageCodeDisplay = computed(
() => String(props.target?.labStorageCode || '').trim() || '—'
)
const sampleCode = computed(() => String(props.target?.sampleCode || '').trim())
watch(
+2
View File
@@ -8,12 +8,14 @@ describe('resolveSampleVoidTarget', () => {
receptionSource: 'cell_storage',
protocolSampleId: 'ps-1',
sampleCode: 'S1',
labStorageCode: 'B0000108',
collectionProtocolId: 'p-1'
})
assert.deepEqual(target, {
receptionSource: 'cell_storage',
sampleId: 'ps-1',
sampleCode: 'S1',
labStorageCode: 'B0000108',
protocolId: 'p-1'
})
})
+3
View File
@@ -8,6 +8,7 @@ export function resolveSampleVoidTarget(input: {
receptionSource?: string | null
protocolSampleId?: string | null
sampleCode?: string | null
labStorageCode?: string | null
collectionProtocolId?: string | null
fallbackSource?: string | null
}): SampleVoidTarget | null {
@@ -18,12 +19,14 @@ export function resolveSampleVoidTarget(input: {
if (source !== 'cell_storage' && source !== 'research_donation') return null
const sampleId = String(input.protocolSampleId || '').trim()
const sampleCode = String(input.sampleCode || '').trim()
const labStorageCode = String(input.labStorageCode || '').trim()
const protocolId = String(input.collectionProtocolId || '').trim()
if (!sampleId && !sampleCode) return null
return {
receptionSource: source,
sampleId: sampleId || undefined,
sampleCode: sampleCode || undefined,
labStorageCode: labStorageCode || undefined,
protocolId: protocolId || undefined
}
}
@@ -499,6 +499,7 @@
receptionSource: row.receptionSource,
protocolSampleId: row.protocolSampleId,
sampleCode: row.sampleCode,
labStorageCode: row.labStorageCode,
collectionProtocolId: row.collectionProtocolId,
fallbackSource: productionVoidFallbackSource(row)
})
@@ -509,6 +510,7 @@
receptionSource: row.receptionSource,
protocolSampleId: row.protocolSampleId,
sampleCode: row.sampleCode,
labStorageCode: row.labStorageCode,
collectionProtocolId: row.collectionProtocolId,
fallbackSource: productionVoidFallbackSource(row)
})
@@ -419,6 +419,7 @@
receptionSource: props.row.receptionSource,
protocolSampleId: props.row.protocolSampleId,
sampleCode: props.row.sampleCode,
labStorageCode: props.row.labStorageCode,
collectionProtocolId: props.row.collectionProtocolId,
fallbackSource: inboundVoidFallbackSource()
})