From 6fc87fbf2436f5590a3b7ed7927c4fe06eef04f6 Mon Sep 17 00:00:00 2001
From: yueyang <2495544247@qq.com>
Date: Fri, 13 Nov 2026 12:08:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20OA=20=E5=AE=A1=E6=89=B9=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E5=A2=9E=E5=8A=A0=E8=BF=9B=E5=85=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process-details-content.blade.php               |  6 ++++--
 tests/Feature/Business/ProcessDetailsPageTest.php   | 13 +++++++++----
 .../EcommerceFinance/ProcessDetailsPageDataTest.php |  1 +
 3 files changed, 14 insertions(+), 6 deletions(-)

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 9108c8a1..6be1e69e 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
@@ -736,7 +736,7 @@
             }
 
             .process-details-table.is-approval-summary {
-                min-width: 68rem;
+                min-width: 74rem;
                 table-layout: fixed;
             }
 
@@ -1414,6 +1414,7 @@
                             <th>用途</th>
                             <th class="num">应付金额</th>
                             <th class="num">实际付款</th>
+                            <th>进入时间</th>
                             <th>已等待</th>
                         </tr>
                         @else
@@ -1450,6 +1451,7 @@
                                 <td class="wide" title="{{ $row->purpose ?? '' }}">{{ $text($row->purpose ?? null) }}</td>
                                 <td class="num">{{ $money($row->amount_total ?? null) }}</td>
                                 <td class="num">{{ $money($row->payment_amount_total ?? null) }}</td>
+                                <td>{{ $dateTimeText($row->current_task_started_at ?? null) }}</td>
                                 <td>{{ $waitText($row->current_task_started_at ?? null) }}</td>
                             </tr>
                             @else
@@ -1483,7 +1485,7 @@
                             @endif
                         @empty
                             <tr>
-                                <td colspan="{{ $approvalSummaryMode ? 5 : 21 }}" class="process-details-empty">
+                                <td colspan="{{ $approvalSummaryMode ? 6 : 21 }}" class="process-details-empty">
                                     当前筛选条件没有OA流程数据。可以调整月份、单据类型、状态或关键词后重试。
                                 </td>
                             </tr>
diff --git a/tests/Feature/Business/ProcessDetailsPageTest.php b/tests/Feature/Business/ProcessDetailsPageTest.php
index e807384b..7c976571 100644
--- a/tests/Feature/Business/ProcessDetailsPageTest.php
+++ b/tests/Feature/Business/ProcessDetailsPageTest.php
@@ -184,6 +184,10 @@ class ProcessDetailsPageTest extends FeatureTestCase
         $this->user->attachPermission(Permission::where('name', 'read-admin-panel')->firstOrFail());
 
         $businessId = '202601011200000000001';
+        $currentTaskStartedAt = \Modules\EcommerceFinance\Support\OaProcessTime::now()
+            ->subMinutes(90)
+            ->startOfMinute()
+            ->format('Y-m-d H:i:s');
         $repository = Mockery::mock(DingProcessDetailMirrorRepository::class);
         $repository->shouldReceive('filterOptions')->once()
             ->with(Mockery::on(static fn (array $filters): bool =>
@@ -209,10 +213,7 @@ class ProcessDetailsPageTest extends FeatureTestCase
                         'amount_total' => 500.00,
                         'payment_amount_total' => 200.00,
                         'purpose' => '办公用品采购；交通费',
-                        'current_task_started_at' => \Modules\EcommerceFinance\Support\OaProcessTime::now()
-                            ->subMinutes(90)
-                            ->startOfMinute()
-                            ->format('Y-m-d H:i:s'),
+                        'current_task_started_at' => $currentTaskStartedAt,
                     ],
                 ],
                 'total' => 1,
@@ -243,10 +244,14 @@ class ProcessDetailsPageTest extends FeatureTestCase
             ->assertSee('<th>用途</th>', false)
             ->assertSee('<th class="num">应付金额</th>', false)
             ->assertSee('<th class="num">实际付款</th>', false)
+            ->assertSee('<th>进入时间</th>', false)
             ->assertSee('<th>已等待</th>', false)
             ->assertSee('办公用品采购；交通费')
             ->assertSee('500.00')
             ->assertSee('200.00')
+            ->assertSee(
+                \Modules\EcommerceFinance\Support\OaProcessTime::formatDateTime($currentTaskStartedAt),
+            )
             ->assertSee('1小时')
             ->assertDontSee('发起人部门')
             ->assertDontSee('付款明细金额')
diff --git a/tests/Unit/EcommerceFinance/ProcessDetailsPageDataTest.php b/tests/Unit/EcommerceFinance/ProcessDetailsPageDataTest.php
index 095ad5f0..6d386bb7 100644
--- a/tests/Unit/EcommerceFinance/ProcessDetailsPageDataTest.php
+++ b/tests/Unit/EcommerceFinance/ProcessDetailsPageDataTest.php
@@ -52,6 +52,7 @@ class ProcessDetailsPageDataTest extends TestCase
         $this->assertStringContainsString('<th>用途</th>', $content);
         $this->assertStringContainsString('<th class="num">应付金额</th>', $content);
         $this->assertStringContainsString('<th class="num">实际付款</th>', $content);
+        $this->assertStringContainsString('<th>进入时间</th>', $content);
         $this->assertStringContainsString('name="include_paid"', $content);
         $this->assertStringContainsString('包含已付款审批', $content);
         $this->assertStringContainsString('页面默认仅展示现金付款节点尚未完成的审批', $content);