From ac70d9f5daacdf83f24e45e7834ad6d3325c3cbb Mon Sep 17 00:00:00 2001 From: dujinkim Date: Thu, 20 Nov 2025 03:15:03 +0000 Subject: (최겸) 입찰 수정 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/bidding/vendor/partners-bidding-detail.tsx | 10 +++--- .../vendor/partners-bidding-list-columns.tsx | 40 ++++++++++++---------- 2 files changed, 27 insertions(+), 23 deletions(-) (limited to 'lib/bidding/vendor') diff --git a/lib/bidding/vendor/partners-bidding-detail.tsx b/lib/bidding/vendor/partners-bidding-detail.tsx index fe254dad..66c90eaf 100644 --- a/lib/bidding/vendor/partners-bidding-detail.tsx +++ b/lib/bidding/vendor/partners-bidding-detail.tsx @@ -25,7 +25,7 @@ import { Calendar, ChevronDown } from 'lucide-react' - +import { format } from 'date-fns' import { formatDate } from '@/lib/utils' import { getBiddingDetailsForPartners, @@ -806,9 +806,9 @@ export function PartnersBiddingDetail({ biddingId, companyId }: PartnersBiddingD
- {formatDate(biddingDetail.contractStartDate, 'KR')} + {format(new Date(biddingDetail.contractStartDate), "yyyy-MM-dd")} ~ - {formatDate(biddingDetail.contractEndDate, 'KR')} + {format(new Date(biddingDetail.contractEndDate), "yyyy-MM-dd")}
@@ -874,12 +874,12 @@ export function PartnersBiddingDetail({ biddingId, companyId }: PartnersBiddingD
{biddingDetail.submissionStartDate && biddingDetail.submissionEndDate && (
- 응찰기간: {formatDate(biddingDetail.submissionStartDate, 'KR')} ~ {formatDate(biddingDetail.submissionEndDate, 'KR')} + 입찰서 제출기간: {new Date(biddingDetail.submissionStartDate).toISOString().slice(0, 16).replace('T', ' ')} ~ {new Date(biddingDetail.submissionEndDate).toISOString().slice(0, 16).replace('T', ' ')}
)} {biddingDetail.evaluationDate && (
- 평가일: {formatDate(biddingDetail.evaluationDate, 'KR')} + 평가일: {format(new Date(biddingDetail.evaluationDate), "yyyy-MM-dd HH:mm")}
)}
diff --git a/lib/bidding/vendor/partners-bidding-list-columns.tsx b/lib/bidding/vendor/partners-bidding-list-columns.tsx index d9058e97..ba8efae6 100644 --- a/lib/bidding/vendor/partners-bidding-list-columns.tsx +++ b/lib/bidding/vendor/partners-bidding-list-columns.tsx @@ -240,22 +240,6 @@ export function getPartnersBiddingListColumns({ setRowAction }: PartnersBiddingL }, }), - // 사전견적 참여의사 - columnHelper.accessor('isPreQuoteParticipated', { - header: '사전견적 참여의사', - cell: ({ row }) => { - const participated = row.original.isPreQuoteParticipated - if (participated === null) { - return 미결정 - } - return ( - - {participated ? '참여' : '미참여'} - - ) - }, - }), - // 입찰 참여의사 columnHelper.accessor('isBiddingParticipated', { header: '입찰 참여의사', @@ -272,6 +256,26 @@ export function getPartnersBiddingListColumns({ setRowAction }: PartnersBiddingL }, }), + // 입찰 제출여부 + columnHelper.display({ + id: 'biddingSubmissionStatus', + header: '입찰 제출여부', + cell: ({ row }) => { + const finalQuoteAmount = row.original.finalQuoteAmount + const isFinalSubmission = row.original.isFinalSubmission + + if (!finalQuoteAmount) { + return 미제출 + } + + if (isFinalSubmission) { + return 최종제출 + } + + return 제출 + }, + }), + // 계약구분 columnHelper.accessor('contractType', { header: '계약구분', @@ -291,9 +295,9 @@ export function getPartnersBiddingListColumns({ setRowAction }: PartnersBiddingL } return (
-
{format(new Date(startDate), "yyyy-MM-dd")}
+
{new Date(startDate).toISOString().slice(0, 16).replace('T', ' ')}
~
-
{format(new Date(endDate), "yyyy-MM-dd")}
+
{new Date(endDate).toISOString().slice(0, 16).replace('T', ' ')}
) }, -- cgit v1.2.3