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 @@ 用途 应付金额 实际付款 + 进入时间 已等待 @else @@ -1450,6 +1451,7 @@ {{ $text($row->purpose ?? null) }} {{ $money($row->amount_total ?? null) }} {{ $money($row->payment_amount_total ?? null) }} + {{ $dateTimeText($row->current_task_started_at ?? null) }} {{ $waitText($row->current_task_started_at ?? null) }} @else @@ -1483,7 +1485,7 @@ @endif @empty - + 当前筛选条件没有OA流程数据。可以调整月份、单据类型、状态或关键词后重试。 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('用途', false) ->assertSee('应付金额', false) ->assertSee('实际付款', false) + ->assertSee('进入时间', false) ->assertSee('已等待', 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('用途', $content); $this->assertStringContainsString('应付金额', $content); $this->assertStringContainsString('实际付款', $content); + $this->assertStringContainsString('进入时间', $content); $this->assertStringContainsString('name="include_paid"', $content); $this->assertStringContainsString('包含已付款审批', $content); $this->assertStringContainsString('页面默认仅展示现金付款节点尚未完成的审批', $content);