feat: OA 审批汇总增加进入时间
This commit is contained in:
parent
31ef152cc9
commit
6fc87fbf24
@ -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>
|
||||
|
||||
@ -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('付款明细金额')
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user