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

feat(Inventory): 同步調撥管理權限邏輯至盤點管理標準
All checks were successful
Koori-ERP-Deploy-System / deploy-demo (push) Has been skipped
Details
Koori-ERP-Deploy-System / deploy-production (push) Successful in 1m5s
Details

Browse Source
This commit is contained in:
sky121113
2026-02-03 17:29:32 +08:00
parent bd999c7bb6
commit 19216f5846
2 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
resources/js/Pages/Inventory/Transfer/Index.tsx
View File

@@ -48,8 +48,10 @@ import {
import Pagination from "@/Components/shared/Pagination"; import Pagination from "@/Components/shared/Pagination";
import { toast } from "sonner"; import { toast } from "sonner";
import { Can } from '@/Components/Permission/Can'; import { Can } from '@/Components/Permission/Can';
import { usePermission } from '@/hooks/usePermission';
export default function Index({ warehouses, orders, filters }: any) { export default function Index({ warehouses, orders, filters }: any) {
const { can } = usePermission();
const [searchTerm, setSearchTerm] = useState(filters.search || ""); const [searchTerm, setSearchTerm] = useState(filters.search || "");
const [warehouseFilter, setWarehouseFilter] = useState(filters.warehouse_id || "all"); const [warehouseFilter, setWarehouseFilter] = useState(filters.warehouse_id || "all");
const [perPage, setPerPage] = useState(filters.per_page || "10"); const [perPage, setPerPage] = useState(filters.per_page || "10");
@@ -320,21 +322,44 @@ export default function Index({ warehouses, orders, filters }: any) {
<TableCell className="text-sm">{order.created_by}</TableCell> <TableCell className="text-sm">{order.created_by}</TableCell>
<TableCell className="text-center"> <TableCell className="text-center">
<div className="flex items-center justify-center gap-2" onClick={(e) => e.stopPropagation()}> <div className="flex items-center justify-center gap-2" onClick={(e) => e.stopPropagation()}>
<Can permission="inventory_transfer.view"> {(() => {
const isEditable = order.status === 'draft';
const canEdit = can('inventory_transfer.edit');
const canView = can('inventory_transfer.view');
if (isEditable && canEdit) {
return (
<Link href={route('inventory.transfer.show', [order.id])}> <Link href={route('inventory.transfer.show', [order.id])}>
<Button <Button
variant="outline" variant="outline"
size="sm" size="sm"
className="button-outlined-primary" className="button-outlined-primary"
title={['completed', 'voided'].includes(order.status) ? '查閱' : '編輯'} title="編輯"
> >
{['completed', 'voided'].includes(order.status) ? (
<Eye className="w-4 h-4 ml-0.5" />
) : (
<Pencil className="w-4 h-4 ml-0.5" /> <Pencil className="w-4 h-4 ml-0.5" />
)}
</Button> </Button>
</Link> </Link>
);
}
if (canView) {
return (
<Link href={route('inventory.transfer.show', [order.id])}>
<Button
variant="outline"
size="sm"
className="button-outlined-primary"
title="查閱"
>
<Eye className="w-4 h-4 ml-0.5" />
</Button>
</Link>
);
}
return null;
})()}
{order.status === 'draft' && ( {order.status === 'draft' && (
<Can permission="inventory_transfer.delete"> <Can permission="inventory_transfer.delete">
<Button <Button
@@ -348,7 +373,6 @@ export default function Index({ warehouses, orders, filters }: any) {
</Button> </Button>
</Can> </Can>
)} )}
</Can>
</div> </div>
</TableCell> </TableCell>
</TableRow> </TableRow>

10
resources/js/Pages/Inventory/Transfer/Show.tsx
View File

@@ -1,4 +1,3 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import AuthenticatedLayout from "@/Layouts/AuthenticatedLayout"; import AuthenticatedLayout from "@/Layouts/AuthenticatedLayout";
import { Head, router, Link } from "@inertiajs/react"; import { Head, router, Link } from "@inertiajs/react";
@@ -37,8 +36,10 @@ import { Plus, Save, Trash2, ArrowLeft, CheckCircle, Package, ArrowLeftRight, Pr
import { toast } from "sonner"; import { toast } from "sonner";
import axios from "axios"; import axios from "axios";
import { Can } from '@/Components/Permission/Can'; import { Can } from '@/Components/Permission/Can';
import { usePermission } from '@/hooks/usePermission';
export default function Show({ order }: any) { export default function Show({ order }: any) {
const { can } = usePermission();
const [items, setItems] = useState(order.items || []); const [items, setItems] = useState(order.items || []);
const [remarks, setRemarks] = useState(order.remarks || ""); const [remarks, setRemarks] = useState(order.remarks || "");
const [isSaving, setIsSaving] = useState(false); const [isSaving, setIsSaving] = useState(false);
@@ -181,7 +182,8 @@ export default function Show({ order }: any) {
}); });
}; };
const isReadOnly = order.status !== 'draft'; const canEdit = can('inventory_transfer.edit');
const isReadOnly = order.status !== 'draft' || !canEdit;
return ( return (
<AuthenticatedLayout <AuthenticatedLayout
@@ -234,7 +236,7 @@ export default function Show({ order }: any) {
{!isReadOnly && ( {!isReadOnly && (
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Can permission="inventory.view"> <Can permission="inventory_transfer.delete">
<AlertDialog open={!!deleteId} onOpenChange={(open) => !open && setDeleteId(null)}> <AlertDialog open={!!deleteId} onOpenChange={(open) => !open && setDeleteId(null)}>
<AlertDialogTrigger asChild> <AlertDialogTrigger asChild>
<Button variant="outline" size="sm" className="button-outlined-error" onClick={() => setDeleteId(order.id)}> <Button variant="outline" size="sm" className="button-outlined-error" onClick={() => setDeleteId(order.id)}>
@@ -255,7 +257,9 @@ export default function Show({ order }: any) {
</AlertDialogFooter> </AlertDialogFooter>
</AlertDialogContent> </AlertDialogContent>
</AlertDialog> </AlertDialog>
</Can>
<Can permission="inventory_transfer.edit">
<Button <Button
variant="outline" variant="outline"
size="sm" size="sm"