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

Compare commits

base: mama:5668e17e61c28bb73509e730aa99204a1fa907ad
Branches Tags
mama:main mama:demo mama:dev mama:feature/modular-monolith-arch
..
compare: mama:e3df090afdd70fec7108feee21f77d671d342406
Branches Tags
mama:demo mama:dev mama:main mama:feature/modular-monolith-arch

3 Commits
5668e17e61 ... e3df090afd

Author SHA1 Message Date
sky121113
e3df090afd feat: 統一各模組分頁組件佈局並新增系統設定功能相關檔案
All checks were successful
ERP-Deploy-Demo / deploy-demo (push) Successful in 1m5s
Details
2026-02-25 16:16:49 +08:00
sky121113
878b90e2ad UI: 統一各單據詳情頁面標題與基本資訊排版 2026-02-25 14:56:15 +08:00
sky121113
299cf37054 fix: 修正全系統側邊欄捲軸重置問題 
在所有報表與管理頁面的 router.get 調用中加入 preserveScroll: true。
受影響模組包括：
- 財務管理 (會計報表、公用事業費)
- 庫存管理 (庫存查詢、倉庫管理、進貨、調整、調撥)
- 生產管理 (工單管理、配方管理)
- 採購管理 (採購單)
- 銷售與發貨管理 (銷售單、發貨單、匯入管理)
- 系統管理 (使用者、角色、操作紀錄)
 2026-02-25 14:04:22 +08:00
66 changed files with 1094 additions and 574 deletions
Expand all files Collapse all files

6
app/Modules/Core/Controllers/ActivityLogController.php
View File

@@ -36,7 +36,11 @@ class ActivityLogController extends Controller
public function index(Request $request)
{
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$sortBy = $request->input('sort_by', 'created_at');
$sortOrder = $request->input('sort_order', 'desc');

46
app/Modules/Core/Controllers/SystemSettingController.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
namespace App\Modules\Core\Controllers;
use App\Http\Controllers\Controller;
use App\Modules\Core\Models\SystemSetting;
use Illuminate\Http\Request;
use Inertia\Inertia;
class SystemSettingController extends Controller
{
/**
* 顯示系統設定頁面
*/
public function index()
{
$settings = SystemSetting::all()->groupBy('group');
return Inertia::render('Admin/Setting/Index', [
'settings' => $settings,
]);
}
/**
* 更新系統設定
*/
public function update(Request $request)
{
$validated = $request->validate([
'settings' => 'required|array',
'settings.*.key' => 'required|string|exists:system_settings,key',
'settings.*.value' => 'nullable',
]);
foreach ($validated['settings'] as $item) {
SystemSetting::where('key', $item['key'])->update([
'value' => $item['value']
]);
}
// 清除記憶體快取，確保後續讀取拿到最新值
SystemSetting::clearCache();
return redirect()->back()->with('success', '系統設定已更新');
}
}

7
app/Modules/Core/Controllers/UserController.php
View File

@@ -18,7 +18,12 @@ class UserController extends Controller
*/
public function index(Request $request)
{
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$sortBy = $request->input('sort_by', 'id');
$sortOrder = $request->input('sort_order', 'asc');
$search = $request->input('search');

61
app/Modules/Core/Models/SystemSetting.php Normal file
View File

@@ -0,0 +1,61 @@
<?php
namespace App\Modules\Core\Models;
use Illuminate\Database\Eloquent\Model;
class SystemSetting extends Model
{
protected $fillable = [
'group',
'key',
'value',
'type',
'description',
];
/**
* 同請求內的記憶體快取，避免重複查詢 DB
* PHP 請求結束後自動釋放，無需額外處理失效
*/
protected static array $cache = [];
/**
* 取得特定設定值（含記憶體快取）
*/
public static function getVal(string $key, $default = null)
{
if (array_key_exists($key, static::$cache)) {
return static::$cache[$key];
}
$setting = self::where('key', $key)->first();
if (!$setting) {
static::$cache[$key] = $default;
return $default;
}
$value = $setting->value;
// 根據 type 進行類別轉換
$resolved = match ($setting->type) {
'integer', 'number' => (int) $value,
'boolean', 'bool' => filter_var($value, FILTER_VALIDATE_BOOLEAN),
'json', 'array' => json_decode($value, true),
default => $value,
};
static::$cache[$key] = $resolved;
return $resolved;
}
/**
* 清除記憶體快取（儲存設定後應呼叫）
*/
public static function clearCache(): void
{
static::$cache = [];
}
}

6
app/Modules/Core/Routes/web.php
View File

@@ -7,6 +7,7 @@ use App\Modules\Core\Controllers\ProfileController;
use App\Modules\Core\Controllers\RoleController;
use App\Modules\Core\Controllers\UserController;
use App\Modules\Core\Controllers\ActivityLogController;
use App\Modules\Core\Controllers\SystemSettingController;
// 登入/登出路由
Route::get('/login', [LoginController::class, 'show'])->name('login');
@@ -56,5 +57,10 @@ Route::middleware('auth')->group(function () {
Route::get('/activity-logs', [ActivityLogController::class, 'index'])->name('activity-logs.index');
});
Route::middleware('permission:system.settings.view')->group(function () {
Route::get('/settings', [SystemSettingController::class, 'index'])->name('settings.index');
Route::post('/settings', [SystemSettingController::class, 'update'])->name('settings.update');
});
});
});

6
app/Modules/Finance/Controllers/AccountPayableController.php
View File

@@ -63,7 +63,11 @@ class AccountPayableController extends Controller
$query->where('due_date', '<=', $request->date_end);
}
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$payables = $query->latest()->paginate($perPage)->withQueryString();
// Manual Hydration for Vendors

6
app/Modules/Finance/Controllers/AccountingReportController.php
View File

@@ -27,7 +27,11 @@ class AccountingReportController extends Controller
$allRecords = $reportData['records'];
// 3. Manual Pagination
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$page = $request->input('page', 1);
$offset = ($page - 1) * $perPage;

4
app/Modules/Finance/Services/AccountPayableService.php
View File

@@ -50,8 +50,8 @@ class AccountPayableService
'total_amount' => collect($receiptData['items'] ?? [])->sum('total_amount'),
'tax_amount' => 0, // 假設後續會實作稅額計算，目前預設為 0
'status' => AccountPayable::STATUS_PENDING,
// 設定應付日期，預設為進貨後 30 天 (可依據供應商設定調整)
'due_date' => now()->addDays(30)->toDateString(),
// 設定應付日期，預設為進貨後天數 (由系統設定決定，預設 30 天)
'due_date' => now()->addDays(\App\Modules\Core\Models\SystemSetting::getVal('finance.ap_payment_days', 30))->toDateString(),
'created_by' => $userId,
'remarks' => "由進貨單 {$receiptData['code']} 自動生成",
]);

8
app/Modules/Finance/Services/FinanceService.php
View File

@@ -94,7 +94,13 @@ class FinanceService implements FinanceServiceInterface
$sortDirection = $filters['sort_direction'] ?? 'desc';
$query->orderBy($sortField, $sortDirection);
return $query->paginate($filters['per_page'] ?? 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = (int) ($filters['per_page'] ?? $defaultPerPage);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
return $query->paginate($perPage);
}
public function getUniqueCategories(): Collection

8
app/Modules/Integration/Controllers/SalesOrderController.php
View File

@@ -29,7 +29,13 @@ class SalesOrderController extends Controller
// 排序
$query->orderBy('sold_at', 'desc');
$orders = $query->paginate($request->input('per_page', 10))
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = (int) $request->input('per_page', $defaultPerPage);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$orders = $query->paginate($perPage)
->withQueryString();
return Inertia::render('Integration/SalesOrders/Index', [

2
app/Modules/Inventory/Contracts/InventoryServiceInterface.php
View File

@@ -131,7 +131,7 @@ interface InventoryServiceInterface
* @param int $perPage 每頁筆數
* @return array
*/
public function getStockQueryData(array $filters = [], int $perPage = 10): array;
public function getStockQueryData(array $filters = [], ?int $perPage = null): array;
/**
* Get statistics for the dashboard.

6
app/Modules/Inventory/Controllers/AdjustDocController.php
View File

@@ -39,7 +39,11 @@ class AdjustDocController extends Controller
$query->where('warehouse_id', $request->warehouse_id);
}
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$docs = $query->orderByDesc('created_at')
->paginate($perPage)
->withQueryString()

8
app/Modules/Inventory/Controllers/CountDocController.php
View File

@@ -35,9 +35,11 @@ class CountDocController extends Controller
});
}
$perPage = $request->input('per_page', 10);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = 10;
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$countQuery = function ($query) {

15
app/Modules/Inventory/Controllers/GoodsReceiptController.php
View File

@@ -63,7 +63,11 @@ class GoodsReceiptController extends Controller
}
// 每頁筆數
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$receipts = $query->orderBy('created_at', 'desc')
->paginate($perPage)
@@ -88,7 +92,7 @@ class GoodsReceiptController extends Controller
]);
}
public function show($id)
public function show(Request $request, $id)
{
$receipt = GoodsReceipt::with([
'warehouse',
@@ -105,7 +109,12 @@ class GoodsReceiptController extends Controller
$receipt->items_sum_total_amount = $receipt->items->sum('total_amount');
return Inertia::render('Inventory/GoodsReceipt/Show', [
'receipt' => $receipt
'receipt' => $receipt,
'navigation' => [
'from' => $request->query('from'),
'from_id' => $request->query('from_id'),
'from_label' => $request->query('from_label'),
]
]);
}

7
app/Modules/Inventory/Controllers/InventoryAnalysisController.php
View File

@@ -24,7 +24,12 @@ class InventoryAnalysisController extends Controller
'warehouse_id', 'category_id', 'search', 'per_page', 'sort_by', 'sort_order', 'status'
]);
$analysisData = $this->turnoverService->getAnalysisData($filters, $request->input('per_page', 10));
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = (int) $request->input('per_page', $defaultPerPage);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$analysisData = $this->turnoverService->getAnalysisData($filters, $perPage);
$kpis = $this->turnoverService->getKPIs($filters);
return Inertia::render('Inventory/Analysis/Index', [

7
app/Modules/Inventory/Controllers/InventoryReportController.php
View File

@@ -35,7 +35,12 @@ class InventoryReportController extends Controller
$filters['date_to'] = date('Y-m-d');
}
$reportData = $this->reportService->getReportData($filters, $request->input('per_page', 10));
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = (int) $request->input('per_page', $defaultPerPage);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$reportData = $this->reportService->getReportData($filters, $perPage);
$summary = $this->reportService->getSummary($filters);
return Inertia::render('Inventory/Report/Index', [

8
app/Modules/Inventory/Controllers/ProductController.php
View File

@@ -37,9 +37,11 @@ class ProductController extends Controller
$query->where('category_id', $request->category_id);
}
$perPage = $request->input('per_page', 10);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = 10;
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$sortField = $request->input('sort_field', 'id');

7
app/Modules/Inventory/Controllers/StockQueryController.php
View File

@@ -24,7 +24,12 @@ class StockQueryController extends Controller
public function index(Request $request)
{
$filters = $request->only(['warehouse_id', 'category_id', 'search', 'status', 'sort_by', 'sort_order', 'per_page']);
$perPage = (int) ($filters['per_page'] ?? 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = (int) ($filters['per_page'] ?? $defaultPerPage);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$result = $this->inventoryService->getStockQueryData($filters, $perPage);

6
app/Modules/Inventory/Controllers/StoreRequisitionController.php
View File

@@ -65,7 +65,11 @@ class StoreRequisitionController extends Controller
$query->orderBy('id', 'desc');
}
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$requisitions = $query->paginate($perPage)->withQueryString();
// 水和倉庫名稱與使用者名稱

6
app/Modules/Inventory/Controllers/TransferOrderController.php
View File

@@ -42,7 +42,11 @@ class TransferOrderController extends Controller
});
}
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$orders = $query->orderByDesc('created_at')
->paginate($perPage)
->withQueryString()

8
app/Modules/Inventory/Controllers/WarehouseController.php
View File

@@ -24,9 +24,11 @@ class WarehouseController extends Controller
});
}
$perPage = $request->input('per_page', 10);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = 10;
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$warehouses = $query->withSum('inventories as book_stock', 'quantity') // 帳面庫存 = 所有庫存總和

6
app/Modules/Inventory/Services/InventoryReportService.php
View File

@@ -23,8 +23,9 @@ class InventoryReportService
* @param int|null $perPage 每頁筆數
* @return \Illuminate\Pagination\LengthAwarePaginator|\Illuminate\Support\Collection
*/
public function getReportData(array $filters, ?int $perPage = 10)
public function getReportData(array $filters, ?int $perPage = null)
{
$perPage = $perPage ?? \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$dateFrom = $filters['date_from'] ?? null;
$dateTo = $filters['date_to'] ?? null;
$warehouseId = $filters['warehouse_id'] ?? null;
@@ -197,8 +198,9 @@ class InventoryReportService
/**
* 取得特定商品的庫存異動明細
*/
public function getProductDetails($productId, array $filters, ?int $perPage = 20)
public function getProductDetails($productId, array $filters, ?int $perPage = null)
{
$perPage = $perPage ?? \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$dateFrom = $filters['date_from'] ?? null;
$dateTo = $filters['date_to'] ?? null;
$warehouseId = $filters['warehouse_id'] ?? null;

9
app/Modules/Inventory/Services/InventoryService.php
View File

@@ -258,10 +258,12 @@ class InventoryService implements InventoryServiceInterface
/**
* 即時庫存查詢：統計卡片 + 分頁明細
*/
public function getStockQueryData(array $filters = [], int $perPage = 10): array
public function getStockQueryData(array $filters = [], ?int $perPage = null): array
{
$perPage = $perPage ?? \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$today = now()->toDateString();
$expiryThreshold = now()->addDays(30)->toDateString();
$expiryDays = \App\Modules\Core\Models\SystemSetting::getVal('inventory.expiry_warning_days', 30);
$expiryThreshold = now()->addDays($expiryDays)->toDateString();
// 基礎查詢
$query = Inventory::query()
@@ -492,7 +494,8 @@ class InventoryService implements InventoryServiceInterface
public function getDashboardStats(): array
{
$today = now()->toDateString();
$expiryThreshold = now()->addDays(30)->toDateString();
$expiryDays = \App\Modules\Core\Models\SystemSetting::getVal('inventory.expiry_warning_days', 30);
$expiryThreshold = now()->addDays($expiryDays)->toDateString();
// 1. 庫存品項數 (明細總數)
$totalItems = DB::table('inventories')

28
app/Modules/Inventory/Services/TurnoverService.php
View File

@@ -12,8 +12,9 @@ class TurnoverService
/**
* Get inventory turnover analysis data
*/
public function getAnalysisData(array $filters, int $perPage = 20)
public function getAnalysisData(array $filters, ?int $perPage = null)
{
$perPage = $perPage ?? \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$warehouseId = $filters['warehouse_id'] ?? null;
$categoryId = $filters['category_id'] ?? null;
$search = $filters['search'] ?? null;
@@ -60,7 +61,8 @@ class TurnoverService
// Given potentially large data, subquery per row might be slow, but for pagination it's okay-ish.
// Better approach: Join with a subquery of aggregated transactions.
$thirtyDaysAgo = Carbon::now()->subDays(30);
$analysisDays = \App\Modules\Core\Models\SystemSetting::getVal('turnover.analysis_period_days', 30);
$thirtyDaysAgo = Carbon::now()->subDays($analysisDays);
// Subquery for 30-day sales
$salesSubquery = InventoryTransaction::query()
@@ -111,7 +113,7 @@ class TurnoverService
// Turnover Days Calculation in SQL: (stock / (sales_30d / 30)) => (stock * 30) / sales_30d
// Handle division by zero: if sales_30d is 0, turnover is 'Inf' (or very high number like 9999)
$turnoverDaysSql = "CASE WHEN COALESCE(sales_30d.sales_qty_30d, 0) > 0
THEN (COALESCE(SUM(inventories.quantity), 0) * 30) / sales_30d.sales_qty_30d
THEN (COALESCE(SUM(inventories.quantity), 0) * $analysisDays) / sales_30d.sales_qty_30d
ELSE 9999 END";
$query->addSelect(DB::raw("$turnoverDaysSql as turnover_days"));
@@ -125,7 +127,8 @@ class TurnoverService
// For dead stock, definitive IS stock > 0.
if ($statusFilter === 'dead') {
$ninetyDaysAgo = Carbon::now()->subDays(90);
$deadStockDays = \App\Modules\Core\Models\SystemSetting::getVal('turnover.dead_stock_days', 90);
$ninetyDaysAgo = Carbon::now()->subDays($deadStockDays);
$query->havingRaw("current_stock > 0 AND (last_sale_date < ? OR last_sale_date IS NULL)", [$ninetyDaysAgo]);
}
@@ -146,10 +149,13 @@ class TurnoverService
$lastSale = $item->last_sale_date ? Carbon::parse($item->last_sale_date) : null;
$daysSinceSale = $lastSale ? $lastSale->diffInDays(Carbon::now()) : 9999;
if ($item->current_stock > 0 && $daysSinceSale > 90) {
$deadStockDays = \App\Modules\Core\Models\SystemSetting::getVal('turnover.dead_stock_days', 90);
$slowMovingDays = \App\Modules\Core\Models\SystemSetting::getVal('turnover.slow_moving_days', 60);
if ($item->current_stock > 0 && $daysSinceSale > $deadStockDays) {
$item->status = 'dead'; // 滯銷
$item->status_label = '滯銷';
} elseif ($item->current_stock > 0 && $item->turnover_days > 60) {
} elseif ($item->current_stock > 0 && $item->turnover_days > $slowMovingDays) {
$item->status = 'slow'; // 週轉慢
$item->status_label = '週轉慢';
} elseif ($item->current_stock == 0) {
@@ -187,8 +193,8 @@ class TurnoverService
// 2. Dead Stock Value (No sale in 90 days)
// Need last sale date for each product-location or just product?
// Assuming dead stock is product-level logic for simplicity.
$ninetyDaysAgo = Carbon::now()->subDays(90);
$deadStockDays = \App\Modules\Core\Models\SystemSetting::getVal('turnover.dead_stock_days', 90);
$ninetyDaysAgo = Carbon::now()->subDays($deadStockDays);
// Get IDs of products sold in last 90 days
$soldProductIds = InventoryTransaction::query()
@@ -225,17 +231,17 @@ class TurnoverService
// Simplified: (Total Stock / Total Sales 30d) * 30
$totalStock = (clone $buildInvQuery())->sum('inventories.quantity');
$analysisDays = \App\Modules\Core\Models\SystemSetting::getVal('turnover.analysis_period_days', 30);
$totalSales30d = DB::table('inventory_transactions')
->join('inventories', 'inventory_transactions.inventory_id', '=', 'inventories.id')
->join('products', 'inventories.product_id', '=', 'products.id')
->where('inventory_transactions.type', '出庫')
->where('inventory_transactions.actual_time', '>=', Carbon::now()->subDays(30))
->where('inventory_transactions.actual_time', '>=', Carbon::now()->subDays($analysisDays))
->when($warehouseId, fn($q) => $q->where('inventories.warehouse_id', $warehouseId))
->when($categoryId, fn($q) => $q->where('products.category_id', $categoryId))
->sum(DB::raw('ABS(inventory_transactions.quantity)'));
$avgTurnoverDays = $totalSales30d > 0 ? ($totalStock * 30) / $totalSales30d : 0;
$avgTurnoverDays = $totalSales30d > 0 ? ($totalStock * $analysisDays) / $totalSales30d : 0;
return [
'total_stock_value' => $totalValue,

6
app/Modules/Procurement/Controllers/PurchaseOrderController.php
View File

@@ -66,7 +66,11 @@ class PurchaseOrderController extends Controller
$query->orderBy($sortField, $sortDirection);
}
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$orders = $query->paginate($perPage)->withQueryString();
// 2. 手動注入倉庫與使用者資料

5
app/Modules/Procurement/Controllers/PurchaseReturnController.php
View File

@@ -35,11 +35,12 @@ class PurchaseReturnController extends Controller
$query->where('status', $request->status);
}
$purchaseReturns = $query->paginate(15)->withQueryString();
$perPage = $request->input('per_page', 15);
$purchaseReturns = $query->paginate($perPage)->withQueryString();
return Inertia::render('PurchaseReturn/Index', [
'purchaseReturns' => $purchaseReturns,
'filters' => $request->only(['search', 'status']),
'filters' => $request->only(['search', 'status', 'per_page']),
]);
}

6
app/Modules/Procurement/Controllers/ShippingOrderController.php
View File

@@ -48,7 +48,11 @@ class ShippingOrderController extends Controller
$query->where('status', $request->status);
}
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$orders = $query->orderBy('id', 'desc')->paginate($perPage)->withQueryString();
// 水和倉庫與使用者

6
app/Modules/Procurement/Controllers/VendorController.php
View File

@@ -44,7 +44,11 @@ class VendorController extends Controller
$sortDirection = 'desc';
}
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$vendors = $query->orderBy($sortField, $sortDirection)
->paginate($perPage)

6
app/Modules/Production/Controllers/ProductionOrderController.php
View File

@@ -62,7 +62,11 @@ class ProductionOrderController extends Controller
$query->orderBy($request->input('sort_field', 'created_at'), $request->input('sort_direction', 'desc'));
// 分頁
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$productionOrders = $query->paginate($perPage)->withQueryString();
// --- 手動資料水和 (Manual Hydration) ---

8
app/Modules/Production/Controllers/RecipeController.php
View File

@@ -40,7 +40,13 @@ class RecipeController extends Controller
$query->orderBy($request->input('sort_field', 'created_at'), $request->input('sort_direction', 'desc'));
$recipes = $query->paginate($request->input('per_page', 10))->withQueryString();
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = (int) $request->input('per_page', $defaultPerPage);
if (!in_array($perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$recipes = $query->paginate($perPage)->withQueryString();
// Manual Hydration
$productIds = $recipes->pluck('product_id')->unique()->filter()->toArray();

12
app/Modules/Sales/Controllers/SalesImportController.php
View File

@@ -15,7 +15,11 @@ class SalesImportController extends Controller
{
public function index(Request $request)
{
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$search = $request->input('search');
$batches = SalesImportBatch::with('importer')
@@ -65,7 +69,11 @@ class SalesImportController extends Controller
{
$import->load(['items', 'importer']);
$perPage = $request->input('per_page', 10);
$defaultPerPage = \App\Modules\Core\Models\SystemSetting::getVal('display.per_page', 10);
$perPage = $request->input('per_page', $defaultPerPage);
if (!in_array((int)$perPage, [10, 20, 50, 100])) {
$perPage = $defaultPerPage;
}
$paginatedItems = $import->items()->paginate($perPage)->withQueryString();
// Manual Hydration for Products and Warehouses

29
database/migrations/tenant/2026_02_25_151106_create_system_settings_table.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('system_settings', function (Blueprint $table) {
$table->id();
$table->string('group')->index()->comment('設定分組');
$table->string('key')->unique()->comment('設定鍵名');
$table->text('value')->nullable()->comment('設定值');
$table->string('type')->default('string')->comment('資料型別');
$table->string('description')->nullable()->comment('功能說明');
$table->timestamps();
});
}
public function down(): void
{
Schema::dropIfExists('system_settings');
}
};

4
database/seeders/PermissionSeeder.php
View File

@@ -124,6 +124,10 @@ class PermissionSeeder extends Seeder
// 系統日誌
'system.view_logs' => '檢視日誌',
// 系統設定
'system.settings.view' => '檢視設定',
'system.settings.edit' => '編輯設定',
// 公共事業費管理
'utility_fees.view' => '檢視',
'utility_fees.create' => '建立',

68
database/seeders/SystemSettingSeeder.php Normal file
View File

@@ -0,0 +1,68 @@
<?php
namespace Database\Seeders;
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use Illuminate\Database\Seeder;
class SystemSettingSeeder extends Seeder
{
public function run(): void
{
$settings = [
// 💰 財務設定
[
'group' => 'finance',
'key' => 'finance.ap_payment_days',
'value' => '30',
'type' => 'integer',
'description' => '應付帳款預設付款天數',
],
// 📦 庫存管理
[
'group' => 'inventory',
'key' => 'inventory.expiry_warning_days',
'value' => '30',
'type' => 'integer',
'description' => '商品到期預警天數',
],
// 📊 周轉率分析
[
'group' => 'turnover',
'key' => 'turnover.analysis_period_days',
'value' => '30',
'type' => 'integer',
'description' => '周轉率分析：銷售統計期間（天）',
],
[
'group' => 'turnover',
'key' => 'turnover.dead_stock_days',
'value' => '90',
'type' => 'integer',
'description' => '周轉率分析：滯銷判定天數',
],
[
'group' => 'turnover',
'key' => 'turnover.slow_moving_days',
'value' => '60',
'type' => 'integer',
'description' => '周轉率分析：週轉慢判定天數',
],
// 🖥️ 顯示設定
[
'group' => 'display',
'key' => 'display.per_page',
'value' => '10',
'type' => 'integer',
'description' => '每頁預設筆數',
],
];
foreach ($settings as $setting) {
\App\Modules\Core\Models\SystemSetting::updateOrCreate(
['key' => $setting['key']],
$setting
);
}
}
}

7
resources/js/Layouts/AuthenticatedLayout.tsx
View File

@@ -307,6 +307,13 @@ export default function AuthenticatedLayout({
route: "/admin/activity-logs",
permission: "system.view_logs",
},
{
id: "system-settings",
label: "系統設定",
icon: <Settings className="h-4 w-4" />,
route: "/admin/settings",
permission: "system.settings.view",
},
{
id: "manual",
label: "操作手冊",

4
resources/js/Pages/AccountPayable/Index.tsx
View File

@@ -260,7 +260,7 @@ export default function AccountPayableIndex({ payables, filters, vendors }: any)
</Table>
</div>
<div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
@@ -278,7 +278,7 @@ export default function AccountPayableIndex({ payables, filters, vendors }: any)
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {payables.total} 筆紀錄</span>
<span className="text-sm text-gray-500">共 {payables.total} 筆資料</span>
</div>
<Pagination links={payables.links} />
</div>

88
resources/js/Pages/AccountPayable/Show.tsx
View File

@@ -100,24 +100,27 @@ export default function AccountPayableShow({ payable }: any) {
</div>
{/* 頁面標題與操作 */}
<div className="flex items-start justify-between mb-6">
<div>
<div className="flex flex-col md:flex-row md:items-start justify-between gap-4 mb-6">
<div className="space-y-2">
<div className="flex items-center gap-2">
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<Wallet className="h-6 w-6 text-primary-main" />
{payable.document_number}
應付帳款: {payable.document_number}
</h1>
<div className="flex items-center gap-2 mt-1">
{/* @ts-ignore */}
<StatusBadge variant={getStatusBadgeVariant(payable.status)}>
{getStatusLabel(payable.status)}
</StatusBadge>
<span className="text-gray-500 text-sm">
{formatDate(payable.created_at)}
</span>
</div>
<p className="text-sm text-gray-500 font-medium flex flex-wrap items-center gap-2">
供應商: {payable.vendor?.name || '未知供應商'} <span className="mx-1">|</span>
建立者: {payable.creator?.name || "-"} <span className="mx-1">|</span>
到期日: {formatDate(payable.due_date)} <span className="mx-1">|</span>
建立時間: {formatDate(payable.created_at)}
</p>
</div>
<div className="flex items-center gap-2">
<div className="flex flex-wrap items-center gap-2">
<Can permission="account_payables.edit">
<Button
variant="outline"
@@ -144,74 +147,35 @@ export default function AccountPayableShow({ payable }: any) {
</div>
<div className="space-y-6">
{/* 基本資料 */}
{/* 進階資訊 */}
<div className="bg-white rounded-lg shadow-sm border p-6">
<h2 className="text-lg font-semibold text-gray-800 mb-4">基本資料</h2>
<div className="grid grid-cols-1 md:grid-cols-3 gap-6">
<h2 className="text-lg font-bold text-gray-900 mb-6 border-b pb-4">進階資訊</h2>
<div className="grid grid-cols-1 md:grid-cols-3 gap-x-8 gap-y-6">
<div>
<span className="text-sm text-gray-500">供應商</span>
<p className="font-medium text-gray-800 mt-1">
{payable.vendor?.name || '未知供應商'}
</p>
</div>
<div>
<span className="text-sm text-gray-500">總金額</span>
<p className="font-medium text-gray-800 mt-1">
<span className="text-sm text-gray-500 block mb-1">總金額</span>
<p className="font-medium text-gray-800">
${parseFloat(payable.total_amount).toLocaleString()}
</p>
</div>
<div>
<span className="text-sm text-gray-500">到期日</span>
<p className="font-medium text-gray-800 mt-1">
{formatDate(payable.due_date)}
</p>
</div>
<div>
<span className="text-sm text-gray-500">建立人</span>
<p className="font-medium text-gray-800 mt-1">
{payable.creator?.name || '-'}
</p>
</div>
<div>
<span className="text-sm text-gray-500">提交時間</span>
<p className="font-medium text-gray-800 mt-1">
{formatDate(payable.created_at)}
</p>
</div>
{payable.remarks && (
<div className="md:col-span-3">
<span className="text-sm text-gray-500">備註</span>
<p className="font-medium text-gray-800 mt-1">
{payable.remarks}
</p>
</div>
)}
</div>
</div>
{/* 來源關聯 */}
<div className="bg-white rounded-lg shadow-sm border p-6">
<h2 className="text-lg font-semibold text-gray-800 mb-4">來源關聯</h2>
<div className="grid grid-cols-1 md:grid-cols-3 gap-6">
<div>
<span className="text-sm text-gray-500">來源類型</span>
<p className="font-medium text-gray-800 mt-1">
<span className="text-sm text-gray-500 block mb-1">來源類型</span>
<p className="font-medium text-gray-800">
{payable.source_document_type === 'goods_receipt' ? (
<Badge variant="outline" className="font-normal">進貨單</Badge>
<Badge variant="outline" className="font-normal border-gray-300">進貨單</Badge>
) : (
payable.source_document_type || '-'
)}
</p>
</div>
<div>
<span className="text-sm text-gray-500">來源單號</span>
<div className="flex items-center gap-2 mt-1">
<span className="text-sm text-gray-500 block mb-1">來源單號</span>
<div className="flex items-center gap-2">
<p className="font-medium text-gray-800">
{payable.source_document_code || payable.source_document_id || '-'}
</p>
{payable.source_document_type === 'goods_receipt' && payable.source_document_id && (
<Link
href={route('goods-receipts.show', [payable.source_document_id])}
href={route('goods-receipts.show', [payable.source_document_id]) + `?from=account-payables&from_id=${payable.id}&from_label=${payable.document_number}`}
className="text-primary-main hover:underline flex items-center gap-1 text-sm font-medium"
>
查閱 <ExternalLink className="h-3 w-3" />
@@ -220,6 +184,14 @@ export default function AccountPayableShow({ payable }: any) {
</div>
</div>
</div>
{payable.remarks && (
<div className="mt-8 pt-6 border-t border-gray-100">
<span className="text-sm text-gray-500 block mb-2">備註</span>
<p className="text-sm text-gray-700 bg-gray-50 p-4 rounded-lg leading-relaxed">
{payable.remarks}
</p>
</div>
)}
</div>
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">

7
resources/js/Pages/Accounting/Report.tsx
View File

@@ -92,7 +92,7 @@ export default function AccountingReport({ records, summary, filters }: PageProp
date_end: dateEnd,
per_page: perPage,
},
{ preserveState: true }
{ preserveState: true, preserveScroll: true }
);
};
@@ -105,7 +105,7 @@ export default function AccountingReport({ records, summary, filters }: PageProp
date_end: dateEnd,
per_page: value,
},
{ preserveState: true }
{ preserveState: true, preserveScroll: true }
);
};
@@ -365,6 +365,7 @@ export default function AccountingReport({ records, summary, filters }: PageProp
{/* Pagination Footer */}
<div className="mt-6 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -381,6 +382,8 @@ export default function AccountingReport({ records, summary, filters }: PageProp
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {records.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={records.links} />
</div>

11
resources/js/Pages/Admin/ActivityLog/Index.tsx
View File

@@ -81,7 +81,7 @@ export default function ActivityLogIndex({ activities, filters, subject_types, u
causer_id: causer === 'all' ? undefined : causer,
page: 1 // Reset to first page on filter
},
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
@@ -97,7 +97,7 @@ export default function ActivityLogIndex({ activities, filters, subject_types, u
router.get(
route('activity-logs.index'),
{ per_page: perPage, sort_by: filters.sort_by, sort_order: filters.sort_order },
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
@@ -131,7 +131,7 @@ export default function ActivityLogIndex({ activities, filters, subject_types, u
router.get(
route('activity-logs.index'),
{ ...filters, sort_by: newSortBy, sort_order: newSortOrder },
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
@@ -318,7 +318,8 @@ export default function ActivityLogIndex({ activities, filters, subject_types, u
from={activities.from}
/>
<div className="mt-4 flex flex-col md:flex-row items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -335,6 +336,8 @@ export default function ActivityLogIndex({ activities, filters, subject_types, u
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {activities.total} 筆資料</span>
</div>
<div className="w-full md:w-auto flex justify-center md:justify-end">
<Pagination links={activities.links} />
</div>

2
resources/js/Pages/Admin/Role/Index.tsx
View File

@@ -96,7 +96,7 @@ export default function RoleIndex({ roles, filters = {} }: Props) {
router.get(
route('roles.index'),
{ ...filters, sort_by: newSortBy, sort_order: newSortOrder },
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};

178
resources/js/Pages/Admin/Setting/Index.tsx Normal file
View File

@@ -0,0 +1,178 @@
import React from "react";
import AuthenticatedLayout from "@/Layouts/AuthenticatedLayout";
import { Head, useForm } from "@inertiajs/react";
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle
} from "@/Components/ui/card";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/Components/ui/tabs";
import { Input } from "@/Components/ui/input";
import { Label } from "@/Components/ui/label";
import { Button } from "@/Components/ui/button";
import {
Coins,
Package,
RefreshCcw,
Monitor,
Save,
Settings
} from "lucide-react";
import { toast } from "sonner";
interface Setting {
key: string;
value: string;
description: string;
}
interface PageProps {
settings: Record<string, Setting[]>;
}
export default function SettingIndex({ settings }: PageProps) {
const { data, setData, post, processing } = useForm({
settings: Object.values(settings).flat().map(s => ({
key: s.key,
value: s.value
}))
});
const handleValueChange = (key: string, value: string) => {
const newSettings = data.settings.map(s =>
s.key === key ? { ...s, value } : s
);
setData('settings', newSettings);
};
const submit = (e: React.FormEvent) => {
e.preventDefault();
post(route('settings.update'), {
onSuccess: () => toast.success("系統設定已更新"),
});
};
const renderSettingRow = (setting: Setting) => {
const currentVal = data.settings.find(s => s.key === setting.key)?.value || '';
return (
<div key={setting.key} className="grid grid-cols-1 md:grid-cols-2 gap-4 items-center py-4 border-b last:border-0 border-gray-100">
<div>
<Label className="text-base font-semibold text-grey-0">{setting.description}</Label>
<p className="text-sm text-gray-500 mt-1">{setting.key}</p>
</div>
<div>
<Input
type="text"
value={currentVal}
onChange={(e) => handleValueChange(setting.key, e.target.value)}
className="max-w-xs"
/>
</div>
</div>
);
};
return (
<AuthenticatedLayout
breadcrumbs={[
{ label: "系統管理", href: "#" },
{ label: "系統設定" }
]}
>
<Head title="系統設定" />
<div className="container mx-auto p-6 max-w-7xl">
<div className="mb-6">
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<Settings className="h-6 w-6 text-primary-main" />
系統設定
</h1>
<p className="text-gray-500 mt-2">
管理全系統的預設值與業務規則。
</p>
</div>
<form onSubmit={submit}>
<Tabs defaultValue="finance" className="space-y-6">
<TabsList className="bg-white border p-1 h-auto gap-2">
<TabsTrigger value="finance" className="gap-2 py-2 data-[state=active]:button-filled-primary data-[state=active]:text-white">
<Coins className="h-4 w-4" /> 財務設定
</TabsTrigger>
<TabsTrigger value="inventory" className="gap-2 py-2 data-[state=active]:button-filled-primary data-[state=active]:text-white">
<Package className="h-4 w-4" /> 庫存管理
</TabsTrigger>
<TabsTrigger value="turnover" className="gap-2 py-2 data-[state=active]:button-filled-primary data-[state=active]:text-white">
<RefreshCcw className="h-4 w-4" /> 周轉率分析
</TabsTrigger>
<TabsTrigger value="display" className="gap-2 py-2 data-[state=active]:button-filled-primary data-[state=active]:text-white">
<Monitor className="h-4 w-4" /> 顯示設定
</TabsTrigger>
</TabsList>
<TabsContent value="finance">
<Card>
<CardHeader>
<CardTitle>財務設定</CardTitle>
<CardDescription>管理應付帳款與稅務相關的預設規則。</CardDescription>
</CardHeader>
<CardContent className="space-y-1">
{settings.finance?.map(renderSettingRow)}
</CardContent>
</Card>
</TabsContent>
<TabsContent value="inventory">
<Card>
<CardHeader>
<CardTitle>庫存管理</CardTitle>
<CardDescription>管理商品效期、預警等庫存核心設定。</CardDescription>
</CardHeader>
<CardContent className="space-y-1">
{settings.inventory?.map(renderSettingRow)}
</CardContent>
</Card>
</TabsContent>
<TabsContent value="turnover">
<Card>
<CardHeader>
<CardTitle>周轉率分析</CardTitle>
<CardDescription>調整商品周轉率計算與滯銷判定的天數標準。</CardDescription>
</CardHeader>
<CardContent className="space-y-1">
{settings.turnover?.map(renderSettingRow)}
</CardContent>
</Card>
</TabsContent>
<TabsContent value="display">
<Card>
<CardHeader>
<CardTitle>顯示設定</CardTitle>
<CardDescription>設定全系統清單頁面的顯示偏好。</CardDescription>
</CardHeader>
<CardContent className="space-y-1">
{settings.display?.map(renderSettingRow)}
</CardContent>
</Card>
</TabsContent>
<div className="flex justify-end gap-4 mt-6">
<Button
type="submit"
className="button-filled-primary"
disabled={processing}
>
<Save className="h-4 w-4 mr-2" />
{processing ? "儲存中..." : "儲存設定"}
</Button>
</div>
</Tabs>
</form>
</div>
</AuthenticatedLayout>
);
}

8
resources/js/Pages/Admin/User/Index.tsx
View File

@@ -56,6 +56,7 @@ interface Props {
users: {
data: User[];
from: number;
total: number;
links: PaginationLinks[];
};
filters: {
@@ -164,7 +165,7 @@ export default function UserIndex({ users, roles, filters }: Props) {
router.get(
route('users.index'),
{ ...filters, sort_by: newSortBy, sort_order: newSortOrder },
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
@@ -394,7 +395,8 @@ export default function UserIndex({ users, roles, filters }: Props) {
</div>
{/* 分頁元件 - 統一樣式 */}
<div className="mt-4 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -411,6 +413,8 @@ export default function UserIndex({ users, roles, filters }: Props) {
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {users.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={users.links} />
</div>

10
resources/js/Pages/Integration/SalesOrders/Index.tsx
View File

@@ -109,7 +109,7 @@ export default function SalesOrderIndex({ orders, filters }: Props) {
router.get(
route("integration.sales-orders.index"),
{ ...filters, search, page: 1 },
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
@@ -118,7 +118,7 @@ export default function SalesOrderIndex({ orders, filters }: Props) {
router.get(
route("integration.sales-orders.index"),
{ ...filters, per_page: value, page: 1 },
{ preserveState: false, replace: true }
{ preserveState: false, replace: true, preserveScroll: true }
);
};
@@ -159,7 +159,7 @@ export default function SalesOrderIndex({ orders, filters }: Props) {
router.get(
route("integration.sales-orders.index"),
{ ...filters, source: v || undefined, page: 1 },
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
)
}
options={sourceOptions}
@@ -280,9 +280,7 @@ export default function SalesOrderIndex({ orders, filters }: Props) {
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">
共 {orders.total} 筆紀錄
</span>
<span className="text-sm text-gray-500">共 {orders.total} 筆資料</span>
</div>
<Pagination links={orders.links} />
</div>

63
resources/js/Pages/Integration/SalesOrders/Show.tsx
View File

@@ -1,4 +1,4 @@
import { ArrowLeft, TrendingUp, Package, CreditCard, Calendar, FileJson } from "lucide-react";
import { ArrowLeft, TrendingUp, FileJson } from "lucide-react";
import { Button } from "@/Components/ui/button";
import AuthenticatedLayout from "@/Layouts/AuthenticatedLayout";
import { Head, Link } from "@inertiajs/react";
@@ -13,7 +13,6 @@ import {
import { StatusBadge, StatusVariant } from "@/Components/shared/StatusBadge";
import { formatDate } from "@/lib/date";
import { formatNumber } from "@/utils/format";
import CopyButton from "@/Components/shared/CopyButton";
interface SalesOrderItem {
id: number;
@@ -91,62 +90,30 @@ export default function SalesOrderShow({ order }: Props) {
</Button>
</Link>
<div className="flex items-center justify-between mb-6">
<div>
<div className="flex flex-col md:flex-row md:items-start justify-between gap-4 mb-6">
<div className="space-y-2">
<div className="flex items-center gap-2">
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<TrendingUp className="h-6 w-6 text-primary-main" />
查看銷售訂單
銷售訂單: #{order.external_order_id}
</h1>
<p className="text-gray-500 mt-1">外部單號：{order.external_order_id}</p>
</div>
<StatusBadge variant={getStatusVariant(order.status)}>
{getStatusLabel(order.status)}
</StatusBadge>
</div>
<p className="text-sm text-gray-500 font-medium flex flex-wrap items-center gap-2">
銷售時間: {formatDate(order.sold_at)} <span className="mx-1">|</span>
付款方式: {order.payment_method || "—"} <span className="mx-1">|</span>
訂單來源: {getSourceDisplay(order.source, order.source_label)} <span className="mx-1">|</span>
同步時間: {formatDate(order.created_at as any)}
</p>
</div>
</div>
</div>
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
{/* 左側：基本資訊與明細 */}
<div className="lg:col-span-2 space-y-6">
{/* 基本資訊卡片 */}
<div className="bg-white rounded-xl border border-gray-200 shadow-sm p-6">
<h2 className="text-lg font-bold text-gray-900 mb-6 flex items-center gap-2">
<Package className="h-5 w-5 text-primary-main" />
基本資訊
</h2>
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
<div>
<span className="text-sm text-gray-500 block mb-1">外部訂單編號</span>
<div className="flex items-center gap-1.5">
<span className="font-mono font-medium text-gray-900">{order.external_order_id}</span>
<CopyButton text={order.external_order_id} label="複製單號" />
</div>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">銷售時間</span>
<div className="flex items-center gap-1.5 font-medium text-gray-900">
<Calendar className="h-4 w-4 text-gray-400" />
{formatDate(order.sold_at)}
</div>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">付款方式</span>
<div className="flex items-center gap-1.5 font-medium text-gray-900">
<CreditCard className="h-4 w-4 text-gray-400" />
{order.payment_method || "—"}
</div>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">同步時間</span>
<span className="font-medium text-gray-900">{formatDate(order.created_at as any)}</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">訂單來源</span>
<span className="font-medium text-gray-900">{getSourceDisplay(order.source, order.source_label)}</span>
</div>
</div>
</div>
{/* 項目清單卡片 */}
<div className="bg-white rounded-xl border border-gray-200 shadow-sm overflow-hidden">
<div className="p-6 border-b border-gray-100">
@@ -201,8 +168,8 @@ export default function SalesOrderShow({ order }: Props) {
<p className="text-sm text-gray-500 mb-4">
此區塊顯示同步時接收到的完整原始 JSON 內容，可用於排查資料問題。
</p>
<div className="bg-slate-900 rounded-lg p-4 overflow-auto max-h-[600px]">
<pre className="text-xs text-slate-300 font-mono">
<div className="bg-gray-50 border border-gray-100 rounded-lg p-4 overflow-auto max-h-[600px]">
<pre className="text-xs text-gray-700 font-mono">
{JSON.stringify(order.raw_payload, null, 2)}
</pre>
</div>

5
resources/js/Pages/Inventory/Adjust/Index.tsx
View File

@@ -102,6 +102,7 @@ export default function Index({ docs, warehouses, filters }: { docs: DocsPaginat
router.get(route('inventory.adjust.index'), params as any, {
preserveState: true,
replace: true,
preserveScroll: true,
});
}, 300),
[]
@@ -352,7 +353,7 @@ export default function Index({ docs, warehouses, filters }: { docs: DocsPaginat
</Table>
</div>
<div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
@@ -370,7 +371,7 @@ export default function Index({ docs, warehouses, filters }: { docs: DocsPaginat
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {docs?.total || 0} 筆紀錄</span>
<span className="text-sm text-gray-500">共 {docs.total} 筆資料</span>
</div>
<Pagination links={docs.links} />
</div>

5
resources/js/Pages/Inventory/Analysis/Index.tsx
View File

@@ -415,7 +415,8 @@ export default function InventoryAnalysisIndex({ analysisData, kpis, warehouses,
</div>
{/* Pagination Footer */}
<div className="mt-6 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -432,6 +433,8 @@ export default function InventoryAnalysisIndex({ analysisData, kpis, warehouses,
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {analysisData.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={analysisData.links} />
</div>

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

@@ -368,7 +368,7 @@ export default function Index({ docs, warehouses, filters }: any) {
</Table>
</div>
<div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
@@ -386,7 +386,7 @@ export default function Index({ docs, warehouses, filters }: any) {
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {docs.total} 筆紀錄</span>
<span className="text-sm text-gray-500">共 {docs.total} 筆資料</span>
</div>
<Pagination links={docs.links} />
</div>

13
resources/js/Pages/Inventory/GoodsReceipt/Index.tsx
View File

@@ -45,7 +45,7 @@ export default function GoodsReceiptIndex({ receipts, filters, warehouses }: Pro
const [warehouseId, setWarehouseId] = useState(filters.warehouse_id || 'all');
const [dateStart, setDateStart] = useState(filters.date_start || '');
const [dateEnd, setDateEnd] = useState(filters.date_end || '');
const [perPage, setPerPage] = useState(filters.per_page || '10');
const [perPage, setPerPage] = useState(filters.per_page || receipts.per_page?.toString() || '10');
const [dateRangeType, setDateRangeType] = useState('custom');
// Advanced Filter Toggle
@@ -58,7 +58,7 @@ export default function GoodsReceiptIndex({ receipts, filters, warehouses }: Pro
setWarehouseId(filters.warehouse_id || 'all');
setDateStart(filters.date_start || '');
setDateEnd(filters.date_end || '');
setPerPage(filters.per_page || '10');
setPerPage(filters.per_page || receipts.per_page?.toString() || '10');
}, [filters]);
const handleFilter = () => {
@@ -69,7 +69,7 @@ export default function GoodsReceiptIndex({ receipts, filters, warehouses }: Pro
date_start: dateStart || undefined,
date_end: dateEnd || undefined,
per_page: perPage,
}, { preserveState: true, replace: true });
}, { preserveState: true, replace: true, preserveScroll: true });
};
const handleReset = () => {
@@ -80,7 +80,7 @@ export default function GoodsReceiptIndex({ receipts, filters, warehouses }: Pro
setDateEnd('');
setDateRangeType('custom');
setPerPage('10');
router.get(route('goods-receipts.index'), {}, { preserveState: false });
router.get(route('goods-receipts.index'), {}, { preserveState: false, preserveScroll: true });
};
const handleDateRangeChange = (type: string) => {
@@ -285,7 +285,8 @@ export default function GoodsReceiptIndex({ receipts, filters, warehouses }: Pro
<GoodsReceiptTable receipts={receipts.data} />
{/* Pagination */}
<div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -302,6 +303,8 @@ export default function GoodsReceiptIndex({ receipts, filters, warehouses }: Pro
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {receipts.total} 筆資料</span>
</div>
<Pagination links={receipts.links} />
</div>
</div>

75
resources/js/Pages/Inventory/GoodsReceipt/Show.tsx
View File

@@ -8,7 +8,7 @@ import AuthenticatedLayout from "@/Layouts/AuthenticatedLayout";
import { Head, Link, usePage, useForm } from "@inertiajs/react";
import { useState } from "react";
import GoodsReceiptStatusBadge from "@/Components/Inventory/GoodsReceiptStatusBadge";
import CopyButton from "@/Components/shared/CopyButton";
import {
Table,
TableBody,
@@ -70,82 +70,83 @@ interface GoodsReceipt {
interface Props {
receipt: GoodsReceipt;
navigation?: {
from?: string;
from_id?: string;
from_label?: string;
};
}
export default function ViewGoodsReceiptPage({ receipt }: Props) {
export default function ViewGoodsReceiptPage({ receipt, navigation }: Props) {
const typeMap: Record<string, string> = {
standard: "標準採購進貨",
miscellaneous: "雜項入庫",
other: "其他入庫",
};
const breadcrumbs = [
const breadcrumbs: any[] = [
{ label: "庫存管理", href: "#" },
{ label: "進貨單管理", href: route("goods-receipts.index") },
{ label: `單據詳情 (#${receipt.code})` },
];
let backUrl = route("goods-receipts.index");
let backLabel = "返回進貨單列表";
if (navigation?.from === 'account-payables' && navigation.from_id) {
breadcrumbs.push({
label: `應付帳款: ${navigation.from_label || navigation.from_id}`,
href: route('account-payables.show', [navigation.from_id])
});
backUrl = route('account-payables.show', [navigation.from_id]);
backLabel = `返回應付帳款 (${navigation.from_label || navigation.from_id})`;
}
breadcrumbs.push({ label: `單據詳情 (#${receipt.code})`, isPage: true });
return (
<AuthenticatedLayout breadcrumbs={breadcrumbs}>
<Head title={`進貨單詳情 - ${receipt.code}`} />
<div className="container mx-auto p-6 max-w-7xl">
{/* Header */}
<div className="mb-6">
<Link href={route("goods-receipts.index")}>
<Link href={backUrl}>
<Button
variant="outline"
className="gap-2 button-outlined-primary"
>
<ArrowLeft className="h-4 w-4" />
返回進貨單列表
{backLabel}
</Button>
</Link>
</div>
<div className="flex items-center justify-between mb-6">
<div>
{/* 頁面標題與操作 */}
<div className="flex flex-col md:flex-row md:items-start justify-between gap-4 mb-6">
<div className="space-y-2">
<div className="flex items-center gap-2">
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<Package className="h-6 w-6 text-primary-main" />
查看進貨單
進貨單: {receipt.code}
</h1>
<div className="flex items-center gap-2 mt-1">
<GoodsReceiptStatusBadge status={receipt.status} />
<span className="text-gray-500 text-sm">單號：{receipt.code}</span>
</div>
<p className="text-sm text-gray-500 font-medium flex flex-wrap items-center gap-2">
入庫類型: {typeMap[receipt.type] || receipt.type} <span className="mx-1">|</span>
倉庫: {receipt.warehouse?.name || "-"} <span className="mx-1">|</span>
供應商: {receipt.vendor?.name || "-"} <span className="mx-1">|</span>
進貨日期: {formatDate(receipt.received_date)}
</p>
</div>
<div className="flex items-center gap-3">
<div className="flex flex-wrap items-center gap-2">
<GoodsReceiptActions receipt={receipt} />
</div>
</div>
<div className="grid grid-cols-1 gap-8">
{/* 基本資訊卡片 */}
{/* 進階資訊卡片 */}
<div className="bg-white rounded-lg border shadow-sm p-6">
<h2 className="text-lg font-bold text-gray-900 mb-6 border-b pb-4">基本資訊</h2>
<h2 className="text-lg font-bold text-gray-900 mb-6 border-b pb-4">進階資訊</h2>
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-8 gap-y-6">
<div>
<span className="text-sm text-gray-500 block mb-1">進貨單編號</span>
<div className="flex items-center gap-1.5">
<span className="font-mono font-medium text-gray-900">{receipt.code}</span>
<CopyButton text={receipt.code} label="複製單號" />
</div>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">入庫類型</span>
<span className="font-medium text-gray-900">{typeMap[receipt.type] || receipt.type}</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">倉庫</span>
<span className="font-medium text-gray-900">{receipt.warehouse?.name || "-"}</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">供應商</span>
<span className="font-medium text-gray-900">{receipt.vendor?.name || "-"}</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">進貨日期</span>
<span className="font-medium text-gray-900">{formatDate(receipt.received_date)}</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">建立時間</span>
<span className="font-medium text-gray-900">{formatDateTime(receipt.created_at)}</span>

5
resources/js/Pages/Inventory/Report/Index.tsx
View File

@@ -581,7 +581,8 @@ export default function InventoryReportIndex({ reportData, summary, warehouses,
</div>
{/* Pagination Footer */}
<div className="mt-6 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -598,6 +599,8 @@ export default function InventoryReportIndex({ reportData, summary, warehouses,
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {reportData.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={reportData.links} />
</div>

3
resources/js/Pages/Inventory/StockQuery/Index.tsx
View File

@@ -123,7 +123,7 @@ export default function StockQueryIndex({
}: Props) {
const [search, setSearch] = useState(filters.search || "");
const [perPage, setPerPage] = useState<string>(
filters.per_page || "10"
filters.per_page || inventories.per_page?.toString() || "10"
);
// 執行篩選
@@ -139,6 +139,7 @@ export default function StockQueryIndex({
router.get(route("inventory.stock-query.index"), cleaned, {
preserveState: true,
replace: true,
preserveScroll: true,
});
};

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

@@ -71,6 +71,7 @@ export default function Index({ warehouses, orders, filters }: any) {
router.get(route('inventory.transfer.index'), params, {
preserveState: true,
replace: true,
preserveScroll: true,
});
}, 500),
[]
@@ -385,7 +386,7 @@ export default function Index({ warehouses, orders, filters }: any) {
</Table>
</div>
<div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
@@ -403,7 +404,7 @@ export default function Index({ warehouses, orders, filters }: any) {
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {orders.total} 筆紀錄</span>
<span className="text-sm text-gray-500">共 {orders.total} 筆資料</span>
</div>
<Pagination links={orders.links} />
</div>

16
resources/js/Pages/Product/Index.tsx
View File

@@ -51,6 +51,9 @@ interface PageProps {
data: Product[];
links: any[]; // Todo: pagination types
from: number;
per_page: number;
current_page: number;
total: number;
};
categories: Category[];
units: Unit[];
@@ -67,7 +70,7 @@ export default function ProductManagement({ products, categories, units, filters
const { branding } = usePage<GlobalPageProps>().props;
const [searchTerm, setSearchTerm] = useState(filters.search || "");
const [typeFilter, setTypeFilter] = useState<string>(filters.category_id || "all");
const [perPage, setPerPage] = useState<string>(filters.per_page || "10");
const [perPage, setPerPage] = useState<string>(filters.per_page || products.per_page?.toString() || "10");
const [sortField, setSortField] = useState<string | null>(filters.sort_field || null);
const [sortDirection, setSortDirection] = useState<"asc" | "desc" | null>(filters.sort_direction as "asc" | "desc" || null);
const [isCategoryDialogOpen, setIsCategoryDialogOpen] = useState(false);
@@ -78,12 +81,10 @@ export default function ProductManagement({ products, categories, units, filters
useEffect(() => {
setSearchTerm(filters.search || "");
setTypeFilter(filters.category_id || "all");
setSearchTerm(filters.search || "");
setTypeFilter(filters.category_id || "all");
setPerPage(filters.per_page || "10");
setPerPage(filters.per_page || products.per_page?.toString() || "10");
setSortField(filters.sort_field || null);
setSortDirection(filters.sort_direction as "asc" | "desc" || null);
}, [filters]);
}, [filters, products.per_page]);
const handleSort = (field: string) => {
let newField: string | null = field;
@@ -270,7 +271,8 @@ export default function ProductManagement({ products, categories, units, filters
/>
{/* 分頁元件 */}
<div className="mt-4 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -287,6 +289,8 @@ export default function ProductManagement({ products, categories, units, filters
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {products.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={products.links} />
</div>

17
resources/js/Pages/Production/Index.tsx
View File

@@ -43,6 +43,7 @@ interface Props {
data: ProductionOrder[];
links: any[];
total: number;
per_page: number;
from: number;
to: number;
};
@@ -66,12 +67,12 @@ const statusOptions = [
export default function ProductionIndex({ productionOrders, filters }: Props) {
const [search, setSearch] = useState(filters.search || "");
const [status, setStatus] = useState<string>(filters.status || "all");
const [perPage, setPerPage] = useState<string>(filters.per_page || "10");
const [perPage, setPerPage] = useState<string>(filters.per_page || productionOrders.per_page?.toString() || "10");
useEffect(() => {
setSearch(filters.search || "");
setStatus(filters.status || "all");
setPerPage(filters.per_page || "10");
setPerPage(filters.per_page || productionOrders.per_page?.toString() || "10");
}, [filters]);
const handleFilter = () => {
@@ -82,12 +83,11 @@ export default function ProductionIndex({ productionOrders, filters }: Props) {
status: status === 'all' ? undefined : status,
per_page: perPage,
},
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
const handlePerPageChange = (value: string) => {
setPerPage(value);
router.get(
@@ -135,7 +135,7 @@ export default function ProductionIndex({ productionOrders, filters }: Props) {
<button
onClick={() => {
setSearch("");
router.get(route('production-orders.index'), { ...filters, search: "" }, { preserveState: true, replace: true });
router.get(route('production-orders.index'), { ...filters, search: "" }, { preserveState: true, replace: true, preserveScroll: true });
}}
className="absolute right-3 top-1/2 transform -translate-y-1/2 text-gray-400 hover:text-gray-600"
>
@@ -152,7 +152,7 @@ export default function ProductionIndex({ productionOrders, filters }: Props) {
router.get(
route('production-orders.index'),
{ ...filters, status: val === 'all' ? undefined : val },
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
}}
>
@@ -303,7 +303,8 @@ export default function ProductionIndex({ productionOrders, filters }: Props) {
</div>
{/* 分頁 */}
<div className="mt-4 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -320,6 +321,8 @@ export default function ProductionIndex({ productionOrders, filters }: Props) {
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {productionOrders.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={productionOrders.links} />
</div>

12
resources/js/Pages/Production/Recipe/Index.tsx
View File

@@ -78,12 +78,11 @@ export default function RecipeIndex({ recipes, filters }: Props) {
search,
per_page: perPage,
},
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
const handlePerPageChange = (value: string) => {
setPerPage(value);
router.get(
@@ -95,7 +94,7 @@ export default function RecipeIndex({ recipes, filters }: Props) {
const handleDelete = (id: number) => {
if (confirm("確定要刪除此配方嗎？")) {
router.delete(route('recipes.destroy', id));
router.delete(route('recipes.destroy', id), { preserveScroll: true });
}
};
@@ -147,7 +146,7 @@ export default function RecipeIndex({ recipes, filters }: Props) {
<button
onClick={() => {
setSearch("");
router.get(route('recipes.index'), { ...filters, search: "" }, { preserveState: true, replace: true });
router.get(route('recipes.index'), { ...filters, search: "" }, { preserveState: true, replace: true, preserveScroll: true });
}}
className="absolute right-3 top-1/2 transform -translate-y-1/2 text-gray-400 hover:text-gray-600"
>
@@ -307,7 +306,8 @@ export default function RecipeIndex({ recipes, filters }: Props) {
</div>
{/* 分頁 */}
<div className="mt-4 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -324,6 +324,8 @@ export default function RecipeIndex({ recipes, filters }: Props) {
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {recipes.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={recipes.links} />
</div>

14
resources/js/Pages/PurchaseOrder/Index.tsx
View File

@@ -30,6 +30,7 @@ interface Props {
data: PurchaseOrder[];
links: any[];
total: number;
per_page: number;
from: number;
to: number;
};
@@ -53,7 +54,7 @@ export default function PurchaseOrderIndex({ orders, filters, warehouses }: Prop
const [warehouseId, setWarehouseId] = useState<string>(filters.warehouse_id || "all");
const [dateStart, setDateStart] = useState(filters.date_start || "");
const [dateEnd, setDateEnd] = useState(filters.date_end || "");
const [perPage, setPerPage] = useState<string>(filters.per_page || "10");
const [perPage, setPerPage] = useState<string>(filters.per_page || orders.per_page?.toString() || "10");
const [dateRangeType, setDateRangeType] = useState('custom');
// Advanced Filter Toggle
@@ -66,7 +67,7 @@ export default function PurchaseOrderIndex({ orders, filters, warehouses }: Prop
setWarehouseId(filters.warehouse_id || "all");
setDateStart(filters.date_start || "");
setDateEnd(filters.date_end || "");
setPerPage(filters.per_page || "10");
setPerPage(filters.per_page || orders.per_page?.toString() || "10");
}, [filters]);
const handleFilter = () => {
@@ -82,7 +83,7 @@ export default function PurchaseOrderIndex({ orders, filters, warehouses }: Prop
sort_field: filters.sort_field,
sort_direction: filters.sort_direction,
},
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
@@ -94,7 +95,7 @@ export default function PurchaseOrderIndex({ orders, filters, warehouses }: Prop
setDateEnd("");
setDateRangeType("custom");
router.get(route('purchase-orders.index'));
router.get(route('purchase-orders.index'), {}, { preserveScroll: true });
};
const handleDateRangeChange = (type: string) => {
@@ -295,7 +296,8 @@ export default function PurchaseOrderIndex({ orders, filters, warehouses }: Prop
/>
{/* 分頁元件 - 統一樣式 */}
<div className="mt-4 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -312,6 +314,8 @@ export default function PurchaseOrderIndex({ orders, filters, warehouses }: Prop
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {orders.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={orders.links} />
</div>

50
resources/js/Pages/PurchaseOrder/Show.tsx
View File

@@ -12,6 +12,7 @@ import CopyButton from "@/Components/shared/CopyButton";
import { PurchaseOrderItemsTable } from "@/Components/PurchaseOrder/PurchaseOrderItemsTable";
import type { PurchaseOrder } from "@/types/purchase-order";
import { formatCurrency, formatDateTime } from "@/utils/format";
import { formatDate } from "@/lib/date";
import { getShowBreadcrumbs } from "@/utils/breadcrumb";
import { toast } from "sonner";
import { PageProps } from "@/types/global";
@@ -40,18 +41,23 @@ export default function ViewPurchaseOrderPage({ order }: Props) {
</div>
{/* 頁面標題與操作 */}
<div className="flex items-center justify-between mb-6">
<div>
<div className="flex flex-col md:flex-row md:items-start justify-between gap-4 mb-6">
<div className="space-y-2">
<div className="flex items-center gap-2">
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<ShoppingCart className="h-6 w-6 text-primary-main" />
查看採購單
採購單: {order.poNumber}
</h1>
<div className="flex items-center gap-2 mt-1">
<PurchaseOrderStatusBadge status={order.status} />
<span className="text-gray-500 text-sm">單號：{order.poNumber}</span>
</div>
<p className="text-sm text-gray-500 font-medium flex items-center gap-2">
供應商: {order.supplierName} <span className="mx-1">|</span>
{/* 此處將申請單位及申請人一起顯示 */}
建立者: {order.warehouse_name} ({order.createdBy}) <span className="mx-1">|</span>
時間: {formatDateTime(order.createdAt)}
</p>
</div>
<div className="flex items-center gap-3">
<div className="flex flex-wrap items-center gap-2">
<PurchaseOrderActions order={order} />
</div>
</div>
@@ -64,39 +70,17 @@ export default function ViewPurchaseOrderPage({ order }: Props) {
{/* 基本資訊與品項 */}
<div className="space-y-8">
{/* 基本資訊卡片 */}
{/* 基本資訊卡片 (省略已在標題顯示的欄位) */}
<div className="bg-white rounded-lg border shadow-sm p-6">
<h2 className="text-lg font-bold text-gray-900 mb-6">基本資訊</h2>
<div className="grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-6">
<div>
<span className="text-sm text-gray-500 block mb-1">採購單編號</span>
<div className="flex items-center gap-1.5">
<span className="font-mono font-medium text-gray-900">{order.poNumber}</span>
<CopyButton text={order.poNumber} label="複製單號" />
</div>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">供應商</span>
<span className="font-medium text-gray-900">{order.supplierName}</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">申請單位 (申請人)</span>
<span className="font-medium text-gray-900">
{order.warehouse_name} ({order.createdBy})
</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">建立日期</span>
<span className="font-medium text-gray-900">{formatDateTime(order.createdAt)}</span>
</div>
<h2 className="text-lg font-bold text-gray-900 mb-6">進階資訊</h2>
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-8 gap-y-6">
<div>
<span className="text-sm text-gray-500 block mb-1">下單日期</span>
<span className="font-medium text-gray-900">{order.orderDate || "-"}</span>
<span className="font-medium text-gray-900">{order.orderDate ? formatDate(order.orderDate) : "-"}</span>
</div>
<div>
<span className="text-sm text-gray-500 block mb-1">預計到貨日期</span>
<span className="font-medium text-gray-900">{order.expectedDate || "-"}</span>
<span className="font-medium text-gray-900">{order.expectedDate ? formatDate(order.expectedDate) : "-"}</span>
</div>
</div>
{order.remark && (

38
resources/js/Pages/PurchaseReturn/Index.tsx
View File

@@ -14,6 +14,7 @@ import { getBreadcrumbs } from "@/utils/breadcrumb";
import { Can } from "@/Components/Permission/Can";
import { Input } from "@/Components/ui/input";
import { Label } from "@/Components/ui/label";
import { SearchableSelect } from "@/Components/ui/searchable-select";
import {
Select,
SelectContent,
@@ -34,17 +35,20 @@ interface Props {
filters: {
search?: string;
status?: string;
per_page?: string;
};
}
export default function PurchaseReturnIndex({ purchaseReturns, filters }: Props) {
const [search, setSearch] = useState(filters.search || "");
const [status, setStatus] = useState<string>(filters.status || "all");
const [perPage, setPerPage] = useState<string>(filters.per_page || "15");
// 同步 URL 參數
useEffect(() => {
setSearch(filters.search || "");
setStatus(filters.status || "all");
setPerPage(filters.per_page || "15");
}, [filters]);
const handleFilter = () => {
@@ -53,6 +57,7 @@ export default function PurchaseReturnIndex({ purchaseReturns, filters }: Props)
{
search,
status: status === 'all' ? undefined : status,
per_page: perPage,
},
{ preserveState: true, replace: true }
);
@@ -61,9 +66,19 @@ export default function PurchaseReturnIndex({ purchaseReturns, filters }: Props)
const handleReset = () => {
setSearch("");
setStatus("all");
setPerPage("15");
router.get(route('purchase-returns.index'));
};
const handlePerPageChange = (value: string) => {
setPerPage(value);
router.get(
route('purchase-returns.index'),
{ ...filters, per_page: value, page: 1 },
{ preserveState: false, replace: true, preserveScroll: true }
);
};
const handleNavigateToCreate = () => {
router.get(route('purchase-returns.create'));
};
@@ -163,10 +178,31 @@ export default function PurchaseReturnIndex({ purchaseReturns, filters }: Props)
/>
{/* 分頁元件 */}
<div className="mt-4 flex flex-col sm:flex-row items-center justify-between sm:justify-end gap-4 w-full">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
value={perPage}
onValueChange={handlePerPageChange}
options={[
{ label: "10", value: "10" },
{ label: "20", value: "20" },
{ label: "50", value: "50" },
{ label: "100", value: "100" }
]}
className="w-[100px] h-8"
showSearch={false}
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {purchaseReturns.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={purchaseReturns.links} />
</div>
</div>
</div>
</AuthenticatedLayout>
);
}

10
resources/js/Pages/Sales/Import/Index.tsx
View File

@@ -47,6 +47,7 @@ interface Props {
batches: {
data: ImportBatch[];
links: any[]; // Pagination links
total: number;
};
filters?: {
per_page?: string;
@@ -74,7 +75,7 @@ export default function SalesImportIndex({ batches, filters = {} }: Props) {
per_page: perPage,
search: search
},
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
@@ -126,7 +127,7 @@ export default function SalesImportIndex({ batches, filters = {} }: Props) {
<button
onClick={() => {
setSearch("");
router.get(route('sales-imports.index'), { ...filters, search: "" }, { preserveState: true, replace: true });
router.get(route('sales-imports.index'), { ...filters, search: "" }, { preserveState: true, replace: true, preserveScroll: true });
}}
className="absolute right-3 top-1/2 transform -translate-y-1/2 text-gray-400 hover:text-gray-600"
>
@@ -250,7 +251,8 @@ export default function SalesImportIndex({ batches, filters = {} }: Props) {
</div>
{/* Pagination */}
<div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -267,6 +269,8 @@ export default function SalesImportIndex({ batches, filters = {} }: Props) {
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {batches.total} 筆資料</span>
</div>
<Pagination links={batches.links} />
</div>
</div>

16
resources/js/Pages/Sales/Import/Show.tsx
View File

@@ -128,18 +128,22 @@ export default function SalesImportShow({ import: batch, items, filters = {} }:
</Button>
</Link>
<div className="flex items-center justify-between mb-6">
<div>
<div className="flex flex-col md:flex-row md:items-start justify-between gap-4 mb-6">
<div className="space-y-2">
<div className="flex items-center gap-2">
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<CheckCircle className="h-6 w-6 text-primary-main" />
銷售匯入詳情
銷售匯入: #{batch.id}
</h1>
<p className="text-gray-500 mt-1">批次編號：#{batch.id} | 匯入時間：{format(new Date(batch.created_at), 'yyyy/MM/dd HH:mm')}</p>
</div>
<div className="flex items-center gap-3">
<StatusBadge variant={batch.status === 'confirmed' ? 'success' : 'neutral'}>
{batch.status === 'confirmed' ? '已確認' : '待確認'}
</StatusBadge>
</div>
<p className="text-sm text-gray-500 font-medium flex flex-wrap items-center gap-2">
匯入時間: {format(new Date(batch.created_at), 'yyyy/MM/dd HH:mm')}
</p>
</div>
<div className="flex flex-wrap items-center gap-2">
{batch.status === 'pending' && (
<div className="flex gap-3">
{can('sales_imports.delete') && (

15
resources/js/Pages/ShippingOrder/Index.tsx
View File

@@ -1,5 +1,5 @@
import { useState, useEffect } from "react";
import { Plus, Package, Search, RotateCcw, ChevronDown, ChevronUp } from 'lucide-react';
import { useState } from "react";
import { Plus, Package, Search, RotateCcw } from 'lucide-react';
import { Button } from "@/Components/ui/button";
import AuthenticatedLayout from "@/Layouts/AuthenticatedLayout";
import { Head, router, Link } from "@inertiajs/react";
@@ -30,7 +30,7 @@ interface Props {
warehouses: { id: number; name: string }[];
}
export default function ShippingOrderIndex({ orders, filters, warehouses }: Props) {
export default function ShippingOrderIndex({ orders, filters }: Props) {
const [search, setSearch] = useState(filters.search || "");
const [status, setStatus] = useState<string>(filters.status || "all");
@@ -41,14 +41,14 @@ export default function ShippingOrderIndex({ orders, filters, warehouses }: Prop
search,
status: status === 'all' ? undefined : status,
},
{ preserveState: true, replace: true }
{ preserveState: true, replace: true, preserveScroll: true }
);
};
const handleReset = () => {
setSearch("");
setStatus("all");
router.get(route('delivery-notes.index'));
router.get(route('delivery-notes.index'), {}, { preserveScroll: true });
};
const getStatusBadge = (status: string) => {
@@ -198,7 +198,10 @@ export default function ShippingOrderIndex({ orders, filters, warehouses }: Prop
</Table>
</div>
<div className="mt-4 flex justify-end">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<span className="text-sm text-gray-500">共 {(orders as any).total} 筆資料</span>
</div>
<Pagination links={orders.links} />
</div>
</div>

5
resources/js/Pages/StoreRequisition/Index.tsx
View File

@@ -86,6 +86,7 @@ export default function Index({
router.get(route("store-requisitions.index"), params, {
preserveState: true,
replace: true,
preserveScroll: true,
});
}, 300),
[]
@@ -366,7 +367,7 @@ export default function Index({
</div>
{/* 分頁 */}
<div className="mt-4 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
@@ -384,7 +385,7 @@ export default function Index({
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {requisitions.total} 筆紀錄</span>
<span className="text-sm text-gray-500">共 {requisitions.total} 筆資料</span>
</div>
<Pagination links={requisitions.links} />
</div>

73
resources/js/Pages/StoreRequisition/Show.tsx
View File

@@ -23,13 +23,7 @@ import {
DialogFooter,
DialogDescription,
} from "@/Components/ui/dialog";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/Components/ui/select";
import {
AlertDialog,
AlertDialogAction,
@@ -119,7 +113,7 @@ export default function Show({ requisition, warehouses }: Props) {
// 核准狀態
const [showApproveDialog, setShowApproveDialog] = useState(false);
const [supplyWarehouseId, setSupplyWarehouseId] = useState("");
const [approvedItems, setApprovedItems] = useState<{ id: number; approved_qty: string }[]>(
requisition.items.map((item) => ({
id: item.id,
@@ -235,22 +229,35 @@ export default function Show({ requisition, warehouses }: Props) {
</div>
{/* 頁面標題與操作 */}
<div className="flex items-center justify-between mb-6">
<div>
<div className="flex flex-col md:flex-row md:items-start justify-between gap-4 mb-6">
<div className="space-y-2">
<div className="flex items-center gap-2">
<h1 className="text-2xl font-bold text-grey-0 flex items-center gap-2">
<Store className="h-6 w-6 text-primary-main" />
{requisition.doc_no}
門市叫貨單: {requisition.doc_no}
</h1>
<div className="flex items-center gap-2 mt-1">
{getStatusBadge(requisition.status)}
<span className="text-gray-500 text-sm">
{formatDate(requisition.created_at)}
</span>
</div>
<p className="text-sm text-gray-500 mt-1 font-medium flex items-center gap-2">
申請倉庫: {requisition.store_warehouse_name} <span className="mx-1">|</span>
建立者: {requisition.creator_name} <span className="mx-1">|</span>
時間: {formatDate(requisition.created_at)}
{requisition.transfer_order_id && (
<>
<span className="mx-1">|</span>
<Link
href={`${route("inventory.transfer.show", [requisition.transfer_order_id])}?from=requisition&from_id=${requisition.id}&from_doc=${encodeURIComponent(requisition.doc_no)}`}
className="text-primary-main hover:underline flex items-center gap-1"
>
關聯調撥單: {requisition.transfer_order_id}
</Link>
</>
)}
</p>
</div>
{/* 操作按鈕 */}
<div className="flex gap-2">
<div className="flex flex-wrap gap-2">
{isEditable && (
<>
<Can permission="store_requisitions.edit">
@@ -300,16 +307,10 @@ export default function Show({ requisition, warehouses }: Props) {
{/* 基本資訊 */}
<div className="bg-white rounded-lg shadow-sm border p-6 mb-6">
<h2 className="text-lg font-semibold text-gray-800 mb-4">基本資訊</h2>
<div className="grid grid-cols-1 md:grid-cols-3 gap-6">
<h2 className="text-lg font-semibold text-gray-800 mb-4 border-b pb-4">基本資訊</h2>
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-8 gap-y-6">
<div>
<span className="text-sm text-gray-500">申請倉庫</span>
<p className="font-medium text-gray-800 mt-1">
{requisition.store_warehouse_name}
</p>
</div>
<div>
<span className="text-sm text-gray-500">供貨倉庫</span>
<span className="text-sm text-gray-500 block mb-1">供貨倉庫</span>
<div className="mt-1">
{isPending && canApprove ? (
<SearchableSelect
@@ -332,16 +333,10 @@ export default function Show({ requisition, warehouses }: Props) {
)}
</div>
</div>
<div>
<span className="text-sm text-gray-500">申請人</span>
<p className="font-medium text-gray-800 mt-1">
{requisition.creator_name}
</p>
</div>
{requisition.submitted_at && (
<div>
<span className="text-sm text-gray-500">提交時間</span>
<p className="font-medium text-gray-800 mt-1">
<span className="text-sm text-gray-500 block mb-1">提交時間</span>
<p className="font-medium text-gray-800">
{formatDate(requisition.submitted_at)}
</p>
</div>
@@ -349,14 +344,14 @@ export default function Show({ requisition, warehouses }: Props) {
{requisition.approved_at && (
<>
<div>
<span className="text-sm text-gray-500">審核人</span>
<p className="font-medium text-gray-800 mt-1">
<span className="text-sm text-gray-500 block mb-1">審核人</span>
<p className="font-medium text-gray-800">
{requisition.approver_name}
</p>
</div>
<div>
<span className="text-sm text-gray-500">審核時間</span>
<p className="font-medium text-gray-800 mt-1">
<span className="text-sm text-gray-500 block mb-1">審核時間</span>
<p className="font-medium text-gray-800">
{formatDate(requisition.approved_at)}
</p>
</div>
@@ -364,8 +359,8 @@ export default function Show({ requisition, warehouses }: Props) {
)}
{requisition.remark && (
<div className="md:col-span-3">
<span className="text-sm text-gray-500">備註</span>
<p className="font-medium text-gray-800 mt-1">
<span className="text-sm text-gray-500 block mb-1">備註</span>
<p className="font-medium text-gray-800">
{requisition.remark}
</p>
</div>

11
resources/js/Pages/UtilityFee/Index.tsx
View File

@@ -106,7 +106,7 @@ export default function UtilityFeeIndex({ fees, availableCategories, filters }:
sort_direction: sortDirection,
per_page: perPage,
},
{ preserveState: true }
{ preserveState: true, preserveScroll: true }
);
};
@@ -133,7 +133,7 @@ export default function UtilityFeeIndex({ fees, availableCategories, filters }:
setDateStart("");
setDateEnd("");
setDateRangeType("custom");
router.get(route("utility-fees.index"), { per_page: perPage }, { preserveState: false });
router.get(route("utility-fees.index"), { per_page: perPage }, { preserveState: false, preserveScroll: true });
};
const handleSort = (field: string) => {
@@ -163,7 +163,7 @@ export default function UtilityFeeIndex({ fees, availableCategories, filters }:
sort_direction: newDirection,
per_page: perPage,
},
{ preserveState: true }
{ preserveState: true, preserveScroll: true }
);
};
@@ -464,7 +464,8 @@ export default function UtilityFeeIndex({ fees, availableCategories, filters }:
</div>
<div className="mt-4 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -481,6 +482,8 @@ export default function UtilityFeeIndex({ fees, availableCategories, filters }:
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {fees.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={fees.links} />
</div>

11
resources/js/Pages/Vendor/Index.tsx vendored
View File

@@ -34,6 +34,8 @@ interface PageProps {
data: Vendor[];
links: any[];
meta: any;
total: number;
per_page: number;
};
filters: {
search?: string;
@@ -47,7 +49,7 @@ export default function VendorManagement({ vendors, filters }: PageProps) {
const [searchTerm, setSearchTerm] = useState(filters.search || "");
const [sortField, setSortField] = useState<string | null>(filters.sort_field || null);
const [sortDirection, setSortDirection] = useState<"asc" | "desc" | null>(filters.sort_direction as "asc" | "desc" || null);
const [perPage, setPerPage] = useState<string>(filters.per_page || "10");
const [perPage, setPerPage] = useState<string>(filters.per_page || vendors.per_page?.toString() || "10");
const [isDialogOpen, setIsDialogOpen] = useState(false);
const [editingVendor, setEditingVendor] = useState<Vendor | null>(null);
@@ -56,7 +58,7 @@ export default function VendorManagement({ vendors, filters }: PageProps) {
setSearchTerm(filters.search || "");
setSortField(filters.sort_field || null);
setSortDirection(filters.sort_direction as "asc" | "desc" || null);
setPerPage(filters.per_page || "10");
setPerPage(filters.per_page || vendors.per_page?.toString() || "10");
}, [filters]);
// Debounced Search
@@ -202,7 +204,8 @@ export default function VendorManagement({ vendors, filters }: PageProps) {
/>
{/* 分頁元件 - 統一樣式 */}
<div className="mt-4 flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
<div className="mt-6 flex flex-col sm:flex-row items-center justify-between gap-4">
<div className="flex items-center gap-4">
<div className="flex items-center gap-2 text-sm text-gray-500">
<span>每頁顯示</span>
<SearchableSelect
@@ -219,6 +222,8 @@ export default function VendorManagement({ vendors, filters }: PageProps) {
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {vendors.total} 筆資料</span>
</div>
<div className="w-full sm:w-auto flex justify-center sm:justify-end">
<Pagination links={vendors.links} />
</div>

4
resources/js/Pages/Warehouse/Index.tsx
View File

@@ -86,7 +86,7 @@ export default function WarehouseIndex({ warehouses, totals, transitWarehouses,
// 導航處理
const handleViewInventory = (warehouseId: string | number) => {
router.get(`/warehouses/${warehouseId}/inventory`);
router.get(`/warehouses/${warehouseId}/inventory`, {}, { preserveScroll: true });
};
// 倉庫操作處理函式
@@ -300,7 +300,7 @@ export default function WarehouseIndex({ warehouses, totals, transitWarehouses,
/>
<span>筆</span>
</div>
<span className="text-sm text-gray-500">共 {warehouses.total} 筆紀錄</span>
<span className="text-sm text-gray-500">共 {warehouses.total} 筆資料</span>
</div>
<Pagination links={warehouses.links} />
</div>