From c1965167d187610ab85b80f2cd56d74f42794f39 Mon Sep 17 00:00:00 2001 From: yueyang <2495544247@qq.com> Date: Mon, 26 Oct 2026 19:28:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=87=8D=E5=A4=8D=E9=A1=B5=E9=9D=A2=E5=A4=96?= =?UTF-8?q?=E5=A3=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process-details-content.blade.php | 412 +++++++++++++++++ .../process-details.blade.php | 433 +----------------- .../ProcessDetailsPageDataTest.php | 19 + 3 files changed, 447 insertions(+), 417 deletions(-) create mode 100644 resources/views/business/pages/financial-operations/process-details-content.blade.php 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 new file mode 100644 index 00000000..62cbe478 --- /dev/null +++ b/resources/views/business/pages/financial-operations/process-details-content.blade.php @@ -0,0 +1,412 @@ + + +
+
+ 数据范围：{{ $scopeLabel }} + 镜像状态：{{ $mirrorStatus ?? 'unknown' }} + @if (! empty($mirrorSyncedAt)) + 最近同步：{{ $mirrorSyncedAt }} + @endif +
+ + @if ($error) + + @endif + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + 重置 + + + 导出 + +
+
+ +
+
明细行数{{ number_format((int) ($summary['rows'] ?? 0)) }}
+
审批单数{{ number_format((int) ($summary['approvals'] ?? 0)) }}
+
金额合计{{ $money($summary['amount_total'] ?? null) }}
+
银行付款合计{{ $money($summary['bank_amount_total'] ?? null) }}
+
+ +

+ 当前展示的是当前账号权限范围内可读取的钉钉审批流程明细；审批中的金额和行项目仍可能随流程变化。 + 企业级全量数据待领导开通 OA 权限后切换。 +

+ +
+ + + + + + + + + + + + + + + + + + + + + + @forelse ($processRows as $row) + + + + + + + + + + + + + + + + + + @empty + + + + @endforelse + +
序号审批编号发起人状态单据类型用途/摘要单据内行号科目编码科目名称金额(元)银行科目编码银行科目名称银行付款金额付款方式打款时间
{{ ($processRows->currentPage() - 1) * $processRows->perPage() + $loop->iteration }}{{ $row->business_id }}{{ $text($row->originator_name) }} + {{ $text($row->status) }} + {{ $text($row->document_type) }}{{ $text($row->purpose) }}{{ $row->line_no }}{{ $text($row->account_code) }}{{ $text($row->account_name) }}{{ $money($row->amount) }}{{ $text($row->bank_account_code) }}{{ $text($row->bank_account_name) }}{{ $money($row->bank_amount) }}{{ $text($row->payment_method) }}{{ $text($row->paid_at) }}
+ 当前筛选条件没有流程明细。可以调整月份、单据类型、状态或关键词后重试。 +
+
+ +
+ + 第 {{ $processRows->currentPage() }} / {{ max($processRows->lastPage(), 1) }} 页，共 {{ number_format($processRows->total()) }} 行 + +
{{ $processRows->links() }}
+
+
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 7fda65f4..e17f5c51 100644 --- a/resources/views/business/pages/financial-operations/process-details.blade.php +++ b/resources/views/business/pages/financial-operations/process-details.blade.php @@ -47,423 +47,22 @@ } @endphp - - - 流程明细 - - - - -
-
- 数据范围：{{ $scopeLabel }} - 镜像状态：{{ $mirrorStatus ?? 'unknown' }} - @if (! empty($mirrorSyncedAt)) - 最近同步：{{ $mirrorSyncedAt }} - @endif -
- - @if ($error) - - @endif - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - 重置 - - - 导出 - -
-
- -
-
明细行数{{ number_format((int) ($summary['rows'] ?? 0)) }}
-
审批单数{{ number_format((int) ($summary['approvals'] ?? 0)) }}
-
金额合计{{ $money($summary['amount_total'] ?? null) }}
-
银行付款合计{{ $money($summary['bank_amount_total'] ?? null) }}
-
- -

- 当前展示的是当前账号权限范围内可读取的钉钉审批流程明细；审批中的金额和行项目仍可能随流程变化。 - 企业级全量数据待领导开通 OA 权限后切换。 -

- -
- - - - - - - - - - - - - - - - - - - - - - @forelse ($processRows as $row) - - - - - - - - - - - - - - - - - - @empty - - - - @endforelse - -
序号审批编号发起人状态单据类型用途/摘要单据内行号科目编码科目名称金额(元)银行科目编码银行科目名称银行付款金额付款方式打款时间
{{ ($processRows->currentPage() - 1) * $processRows->perPage() + $loop->iteration }}{{ $row->business_id }}{{ $text($row->originator_name) }} - {{ $text($row->status) }} - {{ $text($row->document_type) }}{{ $text($row->purpose) }}{{ $row->line_no }}{{ $text($row->account_code) }}{{ $text($row->account_name) }}{{ $money($row->amount) }}{{ $text($row->bank_account_code) }}{{ $text($row->bank_account_name) }}{{ $money($row->bank_amount) }}{{ $text($row->payment_method) }}{{ $text($row->paid_at) }}
- 当前筛选条件没有流程明细。可以调整月份、单据类型、状态或关键词后重试。 -
-
- -
- - 第 {{ $processRows->currentPage() }} / {{ max($processRows->lastPage(), 1) }} 页，共 {{ number_format($processRows->total()) }} 行 - -
{{ $processRows->links() }}
-
-
- - + + @include('business.pages.financial-operations.process-details-content') + + +@endif diff --git a/tests/Unit/EcommerceFinance/ProcessDetailsPageDataTest.php b/tests/Unit/EcommerceFinance/ProcessDetailsPageDataTest.php index c5adf0a6..da2a6595 100644 --- a/tests/Unit/EcommerceFinance/ProcessDetailsPageDataTest.php +++ b/tests/Unit/EcommerceFinance/ProcessDetailsPageDataTest.php @@ -10,6 +10,25 @@ use PHPUnit\Framework\TestCase; class ProcessDetailsPageDataTest extends TestCase { + public function test_embedded_process_page_uses_content_only_without_nested_admin_layout(): void + { + $root = dirname(__DIR__, 3); + $page = (string) file_get_contents( + $root . '/resources/views/business/pages/financial-operations/process-details.blade.php', + ); + $content = (string) file_get_contents( + $root . '/resources/views/business/pages/financial-operations/process-details-content.blade.php', + ); + + $this->assertStringContainsString('$processDetailsEmbedded', $page); + $this->assertStringContainsString( + "@include('business.pages.financial-operations.process-details-content')", + $page, + ); + $this->assertStringNotContainsString('', $content); + $this->assertStringContainsString('class="process-details-page"', $content); + } + public function test_page_data_contains_real_paginator_filters_and_summary(): void { $row = (object) [ -- 2.47.2