diff --git a/furniture-3d-system/src/app/intake/AlphabetLibraryPanel.tsx b/furniture-3d-system/src/app/intake/AlphabetLibraryPanel.tsx index 0779fab4..81457ce2 100644 --- a/furniture-3d-system/src/app/intake/AlphabetLibraryPanel.tsx +++ b/furniture-3d-system/src/app/intake/AlphabetLibraryPanel.tsx @@ -11,6 +11,8 @@ const ALPHABET_LIBRARY_IMAGE_MAX_SIZE_BYTES = 1.5 * 1024 * 1024 const ALPHABET_LIBRARY_LETTERS = Array.from({ length: 26 }, (_, index) => String.fromCharCode('A'.charCodeAt(0) + index), ) +const LIBRARY_PRIMARY_BUTTON_CLASS = + '!border-zinc-950 !bg-zinc-950 !bg-none !text-white !shadow-none hover:!border-zinc-800 hover:!bg-zinc-800 focus:!border-zinc-600 disabled:!border-zinc-200 disabled:!bg-zinc-200 disabled:!text-zinc-400' type AlphabetLibraryLetter = (typeof ALPHABET_LIBRARY_LETTERS)[number] @@ -363,11 +365,22 @@ export default function AlphabetLibraryPanel({

查询动作

- - @@ -421,7 +434,7 @@ export default function AlphabetLibraryPanel({ @@ -442,7 +455,13 @@ export default function AlphabetLibraryPanel({ 当前显示 {currentLetterItems.length} 条数据,字段固定为编号、名称、图片、价格。

- @@ -516,7 +535,7 @@ export default function AlphabetLibraryPanel({ @@ -569,7 +588,11 @@ export default function AlphabetLibraryPanel({ > 取消 -
diff --git a/furniture-3d-system/src/app/intake/EdgeBandingLibraryPanel.tsx b/furniture-3d-system/src/app/intake/EdgeBandingLibraryPanel.tsx index 6dc74d68..9b779c81 100644 --- a/furniture-3d-system/src/app/intake/EdgeBandingLibraryPanel.tsx +++ b/furniture-3d-system/src/app/intake/EdgeBandingLibraryPanel.tsx @@ -30,6 +30,8 @@ type EdgeBandingLibraryCategory = { const EDGE_BANDING_CATEGORY_STORAGE_KEY = 'formal-intake-edge-banding-library-categories' +const LIBRARY_PRIMARY_BUTTON_CLASS = + '!border-zinc-950 !bg-zinc-950 !bg-none !text-white !shadow-none hover:!border-zinc-800 hover:!bg-zinc-800 focus:!border-zinc-600 disabled:!border-zinc-200 disabled:!bg-zinc-200 disabled:!text-zinc-400' function normalizeText(value: string) { return value.trim().toLowerCase() @@ -576,11 +578,22 @@ export default function EdgeBandingLibraryPanel() { placeholder="例如:12MM" />
- - @@ -606,7 +619,7 @@ export default function EdgeBandingLibraryPanel() { type="button" variant="tinted" size="small" - className="!min-h-8 !px-2 !py-1 text-xs" + className={`!min-h-8 !px-2 !py-1 text-xs ${LIBRARY_PRIMARY_BUTTON_CLASS}`} onClick={startCreateCategory} > @@ -766,7 +779,7 @@ export default function EdgeBandingLibraryPanel() {
- @@ -1644,7 +1650,12 @@ function IntegratedPendingDetail({
- + @@ -2005,7 +2016,7 @@ function NonIntegratedPendingDetail({
))} - @@ -399,7 +407,13 @@ export default function SteelFrameLibraryPanel() { 删除 ) : null} - diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx index 04cf94b5..32cd4835 100644 --- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx +++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.test.tsx @@ -274,6 +274,7 @@ function createProductRecord( skuItems: [], factoryRows: [], pricingRows: [], + productLimitRows: [], sampleMeasurementRows: [], uploadFiles: [], documentWorkspaceNotes: {}, @@ -308,6 +309,7 @@ function createSkuItem( drawingId: "SZ0230K01AV0", installMethod: "拆装", executeStandard: "", + nationalStandardCompliant: "", manufacturer: "", manufacturerCode: "", tagMaterial: "", @@ -476,6 +478,7 @@ describe("NonIntegratedDetailClient", () => { expect(mockedUploadDetachedNonIntegratedFile).toHaveBeenCalledWith( undefined, expect.objectContaining({ name: "remote-preview.png" }), + expect.any(Function), ); expect(mockedSaveSharedNonIntegratedProduct.mock.calls[0]?.[0]).toEqual( expect.objectContaining({ @@ -1127,6 +1130,7 @@ describe("NonIntegratedDetailClient", () => { "document-workspace-trigger-设计卖点", "document-workspace-trigger-产品模型", "document-workspace-trigger-评审资料", + "document-workspace-trigger-企划布局", "document-workspace-trigger-专利申请", "document-workspace-trigger-产品实拍图", "document-workspace-trigger-安装方式", @@ -1134,6 +1138,7 @@ describe("NonIntegratedDetailClient", () => { "document-workspace-trigger-产品定厂", "document-workspace-trigger-样包测量", "document-workspace-trigger-产品核价", + "document-workspace-trigger-产品限价", ]); expect( screen.queryByTestId("document-workspace-trigger-立项评审"), @@ -1205,6 +1210,7 @@ describe("NonIntegratedDetailClient", () => { "document-workspace-trigger-设计卖点", "document-workspace-trigger-产品模型", "document-workspace-trigger-评审资料", + "document-workspace-trigger-企划布局", "document-workspace-trigger-专利申请", "document-workspace-trigger-产品实拍图", "document-workspace-trigger-安装方式", @@ -1212,6 +1218,7 @@ describe("NonIntegratedDetailClient", () => { "document-workspace-trigger-产品定厂", "document-workspace-trigger-样包测量", "document-workspace-trigger-产品核价", + "document-workspace-trigger-产品限价", ]); expect( sidebar.querySelector( @@ -1747,11 +1754,7 @@ describe("NonIntegratedDetailClient", () => { screen.queryByRole("button", { name: "删除当前" }), ).not.toBeInTheDocument(); - expect( - screen.queryByTestId("document-workspace-confirm-专利申请"), - ).not.toBeInTheDocument(); - - await actor.click(screen.getByTestId("workflow-approve-current-node")); + await actor.click(screen.getByTestId("document-workspace-confirm-专利申请")); await waitFor(() => { const savedProduct = getNonIntegratedProductById( @@ -1833,7 +1836,7 @@ describe("NonIntegratedDetailClient", () => { expect(screen.queryByLabelText("申请号")).not.toBeInTheDocument(); expect(screen.queryByLabelText("申请缴费日")).not.toBeInTheDocument(); - await actor.click(screen.getByTestId("workflow-approve-current-node")); + await actor.click(screen.getByTestId("document-workspace-confirm-专利申请")); await waitFor(() => { const savedProduct = getNonIntegratedProductById( @@ -1918,6 +1921,55 @@ describe("NonIntegratedDetailClient", () => { ).not.toBeInTheDocument(); }); + it("persists the SKU national standard compliance selection", async () => { + const actor = userEvent.setup(); + + saveNonIntegratedProduct( + createProductRecord({ + id: "SZ0230-national-standard", + spu: "SZ0230", + skuItems: [ + createSkuItem({ + id: "sku-national-standard-1", + model: "SZ0230K01", + }), + createSkuItem({ + id: "sku-national-standard-2", + model: "SZ0230K01", + }), + createSkuItem({ + id: "sku-national-standard-3", + model: "SZ0230K02", + }), + ], + }), + ); + + render( + , + ); + + const skuRow = screen.getAllByDisplayValue("SZ0230K01")[0]?.closest("tr"); + expect(skuRow).not.toBeNull(); + + await actor.selectOptions( + within(skuRow!).getByRole("combobox", { name: "符合国标" }), + "是", + ); + + await waitFor(() => { + const savedProduct = getNonIntegratedProductById( + "SZ0230-national-standard", + ); + expect(savedProduct?.skuItems[0]?.nationalStandardCompliant).toBe("是"); + expect(savedProduct?.skuItems[1]?.nationalStandardCompliant).toBe("是"); + expect(savedProduct?.skuItems[2]?.nationalStandardCompliant).toBe(""); + }); + }); + it("hides redundant fields from the product detail summary", () => { saveNonIntegratedProduct( createProductRecord({ @@ -1981,6 +2033,7 @@ describe("NonIntegratedDetailClient", () => { id: "sku-sample-1", model: "SZ0230K01", skuCode: "SZ023001", + barcode: "SZ023001N1280V01", setCount: "1", specName: "款式一 140/60/75", barcode: "SZ023001N1280V01", @@ -2055,8 +2108,9 @@ describe("NonIntegratedDetailClient", () => { it("lets purchasing users edit only purchasing document nodes", async () => { const actor = userEvent.setup(); - const openingReferenceCategory = NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES[0]; - const sampleMeasurementCategory = NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES[10]; + const openingReferenceCategory = "开品参考"; + const sampleMeasurementCategory = "样包测量"; + const productLimitCategory = "产品限价"; saveNonIntegratedProduct( createProductRecord({ @@ -2106,12 +2160,24 @@ describe("NonIntegratedDetailClient", () => { ); expect(savedProduct?.sampleMeasurementRows?.[0]?.lengthCm).toBe("120"); }); + + await actor.click( + screen.getByTestId(`document-workspace-trigger-${productLimitCategory}`), + ); + + expect( + screen.getByTestId( + "product-limit-expectedDailyLimitPrice-sku-purchasing-permission-1", + ), + ).toHaveAttribute("readonly"); }); - it("lets planning users edit only the opening reference node", async () => { + it("lets planning users edit opening reference, planning layout, and product limit nodes", async () => { const actor = userEvent.setup(); - const openingReferenceCategory = NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES[0]; - const sampleMeasurementCategory = NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES[10]; + const openingReferenceCategory = "开品参考"; + const planningLayoutCategory = "企划布局"; + const productLimitCategory = "产品限价"; + const sampleMeasurementCategory = "样包测量"; saveNonIntegratedProduct( createProductRecord({ @@ -2137,7 +2203,7 @@ describe("NonIntegratedDetailClient", () => { initialDocumentWorkspaceCategory={openingReferenceCategory} currentUserRole="USER" currentUserName="企划同事" - currentUserBusinessRoles={["PLANNING"]} + currentUserDepartmentName="品牌中心" />, ); @@ -2153,6 +2219,32 @@ describe("NonIntegratedDetailClient", () => { expect(savedProduct?.openingReference.reason).toBe("企划补充开品理由"); }); + await actor.click( + screen.getByTestId(`document-workspace-trigger-${planningLayoutCategory}`), + ); + expect( + screen.getByTestId(`document-workspace-confirm-${planningLayoutCategory}`), + ).not.toBeDisabled(); + + await actor.click( + screen.getByTestId(`document-workspace-trigger-${productLimitCategory}`), + ); + await actor.type( + screen.getByTestId( + "product-limit-expectedDailyLimitPrice-sku-planning-permission-1", + ), + "1999", + ); + + await waitFor(() => { + const savedProduct = getNonIntegratedProductById( + "SZ0230-planning-permission", + ); + expect(savedProduct?.productLimitRows?.[0]?.expectedDailyLimitPrice).toBe( + "1999", + ); + }); + await actor.click( screen.getByTestId(`document-workspace-trigger-${sampleMeasurementCategory}`), ); @@ -2191,7 +2283,7 @@ describe("NonIntegratedDetailClient", () => { }); it("keeps regular users read-only in purchasing document nodes", async () => { - const sampleMeasurementCategory = NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES[10]; + const sampleMeasurementCategory = "样包测量"; saveNonIntegratedProduct( createProductRecord({ @@ -2267,11 +2359,9 @@ describe("NonIntegratedDetailClient", () => { ); await actor.click(screen.getByTestId("document-workspace-trigger-包装细节")); + await actor.click(screen.getByTestId("packaging-workspace-panel-factoryQuality")); const panel = screen.getByTestId("document-workspace-panel"); - expect( - screen.getByTestId("packaging-factory-quality-section"), - ).toBeInTheDocument(); expect(screen.getByTestId("factory-quality-workspace")).toBeInTheDocument(); expect(screen.getByTestId("factory-quality-style-K01")).toHaveTextContent( "SZ0230K01", @@ -2349,6 +2439,7 @@ describe("NonIntegratedDetailClient", () => { id: "sku-pricing-1", model: "SZ0230K01", skuCode: "SZ023001", + barcode: "SZ023001N1280V01", setCount: "1", specName: "款式一 140/60/75", manufacturer: "兰考华兰家具", @@ -2414,6 +2505,119 @@ describe("NonIntegratedDetailClient", () => { }); }); + it("renders planning layout rows from SKU data without SKU edit actions", async () => { + const actor = userEvent.setup(); + + saveNonIntegratedProduct( + createProductRecord({ + id: "DNZ0001-planning-layout", + skuItems: [ + createSkuItem({ + id: "sku-planning-layout-1", + model: "SZ0230K01", + skuCode: "SZ023001", + barcode: "SZ023001N1280V01", + setCount: "1", + specName: "款式一 140/60/75", + size: "140/60/75", + color: "胡桃色", + material: "橡胶木", + installMethod: "整装", + manufacturer: "兰考华兰家具", + executeStandard: "GB/T3324-2024", + nationalStandardCompliant: "是", + }), + ], + }), + ); + + render( + , + ); + + await actor.click(screen.getByTestId("document-workspace-trigger-企划布局")); + + const planningWorkspace = screen.getByTestId("planning-layout-workspace"); + expect(planningWorkspace).toHaveTextContent("SZ0230K01"); + expect(planningWorkspace).toHaveTextContent("SZ023001N1280V01"); + expect(planningWorkspace).toHaveTextContent("GB/T3324-2024"); + expect(planningWorkspace).toHaveTextContent("是"); + expect( + screen.getByTestId("document-workspace-confirm-企划布局"), + ).toBeInTheDocument(); + expect( + within(planningWorkspace).queryByRole("button", { name: "新增SKU" }), + ).not.toBeInTheDocument(); + expect( + within(planningWorkspace).queryByText("上传图片"), + ).not.toBeInTheDocument(); + expect( + within(planningWorkspace).queryByText("删除"), + ).not.toBeInTheDocument(); + }); + + it("renders product limit rows and persists editable limit fields", async () => { + const actor = userEvent.setup(); + + saveNonIntegratedProduct( + createProductRecord({ + id: "DNZ0001-product-limit", + spu: "SZ0230", + previewImage: "data:image/png;base64,product-limit-image", + skuItems: [ + createSkuItem({ + id: "sku-product-limit-1", + model: "SZ0230K01", + skuCode: "SZ023001", + barcode: "SZ023001N1280V01", + setCount: "1", + specName: "款式一 140/60/75", + }), + ], + }), + ); + + render( + , + ); + + await actor.click(screen.getByTestId("document-workspace-trigger-产品限价")); + + const productLimitWorkspace = screen.getByTestId("product-limit-workspace"); + expect(productLimitWorkspace).toHaveTextContent("SPU"); + expect(productLimitWorkspace).toHaveTextContent("SZ0230"); + expect(productLimitWorkspace).toHaveTextContent("期望日常限价"); + expect(productLimitWorkspace).toHaveTextContent("期望限价毛利率(%)"); + expect(productLimitWorkspace).toHaveTextContent("非SPU负责人限价"); + + await actor.type(screen.getByTestId("product-limit-expectedDailyLimitPrice-sku-product-limit-1"), "1999"); + await actor.type(screen.getByTestId("product-limit-expectedLimitGrossMarginRate-sku-product-limit-1"), "45"); + await actor.type(screen.getByTestId("product-limit-nonSpuOwnerLimitPrice-sku-product-limit-1"), "1899"); + + await waitFor(() => { + const savedProduct = getNonIntegratedProductById("DNZ0001-product-limit"); + expect(savedProduct?.productLimitRows).toEqual([ + { + skuId: "sku-product-limit-1", + expectedDailyLimitPrice: "1999", + expectedLimitGrossMarginRate: "45", + nonSpuOwnerLimitPrice: "1899", + }, + ]); + }); + + await actor.click(screen.getByRole("button", { name: "确认限价" })); + + await waitFor(() => { + const savedProduct = getNonIntegratedProductById("DNZ0001-product-limit"); + expect(savedProduct?.documentWorkspaceConfirmations["产品限价"]).toBe(true); + expect(savedProduct?.documentWorkspaceApprovedAt?.["产品限价"]).toBeTruthy(); + }); + }); + it.skip("persists distinct board material rows after submit", async () => { const actor = userEvent.setup(); @@ -2817,7 +3021,7 @@ describe("NonIntegratedDetailClient", () => { expect( screen.getByTestId("document-workspace-basic-info-trigger"), ).toHaveAttribute("data-pending-confirmation", "true"); - expect(screen.getByTestId("workflow-approve-current-node")).toBeEnabled(); + expect(screen.getByTestId("basic-info-confirm")).toBeEnabled(); }); }); diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx index 0af89f89..460369de 100644 --- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx +++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx @@ -158,6 +158,7 @@ import { NON_INTEGRATED_BRAND_PREFIX_MAP, NON_INTEGRATED_DUPLICATE_SPU_MESSAGE, NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES, + NON_INTEGRATED_PLANNING_LAYOUT_WORKSPACE_CATEGORY, NON_INTEGRATED_WORKFLOW_NODE_CATEGORIES, getNonIntegratedDocumentWorkspaceCategoryLabel, getNonIntegratedFormalSpu, @@ -181,6 +182,7 @@ import { type NonIntegratedPatentApplication, type NonIntegratedPricingRow, type NonIntegratedPackagingInnerItem, + type NonIntegratedProductLimitRow, type NonIntegratedProductRecord, type NonIntegratedProjectReview, type NonIntegratedProjectStatus, @@ -236,6 +238,7 @@ type SkuColumnWidthKey = | "drawingId" | "installMethod" | "executeStandard" + | "nationalStandardCompliant" | "supplierName" | "manufacturerCode" | "batchNo" @@ -250,12 +253,14 @@ type UploadCategoryKey = | "产品模型" | "产品实拍图" | "设计卖点" + | "企划布局" | "安装方式" | "检测报告" | "包装细节" | "产品定厂" | "样包测量" | "产品核价" + | "产品限价" | "工厂质检"; const SKU_BATCH_CHANGE_TYPE_OPTIONS: SkuBatchChangeType[] = [ @@ -265,6 +270,7 @@ const SKU_BATCH_CHANGE_TYPE_OPTIONS: SkuBatchChangeType[] = [ "改款", "转厂", ]; +const NATIONAL_STANDARD_COMPLIANCE_OPTIONS = ["是", "否"] as const; const SKU_COLUMN_DEFAULT_WIDTHS: Record = { model: 96, @@ -280,6 +286,7 @@ const SKU_COLUMN_DEFAULT_WIDTHS: Record = { drawingId: 150, installMethod: 96, executeStandard: 140, + nationalStandardCompliant: 96, supplierName: 140, manufacturerCode: 96, batchNo: 64, @@ -597,6 +604,10 @@ const SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY: DocumentWorkspaceCategory = "样包测量"; const PRODUCT_PRICING_WORKSPACE_CATEGORY: DocumentWorkspaceCategory = "产品核价"; +const PRODUCT_LIMIT_WORKSPACE_CATEGORY: DocumentWorkspaceCategory = + "产品限价"; +const PLANNING_LAYOUT_WORKSPACE_CATEGORY: DocumentWorkspaceCategory = + NON_INTEGRATED_PLANNING_LAYOUT_WORKSPACE_CATEGORY; const NON_INTEGRATED_FULL_DETAIL_EDIT_ROLES = new Set([ "ADMIN", "SUPER_ADMIN", @@ -608,6 +619,12 @@ const PURCHASING_EDITABLE_WORKSPACE_CATEGORIES = SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY, PRODUCT_PRICING_WORKSPACE_CATEGORY, ]); +const PLANNING_EDITABLE_WORKSPACE_CATEGORIES = + new Set([ + "开品参考", + PLANNING_LAYOUT_WORKSPACE_CATEGORY, + PRODUCT_LIMIT_WORKSPACE_CATEGORY, + ]); function getUniqueNonEmptyStrings(values: Array) { return Array.from( @@ -1173,6 +1190,12 @@ const SKU_TAB_OPTIONS: { key: SkuTabKey; label: string }[] = [ const SKU_TOOLBAR_BUTTON_BASE_CLASS = "inline-flex h-8 shrink-0 items-center justify-center rounded-apple-lg border px-3 text-xs font-apple-medium transition disabled:cursor-not-allowed"; +const SKU_PRIMARY_ACTION_BUTTON_CLASS = + "!h-8 !min-h-8 !rounded-apple-lg !border-zinc-950 !bg-zinc-950 !bg-none !px-3 !py-0 !text-xs !text-white !shadow-none hover:!border-zinc-800 hover:!bg-zinc-800 focus:!border-zinc-600 disabled:!border-zinc-200 disabled:!bg-zinc-200 disabled:!text-zinc-400"; +const DETAIL_PRIMARY_ADD_BUTTON_CLASS = + "!min-h-7 !rounded-apple-lg !border-zinc-950 !bg-zinc-950 !bg-none !px-2 !py-0.5 !text-[11px] !leading-none !text-white !shadow-none hover:!border-zinc-800 hover:!bg-zinc-800 focus:!border-zinc-600 focus:!px-[calc(0.5rem-1px)] focus:!py-[calc(0.125rem-1px)] disabled:!border-zinc-200 disabled:!bg-zinc-200 disabled:!text-zinc-400"; +const DETAIL_PRIMARY_BUTTON_CLASS = + "!border-zinc-950 !bg-zinc-950 !bg-none !text-white !shadow-none hover:!border-zinc-800 hover:!bg-zinc-800 focus:!border-zinc-600 disabled:!border-zinc-200 disabled:!bg-zinc-200 disabled:!text-zinc-400"; function getSkuToolbarButtonClass(options?: { active?: boolean; @@ -1190,13 +1213,13 @@ function getSkuToolbarButtonClass(options?: { } const DOCUMENT_WORKSPACE_ACTION_BUTTON_CLASS = - "!h-9 !min-h-9 !rounded-apple-lg !border !border-apple-separator !bg-apple-bg-secondary !px-3 !py-0 !text-xs !font-apple-medium !text-apple-label-primary !shadow-none hover:!bg-apple-bg-tertiary disabled:!bg-apple-bg-secondary disabled:!text-apple-label-tertiary disabled:!opacity-60 [&>span]:gap-1"; + "!h-9 !min-h-9 !rounded-apple-lg !border !border-zinc-950 !bg-zinc-950 !bg-none !px-3 !py-0 !text-xs !font-apple-medium !text-white !shadow-none hover:!border-zinc-800 hover:!bg-zinc-800 disabled:!border-zinc-950 disabled:!bg-zinc-950 disabled:!text-white disabled:!opacity-100 [&>span]:gap-1"; const DOCUMENT_WORKSPACE_ACTION_GROUP_CLASS = - "flex flex-wrap items-center justify-end gap-2 [&_button]:!h-9 [&_button]:!min-h-9 [&_button]:!rounded-apple-lg [&_button]:!border [&_button]:!border-apple-separator [&_button]:!bg-apple-bg-secondary [&_button]:!bg-none [&_button]:!px-3 [&_button]:!py-0 [&_button]:!text-xs [&_button]:!font-apple-medium [&_button]:!text-apple-label-primary [&_button]:!shadow-none hover:[&_button]:!bg-apple-bg-tertiary disabled:[&_button]:!bg-apple-bg-secondary disabled:[&_button]:!text-apple-label-tertiary disabled:[&_button]:!opacity-60"; + "flex flex-wrap items-center justify-end gap-2 [&_button]:!h-9 [&_button]:!min-h-9 [&_button]:!rounded-apple-lg [&_button]:!border [&_button]:!border-zinc-950 [&_button]:!bg-zinc-950 [&_button]:!bg-none [&_button]:!px-3 [&_button]:!py-0 [&_button]:!text-xs [&_button]:!font-apple-medium [&_button]:!text-white [&_button]:!shadow-none hover:[&_button]:!border-zinc-800 hover:[&_button]:!bg-zinc-800 disabled:[&_button]:!border-zinc-950 disabled:[&_button]:!bg-zinc-950 disabled:[&_button]:!text-white disabled:[&_button]:!opacity-100"; const DOCUMENT_WORKSPACE_CONFIRMED_CLASS = - "inline-flex h-9 min-h-9 min-w-[64px] items-center justify-center rounded-apple-lg border border-[#cdebd9] bg-[#e8f6ee] px-3 text-xs font-apple-medium text-[#156b3f]"; + "inline-flex h-9 min-h-9 min-w-[64px] items-center justify-center rounded-apple-lg border border-zinc-950 bg-zinc-950 px-3 text-xs font-apple-medium text-white"; function DocumentWorkspaceActionButton({ variant = "gray", @@ -1573,6 +1596,7 @@ const EMPTY_DOCUMENT_WORKSPACE_NOTES: Record< 专利申请: "", 立项评审: "", 设计卖点: "", + 企划布局: "", 安装方式: "", 包装细节: "", 产品模型: "", @@ -1580,6 +1604,7 @@ const EMPTY_DOCUMENT_WORKSPACE_NOTES: Record< 产品定厂: "", 样包测量: "", 产品核价: "", + 产品限价: "", 工厂质检: "", }; @@ -1648,6 +1673,13 @@ const DOCUMENT_WORKSPACE_COPY: Record< emptyTitle: "当前还没有设计卖点资料", emptyDescription: "可先上传卖点图或文案文件,再在这里集中预览。", }, + 企划布局: { + description: "按 SKU 带出企划布局需要查看和维护的基础信息。", + noteLabel: "企划布局备注", + notePlaceholder: "可填写企划布局补充说明。", + emptyTitle: "当前还没有企划布局资料", + emptyDescription: "请先维护 SKU 信息,再在这里查看企划布局。", + }, 安装方式: { description: "按款式集中维护安装图纸、安装视频和版本迭代资料。", noteLabel: "安装备注", @@ -1692,6 +1724,13 @@ const DOCUMENT_WORKSPACE_COPY: Record< emptyTitle: "当前还没有产品核价资料", emptyDescription: "该入口已预留,后续可配置产品核价资料内容。", }, + 产品限价: { + description: "按 SKU 带出产品基础信息,并维护限价字段。", + noteLabel: "限价备注", + notePlaceholder: "可填写限价规则、沟通结论或补充说明。", + emptyTitle: "当前还没有产品限价资料", + emptyDescription: "请先维护 SKU 信息,再在这里填写产品限价。", + }, 工厂质检: { description: "按款式维护工厂质检资料,集中归档摔包图片和摔包视频。", noteLabel: "工厂质检备注", @@ -2276,6 +2315,7 @@ function createEmptySkuItem(): NonIntegratedSkuItem { drawingId: "", installMethod: "", executeStandard: "", + nationalStandardCompliant: "", manufacturer: "", manufacturerCode: "", tagMaterial: "", @@ -2307,6 +2347,15 @@ function normalizeSetCountValue(value: string) { return Math.min(numericValue, 26); } +function normalizeNationalStandardCompliance(value: string | undefined) { + const normalizedValue = value?.trim() ?? ""; + return NATIONAL_STANDARD_COMPLIANCE_OPTIONS.includes( + normalizedValue as (typeof NATIONAL_STANDARD_COMPLIANCE_OPTIONS)[number], + ) + ? normalizedValue + : ""; +} + function getStyleKeyFromModel(model: string) { const match = model .trim() @@ -4003,6 +4052,9 @@ function deriveSkuItem( : autoDrawingId, installMethod: item.installMethod.trim(), executeStandard: item.executeStandard.trim(), + nationalStandardCompliant: normalizeNationalStandardCompliance( + item.nationalStandardCompliant, + ), manufacturer: item.manufacturer.trim(), manufacturerCode: item.manufacturerCode.trim().toUpperCase(), tagMaterial: formValues.tagMaterial.trim() || item.tagMaterial.trim(), @@ -4059,6 +4111,9 @@ function buildSkuItemFromImportedRow( drawingId: row.drawingId.trim().toUpperCase(), installMethod: row.installMethod.trim(), executeStandard: normalizedExecuteStandard, + nationalStandardCompliant: normalizeNationalStandardCompliance( + row.nationalStandardCompliant, + ), manufacturer, manufacturerCode, tagMaterial: formValues.tagMaterial.trim() || baseItem.tagMaterial, @@ -4225,6 +4280,33 @@ type ProductPricingDisplayRow = NonIntegratedPricingRow & { supplierName: string; }; +type PlanningLayoutSkuRow = { + skuId: string; + image: string; + model: string; + skuCode: string; + barcode: string; + setCount: string; + specName: string; + size: string; + color: string; + material: string; + installMethod: string; + executeStandard: string; + nationalStandardCompliant: string; + supplierName: string; + batchNo: number; +}; + +type ProductLimitDisplayRow = NonIntegratedProductLimitRow & { + image: string; + spu: string; + skuCode: string; + barcode: string; + setCount: string; + specName: string; +}; + function createProductPricingRowFromSku( sku: NonIntegratedSkuItem, existingRow?: NonIntegratedPricingRow, @@ -4272,6 +4354,100 @@ function isProductPricingRowComplete(row: NonIntegratedPricingRow) { return [row.costPrice, row.productTag].every((value) => value.trim()); } +function createProductLimitRowFromSku( + sku: NonIntegratedSkuItem, + spu: string, + productImage: string, + existingRow?: NonIntegratedProductLimitRow, +): ProductLimitDisplayRow { + return { + skuId: sku.id, + image: productImage.trim() || sku.image.trim(), + spu: spu.trim(), + skuCode: sku.skuCode.trim(), + barcode: sku.barcode.trim(), + setCount: sku.setCount.trim() || "1", + specName: sku.specName.trim(), + expectedDailyLimitPrice: + existingRow?.expectedDailyLimitPrice?.trim() ?? "", + expectedLimitGrossMarginRate: + existingRow?.expectedLimitGrossMarginRate?.trim() ?? "", + nonSpuOwnerLimitPrice: + existingRow?.nonSpuOwnerLimitPrice?.trim() ?? "", + }; +} + +function buildProductLimitRows( + skuItems: NonIntegratedSkuItem[], + savedRows: NonIntegratedProductLimitRow[], + spu: string, + productImage: string, +): ProductLimitDisplayRow[] { + const rowBySkuId = new Map(savedRows.map((row) => [row.skuId, row])); + + return skuItems.map((sku) => + createProductLimitRowFromSku( + sku, + spu, + productImage, + rowBySkuId.get(sku.id), + ), + ); +} + +function normalizeProductLimitRowsForPayload( + rows: NonIntegratedProductLimitRow[], +): NonIntegratedProductLimitRow[] { + return rows + .map((row) => ({ + skuId: row.skuId, + expectedDailyLimitPrice: row.expectedDailyLimitPrice.trim(), + expectedLimitGrossMarginRate: row.expectedLimitGrossMarginRate.trim(), + nonSpuOwnerLimitPrice: row.nonSpuOwnerLimitPrice.trim(), + })) + .filter( + (row) => + row.skuId && + [ + row.expectedDailyLimitPrice, + row.expectedLimitGrossMarginRate, + row.nonSpuOwnerLimitPrice, + ].some(Boolean), + ); +} + +function isProductLimitRowComplete(row: NonIntegratedProductLimitRow) { + return [ + row.expectedDailyLimitPrice, + row.expectedLimitGrossMarginRate, + row.nonSpuOwnerLimitPrice, + ].every((value) => value.trim()); +} + +function buildPlanningLayoutSkuRows( + skuItems: NonIntegratedSkuItem[], +): PlanningLayoutSkuRow[] { + return skuItems.map((item) => ({ + skuId: item.id, + image: item.image.trim(), + model: item.model.trim(), + skuCode: item.skuCode.trim(), + barcode: item.barcode.trim(), + setCount: item.setCount.trim() || "1", + specName: item.specName.trim(), + size: item.size.trim(), + color: item.color.trim(), + material: item.material.trim(), + installMethod: item.installMethod.trim(), + executeStandard: item.executeStandard.trim(), + nationalStandardCompliant: normalizeNationalStandardCompliance( + item.nationalStandardCompliant, + ), + supplierName: item.manufacturer.trim(), + batchNo: item.batchNo || 1, + })); +} + type ProductSampleMeasurementDisplayRow = NonIntegratedSampleMeasurementRow & { model: string; skuCode: string; @@ -6575,6 +6751,46 @@ function SkuExecutionStandardField({ ); } +function SkuNationalStandardComplianceField({ + value, + readOnly = false, + columnWidth = SKU_COLUMN_DEFAULT_WIDTHS.nationalStandardCompliant, + onChange, + onColumnResize, +}: { + value: string; + readOnly?: boolean; + columnWidth?: number; + onChange: (value: string) => void; + onColumnResize?: (width: number) => void; +}) { + return ( + + + + ); +} + function BomPartImageField({ rowId, imageUrl, @@ -7140,6 +7356,7 @@ function buildProductPayload( qualityInspectionSheet: NonIntegratedQualityInspectionSheet, factoryRows: NonIntegratedFactoryRow[], pricingRows: NonIntegratedPricingRow[], + productLimitRows: NonIntegratedProductLimitRow[], sampleMeasurementRows: NonIntegratedSampleMeasurementRow[], uploadFiles: NonIntegratedUploadFile[], documentWorkspaceNotes: Record, @@ -7456,6 +7673,7 @@ function buildProductPayload( skuBatchChangeTypes, factoryRows: normalizeFactoryRowsForPayload(factoryRows), pricingRows: normalizePricingRowsForPayload(pricingRows), + productLimitRows: normalizeProductLimitRowsForPayload(productLimitRows), sampleMeasurementRows: normalizeSampleMeasurementRowsForPayload(sampleMeasurementRows), uploadFiles, @@ -7659,6 +7877,9 @@ export default function NonIntegratedDetailClient({ const [pricingRows, setPricingRows] = useState( existingProduct?.pricingRows ?? [], ); + const [productLimitRows, setProductLimitRows] = useState< + NonIntegratedProductLimitRow[] + >(existingProduct?.productLimitRows ?? []); const [sampleMeasurementRows, setSampleMeasurementRows] = useState< NonIntegratedSampleMeasurementRow[] >(existingProduct?.sampleMeasurementRows ?? []); @@ -8313,7 +8534,10 @@ export default function NonIntegratedDetailClient({ ); const isCurrentUserPlanning = currentUserBusinessRoles?.includes("PLANNING") || - Boolean(currentUserDepartmentName?.includes("企划")); + Boolean( + currentUserDepartmentName?.includes("企划") || + currentUserDepartmentName?.includes("品牌中心"), + ); const isCurrentUserPurchasing = currentUserBusinessRoles?.includes("PURCHASING") || Boolean( @@ -8351,7 +8575,9 @@ export default function NonIntegratedDetailClient({ canEditCurrentProduct || Boolean( isCurrentUserPlanning && - activeDocumentWorkspaceCategory === OPENING_REFERENCE_WORKSPACE_CATEGORY, + PLANNING_EDITABLE_WORKSPACE_CATEGORIES.has( + activeDocumentWorkspaceCategory, + ), ) || Boolean( isCurrentUserPurchasing && @@ -8422,6 +8648,20 @@ export default function NonIntegratedDetailClient({ () => buildProductPricingRows(derivedSkuItems, pricingRows), [derivedSkuItems, pricingRows], ); + const planningLayoutSkuRows = useMemo( + () => buildPlanningLayoutSkuRows(derivedSkuItems), + [derivedSkuItems], + ); + const productLimitDisplayRows = useMemo( + () => + buildProductLimitRows( + derivedSkuItems, + productLimitRows, + formValues.spu, + sharedProductImage, + ), + [derivedSkuItems, formValues.spu, productLimitRows, sharedProductImage], + ); const productSampleMeasurementRows = useMemo( () => buildSampleMeasurementRows( @@ -8448,6 +8688,19 @@ export default function NonIntegratedDetailClient({ (skuBatchNoById.get(row.skuId) ?? 1) === activeDownstreamSkuBatch, ); }, [activeDownstreamSkuBatch, productPricingRows, skuBatchNoById]); + const displayedPlanningLayoutSkuRows = useMemo(() => { + if (activeDownstreamSkuBatch === "all") return planningLayoutSkuRows; + return planningLayoutSkuRows.filter( + (row) => row.batchNo === activeDownstreamSkuBatch, + ); + }, [activeDownstreamSkuBatch, planningLayoutSkuRows]); + const displayedProductLimitRows = useMemo(() => { + if (activeDownstreamSkuBatch === "all") return productLimitDisplayRows; + return productLimitDisplayRows.filter( + (row) => + (skuBatchNoById.get(row.skuId) ?? 1) === activeDownstreamSkuBatch, + ); + }, [activeDownstreamSkuBatch, productLimitDisplayRows, skuBatchNoById]); const displayedProductSampleMeasurementRows = useMemo(() => { if (activeDownstreamSkuBatch === "all") { return productSampleMeasurementRows; @@ -8846,6 +9099,18 @@ export default function NonIntegratedDetailClient({ ).length, [productPricingRows], ); + const populatedProductLimitRowCount = useMemo( + () => + productLimitDisplayRows.filter((row) => + [ + row.expectedDailyLimitPrice, + row.expectedLimitGrossMarginRate, + row.nonSpuOwnerLimitPrice, + ].some((value) => value.trim()), + ).length, + [productLimitDisplayRows], + ); + const planningLayoutHasContent = planningLayoutSkuRows.length > 0; const populatedSampleMeasurementRowCount = useMemo( () => productSampleMeasurementRows.filter((row) => @@ -8876,6 +9141,9 @@ export default function NonIntegratedDetailClient({ const displayedProductPricingRowsComplete = displayedProductPricingRows.length > 0 && displayedProductPricingRows.every(isProductPricingRowComplete); + const displayedProductLimitRowsComplete = + displayedProductLimitRows.length > 0 && + displayedProductLimitRows.every(isProductLimitRowComplete); const documentWorkspaceCountByCategory = useMemo(() => { const packagingHasStructuredContent = Object.values(styleDetails).some( (detail) => hasPackagingStyleStructuredContent(detail), @@ -8912,12 +9180,16 @@ export default function NonIntegratedDetailClient({ [SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY]: populatedSampleMeasurementRowCount, [PRODUCT_PRICING_WORKSPACE_CATEGORY]: populatedProductPricingRowCount, + [PRODUCT_LIMIT_WORKSPACE_CATEGORY]: populatedProductLimitRowCount, + [PLANNING_LAYOUT_WORKSPACE_CATEGORY]: planningLayoutHasContent ? 1 : 0, }; }, [ confirmedProductFactoryRowCount, openingReference, patentApplicationHasContent, + planningLayoutHasContent, populatedReviewRoundCount, + populatedProductLimitRowCount, populatedProductPricingRowCount, populatedSampleMeasurementRowCount, qualityInspectionHasContent, @@ -9032,6 +9304,12 @@ export default function NonIntegratedDetailClient({ ); signatures[PRODUCT_PRICING_WORKSPACE_CATEGORY] = JSON.stringify(pricingRows); + signatures[PRODUCT_LIMIT_WORKSPACE_CATEGORY] = JSON.stringify({ + rows: productLimitDisplayRows, + }); + signatures[PLANNING_LAYOUT_WORKSPACE_CATEGORY] = JSON.stringify({ + rows: planningLayoutSkuRows, + }); signatures[DETECTION_WORKSPACE_CATEGORY] = JSON.stringify({ files: filesForCategory(DETECTION_WORKSPACE_CATEGORY).filter( (file) => resolveDetectionWorkspaceAssetType(file) === "quality-standard", @@ -9052,6 +9330,8 @@ export default function NonIntegratedDetailClient({ formValues, openingReference, patentApplication, + planningLayoutSkuRows, + productLimitDisplayRows, projectReview, projectStatus, qualityInspectionSheet, @@ -9089,6 +9369,10 @@ export default function NonIntegratedDetailClient({ PRODUCT_PRICING_WORKSPACE_CATEGORY, displayedProductPricingRowsComplete, ); + const displayedProductLimitIsConfirmed = isWorkflowNodeConfirmed( + PRODUCT_LIMIT_WORKSPACE_CATEGORY, + displayedProductLimitRowsComplete, + ); const basicInfoIsApproved = isWorkflowNodeConfirmed( NON_INTEGRATED_BASIC_INFO_WORKSPACE_CATEGORY, basicInfoHasContent, @@ -9230,6 +9514,10 @@ export default function NonIntegratedDetailClient({ activeDocumentWorkspaceCategory === SAMPLE_MEASUREMENT_WORKSPACE_CATEGORY; const isProductPricingWorkspace = activeDocumentWorkspaceCategory === PRODUCT_PRICING_WORKSPACE_CATEGORY; + const isProductLimitWorkspace = + activeDocumentWorkspaceCategory === PRODUCT_LIMIT_WORKSPACE_CATEGORY; + const isPlanningLayoutWorkspace = + activeDocumentWorkspaceCategory === PLANNING_LAYOUT_WORKSPACE_CATEGORY; const isFactoryQualityWorkspace = activeDocumentWorkspaceCategory === FACTORY_QUALITY_WORKSPACE_CATEGORY; const isReviewWorkspace = @@ -10237,6 +10525,7 @@ export default function NonIntegratedDetailClient({ qualityInspectionSheet, productFactoryRows, productPricingRows, + productLimitRows, productSampleMeasurementRows, uploadFiles, documentWorkspaceNotes, @@ -10300,6 +10589,7 @@ export default function NonIntegratedDetailClient({ reviewRounds, qualityInspectionSheet, productFactoryRows, + productLimitRows, productPricingRows, productSampleMeasurementRows, projectReview, @@ -11116,6 +11406,17 @@ export default function NonIntegratedDetailClient({ } } + if (key === "nationalStandardCompliant") { + const targetModel = targetItem.model.trim(); + if (targetModel) { + return current.map((item) => + item.model.trim() === targetModel + ? { ...item, nationalStandardCompliant: String(value) } + : item, + ); + } + } + return current.map((item) => { if (item.id !== id) return item; @@ -11304,6 +11605,34 @@ export default function NonIntegratedDetailClient({ setSaveMessageType("success"); } + function updateProductLimitRow( + skuId: string, + key: Exclude, + value: string, + ) { + if (isReadOnly) return; + + setProductLimitRows((current) => { + const rowBySkuId = new Map(current.map((row) => [row.skuId, row])); + const nextRow = { + skuId, + expectedDailyLimitPrice: "", + expectedLimitGrossMarginRate: "", + nonSpuOwnerLimitPrice: "", + ...rowBySkuId.get(skuId), + [key]: value, + }; + + rowBySkuId.set(skuId, nextRow); + + return derivedSkuItems + .map((sku) => rowBySkuId.get(sku.id)) + .filter((row): row is NonIntegratedProductLimitRow => Boolean(row)); + }); + setSaveMessage(""); + setSaveMessageType("success"); + } + function updateSampleMeasurementRow( skuId: string, key: Exclude, @@ -12605,6 +12934,20 @@ export default function NonIntegratedDetailClient({ ); } + async function handleConfirmProductLimitRows() { + if (isReadOnly || displayedProductLimitRows.length === 0) return; + if (!displayedProductLimitRowsComplete) { + setSaveMessage("请先填完整产品限价数据"); + setSaveMessageType("error"); + return; + } + if (displayedProductLimitIsConfirmed) return; + + await handleConfirmDocumentWorkspaceCategory( + PRODUCT_LIMIT_WORKSPACE_CATEGORY, + ); + } + function handleProjectReviewFieldChange( field: ProjectReviewFieldKey, value: string, @@ -14083,6 +14426,8 @@ export default function NonIntegratedDetailClient({ drawingId: item.drawingId.trim(), installMethod: skuItems[index]?.installMethod?.trim() ?? "", executeStandard: skuItems[index]?.executeStandard?.trim() ?? "", + nationalStandardCompliant: + skuItems[index]?.nationalStandardCompliant?.trim() ?? "", manufacturer: skuItems[index]?.manufacturer?.trim() ?? "", manufacturerCode: skuItems[index]?.manufacturerCode?.trim() ?? "", batchNo: `批次${item.batchNo || 1}`, @@ -14686,6 +15031,7 @@ export default function NonIntegratedDetailClient({ qualityInspectionSheet, productFactoryRows, productPricingRows, + productLimitRows, productSampleMeasurementRows, uploadFiles, documentWorkspaceNotes, @@ -14773,6 +15119,7 @@ export default function NonIntegratedDetailClient({ +
@@ -14954,6 +15306,7 @@ export default function NonIntegratedDetailClient({ + ); + }; + + return ( +
+
+
+ {renderInheritedSkuBatchTabs()} +
+
+ +
+ {planningLayoutSkuRows.length === 0 ? ( +
+ 当前还没有 SKU 信息,先维护 SKU 后再查看企划布局。 +
+ ) : displayedPlanningLayoutSkuRows.length === 0 ? ( +
+ 当前批次还没有 SKU 信息。 +
+ ) : ( +
+ + + + {[ + "序号", + "图片", + "型号", + "规格码", + "条码", + "套件量", + "规格名称", + "尺寸", + "颜色", + "材质", + "安装方式", + "执行标准", + "符合国标", + "供应商名称", + "批次", + ].map((label) => ( + + ))} + + + + {displayedPlanningLayoutSkuRows.map((row, index) => ( + + + + + + + + + + + + + + + + + + ))} + +
+ {label} +
+ {index + 1} + {renderImageCell(row, index)} + {renderReadOnlyCell(row.model)} + + {renderReadOnlyCell(row.skuCode)} + + {renderReadOnlyCell(row.barcode, "160px")} + + {renderReadOnlyCell(row.setCount, "80px")} + + {renderReadOnlyCell(row.specName, "160px")} + + {renderReadOnlyCell(row.size)} + + {renderReadOnlyCell(row.color)} + + {renderReadOnlyCell(row.material)} + + {renderReadOnlyCell(row.installMethod)} + + {renderReadOnlyCell(row.executeStandard)} + + {renderReadOnlyCell(row.nationalStandardCompliant)} + + {renderReadOnlyCell(row.supplierName)} + + 批次{row.batchNo} +
+
+ )} +
+
+ ); + } + + function renderProductLimitWorkspace() { + const renderReadOnlyCell = (value: string, minWidth = "112px") => ( +
+ {value || "-"} +
+ ); + const renderImageCell = (row: ProductLimitDisplayRow, index: number) => { + if (!row.image) { + return ( +
+ 无图 +
+ ); + } + + return ( + + ); + }; + const renderLimitInput = ( + row: ProductLimitDisplayRow, + key: Exclude, + placeholder: string, + ) => ( + updateProductLimitRow(row.skuId, key, value)} + /> + ); + + return ( +
+
+
+ {renderInheritedSkuBatchTabs()} +
+
+ +
+ {productLimitDisplayRows.length === 0 ? ( +
+ 当前还没有 SKU 信息,先维护 SKU 后再填写产品限价。 +
+ ) : displayedProductLimitRows.length === 0 ? ( +
+ 当前批次还没有 SKU 信息。 +
+ ) : ( +
+ + + + {[ + "产品图片", + "SPU", + "规格码", + "条码", + "套件量", + "规格名称", + "期望日常限价", + "期望限价毛利率(%)", + "非SPU负责人限价", + ].map((label) => ( + + ))} + + + + {displayedProductLimitRows.map((row, index) => ( + + + + + + + + + + + + ))} + +
+ {label} +
{renderImageCell(row, index)} + {renderReadOnlyCell(row.spu)} + + {renderReadOnlyCell(row.skuCode)} + + {renderReadOnlyCell(row.barcode, "160px")} + + {renderReadOnlyCell(row.setCount, "80px")} + + {renderReadOnlyCell(row.specName, "160px")} + + {renderLimitInput( + row, + "expectedDailyLimitPrice", + "请输入限价", + )} + + {renderLimitInput( + row, + "expectedLimitGrossMarginRate", + "请输入毛利率", + )} + + {renderLimitInput( + row, + "nonSpuOwnerLimitPrice", + "请输入限价", + )} +
+
+ )} +
+
+ ); + } + function renderProductPricingWorkspace() { const renderReadOnlyCell = (value: string) => (
@@ -17077,7 +17733,7 @@ function renderFactoryQualityWorkspace() {
+ ) : isProductLimitWorkspace ? ( +
+ +
) : isProjectReviewWorkspace ? (
{isReadOnly ? null : ( @@ -22217,12 +22922,16 @@ function renderFactoryQualityWorkspace() { renderProjectReviewWorkspace() ) : isPatentApplicationWorkspace ? ( renderPatentApplicationWorkspace() + ) : isPlanningLayoutWorkspace ? ( + renderPlanningLayoutWorkspace() ) : isSampleMeasurementWorkspace ? ( renderSampleMeasurementWorkspace() ) : isProductFactoryWorkspace ? ( renderProductFactoryWorkspace() ) : isProductPricingWorkspace ? ( renderProductPricingWorkspace() + ) : isProductLimitWorkspace ? ( + renderProductLimitWorkspace() ) : isFactoryQualityWorkspace ? ( renderFactoryQualityWorkspace() ) : isProductPhotoWorkspace ? ( @@ -22563,6 +23272,10 @@ function renderFactoryQualityWorkspace() { ); const shouldInsertBasicInfoTrigger = index === BASIC_INFO_INSERT_INDEX; + const basicInfoShortcutIsDark = + basicInfoDisplayCount === 0 || basicInfoNeedsConfirmation; + const workspaceShortcutIsDark = + !hasFiles || needsConfirmation; return (
@@ -22581,10 +23294,8 @@ function renderFactoryQualityWorkspace() { } onClick={() => setDocumentWorkspaceView("detail")} className={`rounded-apple-lg border px-3 py-2 text-left transition ${ - basicInfoNeedsConfirmation - ? documentWorkspaceView === "detail" - ? "border-[#d78a1a] bg-[#fff3df] text-[#8d5b00]" - : "border-[#ead2a6] bg-[#fff7ea] text-[#8d6510] hover:bg-[#fef0d5]" + basicInfoShortcutIsDark + ? "border-zinc-950 bg-zinc-950 text-white hover:border-zinc-800 hover:bg-zinc-800" : documentWorkspaceView === "detail" ? "border-apple-label-primary bg-apple-label-primary text-white" : "border-apple-separator bg-apple-bg-primary text-apple-label-primary hover:bg-apple-bg-secondary/40" @@ -22598,12 +23309,12 @@ function renderFactoryQualityWorkspace() { 0 - ? "bg-apple-bg-primary text-apple-label-secondary" - : "bg-[#f8fafc] text-[#6f7c89]" + : basicInfoShortcutIsDark + ? "bg-white/20 text-white" + : "bg-apple-bg-primary text-apple-label-secondary" }`} > {basicInfoDisplayCount} @@ -22621,17 +23332,11 @@ function renderFactoryQualityWorkspace() { } onClick={() => handleOpenDocumentWorkspace(category)} className={`rounded-apple-lg border px-3 py-2 text-left transition ${ - needsConfirmation - ? isActive - ? "border-[#d78a1a] bg-[#fff3df] text-[#8d5b00]" - : "border-[#ead2a6] bg-[#fff7ea] text-[#8d6510] hover:bg-[#fef0d5]" + workspaceShortcutIsDark + ? "border-zinc-950 bg-zinc-950 text-white hover:border-zinc-800 hover:bg-zinc-800" : isActive - ? hasFiles - ? "border-apple-label-primary bg-apple-label-primary text-white" - : "border-[#b8c2cd] bg-[#d7dee6] text-[#44515f]" - : hasFiles - ? "border-apple-separator bg-apple-bg-secondary/20 text-apple-label-primary hover:bg-apple-bg-secondary/40" - : "border-[#ccd4dd] bg-[#e6ebf0] text-[#5a6775] hover:bg-[#dde4eb]" + ? "border-apple-label-primary bg-apple-label-primary text-white" + : "border-apple-separator bg-apple-bg-secondary/20 text-apple-label-primary hover:bg-apple-bg-secondary/40" }`} >
@@ -22642,14 +23347,12 @@ function renderFactoryQualityWorkspace() { {fileCount} diff --git a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts index 93f2e506..526446ac 100644 --- a/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts +++ b/furniture-3d-system/src/app/intake/non-integrated/nonIntegratedStorage.ts @@ -37,6 +37,7 @@ export const NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES = [ "立项评审", "产品模型", "评审资料", + "企划布局", "专利申请", "产品实拍图", "安装方式", @@ -44,11 +45,14 @@ export const NON_INTEGRATED_DOCUMENT_WORKSPACE_CATEGORIES = [ "产品定厂", "样包测量", "产品核价", + "产品限价", "工厂质检", "检测报告", ] as const; export const NON_INTEGRATED_BASIC_INFO_WORKSPACE_CATEGORY = "基础信息" as const; +export const NON_INTEGRATED_PLANNING_LAYOUT_WORKSPACE_CATEGORY = + "企划布局" as const; export const NON_INTEGRATED_WORKFLOW_NODE_CATEGORIES = [ "开品参考", @@ -57,6 +61,7 @@ export const NON_INTEGRATED_WORKFLOW_NODE_CATEGORIES = [ "产品模型", "评审资料", NON_INTEGRATED_BASIC_INFO_WORKSPACE_CATEGORY, + NON_INTEGRATED_PLANNING_LAYOUT_WORKSPACE_CATEGORY, "专利申请", "产品实拍图", "安装方式", @@ -64,6 +69,7 @@ export const NON_INTEGRATED_WORKFLOW_NODE_CATEGORIES = [ "产品定厂", "样包测量", "产品核价", + "产品限价", "工厂质检", "检测报告", ] as const; @@ -250,6 +256,7 @@ const NON_INTEGRATED_UPLOAD_CATEGORY_MAP: Record = { 立项评审: "立项评审", 评审资料: "评审资料", 样品评审: "评审资料", + 企划布局: "企划布局", 专利申请: "专利申请", 资料信息: "评审资料", 产品模型: "产品模型", @@ -261,6 +268,7 @@ const NON_INTEGRATED_UPLOAD_CATEGORY_MAP: Record = { 产品定厂: "产品定厂", 样包测量: "样包测量", 产品核价: "产品核价", + 产品限价: "产品限价", 工厂质检: "工厂质检", 仓库质检: "工厂质检", 仓库抽检: "检测报告", @@ -291,6 +299,7 @@ export type NonIntegratedSkuItem = { drawingId: string; installMethod: string; executeStandard: string; + nationalStandardCompliant: string; manufacturer: string; manufacturerCode: string; tagMaterial: string; @@ -331,6 +340,13 @@ export type NonIntegratedPricingRow = { productTag: string; }; +export type NonIntegratedProductLimitRow = { + skuId: string; + expectedDailyLimitPrice: string; + expectedLimitGrossMarginRate: string; + nonSpuOwnerLimitPrice: string; +}; + export type NonIntegratedSampleMeasurementRow = { skuId: string; lengthCm: string; @@ -528,6 +544,7 @@ export type NonIntegratedProductRecord = { skuBatchChangeTypes?: Record; factoryRows: NonIntegratedFactoryRow[]; pricingRows: NonIntegratedPricingRow[]; + productLimitRows: NonIntegratedProductLimitRow[]; sampleMeasurementRows: NonIntegratedSampleMeasurementRow[]; uploadFiles: NonIntegratedUploadFile[]; documentWorkspaceNotes?: Record; @@ -1039,6 +1056,7 @@ function normalizeSkuItem( drawingId: normalizeString(item.drawingId), installMethod: normalizeString(item.installMethod), executeStandard: normalizeString(item.executeStandard), + nationalStandardCompliant: normalizeString(item.nationalStandardCompliant), manufacturer: normalizeString(item.manufacturer), manufacturerCode: normalizeString(item.manufacturerCode), tagMaterial: normalizeString(item.tagMaterial), @@ -1104,6 +1122,37 @@ function normalizePricingRow( }; } +function normalizeProductLimitRow( + item: Partial, +): NonIntegratedProductLimitRow | null { + if (typeof item.skuId !== "string") return null; + + return { + skuId: item.skuId, + expectedDailyLimitPrice: + typeof item.expectedDailyLimitPrice === "string" + ? item.expectedDailyLimitPrice + : typeof item.expectedDailyLimitPrice === "number" && + Number.isFinite(item.expectedDailyLimitPrice) + ? String(item.expectedDailyLimitPrice) + : "", + expectedLimitGrossMarginRate: + typeof item.expectedLimitGrossMarginRate === "string" + ? item.expectedLimitGrossMarginRate + : typeof item.expectedLimitGrossMarginRate === "number" && + Number.isFinite(item.expectedLimitGrossMarginRate) + ? String(item.expectedLimitGrossMarginRate) + : "", + nonSpuOwnerLimitPrice: + typeof item.nonSpuOwnerLimitPrice === "string" + ? item.nonSpuOwnerLimitPrice + : typeof item.nonSpuOwnerLimitPrice === "number" && + Number.isFinite(item.nonSpuOwnerLimitPrice) + ? String(item.nonSpuOwnerLimitPrice) + : "", + }; +} + function normalizeSampleMeasurementRow( item: Partial, ): NonIntegratedSampleMeasurementRow | null { @@ -1650,6 +1699,13 @@ function toProductRecord( .map((entry) => normalizePricingRow(entry)) .filter((entry): entry is NonIntegratedPricingRow => entry !== null) : [], + productLimitRows: Array.isArray(item.productLimitRows) + ? item.productLimitRows + .map((entry) => normalizeProductLimitRow(entry)) + .filter( + (entry): entry is NonIntegratedProductLimitRow => entry !== null, + ) + : [], sampleMeasurementRows: Array.isArray(item.sampleMeasurementRows) ? item.sampleMeasurementRows .map((entry) => normalizeSampleMeasurementRow(entry)) @@ -1976,6 +2032,7 @@ export function createCopiedNonIntegratedProduct( })), factoryRows: [], pricingRows: [], + productLimitRows: [], sampleMeasurementRows: [], uploadFiles: sourceProduct.uploadFiles.map((file) => ({ ...file })), documentWorkspaceNotes: { diff --git a/furniture-3d-system/src/lib/non-integrated-sku-export.ts b/furniture-3d-system/src/lib/non-integrated-sku-export.ts index 73217c27..3ce5bdf5 100644 --- a/furniture-3d-system/src/lib/non-integrated-sku-export.ts +++ b/furniture-3d-system/src/lib/non-integrated-sku-export.ts @@ -15,6 +15,7 @@ export type NonIntegratedSkuExportRow = { drawingId: string installMethod: string executeStandard: string + nationalStandardCompliant: string manufacturer: string manufacturerCode: string batchNo: string @@ -47,6 +48,7 @@ export const NON_INTEGRATED_SKU_TEMPLATE_COLUMNS: { { key: 'drawingId', label: '图纸ID', width: 22 }, { key: 'installMethod', label: '安装方式', width: 14 }, { key: 'executeStandard', label: '执行标准', width: 18 }, + { key: 'nationalStandardCompliant', label: '符合国标', width: 12 }, { key: 'manufacturer', label: '供应商名称', width: 18 }, { key: 'manufacturerCode', label: '供应商代码', width: 14 }, { key: 'batchNo', label: '创建批次', width: 12 },