diff options
Diffstat (limited to 'lib/bidding/vendor')
| -rw-r--r-- | lib/bidding/vendor/partners-bidding-detail.tsx | 10 | ||||
| -rw-r--r-- | lib/bidding/vendor/partners-bidding-list-columns.tsx | 40 |
2 files changed, 27 insertions, 23 deletions
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 <Label className="text-sm font-medium text-muted-foreground mb-2 block">계약기간</Label> <div className="p-3 bg-muted/50 rounded-lg"> <div className="flex items-center gap-2 text-sm"> - <span className="font-medium">{formatDate(biddingDetail.contractStartDate, 'KR')}</span> + <span className="font-medium">{format(new Date(biddingDetail.contractStartDate), "yyyy-MM-dd")}</span> <span className="text-muted-foreground">~</span> - <span className="font-medium">{formatDate(biddingDetail.contractEndDate, 'KR')}</span> + <span className="font-medium">{format(new Date(biddingDetail.contractEndDate), "yyyy-MM-dd")}</span> </div> </div> </div> @@ -874,12 +874,12 @@ export function PartnersBiddingDetail({ biddingId, companyId }: PartnersBiddingD <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-sm"> {biddingDetail.submissionStartDate && biddingDetail.submissionEndDate && ( <div> - <span className="font-medium">응찰기간:</span> {formatDate(biddingDetail.submissionStartDate, 'KR')} ~ {formatDate(biddingDetail.submissionEndDate, 'KR')} + <span className="font-medium">입찰서 제출기간:</span> {new Date(biddingDetail.submissionStartDate).toISOString().slice(0, 16).replace('T', ' ')} ~ {new Date(biddingDetail.submissionEndDate).toISOString().slice(0, 16).replace('T', ' ')} </div> )} {biddingDetail.evaluationDate && ( <div> - <span className="font-medium">평가일:</span> {formatDate(biddingDetail.evaluationDate, 'KR')} + <span className="font-medium">평가일:</span> {format(new Date(biddingDetail.evaluationDate), "yyyy-MM-dd HH:mm")} </div> )} </div> 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 <Badge variant="outline">미결정</Badge> - } - return ( - <Badge variant={participated ? 'default' : 'destructive'}> - {participated ? '참여' : '미참여'} - </Badge> - ) - }, - }), - // 입찰 참여의사 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 <Badge variant="outline">미제출</Badge> + } + + if (isFinalSubmission) { + return <Badge variant="default">최종제출</Badge> + } + + return <Badge variant="secondary">제출</Badge> + }, + }), + // 계약구분 columnHelper.accessor('contractType', { header: '계약구분', @@ -291,9 +295,9 @@ export function getPartnersBiddingListColumns({ setRowAction }: PartnersBiddingL } return ( <div className="text-sm"> - <div>{format(new Date(startDate), "yyyy-MM-dd")}</div> + <div>{new Date(startDate).toISOString().slice(0, 16).replace('T', ' ')}</div> <div className="text-muted-foreground">~</div> - <div>{format(new Date(endDate), "yyyy-MM-dd")}</div> + <div>{new Date(endDate).toISOString().slice(0, 16).replace('T', ' ')}</div> </div> ) }, |
