From f368c7ed943ef830cf5086d88b9cc2a2f49e9210 Mon Sep 17 00:00:00 2001 From: yueyang <2495544247@qq.com> Date: Mon, 26 Oct 2026 17:21:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=93=BE=E6=8E=A5=E6=94=B9=E7=94=A8=E6=98=BE?= =?UTF-8?q?=E5=BC=8F=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/financial-operations/process-details.blade.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 2d743d7b..072c75b8 100644 --- a/resources/views/business/pages/financial-operations/process-details.blade.php +++ b/resources/views/business/pages/financial-operations/process-details.blade.php @@ -24,10 +24,14 @@ 'section' => 'financial-operations', 'page' => 'process-details', ]); - $exportUrl = route('business.process-details.export', array_filter( + $exportFilters = array_filter( $filters, static fn (mixed $value): bool => $value !== '' && $value !== null, - )); + ); + $exportUrl = url('/' . company_id() . '/workspace/financial-operations/process-details/export'); + if ($exportFilters !== []) { + $exportUrl .= '?' . http_build_query($exportFilters); + } @endphp -- 2.47.2 From 26b8b22b6e6aa8cacb558794497feb71d1a33fa0 Mon Sep 17 00:00:00 2001 From: yueyang <2495544247@qq.com> Date: Mon, 26 Oct 2026 17:26:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8F=98=E9=87=8F=E9=81=BF=E5=BC=80=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/ProcessDetails.php | 4 ++-- .../financial-operations/process-details.blade.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) 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) - {{ ($rows->currentPage() - 1) * $rows->perPage() + $loop->iteration }} + {{ ($processRows->currentPage() - 1) * $processRows->perPage() + $loop->iteration }} {{ $row->business_id }} {{ $text($row->originator_name) }} @@ -447,9 +447,9 @@ -- 2.47.2