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

統一庫存盤點與盤調 UI 及邏輯：修正狀態顯示、操作權限與列表樣式
All checks were successful
Koori-ERP-Deploy-System / deploy-demo (push) Successful in 50s
Details
Koori-ERP-Deploy-System / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
sky121113
2026-01-29 13:41:31 +08:00
parent a31c8d6052
commit 2efaded77b
6 changed files with 115 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/js/Pages/Inventory/Count/Index.tsx
View File

@@ -13,7 +13,6 @@ import {
} from '@/Components/ui/table';
import { Button } from '@/Components/ui/button';
import { Input } from '@/Components/ui/input';
import { Card, CardContent } from '@/Components/ui/card';
import { Badge } from '@/Components/ui/badge';
import {
Dialog,
@@ -141,6 +140,8 @@ export default function Index({ auth, docs, warehouses, filters }: any) {
return <Badge className="bg-blue-500 hover:bg-blue-600">盤點中</Badge>;
case 'completed':
return <Badge className="bg-green-500 hover:bg-green-600">已核准</Badge>;
case 'adjusted':
return <Badge className="bg-purple-500 hover:bg-purple-600">已盤調庫存</Badge>;
case 'cancelled':
return <Badge variant="destructive">已取消</Badge>;
default:
@@ -307,16 +308,16 @@ export default function Index({ auth, docs, warehouses, filters }: any) {
variant="outline"
size="sm"
className="button-outlined-primary"
title={doc.status === 'completed' ? '查閱' : '盤點'}
title={['completed', 'adjusted'].includes(doc.status) ? '查閱' : '盤點'}
>
{doc.status === 'completed' ? (
{['completed', 'adjusted'].includes(doc.status) ? (
<Eye className="w-4 h-4 ml-0.5" />
) : (
<Pencil className="w-4 h-4 ml-0.5" />
)}
</Button>
</Link>
{doc.status !== 'completed' && (
{!['completed', 'adjusted'].includes(doc.status) && (
<Button
variant="outline"
size="sm"

12
resources/js/Pages/Inventory/Count/Show.tsx
View File

@@ -61,7 +61,7 @@ export default function Show({ doc }: any) {
});
}
const isCompleted = doc.status === 'completed';
const isCompleted = ['completed', 'adjusted'].includes(doc.status);
// Calculate progress
const totalItems = doc.items.length;
@@ -97,9 +97,13 @@ export default function Show({ doc }: any) {
<ClipboardCheck className="h-6 w-6 text-primary-main" />
盤點單: {doc.doc_no}
</h1>
{doc.status === 'completed' ? (
{doc.status === 'completed' && (
<Badge className="bg-green-500 hover:bg-green-600">已核准</Badge>
) : (
)}
{doc.status === 'adjusted' && (
<Badge className="bg-purple-500 hover:bg-purple-600">已盤調庫存</Badge>
)}
{doc.status === 'draft' && (
<Badge className="bg-blue-500 hover:bg-blue-600">盤點中</Badge>
)}
</div>
@@ -119,7 +123,7 @@ export default function Show({ doc }: any) {
列印
</Button>
{isCompleted && (
{doc.status === 'completed' && (
<Can permission="inventory.adjust">
<AlertDialog>
<AlertDialogTrigger asChild>