From b6c9ac31358206ad291583d4b045cc5d83ca3987 Mon Sep 17 00:00:00 2001 From: dujinkim Date: Thu, 4 Sep 2025 10:51:24 +0000 Subject: (최겸) 구매 입찰내 입찰 조건, 사전견적 기능, 품목별 견적 작성 개발 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/bidding/pre-quote/service.ts | 5 +- .../bidding-pre-quote-item-details-dialog.tsx | 123 +++++++ .../table/bidding-pre-quote-vendor-columns.tsx | 51 ++- .../table/bidding-pre-quote-vendor-table.tsx | 68 +++- .../vendor/components/pr-items-pricing-dialog.tsx | 384 --------------------- .../vendor/components/pr-items-pricing-table.tsx | 195 ++++++++--- lib/bidding/vendor/partners-bidding-pre-quote.tsx | 49 +++ 7 files changed, 420 insertions(+), 455 deletions(-) create mode 100644 lib/bidding/pre-quote/table/bidding-pre-quote-item-details-dialog.tsx delete mode 100644 lib/bidding/vendor/components/pr-items-pricing-dialog.tsx (limited to 'lib') diff --git a/lib/bidding/pre-quote/service.ts b/lib/bidding/pre-quote/service.ts index bf7a4538..c34f6f9e 100644 --- a/lib/bidding/pre-quote/service.ts +++ b/lib/bidding/pre-quote/service.ts @@ -663,6 +663,8 @@ export async function getPrItemsForBidding(biddingId: number) { // SPEC 문서 조회 (PR 아이템에 연결된 문서들) export async function getSpecDocumentsForPrItem(prItemId: number) { try { + console.log('getSpecDocumentsForPrItem called with prItemId:', prItemId) + const specDocs = await db .select({ id: biddingDocuments.id, @@ -678,10 +680,11 @@ export async function getSpecDocumentsForPrItem(prItemId: number) { .where( and( eq(biddingDocuments.prItemId, prItemId), - eq(biddingDocuments.documentType, 'specification') + eq(biddingDocuments.documentType, 'spec_document') ) ) + console.log('getSpecDocumentsForPrItem result:', specDocs) return specDocs } catch (error) { console.error('Failed to get spec documents for PR item:', error) diff --git a/lib/bidding/pre-quote/table/bidding-pre-quote-item-details-dialog.tsx b/lib/bidding/pre-quote/table/bidding-pre-quote-item-details-dialog.tsx new file mode 100644 index 00000000..12bd2696 --- /dev/null +++ b/lib/bidding/pre-quote/table/bidding-pre-quote-item-details-dialog.tsx @@ -0,0 +1,123 @@ +'use client' + +import * as React from 'react' +import { + Dialog, + DialogContent, + DialogDescription, + DialogHeader, + DialogTitle, +} from '@/components/ui/dialog' +import { PrItemsPricingTable } from '../../vendor/components/pr-items-pricing-table' +import { getSavedPrItemQuotations } from '../service' + +interface PrItem { + id: number + itemNumber: string | null + prNumber: string | null + itemInfo: string | null + materialDescription: string | null + quantity: string | null + quantityUnit: string | null + currency: string | null + requestedDeliveryDate: string | null + hasSpecDocument: boolean | null +} + +interface PrItemQuotation { + prItemId: number + bidUnitPrice: number + bidAmount: number + proposedDeliveryDate?: string + technicalSpecification?: string +} + +interface BiddingPreQuoteItemDetailsDialogProps { + open: boolean + onOpenChange: (open: boolean) => void + biddingId: number + biddingCompanyId: number + companyName: string + prItems: PrItem[] + currency?: string +} + +export function BiddingPreQuoteItemDetailsDialog({ + open, + onOpenChange, + biddingId, + biddingCompanyId, + companyName, + prItems, + currency = 'KRW' +}: BiddingPreQuoteItemDetailsDialogProps) { + const [prItemQuotations, setPrItemQuotations] = React.useState([]) + const [isLoading, setIsLoading] = React.useState(false) + + // 다이얼로그가 열릴 때 저장된 품목별 견적 데이터 로드 + React.useEffect(() => { + if (open && biddingCompanyId) { + loadSavedQuotations() + } + }, [open, biddingCompanyId]) + + const loadSavedQuotations = async () => { + setIsLoading(true) + try { + console.log('Loading saved quotations for biddingCompanyId:', biddingCompanyId) + const savedQuotations = await getSavedPrItemQuotations(biddingCompanyId) + console.log('Loaded saved quotations:', savedQuotations) + setPrItemQuotations(savedQuotations) + } catch (error) { + console.error('Failed to load saved quotations:', error) + } finally { + setIsLoading(false) + } + } + + const handleQuotationsChange = (quotations: PrItemQuotation[]) => { + // ReadOnly 모드이므로 변경사항을 저장하지 않음 + console.log('Quotations changed (readonly):', quotations) + } + + const handleTotalAmountChange = (total: number) => { + // ReadOnly 모드이므로 총 금액 변경을 처리하지 않음 + console.log('Total amount changed (readonly):', total) + } + + return ( + + + + + 품목별 견적 상세 + + - {companyName} + + + + 협력업체가 제출한 품목별 견적 상세 정보입니다. + + + + {isLoading ? ( +
+
+
+

견적 정보를 불러오는 중...

+
+
+ ) : ( + + )} + + + ) +} diff --git a/lib/bidding/pre-quote/table/bidding-pre-quote-vendor-columns.tsx b/lib/bidding/pre-quote/table/bidding-pre-quote-vendor-columns.tsx index 30cddbce..39fcb30f 100644 --- a/lib/bidding/pre-quote/table/bidding-pre-quote-vendor-columns.tsx +++ b/lib/bidding/pre-quote/table/bidding-pre-quote-vendor-columns.tsx @@ -57,12 +57,16 @@ interface GetBiddingCompanyColumnsProps { onEdit: (company: BiddingCompany) => void onDelete: (company: BiddingCompany) => void onInvite: (company: BiddingCompany) => void + onViewPriceAdjustment?: (company: BiddingCompany) => void + onViewItemDetails?: (company: BiddingCompany) => void } export function getBiddingPreQuoteVendorColumns({ onEdit, onDelete, - onInvite + onInvite, + onViewPriceAdjustment, + onViewItemDetails }: GetBiddingCompanyColumnsProps): ColumnDef[] { return [ { @@ -115,11 +119,24 @@ export function getBiddingPreQuoteVendorColumns({ { accessorKey: 'preQuoteAmount', header: '사전견적금액', - cell: ({ row }) => ( -
- {row.original.preQuoteAmount ? Number(row.original.preQuoteAmount).toLocaleString() : '-'} KRW -
- ), + cell: ({ row }) => { + const hasAmount = row.original.preQuoteAmount && Number(row.original.preQuoteAmount) > 0 + return ( +
+ {hasAmount ? ( + + ) : ( + - + )} +
+ ) + }, }, { accessorKey: 'preQuoteSubmittedAt', @@ -199,9 +216,21 @@ export function getBiddingPreQuoteVendorColumns({ const hasPriceAdjustment = row.original.priceAdjustmentResponse if (hasPriceAdjustment === null) return
-
return ( - - {hasPriceAdjustment ? '적용' : '미적용'} - +
+ + {hasPriceAdjustment ? '적용' : '미적용'} + + {hasPriceAdjustment && onViewPriceAdjustment && ( + + )} +
) }, }, @@ -276,10 +305,10 @@ export function getBiddingPreQuoteVendorColumns({ 작업 - onEdit(company)}> + {/* onEdit(company)}> 수정 - + */} {company.invitationStatus === 'pending' && ( onInvite(company)}> diff --git a/lib/bidding/pre-quote/table/bidding-pre-quote-vendor-table.tsx b/lib/bidding/pre-quote/table/bidding-pre-quote-vendor-table.tsx index a9d12629..346bf9a6 100644 --- a/lib/bidding/pre-quote/table/bidding-pre-quote-vendor-table.tsx +++ b/lib/bidding/pre-quote/table/bidding-pre-quote-vendor-table.tsx @@ -12,8 +12,12 @@ import { Bidding } from '@/db/schema' import { deleteBiddingCompany } from '../service' +import { getPriceAdjustmentFormByBiddingCompanyId } from '@/lib/bidding/detail/service' import { useToast } from '@/hooks/use-toast' import { useTransition } from 'react' +import { PriceAdjustmentDialog } from '@/components/bidding/price-adjustment-dialog' +import { BiddingPreQuoteItemDetailsDialog } from './bidding-pre-quote-item-details-dialog' +import { getPrItemsForBidding } from '../service' interface BiddingPreQuoteVendorTableContentProps { biddingId: number @@ -97,6 +101,11 @@ export function BiddingPreQuoteVendorTableContent({ const [isPending, startTransition] = useTransition() const [selectedCompany, setSelectedCompany] = React.useState(null) const [isEditDialogOpen, setIsEditDialogOpen] = React.useState(false) + const [isPriceAdjustmentDialogOpen, setIsPriceAdjustmentDialogOpen] = React.useState(false) + const [priceAdjustmentData, setPriceAdjustmentData] = React.useState(null) + const [isItemDetailsDialogOpen, setIsItemDetailsDialogOpen] = React.useState(false) + const [selectedCompanyForDetails, setSelectedCompanyForDetails] = React.useState(null) + const [prItems, setPrItems] = React.useState([]) const handleDelete = (company: BiddingCompany) => { if (!confirm(`${company.companyName} 업체를 삭제하시겠습니까?`)) return @@ -133,13 +142,51 @@ export function BiddingPreQuoteVendorTableContent({ }) } + const handleViewPriceAdjustment = async (company: BiddingCompany) => { + startTransition(async () => { + const priceAdjustmentForm = await getPriceAdjustmentFormByBiddingCompanyId(company.id) + if (priceAdjustmentForm) { + setPriceAdjustmentData(priceAdjustmentForm) + setSelectedCompany(company) + setIsPriceAdjustmentDialogOpen(true) + } else { + toast({ + title: '정보 없음', + description: '연동제 정보가 없습니다.', + variant: 'destructive', + }) + } + }) + } + + const handleViewItemDetails = async (company: BiddingCompany) => { + startTransition(async () => { + try { + // PR 아이템 정보 로드 + const prItemsData = await getPrItemsForBidding(biddingId) + setPrItems(prItemsData) + setSelectedCompanyForDetails(company) + setIsItemDetailsDialogOpen(true) + } catch (error) { + console.error('Failed to load PR items:', error) + toast({ + title: '오류', + description: '품목 정보를 불러오는데 실패했습니다.', + variant: 'destructive', + }) + } + }) + } + const columns = React.useMemo( () => getBiddingPreQuoteVendorColumns({ onEdit: onEdit || handleEdit, onDelete: onDelete || handleDelete, - onInvite: handleInvite + onInvite: handleInvite, + onViewPriceAdjustment: handleViewPriceAdjustment, + onViewItemDetails: handleViewItemDetails }), - [onEdit, onDelete, handleEdit, handleDelete, handleInvite] + [onEdit, onDelete, handleEdit, handleDelete, handleInvite, handleViewPriceAdjustment, handleViewItemDetails] ) const { table } = useDataTable({ @@ -184,6 +231,23 @@ export function BiddingPreQuoteVendorTableContent({ onOpenChange={setIsEditDialogOpen} onSuccess={onRefresh} /> + + + + ) } diff --git a/lib/bidding/vendor/components/pr-items-pricing-dialog.tsx b/lib/bidding/vendor/components/pr-items-pricing-dialog.tsx deleted file mode 100644 index ff0dfd9c..00000000 --- a/lib/bidding/vendor/components/pr-items-pricing-dialog.tsx +++ /dev/null @@ -1,384 +0,0 @@ -'use client' - -import * as React from 'react' -import { Button } from '@/components/ui/button' -import { Input } from '@/components/ui/input' -import { Label } from '@/components/ui/label' -import { Textarea } from '@/components/ui/textarea' -import { Badge } from '@/components/ui/badge' -import { - Dialog, - DialogContent, - DialogDescription, - DialogHeader, - DialogTitle, - DialogTrigger, - DialogFooter, -} from '@/components/ui/dialog' -import { - Table, - TableBody, - TableCell, - TableHead, - TableHeader, - TableRow, -} from '@/components/ui/table' -import { - Package, - FileText, - Download, - Calculator, - Save -} from 'lucide-react' -import { formatDate } from '@/lib/utils' -import { downloadFile } from '@/lib/file-download' -import { getSpecDocumentsForPrItem } from '../../pre-quote/service' -import { useToast } from '@/hooks/use-toast' - -interface PrItem { - id: number - itemNumber: string | null - prNumber: string | null - itemInfo: string | null - materialDescription: string | null - quantity: string | null - quantityUnit: string | null - currency: string | null - requestedDeliveryDate: string | null - hasSpecDocument: boolean | null -} - -interface PrItemQuotation { - prItemId: number - bidUnitPrice: number - bidAmount: number - proposedDeliveryDate?: string - technicalSpecification?: string -} - -interface SpecDocument { - id: number - fileName: string - originalFileName: string - fileSize: number | null - filePath: string - title: string | null - description: string | null - uploadedAt: string -} - -interface PrItemsPricingDialogProps { - prItems: PrItem[] - initialQuotations?: PrItemQuotation[] - currency?: string - onSave: (quotations: PrItemQuotation[], totalAmount: number) => void - readOnly?: boolean - children: React.ReactNode -} - -export function PrItemsPricingDialog({ - prItems, - initialQuotations = [], - currency = 'KRW', - onSave, - readOnly = false, - children -}: PrItemsPricingDialogProps) { - const { toast } = useToast() - const [open, setOpen] = React.useState(false) - const [quotations, setQuotations] = React.useState([]) - const [specDocuments, setSpecDocuments] = React.useState>({}) - const [loadingSpecs, setLoadingSpecs] = React.useState>({}) - - // 다이얼로그 열릴 때 초기 견적 데이터 설정 - React.useEffect(() => { - if (open) { - const initQuotations = prItems.map(item => { - const existing = initialQuotations.find(q => q.prItemId === item.id) - if (existing) { - return existing - } - return { - prItemId: item.id, - bidUnitPrice: 0, - bidAmount: 0, - proposedDeliveryDate: '', - technicalSpecification: '' - } - }) - setQuotations(initQuotations) - } - }, [open, prItems, initialQuotations]) - - // SPEC 문서 로드 - const loadSpecDocuments = async (prItemId: number) => { - if (loadingSpecs[prItemId]) return - - setLoadingSpecs(prev => ({ ...prev, [prItemId]: true })) - try { - const docs = await getSpecDocumentsForPrItem(prItemId) - // Date를 string으로 변환 - const mappedDocs = docs.map(doc => ({ - ...doc, - uploadedAt: doc.uploadedAt.toString() - })) - setSpecDocuments(prev => ({ ...prev, [prItemId]: mappedDocs })) - } catch (error) { - console.error('Failed to load spec documents:', error) - } finally { - setLoadingSpecs(prev => ({ ...prev, [prItemId]: false })) - } - } - - // 견적 데이터 업데이트 - const updateQuotation = (prItemId: number, field: keyof PrItemQuotation, value: any) => { - const updatedQuotations = quotations.map(q => { - if (q.prItemId === prItemId) { - const updated = { ...q, [field]: value } - - // 단가가 변경되면 금액 자동 계산 - if (field === 'bidUnitPrice') { - const prItem = prItems.find(item => item.id === prItemId) - const quantity = parseFloat(prItem?.quantity || '1') - updated.bidAmount = updated.bidUnitPrice * quantity - } - - return updated - } - return q - }) - - setQuotations(updatedQuotations) - } - - // 파일 다운로드 - const handleDownloadSpec = async (document: SpecDocument) => { - try { - await downloadFile(document.filePath, document.originalFileName, { - showToast: true - }) - } catch (error) { - console.error('Failed to download spec document:', error) - } - } - - // 저장 처리 - const handleSave = () => { - const totalAmount = quotations.reduce((sum, q) => sum + q.bidAmount, 0) - onSave(quotations, totalAmount) - setOpen(false) - toast({ - title: '저장 완료', - description: '품목별 견적이 저장되었습니다.', - }) - } - - // 통화 포맷팅 - const formatCurrency = (amount: number) => { - return new Intl.NumberFormat('ko-KR', { - style: 'currency', - currency: currency, - }).format(amount) - } - - // 총 금액 계산 - const totalAmount = quotations.reduce((sum, q) => sum + q.bidAmount, 0) - - return ( - - - {children} - - - - - - 품목별 견적 작성 - - - 각 품목별로 견적 단가를 입력하여 총 사전견적 금액을 계산합니다. - - - -
-
- - - - 아이템번호 - PR번호 - 품목정보 - 자재내역 - 수량 - 단위 - 견적단가 - 견적금액 - 납품예정일 - 기술사양 - SPEC - - - - {prItems.map((item) => { - const quotation = quotations.find(q => q.prItemId === item.id) || { - prItemId: item.id, - bidUnitPrice: 0, - bidAmount: 0, - proposedDeliveryDate: '', - technicalSpecification: '' - } - - return ( - - - {item.itemNumber || '-'} - - {item.prNumber || '-'} - -
- {item.itemInfo || '-'} -
- - -
- {item.materialDescription || '-'} -
- - - {item.quantity ? parseFloat(item.quantity).toLocaleString() : '-'} - - {item.quantityUnit || '-'} - - {readOnly ? ( - - {quotation.bidUnitPrice.toLocaleString()} - - ) : ( - updateQuotation( - item.id, - 'bidUnitPrice', - parseFloat(e.target.value) || 0 - )} - className="w-32 text-right" - placeholder="단가" - /> - )} - - -
- {formatCurrency(quotation.bidAmount)} -
- - - {readOnly ? ( - quotation.proposedDeliveryDate ? - formatDate(quotation.proposedDeliveryDate, 'KR') : '-' - ) : ( - updateQuotation( - item.id, - 'proposedDeliveryDate', - e.target.value - )} - className="w-40" - /> - )} - - - {readOnly ? ( -
- {quotation.technicalSpecification || '-'} -
- ) : ( -