diff --git a/furniture-3d-system/src/app/intake/IntakeClient.test.tsx b/furniture-3d-system/src/app/intake/IntakeClient.test.tsx index 4d9e70d4..726b7280 100644 --- a/furniture-3d-system/src/app/intake/IntakeClient.test.tsx +++ b/furniture-3d-system/src/app/intake/IntakeClient.test.tsx @@ -1884,7 +1884,12 @@ describe('IntakeClient', () => { expect(within(pendingRow as HTMLElement).getByText('流程中')).toBeInTheDocument() expect(screen.getByRole('columnheader', { name: '产品实拍' })).toBeInTheDocument() expect(screen.getByRole('columnheader', { name: '产品资料' })).toBeInTheDocument() - expect(screen.getByRole('columnheader', { name: '仓库抽检' })).toBeInTheDocument() + expect( + screen.queryByRole('columnheader', { name: '工厂质检' }), + ).not.toBeInTheDocument() + expect( + screen.queryByRole('columnheader', { name: '仓库抽检' }), + ).not.toBeInTheDocument() expect( within(checkedRow as HTMLElement).getByLabelText( `${getNonIntegratedDocumentWorkspaceCategoryLabel(readyCategory)}已审批且有数据`, diff --git a/furniture-3d-system/src/app/intake/IntakeClient.tsx b/furniture-3d-system/src/app/intake/IntakeClient.tsx index d3d2248b..8de1059c 100644 --- a/furniture-3d-system/src/app/intake/IntakeClient.tsx +++ b/furniture-3d-system/src/app/intake/IntakeClient.tsx @@ -13,16 +13,13 @@ import { useState, } from "react"; import { - Calculator, Check, Copy, Download, Layers3, Package, - PackagePlus, Palette, Pencil, - Printer, RotateCcw, ShieldCheck, Trash2, @@ -297,15 +294,21 @@ function DocumentStatusMark({ type NonIntegratedDocumentStatusCategory = NonIntegratedWorkflowNodeCategory; +const NON_INTEGRATED_DOCUMENT_STATUS_HIDDEN_CATEGORIES: ReadonlySet = + new Set([ + "立项评审", + "工厂质检", + "检测报告", + ]); + const NON_INTEGRATED_DOCUMENT_STATUS_COLUMNS = [ ...NON_INTEGRATED_WORKFLOW_NODE_CATEGORIES.filter( - (category) => category !== "立项评审", + (category) => !NON_INTEGRATED_DOCUMENT_STATUS_HIDDEN_CATEGORIES.has(category), ), ] as NonIntegratedDocumentStatusCategory[]; const NON_INTEGRATED_FLOW_COMPLETE_CATEGORY = NON_INTEGRATED_DOCUMENT_STATUS_COLUMNS.find( - (category) => - getNonIntegratedDocumentWorkspaceCategoryLabel(category) === "仓库抽检", + (category) => category === "产品核价", ) ?? NON_INTEGRATED_DOCUMENT_STATUS_COLUMNS[ NON_INTEGRATED_DOCUMENT_STATUS_COLUMNS.length - 1 @@ -6685,7 +6688,6 @@ function FormalIntakeWorkbench({ > } expanded={activeSection === "pending" || activeSection === "progress"} onToggle={() => onToggle("pending")} > @@ -6720,7 +6722,6 @@ function FormalIntakeWorkbench({ } expanded={activeSection === "bom"} onToggle={() => onToggle("bom")} > @@ -6746,7 +6747,6 @@ function FormalIntakeWorkbench({ } expanded={activeSection === "rawMaterialLibrary"} onToggle={() => onToggle("rawMaterialLibrary")} > @@ -6779,7 +6779,6 @@ function FormalIntakeWorkbench({ } expanded={activeSection === "referenceEstimator"} onToggle={() => onToggle("referenceEstimator")} > @@ -6804,7 +6803,6 @@ function FormalIntakeWorkbench({ } expanded={activeSection === "patents"} onToggle={onOpenProductPatents} >