diff --git a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php index 3e977652..527436ca 100644 --- a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php +++ b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php @@ -8,6 +8,7 @@ use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Routing\Controller; use Modules\EcommerceFinance\Repositories\DingProcessDetailMirrorRepository; use Modules\EcommerceFinance\Services\DingProcessDetailMirrorImporter; +use Modules\EcommerceFinance\View\ProcessDetailsPageData; use Symfony\Component\HttpFoundation\StreamedResponse; use Throwable; @@ -21,7 +22,7 @@ class ProcessDetails extends Controller { $filters = $this->filters($request); $page = max((int) $request->query('page', 1), 1); - $perPage = 50; + $perPage = ProcessDetailsPageData::normalizePerPage($request->query('per_page')); try { $result = $this->repository->paginate($filters, $page, $perPage); diff --git a/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php b/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php index d1d42991..c8cd2208 100644 --- a/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php +++ b/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php @@ -103,7 +103,7 @@ class DingProcessDetailMirrorRepository } $page = max($page, 1); - $perPage = min(max($perPage, 1), 100); + $perPage = min(max($perPage, 1), 200); $query = $this->filteredQuery($filters); $total = (clone $query)->count(); diff --git a/modules/EcommerceFinance/View/ProcessDetailsPageData.php b/modules/EcommerceFinance/View/ProcessDetailsPageData.php index 9f92dbfc..6a8330f7 100644 --- a/modules/EcommerceFinance/View/ProcessDetailsPageData.php +++ b/modules/EcommerceFinance/View/ProcessDetailsPageData.php @@ -9,16 +9,29 @@ use Throwable; class ProcessDetailsPageData { + public const PER_PAGE_OPTIONS = [50, 100, 200]; + + public const DEFAULT_PER_PAGE = 50; + public function __construct( private readonly DingProcessDetailMirrorRepository $repository, ) {} + public static function normalizePerPage(mixed $value): int + { + $perPage = (int) $value; + + return in_array($perPage, self::PER_PAGE_OPTIONS, true) + ? $perPage + : self::DEFAULT_PER_PAGE; + } + /** @return array */ public function page(Request $request): array { $filters = $this->filters($request); $page = max((int) $request->query('page', 1), 1); - $perPage = 50; + $perPage = self::normalizePerPage($request->query('per_page')); try { $result = $this->repository->paginate($filters, $page, $perPage); diff --git a/resources/views/business/pages/financial-operations/process-details-content.blade.php b/resources/views/business/pages/financial-operations/process-details-content.blade.php index e2850e3c..18ebad1b 100644 --- a/resources/views/business/pages/financial-operations/process-details-content.blade.php +++ b/resources/views/business/pages/financial-operations/process-details-content.blade.php @@ -7,6 +7,7 @@ $paymentStates = $paymentStates ?? ($pageData['paymentStates'] ?? []); $mirrorStale = $mirrorStale ?? ($pageData['mirrorStale'] ?? false); $mirrorStaleAfterMinutes = $mirrorStaleAfterMinutes ?? ($pageData['mirrorStaleAfterMinutes'] ?? 15); + $perPageOptions = \Modules\EcommerceFinance\View\ProcessDetailsPageData::PER_PAGE_OPTIONS; $scopeLabel ??= (($scope ?? null) === 'personal_permission' ? '当前账号权限范围' : ($scope ?? '')); @@ -386,6 +387,32 @@ font-variant-numeric: tabular-nums; } + .process-details-page-size { + display: inline-flex; + align-items: center; + gap: .3rem; + margin: 0; + } + + .process-details-page-size select { + width: 4.5rem; + height: 2rem; + padding: 0 .35rem; + border: 1px solid var(--vip-border, #D8D2C7); + border-radius: .45rem; + background: #fff; + color: var(--vip-content-ink, #171717); + font: inherit; + font-size: .75rem; + font-variant-numeric: tabular-nums; + } + + .process-details-page-size select:focus { + border-color: var(--vip-content-accent-dark, #856632); + outline: 0; + box-shadow: 0 0 0 3px rgba(133, 102, 50, .2); + } + .process-details-pagination { display: inline-flex; align-items: center; @@ -552,6 +579,10 @@ flex-wrap: wrap; } + .process-details-page-size { + width: 100%; + } + .process-details-page-jump { margin-left: 0; } @@ -582,6 +613,7 @@ @endif
+
@@ -722,6 +754,22 @@ 共 {{ number_format($processRows->total()) }} 行 第 {{ number_format($processDetailsCurrentPage) }} / {{ number_format($processDetailsLastPage) }} 页 本页 {{ number_format($processRows->count()) }} 行 + + @foreach ($filters as $filterName => $filterValue) + @if ($filterValue !== '') + + @endif + @endforeach + + + 行 +