diff --git a/web-admin/src/api/qc-work-order.ts b/web-admin/src/api/qc-work-order.ts index 1889474c..32950837 100644 --- a/web-admin/src/api/qc-work-order.ts +++ b/web-admin/src/api/qc-work-order.ts @@ -103,6 +103,7 @@ export type QcWorkOrder = { qcBizType?: string qcBizTypeLabel?: string cellProductId?: string + externalTargetCode?: string cellProductCode?: string cellProductName?: string cellProductTypeName?: string @@ -285,6 +286,7 @@ export function fetchCreateQcWorkOrder(data: { receptionSource?: string qcBizType?: string cellProductId?: string + externalTargetCode?: string remark?: string }) { return request.post({ @@ -295,7 +297,13 @@ export function fetchCreateQcWorkOrder(data: { export function fetchUpdateQcWorkOrder( id: string, - data: { cellProductId?: string; workOrderStatus?: string; qcConclusion?: string; remark?: string } + data: { + cellProductId?: string + externalTargetCode?: string + workOrderStatus?: string + qcConclusion?: string + remark?: string + } ) { return request.put({ url: `/web/admin/qc-work-orders/${id}`, diff --git a/web-admin/src/utils/qc-work-order-card-meta.ts b/web-admin/src/utils/qc-work-order-card-meta.ts index 791491f3..fa6c45f6 100644 --- a/web-admin/src/utils/qc-work-order-card-meta.ts +++ b/web-admin/src/utils/qc-work-order-card-meta.ts @@ -175,6 +175,11 @@ const temporaryFields: CardMetaField[] = [ getValue: (row) => row.productionWorkOrderNo || '—', visible: (row) => isTemporaryQcFromProduction(row) }, + { + label: '质检对象', + getValue: (row) => String(row.externalTargetCode || '').trim() || '—', + visible: (row) => !!(row.externalTargetCode || '').trim() + }, { label: '产品名称', getValue: (row) => formatTempCellProductField(row, row.cellProductName) @@ -396,8 +401,10 @@ export function resolveInboundWorkOrderCardTitle(row: QcWorkOrder): string { return String(row.labStorageCode || '').trim() || '—' } -/** 临时质检 · 工单卡片主标题(展示细胞产品编码) */ +/** 临时质检 · 工单卡片主标题(外部编号优先,否则细胞产品编码) */ export function resolveTemporaryWorkOrderCardTitle(row: QcWorkOrder): string { + const external = String(row.externalTargetCode || '').trim() + if (external) return external return formatTempCellProductField(row, row.cellProductCode) } diff --git a/web-admin/src/utils/qc-work-order-tabs.ts b/web-admin/src/utils/qc-work-order-tabs.ts index ff66c456..27ced959 100644 --- a/web-admin/src/utils/qc-work-order-tabs.ts +++ b/web-admin/src/utils/qc-work-order-tabs.ts @@ -139,7 +139,7 @@ export function tabUsesInfusionTimeFilter(tab: QcWorkOrderTabConfig): boolean { export function keywordPlaceholderForTab(tab: QcWorkOrderTabConfig): string { if (tab.key === 'all') return '工单号 / 样本编码 / 母亲姓名 / 申请单号 / 产品名称等' - if (tab.key === 'temporary') return '工单号' + if (tab.key === 'temporary') return '工单号 / 外部编号' if (tab.key === 'outbound_basic_experiment') { return '工单号/申请单号/课题名称/客户' } diff --git a/web-admin/src/views/quality-inspection/qc-work-order/composables/inbound-view-sections.ts b/web-admin/src/views/quality-inspection/qc-work-order/composables/inbound-view-sections.ts index 42f47cca..810b676c 100644 --- a/web-admin/src/views/quality-inspection/qc-work-order/composables/inbound-view-sections.ts +++ b/web-admin/src/views/quality-inspection/qc-work-order/composables/inbound-view-sections.ts @@ -187,12 +187,22 @@ export function buildTemporaryViewSections( value: detail.productionWorkOrderNo || '—' }) } + const external = String(detail.externalTargetCode || '').trim() + if (external) { + basicFields.push( + { label: '质检对象', value: external }, + { label: '对象来源', value: '外部', tagType: 'warning' } + ) + } else { + basicFields.push( + { label: '产品编码', value: detail.cellProductCode || '—' }, + { label: '产品名称', value: detail.cellProductName || '—' }, + { label: '产品类型', value: detail.cellProductTypeName || '—' }, + { label: '代次', value: detail.cellProductPassage || '—' }, + { label: '规格', value: resolveCellProductSpecDisplay(detail) || '—' } + ) + } basicFields.push( - { label: '产品编码', value: detail.cellProductCode || '—' }, - { label: '产品名称', value: detail.cellProductName || '—' }, - { label: '产品类型', value: detail.cellProductTypeName || '—' }, - { label: '代次', value: detail.cellProductPassage || '—' }, - { label: '规格', value: resolveCellProductSpecDisplay(detail) || '—' }, { label: '状态', value: workOrderStatusLabel(detail.workOrderStatus), diff --git a/web-admin/src/views/quality-inspection/qc-work-order/index.vue b/web-admin/src/views/quality-inspection/qc-work-order/index.vue index e368df82..fd52bb61 100644 --- a/web-admin/src/views/quality-inspection/qc-work-order/index.vue +++ b/web-admin/src/views/quality-inspection/qc-work-order/index.vue @@ -71,13 +71,24 @@ >

临时工单需选择质检对象(细胞产品),创建后请配置检测项目。

临时工单需选择质检对象(系统细胞产品或外部编号),创建后请配置检测项目。

- + + + 系统细胞产品 + 外部科研编号 + + + + + + { if (addMode.value === 'temporary') { + if (addForm.targetSource === 'external') { + return { + externalTargetCode: [ + { required: true, message: '请填写外部编号', trigger: 'blur' }, + { + validator: (_: unknown, v: string, cb: (e?: Error) => void) => { + if ((v || '').trim().length > 64) cb(new Error('外部编号最长 64 个字符')) + else cb() + }, + trigger: 'blur' + } + ] + } + } return { cellProductId: [ { required: true, message: '请选择质检对象(细胞产品)', trigger: 'change' } @@ -335,6 +376,13 @@ } }) + function onTargetSourceChange() { + addForm.cellProductId = '' + addForm.externalTargetCode = '' + cellProductOptions.value = [] + nextTick(() => addFormRef.value?.clearValidate()) + } + function handleAddInbound() { editingId.value = '' editingWorkOrderNo.value = '' @@ -342,7 +390,9 @@ addForm.sampleCode = '' addForm.receptionSource = 'cell_storage' addForm.qcBizType = 'inbound' + addForm.targetSource = 'cell_product' addForm.cellProductId = '' + addForm.externalTargetCode = '' addForm.remark = '' cellProductOptions.value = [] searchCellProductOptions('') @@ -356,7 +406,9 @@ addForm.sampleCode = '' addForm.receptionSource = 'cell_storage' addForm.qcBizType = 'inbound' + addForm.targetSource = 'cell_product' addForm.cellProductId = '' + addForm.externalTargetCode = '' addForm.remark = '' cellProductOptions.value = [] searchCellProductOptions('') @@ -367,11 +419,16 @@ editingId.value = row.id editingWorkOrderNo.value = row.workOrderNo || '' addMode.value = 'temporary' + const hasExternal = !!(row.externalTargetCode || '').trim() + addForm.targetSource = hasExternal ? 'external' : 'cell_product' addForm.cellProductId = row.cellProductId || '' + addForm.externalTargetCode = row.externalTargetCode || '' addForm.remark = row.remark || '' cellProductOptions.value = [] - ensureCellProductOption(row) - searchCellProductOptions(row.cellProductCode || row.cellProductName || '') + if (addForm.targetSource === 'cell_product') { + ensureCellProductOption(row) + searchCellProductOptions(row.cellProductCode || row.cellProductName || '') + } addVisible.value = true } @@ -443,14 +500,20 @@ try { if (editingId.value) { await fetchUpdateQcWorkOrder(editingId.value, { - cellProductId: addForm.cellProductId, + cellProductId: + addForm.targetSource === 'cell_product' ? addForm.cellProductId : '', + externalTargetCode: + addForm.targetSource === 'external' ? addForm.externalTargetCode.trim() : '', remark: addForm.remark }) ElMessage.success('保存成功') } else if (addMode.value === 'temporary') { await fetchCreateQcWorkOrder({ workOrderType: 'temporary', - cellProductId: addForm.cellProductId, + cellProductId: + addForm.targetSource === 'cell_product' ? addForm.cellProductId : '', + externalTargetCode: + addForm.targetSource === 'external' ? addForm.externalTargetCode.trim() : '', remark: addForm.remark }) ElMessage.success('创建成功')