feat: 統一各模組分頁組件佈局並新增系統設定功能相關檔案
All checks were successful
ERP-Deploy-Demo / deploy-demo (push) Successful in 1m5s
All checks were successful
ERP-Deploy-Demo / deploy-demo (push) Successful in 1m5s
This commit is contained in:
@@ -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
46
app/Modules/Core/Controllers/SystemSettingController.php
Normal 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', '系統設定已更新');
|
||||
}
|
||||
}
|
||||
@@ -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
61
app/Modules/Core/Models/SystemSetting.php
Normal 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 = [];
|
||||
}
|
||||
}
|
||||
@@ -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');
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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']} 自動生成",
|
||||
]);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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', [
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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', [
|
||||
|
||||
@@ -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', [
|
||||
|
||||
@@ -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');
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
// 水和倉庫名稱與使用者名稱
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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') // 帳面庫存 = 所有庫存總和
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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. 手動注入倉庫與使用者資料
|
||||
|
||||
@@ -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']),
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
// 水和倉庫與使用者
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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) ---
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
};
|
||||
@@ -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
68
database/seeders/SystemSettingSeeder.php
Normal 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
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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: "操作手冊",
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
178
resources/js/Pages/Admin/Setting/Index.tsx
Normal file
178
resources/js/Pages/Admin/Setting/Index.tsx
Normal 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>
|
||||
);
|
||||
}
|
||||
@@ -56,6 +56,7 @@ interface Props {
|
||||
users: {
|
||||
data: User[];
|
||||
from: number;
|
||||
total: number;
|
||||
links: PaginationLinks[];
|
||||
};
|
||||
filters: {
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -353,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>
|
||||
@@ -371,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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 = () => {
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"
|
||||
);
|
||||
|
||||
// 執行篩選
|
||||
|
||||
@@ -386,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>
|
||||
@@ -404,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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 = () => {
|
||||
@@ -302,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
|
||||
@@ -319,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>
|
||||
|
||||
@@ -306,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
|
||||
@@ -323,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>
|
||||
|
||||
@@ -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 = () => {
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -47,6 +47,7 @@ interface Props {
|
||||
batches: {
|
||||
data: ImportBatch[];
|
||||
links: any[]; // Pagination links
|
||||
total: number;
|
||||
};
|
||||
filters?: {
|
||||
per_page?: string;
|
||||
@@ -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>
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -367,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>
|
||||
@@ -385,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>
|
||||
|
||||
@@ -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
11
resources/js/Pages/Vendor/Index.tsx
vendored
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user