From 7433eea5b4bbc0899e255b88e1a7e91f26e9d95b Mon Sep 17 00:00:00 2001 From: joonhoekim <26rote@gmail.com> Date: Wed, 17 Sep 2025 18:04:10 +0900 Subject: (김준회) 자재그룹 선택기 오류수정, 공용사용을 위한 다이얼로그 컴포넌트 구현, data-table 오류 수정 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table/material-group-table-columns.tsx | 23 +++++++++++++++++++--- lib/material-groups/table/material-group-table.tsx | 16 ++++++++++++--- 2 files changed, 33 insertions(+), 6 deletions(-) (limited to 'lib/material-groups/table') diff --git a/lib/material-groups/table/material-group-table-columns.tsx b/lib/material-groups/table/material-group-table-columns.tsx index 08e730e3..f41ed887 100644 --- a/lib/material-groups/table/material-group-table-columns.tsx +++ b/lib/material-groups/table/material-group-table-columns.tsx @@ -8,7 +8,8 @@ import { DataTableColumnHeaderSimple } from "@/components/data-table/data-table- // MaterialGroup 타입 정의 (서비스에서 반환되는 타입과 일치) type MaterialGroup = { materialGroupCode: string | null; - materialGroupDesc: string | null; + materialGroupDescription: string | null; + materialGroupUom?: string | null; } /** @@ -36,12 +37,12 @@ export function getColumns(): ColumnDef[] { enableHiding: false, }, { - accessorKey: "materialGroupDesc", + accessorKey: "materialGroupDescription", header: ({ column }) => ( ), cell: ({ row }) => { - const value = row.getValue("materialGroupDesc") as string | null + const value = row.getValue("materialGroupDescription") as string | null return (
{value || "-"} @@ -51,6 +52,22 @@ export function getColumns(): ColumnDef[] { enableSorting: true, enableHiding: false, }, + { + accessorKey: "materialGroupUom", + header: ({ column }) => ( + + ), + cell: ({ row }) => { + const value = row.getValue("materialGroupUom") as string | null + return ( +
+ {value || "-"} +
+ ) + }, + enableSorting: true, + enableHiding: false, + }, ] // ---------------------------------------------------------------- diff --git a/lib/material-groups/table/material-group-table.tsx b/lib/material-groups/table/material-group-table.tsx index 766b5054..a5617e9b 100644 --- a/lib/material-groups/table/material-group-table.tsx +++ b/lib/material-groups/table/material-group-table.tsx @@ -20,7 +20,8 @@ import { ViewModeToggle } from "@/components/data-table/view-mode-toggle" // MaterialGroup 타입 정의 (서비스에서 반환되는 타입과 일치) type MaterialGroup = { materialGroupCode: string | null; - materialGroupDesc: string | null; + materialGroupDescription: string | null; + materialGroupUom?: string | null; } interface MaterialGroupTableProps { @@ -50,9 +51,13 @@ export function MaterialGroupTable({ promises }: MaterialGroupTableProps) { label: "자재그룹코드", }, { - id: "materialGroupDesc", + id: "materialGroupDescription", label: "자재그룹명", }, + { + id: "materialGroupUom", + label: "UOM", + }, ] const advancedFilterFields: DataTableAdvancedFilterField[] = [ @@ -62,10 +67,15 @@ export function MaterialGroupTable({ promises }: MaterialGroupTableProps) { type: "text", }, { - id: "materialGroupDesc", + id: "materialGroupDescription", label: "자재그룹명", type: "text", }, + { + id: "materialGroupUom", + label: "UOM", + type: "text", + }, ] // 확장된 useDataTable 훅 사용 (pageSize 기반 자동 전환) -- cgit v1.2.3