From 3dbb09c5d2f438ec08f48c2cd5a07a36c58da30a Mon Sep 17 00:00:00 2001 From: yueyang <2495544247@qq.com> Date: Fri, 20 Nov 2026 10:43:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=9D=E7=95=99OA=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E8=A1=A8=E4=B8=80=E5=B9=B6=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E8=A1=A8=E4=BA=8C=20(#1299)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/ProcessDetailsPageData.php | 2 +- .../process-details-content.blade.php | 28 ++----- .../Business/ProcessDetailsPageTest.php | 78 +++++++++++-------- .../ProcessDetailsPageDataTest.php | 76 +++++++++++++++--- 4 files changed, 117 insertions(+), 67 deletions(-) diff --git a/modules/EcommerceFinance/View/ProcessDetailsPageData.php b/modules/EcommerceFinance/View/ProcessDetailsPageData.php index bb9875e4..7e2dba23 100644 --- a/modules/EcommerceFinance/View/ProcessDetailsPageData.php +++ b/modules/EcommerceFinance/View/ProcessDetailsPageData.php @@ -153,7 +153,7 @@ class ProcessDetailsPageData $filters['payment_state'] = ''; unset($paginationQuery['payment_state']); } - $result = $approvalSummaryDetailMode + $result = $approvalSummaryDetailMode && $request->ajax() ? $this->repository->paginate($filters, $page, $perPage) : $this->repository->paginateApprovals($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 13ffcca5..e9bf3380 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 @@ -1548,11 +1548,6 @@ - @if ($approvalSummaryDetailMode) -
- @include('business.pages.financial-operations.process-details-approval-detail') -
- @else
@@ -1768,10 +1763,12 @@ @endif - @endif