From b9a2081a76e669688d5884f20482b37cc8acca22 Mon Sep 17 00:00:00 2001 From: dujinkim Date: Mon, 13 Oct 2025 08:56:27 +0000 Subject: (최겸, 임수민) 구매 입찰, 견적(그룹코드, tbe에러) 수정, data-room 수정 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/bidding/list/biddings-table-columns.tsx | 34 +++++++++++++++++++---------- 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'lib/bidding/list/biddings-table-columns.tsx') diff --git a/lib/bidding/list/biddings-table-columns.tsx b/lib/bidding/list/biddings-table-columns.tsx index 7f0b8e40..4900d18a 100644 --- a/lib/bidding/list/biddings-table-columns.tsx +++ b/lib/bidding/list/biddings-table-columns.tsx @@ -5,6 +5,7 @@ import { type ColumnDef } from "@tanstack/react-table" import { Checkbox } from "@/components/ui/checkbox" import { Badge } from "@/components/ui/badge" import { Button } from "@/components/ui/button" +import { getUserCodeByEmail } from "@/lib/bidding/service" import { Eye, Edit, MoreHorizontal, FileText, Users, Calendar, Building, Package, DollarSign, Clock, CheckCircle, XCircle, @@ -26,6 +27,12 @@ import { import { DataTableColumnHeaderSimple } from "@/components/data-table/data-table-column-simple-header" import { BiddingListItem } from "@/db/schema" import { DataTableRowAction } from "@/types/table" + +// BiddingListItem에 manager 정보 추가 +type BiddingListItemWithManagerCode = BiddingListItem & { + managerName?: string | null + managerCode?: string | null +} import { biddingStatusLabels, contractTypeLabels, @@ -35,7 +42,7 @@ import { import { formatDate } from "@/lib/utils" interface GetColumnsProps { - setRowAction: React.Dispatch | null>> + setRowAction: React.Dispatch | null>> } // 상태별 배지 색상 @@ -78,7 +85,8 @@ const formatCurrency = (amount: string | number | null, currency = 'KRW') => { -export function getBiddingsColumns({ setRowAction }: GetColumnsProps): ColumnDef[] { +export function getBiddingsColumns({ setRowAction }: GetColumnsProps): ColumnDef[] { + return [ // ═══════════════════════════════════════════════════════════════ // 선택 및 기본 정보 @@ -191,11 +199,11 @@ export function getBiddingsColumns({ setRowAction }: GetColumnsProps): ColumnDef { accessorKey: "managerName", header: ({ column }) => , - cell: ({ row }) => ( -
- {row.original.managerName || '-'} -
- ), + cell: ({ row }) => { + const name = row.original.managerName || "-"; + const managerCode = row.original.managerCode || ""; + return name === "-" ? "-" : `${name}(${managerCode})`; + }, size: 100, meta: { excelHeader: "입찰담당자" }, }, @@ -237,10 +245,12 @@ export function getBiddingsColumns({ setRowAction }: GetColumnsProps): ColumnDef
), @@ -394,7 +404,7 @@ export function getBiddingsColumns({ setRowAction }: GetColumnsProps): ColumnDef header: ({ column }) => , cell: ({ row }) => ( - {formatCurrency(row.original.budget, row.original.currency)} + {row.original.budget} ), size: 120, @@ -406,7 +416,7 @@ export function getBiddingsColumns({ setRowAction }: GetColumnsProps): ColumnDef header: ({ column }) => , cell: ({ row }) => ( - {formatCurrency(row.original.targetPrice, row.original.currency)} + {row.original.targetPrice} ), size: 120, @@ -418,7 +428,7 @@ export function getBiddingsColumns({ setRowAction }: GetColumnsProps): ColumnDef header: ({ column }) => , cell: ({ row }) => ( - {formatCurrency(row.original.finalBidPrice, row.original.currency)} + {row.original.finalBidPrice} ), size: 120, -- cgit v1.2.3