diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/contract/contract-info-card.tsx | 12 | ||||
| -rw-r--r-- | components/contract/contract-items-card.tsx | 26 |
2 files changed, 22 insertions, 16 deletions
diff --git a/components/contract/contract-info-card.tsx b/components/contract/contract-info-card.tsx index 8b9c5103..8c9ec4c3 100644 --- a/components/contract/contract-info-card.tsx +++ b/components/contract/contract-info-card.tsx @@ -1,6 +1,6 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card" import { Button } from "@/components/ui/button" -import { formatCurrency, formatDate } from "@/lib/utils" +import { formatCurrency, formatDate, formatNumber } from "@/lib/utils" import { FileText, DollarSign } from "lucide-react" interface ContractInfoCardProps { @@ -70,10 +70,12 @@ export function ContractInfoCard({ contract }: ContractInfoCardProps) { <p className="text-sm font-medium text-muted-foreground">계약금액</p> <p className="text-sm font-semibold"> {contract.totalAmount - ? formatCurrency( - parseFloat(contract.totalAmount.toString()), - contract.currency || "KRW" - ) + ? contract.currency + ? formatCurrency( + parseFloat(contract.totalAmount.toString()), + contract.currency + ) + : formatNumber(parseFloat(contract.totalAmount.toString())) : "-"} </p> </div> diff --git a/components/contract/contract-items-card.tsx b/components/contract/contract-items-card.tsx index 0d43f979..5bf5a927 100644 --- a/components/contract/contract-items-card.tsx +++ b/components/contract/contract-items-card.tsx @@ -1,5 +1,5 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card" -import { formatCurrency } from "@/lib/utils" +import { formatCurrency, formatNumber } from "@/lib/utils" interface ContractItem { materialNo?: string @@ -13,10 +13,10 @@ interface ContractItem { interface ContractItemsCardProps { items: ContractItem[] - currency?: string + currency?: string | null } -export function ContractItemsCard({ items, currency = "KRW" }: ContractItemsCardProps) { +export function ContractItemsCard({ items, currency }: ContractItemsCardProps) { if (!items || items.length === 0) { return null } @@ -50,18 +50,22 @@ export function ContractItemsCard({ items, currency = "KRW" }: ContractItemsCard </td> <td className="px-4 py-3 text-right font-mono"> {item.unitPrice - ? formatCurrency( - parseFloat(item.unitPrice.toString()), - currency - ) + ? currency + ? formatCurrency( + parseFloat(item.unitPrice.toString()), + currency + ) + : formatNumber(parseFloat(item.unitPrice.toString())) : "-"} </td> <td className="px-4 py-3 text-right font-mono font-medium"> {item.contractAmount - ? formatCurrency( - parseFloat(item.contractAmount.toString()), - currency - ) + ? currency + ? formatCurrency( + parseFloat(item.contractAmount.toString()), + currency + ) + : formatNumber(parseFloat(item.contractAmount.toString())) : "-"} </td> </tr> |