mama/star-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大更新
All checks were successful
Koori-ERP-Deploy-System / deploy-demo (push) Has been skipped
Details
Koori-ERP-Deploy-System / deploy-production (push) Successful in 58s
Details

Browse Source
This commit is contained in:
sky121113
2026-01-08 16:32:10 +08:00
parent 7848976a06
commit 0b60dab208
25 changed files with 661 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/js/Components/Vendor/AddSupplyProductDialog.tsx vendored
View File

@@ -53,8 +53,8 @@ export default function AddSupplyProductDialog({
// 過濾掉已經在供貨列表中的商品
const availableProducts = useMemo(() => {
const existingIds = new Set(existingSupplyProducts.map(sp => sp.productId));
return products.filter(p => !existingIds.has(p.id));
const existingIds = new Set(existingSupplyProducts.map(sp => String(sp.productId)));
return products.filter(p => !existingIds.has(String(p.id)));
}, [products, existingSupplyProducts]);
const selectedProduct = availableProducts.find(p => p.id === selectedProductId);
@@ -105,7 +105,7 @@ export default function AddSupplyProductDialog({
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</button>
</PopoverTrigger>
<PopoverContent className="w-[450px] p-0 shadow-lg border-2" align="start">
<PopoverContent className="w-[450px] p-0 shadow-lg border-2 z-[9999]" align="start">
<Command>
<CommandInput placeholder="搜尋商品名稱..." />
<CommandList className="max-h-[300px]">
@@ -132,7 +132,7 @@ export default function AddSupplyProductDialog({
<div className="flex items-center justify-between flex-1">
<span className="font-medium">{product.name}</span>
<span className="text-xs text-gray-400 bg-gray-50 px-2 py-1 rounded">
{product.purchase_unit || product.base_unit || "個"}
{product.baseUnit?.name || (product.base_unit as any)?.name || product.base_unit || "個"}
</span>
</div>
</CommandItem>
@@ -146,15 +146,17 @@ export default function AddSupplyProductDialog({
{/* 單位（自動帶入） */}
<div className="flex flex-col gap-2">
<Label className="text-sm font-medium text-gray-500">採購單位</Label>
<Label className="text-sm font-medium text-gray-500">單位</Label>
<div className="h-10 px-3 py-2 bg-gray-50 border border-gray-200 rounded-md text-gray-600 font-medium text-sm flex items-center">
{selectedProduct ? (selectedProduct.purchase_unit || selectedProduct.base_unit || "個") : "-"}
{selectedProduct ? (selectedProduct.baseUnit?.name || (selectedProduct.base_unit as any)?.name || selectedProduct.base_unit || "個") : "-"}
</div>
</div>
{/* 上次採購價格 */}
<div>
<Label className="text-muted-foreground text-xs">上次採購單價（選填）</Label>
<Label className="text-muted-foreground text-xs">
上次採購單價 / {selectedProduct ? (selectedProduct.baseUnit?.name || (selectedProduct.base_unit as any)?.name || selectedProduct.base_unit || "個") : "單位"}
</Label>
<Input
type="number"
placeholder="輸入價格"

2
resources/js/Components/Vendor/EditSupplyProductDialog.tsx vendored
View File

@@ -83,7 +83,7 @@ export default function EditSupplyProductDialog({
{/* 上次採購價格 */}
<div>
<Label className="text-muted-foreground text-xs">上次採購單價（選填）</Label>
<Label className="text-muted-foreground text-xs">上次採購單價 / {product.baseUnit || "單位"}</Label>
<Input
type="number"
placeholder="輸入價格"

31
resources/js/Components/Vendor/SupplyProductList.tsx vendored
View File

@@ -28,15 +28,19 @@ export default function SupplyProductList({
<TableRow>
<TableHead className="w-[50px] text-center">#</TableHead>
<TableHead className="font-semibold">商品名稱</TableHead>
<TableHead className="font-semibold">採購單位</TableHead>
<TableHead className="text-right font-semibold">上次採購單價</TableHead>
<TableHead className="font-semibold">基本單位</TableHead>
<TableHead className="font-semibold">轉換率</TableHead>
<TableHead className="text-right font-semibold">
上次採購單價
<div className="text-xs font-normal text-muted-foreground">(以基本單位計算)</div>
</TableHead>
<TableHead className="text-center font-semibold w-[150px]">操作</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{products.length === 0 ? (
<TableRow>
<TableCell colSpan={5} className="text-center text-muted-foreground py-8">
<TableCell colSpan={6} className="text-center text-muted-foreground py-8">
尚無供貨商品，請點擊上方按鈕新增
</TableCell>
</TableRow>
@@ -47,9 +51,26 @@ export default function SupplyProductList({
{index + 1}
</TableCell>
<TableCell>{product.productName}</TableCell>
<TableCell>{product.unit}</TableCell>
<TableCell>
{product.baseUnit || product.unit || "-"}
</TableCell>
<TableCell>
{product.largeUnit && product.conversionRate ? (
<span className="text-sm text-gray-500">
1 {product.largeUnit} = {Number(product.conversionRate)} {product.baseUnit || product.unit}
</span>
) : (
"-"
)}
</TableCell>
<TableCell className="text-right">
{product.lastPrice ? `$${product.lastPrice.toLocaleString()}` : "-"}
{product.lastPrice ? (
<span>
${product.lastPrice.toLocaleString()} / {product.baseUnit || product.unit || "單位"}
</span>
) : (
"-"
)}
</TableCell>
<TableCell className="text-center">
<div className="flex items-center justify-center gap-2">