diff options
| author | joonhoekim <26rote@gmail.com> | 2025-12-01 19:54:27 +0900 |
|---|---|---|
| committer | joonhoekim <26rote@gmail.com> | 2025-12-01 19:54:27 +0900 |
| commit | 4b5880064e2362baf85c91f33b2b44baecea3a7f (patch) | |
| tree | 24b48163ecbf205023fcd565b0476a30e3079a9f /lib/bidding/list | |
| parent | 44b74ff4170090673b6eeacd8c528e0abf47b7aa (diff) | |
| parent | cd0ce0cbe8af8719a6f542098ec78f2a5c1222ce (diff) | |
Merge branch 'dujinkim' of https://github.com/DTS-Development/SHI_EVCP into dujinkim
Diffstat (limited to 'lib/bidding/list')
| -rw-r--r-- | lib/bidding/list/biddings-table-columns.tsx | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/lib/bidding/list/biddings-table-columns.tsx b/lib/bidding/list/biddings-table-columns.tsx index 9b8c19c5..62d4dbe7 100644 --- a/lib/bidding/list/biddings-table-columns.tsx +++ b/lib/bidding/list/biddings-table-columns.tsx @@ -122,14 +122,20 @@ export function getBiddingsColumns({ setRowAction }: GetColumnsProps): ColumnDef // ░░░ 프로젝트명 ░░░ { accessorKey: "projectName", - header: ({ column }) => <DataTableColumnHeaderSimple column={column} title="프로젝트 No." />, - cell: ({ row }) => ( - <div className="truncate max-w-[150px]" title={row.original.projectName || ''}> - {row.original.projectName || '-'} - </div> - ), + header: ({ column }) => <DataTableColumnHeaderSimple column={column} title="프로젝트" />, + cell: ({ row }) => { + const code = row.original.projectCode; + const name = row.original.projectName; + const displayText = code && name ? `${code} (${name})` : (code || name || '-'); + + return ( + <div className="truncate max-w-[150px]" title={displayText}> + {displayText} + </div> + ) + }, size: 150, - meta: { excelHeader: "프로젝트 No." }, + meta: { excelHeader: "프로젝트" }, }, // ░░░ 입찰명 ░░░ { @@ -241,7 +247,7 @@ export function getBiddingsColumns({ setRowAction }: GetColumnsProps): ColumnDef accessorKey: "biddingRegistrationDate", header: ({ column }) => <DataTableColumnHeaderSimple column={column} title="입찰등록일" />, cell: ({ row }) => ( - <span className="text-sm">{formatDate(row.original.biddingRegistrationDate , "KR")}</span> + <span className="text-sm">{row.original.biddingRegistrationDate ? formatDate(row.original.biddingRegistrationDate, "KR") : '-'}</span> ), size: 100, meta: { excelHeader: "입찰등록일" }, |