diff --git a/web-admin/src/api/business-sample.ts b/web-admin/src/api/business-sample.ts
index 1361f7f2..9dc7638b 100644
--- a/web-admin/src/api/business-sample.ts
+++ b/web-admin/src/api/business-sample.ts
@@ -4,6 +4,8 @@ export type SampleVoidTarget = {
receptionSource: 'cell_storage' | 'research_donation'
sampleId?: string
sampleCode?: string
+ /** 仅弹窗展示,不参与作废请求 */
+ labStorageCode?: string
protocolId?: string
}
diff --git a/web-admin/src/components/business/sample-void-dialog/index.vue b/web-admin/src/components/business/sample-void-dialog/index.vue
index 3c93ee80..f4063aea 100644
--- a/web-admin/src/components/business/sample-void-dialog/index.vue
+++ b/web-admin/src/components/business/sample-void-dialog/index.vue
@@ -20,6 +20,9 @@
class="biz-dialog-form"
>
+
+ {{ labStorageCodeDisplay }}
+
{{ sampleCode }}
@@ -84,6 +87,9 @@
]
}
+ const labStorageCodeDisplay = computed(
+ () => String(props.target?.labStorageCode || '').trim() || '—'
+ )
const sampleCode = computed(() => String(props.target?.sampleCode || '').trim())
watch(
diff --git a/web-admin/src/utils/sample-void.test.ts b/web-admin/src/utils/sample-void.test.ts
index 57e6f8e9..097d3a12 100644
--- a/web-admin/src/utils/sample-void.test.ts
+++ b/web-admin/src/utils/sample-void.test.ts
@@ -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'
})
})
diff --git a/web-admin/src/utils/sample-void.ts b/web-admin/src/utils/sample-void.ts
index 6b1b6526..9d662694 100644
--- a/web-admin/src/utils/sample-void.ts
+++ b/web-admin/src/utils/sample-void.ts
@@ -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
}
}
diff --git a/web-admin/src/views/production/production-work-order/ProductionWorkOrderCardList.vue b/web-admin/src/views/production/production-work-order/ProductionWorkOrderCardList.vue
index 1ec61643..aaffb84e 100644
--- a/web-admin/src/views/production/production-work-order/ProductionWorkOrderCardList.vue
+++ b/web-admin/src/views/production/production-work-order/ProductionWorkOrderCardList.vue
@@ -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)
})
diff --git a/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderSingleCard.vue b/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderSingleCard.vue
index 04ee4a67..8ead5bc3 100644
--- a/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderSingleCard.vue
+++ b/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderSingleCard.vue
@@ -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()
})