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

feat: 統一各模組分頁組件佈局並新增系統設定功能相關檔案
All checks were successful
ERP-Deploy-Demo / deploy-demo (push) Successful in 1m5s
Details

Browse Source
This commit is contained in:
sky121113
2026-02-25 16:16:49 +08:00
parent 878b90e2ad
commit e3df090afd
59 changed files with 889 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)