refactor: changes to inventory status (approved/unapprove)
This commit is contained in:
@@ -163,7 +163,7 @@ export default function Index({ docs, warehouses, filters }: { docs: DocsPaginat
|
||||
<ClipboardCheck className="h-6 w-6 text-primary-main" />
|
||||
庫存盤調單
|
||||
</h1>
|
||||
<p className="text-sm text-gray-500 mt-1">針對盤點差異進行庫存調整與過帳 (盤盈、盤虧、報廢等)</p>
|
||||
<p className="text-gray-500 mt-1">針對盤點差異進行庫存調整與過帳 (盤盈、盤虧、報廢等)</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -392,14 +392,14 @@ export default function Index({ docs, warehouses, filters }: { docs: DocsPaginat
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<DialogFooter className="bg-gray-50 -mx-6 -mb-6 p-4 rounded-b-lg">
|
||||
<Button variant="ghost" onClick={() => setIsDialogOpen(false)}>取消</Button>
|
||||
<DialogFooter className="bg-gray-50 -mx-6 -mb-6 p-4 rounded-b-lg gap-2">
|
||||
<Button variant="outline" className="button-outlined-primary" onClick={() => setIsDialogOpen(false)}>取消</Button>
|
||||
<Button
|
||||
className="button-filled-primary"
|
||||
disabled={processing || !data.warehouse_id || !data.reason}
|
||||
onClick={() => handleCreate()}
|
||||
>
|
||||
建立手動盤調
|
||||
新增
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
|
||||
@@ -11,12 +11,6 @@ import {
|
||||
import { Button } from "@/Components/ui/button";
|
||||
import { Input } from "@/Components/ui/input";
|
||||
import { Badge } from "@/Components/ui/badge";
|
||||
import {
|
||||
Card,
|
||||
CardContent,
|
||||
CardHeader,
|
||||
CardTitle,
|
||||
} from "@/Components/ui/card";
|
||||
import {
|
||||
AlertDialog,
|
||||
AlertDialogAction,
|
||||
@@ -30,7 +24,7 @@ import {
|
||||
} from "@/Components/ui/alert-dialog";
|
||||
import { Label } from "@/Components/ui/label";
|
||||
import { Textarea } from "@/Components/ui/textarea";
|
||||
import { Save, CheckCircle, Trash2, ArrowLeft, Plus, X, Search, FileText } from "lucide-react";
|
||||
import { Save, CheckCircle, Trash2, ArrowLeft, Plus, X, Search, FileText, ClipboardCheck } from "lucide-react";
|
||||
import { useState, useEffect } from 'react';
|
||||
import {
|
||||
Dialog,
|
||||
@@ -156,49 +150,61 @@ export default function Show({ doc }: { auth: any, doc: AdjDoc }) {
|
||||
breadcrumbs={[
|
||||
{ label: '商品與庫存管理', href: '#' },
|
||||
{ label: '庫存盤調', href: route('inventory.adjust.index') },
|
||||
{ label: doc.doc_no, href: route('inventory.adjust.show', [doc.id]), isPage: true },
|
||||
{ label: `盤調單: ${doc.doc_no}`, href: route('inventory.adjust.show', [doc.id]), isPage: true },
|
||||
]}
|
||||
>
|
||||
<Head title={`盤調單 ${doc.doc_no}`} />
|
||||
|
||||
<div className="container mx-auto p-6 max-w-7xl animate-in fade-in duration-500">
|
||||
<div className="space-y-6">
|
||||
<div className="container mx-auto p-6 max-w-7xl animate-in fade-in duration-500 space-y-6">
|
||||
<div>
|
||||
<Link href={route('inventory.adjust.index')}>
|
||||
<Button
|
||||
variant="outline"
|
||||
className="gap-2 button-outlined-primary mb-6"
|
||||
>
|
||||
<ArrowLeft className="h-4 w-4" />
|
||||
返回盤調單列表
|
||||
</Button>
|
||||
</Link>
|
||||
|
||||
<div className="flex flex-col md:flex-row md:items-center justify-between gap-4">
|
||||
<div className="flex items-center gap-4">
|
||||
<Button
|
||||
variant="outline"
|
||||
size="icon"
|
||||
className="h-10 w-10 border-grey-200"
|
||||
onClick={() => router.visit(route('inventory.adjust.index'))}
|
||||
>
|
||||
<ArrowLeft className="h-5 w-5 text-grey-600" />
|
||||
</Button>
|
||||
<div>
|
||||
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-3">
|
||||
{doc.doc_no}
|
||||
{isDraft ? (
|
||||
<Badge variant="secondary" className="bg-gray-100 text-gray-600 border-none">草稿</Badge>
|
||||
) : (
|
||||
<Badge className="bg-green-100 text-green-700 border-none">已過帳</Badge>
|
||||
)}
|
||||
<div>
|
||||
<div className="flex items-center gap-2">
|
||||
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
|
||||
<ClipboardCheck className="h-6 w-6 text-primary-main" />
|
||||
盤調單: {doc.doc_no}
|
||||
</h1>
|
||||
<div className="flex items-center gap-3 mt-1 text-sm text-grey-500">
|
||||
<span className="flex items-center gap-1"><CheckCircle className="h-3 w-3" /> 倉庫: {doc.warehouse_name}</span>
|
||||
<span>|</span>
|
||||
<span>建立者: {doc.created_by}</span>
|
||||
<span>|</span>
|
||||
<span>時間: {doc.created_at}</span>
|
||||
</div>
|
||||
{isDraft ? (
|
||||
<Badge variant="secondary" className="bg-gray-100 text-gray-600 border-none">草稿</Badge>
|
||||
) : (
|
||||
<Badge className="bg-green-100 text-green-700 border-none">已過帳</Badge>
|
||||
)}
|
||||
</div>
|
||||
<p className="text-sm text-gray-500 mt-1 font-medium flex items-center gap-2">
|
||||
倉庫: {doc.warehouse_name} <span className="mx-1">|</span>
|
||||
建立者: {doc.created_by} <span className="mx-1">|</span>
|
||||
時間: {doc.created_at}
|
||||
{doc.count_doc_id && (
|
||||
<>
|
||||
<span className="mx-1">|</span>
|
||||
<Link
|
||||
href={route('inventory.count.show', [doc.count_doc_id])}
|
||||
className="flex items-center gap-1 text-primary-main hover:underline"
|
||||
>
|
||||
來源盤點單: {doc.count_doc_no}
|
||||
</Link>
|
||||
</>
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="flex items-center gap-2">
|
||||
{isDraft && (
|
||||
<Can permission="inventory.adjust">
|
||||
<AlertDialog>
|
||||
<AlertDialogTrigger asChild>
|
||||
<Button variant="ghost" className="text-red-500 hover:bg-red-50 hover:text-red-600">
|
||||
<Trash2 className="mr-2 h-4 w-4" /> 刪除單據
|
||||
<Button variant="outline" size="sm" disabled={processing} className="button-outlined-error">
|
||||
<Trash2 className="w-4 h-4 mr-2" />
|
||||
刪除
|
||||
</Button>
|
||||
</AlertDialogTrigger>
|
||||
<AlertDialogContent>
|
||||
@@ -215,190 +221,158 @@ export default function Show({ doc }: { auth: any, doc: AdjDoc }) {
|
||||
</AlertDialogContent>
|
||||
</AlertDialog>
|
||||
|
||||
<Button variant="outline" className="border-primary-200 text-primary-main hover:bg-primary-50" onClick={handleSave} disabled={processing}>
|
||||
<Save className="mr-2 h-4 w-4" />
|
||||
儲存草稿
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
className="button-outlined-primary"
|
||||
onClick={handleSave}
|
||||
disabled={processing}
|
||||
>
|
||||
<Save className="w-4 h-4 mr-2" />
|
||||
儲存
|
||||
</Button>
|
||||
|
||||
<Button className="button-filled-primary" onClick={handlePost} disabled={processing}>
|
||||
<CheckCircle className="mr-2 h-4 w-4" />
|
||||
確認過帳
|
||||
<Button
|
||||
size="sm"
|
||||
className="button-filled-primary"
|
||||
onClick={handlePost}
|
||||
disabled={processing}
|
||||
>
|
||||
<CheckCircle className="w-4 h-4 mr-2" />
|
||||
過帳
|
||||
</Button>
|
||||
</Can>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
||||
<Card className="lg:col-span-2 shadow-sm border-grey-100">
|
||||
<CardHeader className="bg-grey-50/50 border-b border-grey-100 py-3">
|
||||
<CardTitle className="text-sm font-semibold text-grey-600">明細備註</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="pt-6 grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div className="space-y-2">
|
||||
<Label className="text-xs font-bold text-grey-500 uppercase tracking-wider">調整原因</Label>
|
||||
{isDraft ? (
|
||||
<Input
|
||||
value={data.reason}
|
||||
onChange={e => setData('reason', e.target.value)}
|
||||
className="focus:ring-primary-main"
|
||||
/>
|
||||
) : (
|
||||
<div className="text-grey-900 font-medium">{data.reason}</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label className="text-xs font-bold text-grey-500 uppercase tracking-wider">備註說明</Label>
|
||||
{isDraft ? (
|
||||
<Textarea
|
||||
value={data.remarks}
|
||||
onChange={e => setData('remarks', e.target.value)}
|
||||
rows={1}
|
||||
className="focus:ring-primary-main"
|
||||
/>
|
||||
) : (
|
||||
<div className="text-grey-600">{data.remarks || '-'}</div>
|
||||
)}
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
<Card className="shadow-sm border-grey-100 bg-primary-50/30">
|
||||
<CardHeader className="py-3">
|
||||
<CardTitle className="text-sm font-semibold text-primary-main">來源單據</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent className="space-y-3">
|
||||
<div>
|
||||
<Label className="text-[10px] font-bold text-primary-main/60 uppercase">關聯盤點單</Label>
|
||||
{doc.count_doc_id ? (
|
||||
<div className="mt-1">
|
||||
<Link
|
||||
href={route('inventory.count.show', [doc.count_doc_id])}
|
||||
className="text-primary-main font-bold hover:underline flex items-center gap-2"
|
||||
>
|
||||
<FileText className="h-4 w-4" />
|
||||
{doc.count_doc_no || '檢視盤點單'}
|
||||
</Link>
|
||||
</div>
|
||||
) : (
|
||||
<div className="text-grey-400 italic text-sm mt-1">手動建立，無來源盤點單</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="pt-2 border-t border-primary-100">
|
||||
<Label className="text-[10px] font-bold text-primary-main/60 uppercase">倉庫位置</Label>
|
||||
<p className="font-bold text-grey-900">{doc.warehouse_name}</p>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
</div>
|
||||
|
||||
<div className="bg-white rounded-lg shadow-sm border p-6 space-y-4">
|
||||
<div className="flex flex-row items-center justify-between">
|
||||
<h3 className="text-lg font-medium text-grey-900">調整項目清單</h3>
|
||||
{isDraft && (
|
||||
<ProductSearchDialog
|
||||
warehouseId={doc.warehouse_id}
|
||||
onSelect={(product, batch) => addItem(product, batch)}
|
||||
<div className="bg-white rounded-lg shadow-sm border p-6 space-y-4">
|
||||
{/* Header Fields - Inline */}
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4 pb-2">
|
||||
<div className="space-y-1">
|
||||
<Label className="text-xs font-bold text-grey-500 uppercase tracking-wider">調整原因</Label>
|
||||
{isDraft ? (
|
||||
<Input
|
||||
value={data.reason}
|
||||
onChange={e => setData('reason', e.target.value)}
|
||||
className="focus:ring-primary-main h-9"
|
||||
placeholder="請輸入調整原因..."
|
||||
/>
|
||||
) : (
|
||||
<div className="text-grey-900 font-medium py-1">{data.reason}</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="border rounded-lg overflow-hidden">
|
||||
<Table>
|
||||
<TableHeader className="bg-gray-50">
|
||||
<div className="space-y-1">
|
||||
<Label className="text-xs font-bold text-grey-500 uppercase tracking-wider">備註說明</Label>
|
||||
{isDraft ? (
|
||||
<Input
|
||||
value={data.remarks}
|
||||
onChange={e => setData('remarks', e.target.value)}
|
||||
className="focus:ring-primary-main h-9"
|
||||
placeholder="選填備註..."
|
||||
/>
|
||||
) : (
|
||||
<div className="text-grey-600 py-1">{data.remarks || '-'}</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="border-t pt-4"></div>
|
||||
|
||||
<div className="flex flex-row items-center justify-between mb-2">
|
||||
<h3 className="text-lg font-medium text-grey-900">調整項目</h3>
|
||||
{isDraft && (
|
||||
<ProductSearchDialog
|
||||
warehouseId={doc.warehouse_id}
|
||||
onSelect={(product, batch) => addItem(product, batch)}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="border rounded-lg overflow-hidden">
|
||||
<Table>
|
||||
<TableHeader className="bg-gray-50">
|
||||
<TableRow>
|
||||
<TableHead className="w-[50px] text-center font-medium text-grey-600">#</TableHead>
|
||||
<TableHead className="pl-4 font-medium text-grey-600">商品資訊</TableHead>
|
||||
<TableHead className="font-medium text-grey-600">批號</TableHead>
|
||||
<TableHead className="w-24 text-center font-medium text-grey-600">單位</TableHead>
|
||||
<TableHead className="w-32 text-right font-medium text-grey-600">調整前庫存</TableHead>
|
||||
<TableHead className="w-40 text-right font-medium text-grey-600">調整數量 (+/-)</TableHead>
|
||||
<TableHead className="font-medium text-grey-600">備註</TableHead>
|
||||
{isDraft && <TableHead className="w-[50px]"></TableHead>}
|
||||
</TableRow>
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
{data.items.length === 0 ? (
|
||||
<TableRow>
|
||||
<TableHead className="w-[60px] text-center font-medium text-grey-600">#</TableHead>
|
||||
<TableHead className="pl-4 font-medium text-grey-600">商品資訊</TableHead>
|
||||
<TableHead className="font-medium text-grey-600">批號</TableHead>
|
||||
<TableHead className="w-24 text-center font-medium text-grey-600">單位</TableHead>
|
||||
<TableHead className="w-32 text-right font-medium text-grey-600 text-primary-main">調整前庫存</TableHead>
|
||||
<TableHead className="w-40 text-right font-medium text-grey-600">調整數量 (+/-)</TableHead>
|
||||
<TableHead className="font-medium text-grey-600">備註說明</TableHead>
|
||||
{isDraft && <TableHead className="w-[80px]"></TableHead>}
|
||||
<TableCell colSpan={isDraft ? 8 : 7} className="h-32 text-center text-grey-400">
|
||||
尚未加入任何項目
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
{data.items.length === 0 ? (
|
||||
<TableRow>
|
||||
<TableCell colSpan={isDraft ? 8 : 7} className="h-32 text-center text-grey-400">
|
||||
尚未載入任何調整項目
|
||||
) : (
|
||||
data.items.map((item, index) => (
|
||||
<TableRow
|
||||
key={`${item.product_id}-${item.batch_number}-${index}`}
|
||||
className="group hover:bg-gray-50/50 transition-colors"
|
||||
>
|
||||
<TableCell className="text-center text-grey-400 font-medium">{index + 1}</TableCell>
|
||||
<TableCell className="pl-4 py-3">
|
||||
<div className="font-bold text-grey-900">{item.product_name}</div>
|
||||
<div className="text-xs text-grey-500 font-mono">{item.product_code}</div>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
) : (
|
||||
data.items.map((item, index) => (
|
||||
<TableRow
|
||||
key={`${item.product_id}-${item.batch_number}-${index}`}
|
||||
className="group hover:bg-gray-50/50 transition-colors"
|
||||
>
|
||||
<TableCell className="text-center text-grey-400 font-medium">{index + 1}</TableCell>
|
||||
<TableCell className="pl-4">
|
||||
<div className="font-bold text-grey-900">{item.product_name}</div>
|
||||
<div className="text-xs text-grey-500 font-mono">{item.product_code}</div>
|
||||
</TableCell>
|
||||
<TableCell className="text-grey-600">{item.batch_number || '-'}</TableCell>
|
||||
<TableCell className="text-center text-grey-500">{item.unit}</TableCell>
|
||||
<TableCell className="text-right font-medium text-grey-400">
|
||||
{item.qty_before}
|
||||
</TableCell>
|
||||
<TableCell className="text-right">
|
||||
{isDraft ? (
|
||||
<Input
|
||||
type="number"
|
||||
className="text-right h-9 border-grey-200 focus:ring-primary-main"
|
||||
value={item.adjust_qty}
|
||||
onChange={e => updateItem(index, 'adjust_qty', e.target.value)}
|
||||
/>
|
||||
) : (
|
||||
<span className={`font-bold ${Number(item.adjust_qty) > 0 ? 'text-green-600' : 'text-red-600'}`}>
|
||||
{Number(item.adjust_qty) > 0 ? '+' : ''}{item.adjust_qty}
|
||||
</span>
|
||||
)}
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
{isDraft ? (
|
||||
<Input
|
||||
className="h-9 border-grey-200 focus:ring-primary-main"
|
||||
value={item.notes || ''}
|
||||
onChange={e => updateItem(index, 'notes', e.target.value)}
|
||||
placeholder="輸入備註..."
|
||||
/>
|
||||
) : (
|
||||
<span className="text-grey-600 text-sm">{item.notes || '-'}</span>
|
||||
)}
|
||||
</TableCell>
|
||||
{isDraft && (
|
||||
<TableCell className="text-center">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="h-8 w-8 text-red-400 hover:text-red-600 hover:bg-red-50 p-0"
|
||||
onClick={() => removeItem(index)}
|
||||
>
|
||||
<X className="h-4 w-4" />
|
||||
</Button>
|
||||
</TableCell>
|
||||
<TableCell className="text-grey-600">{item.batch_number || '-'}</TableCell>
|
||||
<TableCell className="text-center text-grey-500">{item.unit}</TableCell>
|
||||
<TableCell className="text-right font-medium text-grey-400">
|
||||
{item.qty_before}
|
||||
</TableCell>
|
||||
<TableCell className="text-right">
|
||||
{isDraft ? (
|
||||
<Input
|
||||
type="number"
|
||||
className="text-right h-9 border-grey-200 focus:ring-primary-main"
|
||||
value={item.adjust_qty}
|
||||
onChange={e => updateItem(index, 'adjust_qty', e.target.value)}
|
||||
/>
|
||||
) : (
|
||||
<span className={`font-bold ${Number(item.adjust_qty) > 0 ? 'text-green-600' : 'text-red-600'}`}>
|
||||
{Number(item.adjust_qty) > 0 ? '+' : ''}{item.adjust_qty}
|
||||
</span>
|
||||
)}
|
||||
</TableRow>
|
||||
))
|
||||
)}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</div>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
{isDraft ? (
|
||||
<Input
|
||||
className="h-9 border-grey-200 focus:ring-primary-main text-sm"
|
||||
value={item.notes || ''}
|
||||
onChange={e => updateItem(index, 'notes', e.target.value)}
|
||||
placeholder="備註..."
|
||||
/>
|
||||
) : (
|
||||
<span className="text-grey-600 text-sm">{item.notes || '-'}</span>
|
||||
)}
|
||||
</TableCell>
|
||||
{isDraft && (
|
||||
<TableCell className="text-center">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="h-8 w-8 text-red-400 hover:text-red-600 hover:bg-red-50 p-0"
|
||||
onClick={() => removeItem(index)}
|
||||
>
|
||||
<X className="h-4 w-4" />
|
||||
</Button>
|
||||
</TableCell>
|
||||
)}
|
||||
</TableRow>
|
||||
))
|
||||
)}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="bg-gray-50/80 border border-dashed border-grey-200 rounded-lg p-4 flex items-start gap-3">
|
||||
<CheckCircle className="h-5 w-5 text-primary-main mt-0.5 shrink-0" />
|
||||
<div className="text-xs text-grey-500 leading-relaxed">
|
||||
<p className="font-bold text-grey-700">操作導引：</p>
|
||||
<ul className="list-disc ml-4 space-y-1 mt-1">
|
||||
<li><strong>調整數量 (+/-)：</strong>輸入正數 (+) 表示增加庫存 (盤盈、溢收)；輸入負數 (-) 表示扣減庫存 (盤虧、報廢、損耗)。</li>
|
||||
<li><strong>批號控管：</strong>若商品啟用批號管理，請務必確認調整項目對應的批號是否正確。</li>
|
||||
<li><strong>過帳生效：</strong>點擊「確認過帳」後，單據將轉為唯讀，並立即更新即時庫存明細與異動紀錄。</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</AuthenticatedLayout>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user