diff --git a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php index 73f52b29..887347ba 100644 --- a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php +++ b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php @@ -30,7 +30,7 @@ class ProcessDetails extends Controller return view('business.pages.financial-operations.process-details', [ 'section' => ['slug' => 'financial-operations', 'title' => '财务经营报表'], 'page' => ['slug' => 'process-details', 'title' => '流程明细'], - 'rows' => new LengthAwarePaginator( + 'processRows' => new LengthAwarePaginator( $result['data'], $result['total'], $perPage, @@ -53,7 +53,7 @@ class ProcessDetails extends Controller return view('business.pages.financial-operations.process-details', [ 'section' => ['slug' => 'financial-operations', 'title' => '财务经营报表'], 'page' => ['slug' => 'process-details', 'title' => '流程明细'], - 'rows' => new LengthAwarePaginator([], 0, $perPage, $page, [ + 'processRows' => new LengthAwarePaginator([], 0, $perPage, $page, [ 'path' => $request->url(), 'query' => $request->except('page'), ]), diff --git a/resources/views/business/pages/financial-operations/process-details.blade.php b/resources/views/business/pages/financial-operations/process-details.blade.php index 072c75b8..93ef75c3 100644 --- a/resources/views/business/pages/financial-operations/process-details.blade.php +++ b/resources/views/business/pages/financial-operations/process-details.blade.php @@ -1,5 +1,5 @@ @php - $rows = $rows ?? null; + $processRows = $processRows ?? null; $filters = $filters ?? []; $summary = $summary ?? []; $months = $months ?? []; @@ -414,9 +414,9 @@
- @forelse ($rows as $row) + @forelse ($processRows as $row)