@@ -710,7 +711,7 @@
| {{ $row['allocation'] }} |
@empty
- | 当前筛选条件没有已审批的 OA 流程明细。 |
+ | 当前筛选条件没有符合汇总口径的 OA 流程明细。 |
@endforelse
@@ -751,7 +752,7 @@
二级明细
- 三级汇总与 OA 已审批明细
+ 三级汇总与 OA 已打款审批明细
@@ -927,7 +928,7 @@
const loadDetails = async () => {
if (!activeGroup) return;
- detailStatus.textContent = '正在读取 OA 已审批明细…';
+ detailStatus.textContent = '正在读取符合口径的 OA 审批明细…';
detailRows.replaceChildren();
const params = new URLSearchParams(window.location.search);
params.delete('page');
@@ -955,7 +956,7 @@
prevButton.disabled = activePage <= 1;
nextButton.disabled = activePage >= lastPage;
detailStatus.textContent = activeThird === ''
- ? '当前二级全部已审批明细'
+ ? '当前二级全部已打款审批明细'
: `三级：${activeThird}`;
} catch (error) {
detailStatus.textContent = '明细读取失败，请稍后重试。';
@@ -973,7 +974,7 @@
activeThird = '';
activePage = 1;
title.textContent = `${activeGroup.category} / ${activeGroup.secondLevel}`;
- subtitle.textContent = '点击三级行继续查看对应 OA 已审批明细';
+ subtitle.textContent = '点击三级行继续查看对应已打款审批明细';
const groupRows = secondLevelRows.find((row) =>
row.expense_category === activeGroup.category
&& row.second_level === activeGroup.secondLevel
diff --git a/tests/Feature/Business/ManagementExpensesPageTest.php b/tests/Feature/Business/ManagementExpensesPageTest.php
index 17e99432..8b3f767a 100644
--- a/tests/Feature/Business/ManagementExpensesPageTest.php
+++ b/tests/Feature/Business/ManagementExpensesPageTest.php
@@ -74,7 +74,8 @@ class ManagementExpensesPageTest extends FeatureTestCase
]))->assertOk()
->assertSee('管理费用')
->assertSee('二级汇总')
- ->assertSee('OA 已审批明细模板')
+ ->assertSee('OA 已打款审批明细模板')
+ ->assertSee('不涉及付款或出纳未打款的审批不计入汇总')
->assertSee('审批时间')
->assertSee('进费比')
->assertSee('不进费比')
diff --git a/tests/Unit/EcommerceFinance/ManagementExpensesPageDataTest.php b/tests/Unit/EcommerceFinance/ManagementExpensesPageDataTest.php
index 12445f70..b3c194fb 100644
--- a/tests/Unit/EcommerceFinance/ManagementExpensesPageDataTest.php
+++ b/tests/Unit/EcommerceFinance/ManagementExpensesPageDataTest.php
@@ -40,30 +40,30 @@ class ManagementExpensesPageDataTest extends TestCase
parent::tearDown();
}
- public function test_page_groups_only_approved_oa_rows_by_second_level_and_fee_ratio(): void
+ public function test_page_groups_only_approved_paid_oa_rows_by_second_level_and_fee_ratio(): void
{
$data = $this->pageData->page(Request::create(
'/1/workspace/financial-operations/management-expenses',
'GET',
));
- $this->assertSame(5, $data['rows']->total());
- $this->assertSame(445.0, $data['summary']['amount_total']);
- $this->assertSame(270.0, $data['summary']['in_fee_ratio_amount']);
- $this->assertSame(125.0, $data['summary']['non_fee_ratio_amount']);
+ $this->assertSame(3, $data['rows']->total());
+ $this->assertSame(350.0, $data['summary']['amount_total']);
+ $this->assertSame(200.0, $data['summary']['in_fee_ratio_amount']);
+ $this->assertSame(100.0, $data['summary']['non_fee_ratio_amount']);
$this->assertSame(50.0, $data['summary']['unmapped_amount']);
- $this->assertSame(5, $data['summary']['row_count']);
+ $this->assertSame(3, $data['summary']['row_count']);
$this->assertSame('2026-10-01', $data['filters']['approved_start']);
$this->assertSame('2026-10-31', $data['filters']['approved_end']);
$groups = collect($data['secondLevelSummary'])->keyBy(
static fn (array $row): string => $row['expense_category'] . '|' . $row['second_level'],
);
- $this->assertSame(125.0, $groups['管理费用|办公费']['amount_total']);
+ $this->assertSame(100.0, $groups['管理费用|办公费']['amount_total']);
$this->assertSame(1, $groups['管理费用|办公费']['approval_count']);
- $this->assertSame(270.0, $groups['销售费用|技术服务费']['in_fee_ratio_amount']);
+ $this->assertSame(200.0, $groups['销售费用|技术服务费']['in_fee_ratio_amount']);
$this->assertSame(0.0, $groups['销售费用|技术服务费']['non_fee_ratio_amount']);
- $this->assertSame(270.0, $groups['销售费用|技术服务费']['amount_total']);
+ $this->assertSame(200.0, $groups['销售费用|技术服务费']['amount_total']);
$this->assertSame(50.0, $groups['未映射科目|未映射科目']['unmapped_amount']);
$this->assertCount(3, $data['secondLevelSummary']);
}
@@ -78,11 +78,11 @@ class ManagementExpensesPageDataTest extends TestCase
$this->assertSame('', $data['filters']['approved_start']);
$this->assertSame('', $data['filters']['approved_end']);
- $this->assertSame(6, $data['rows']->total());
- $this->assertSame(465.0, $data['summary']['amount_total']);
+ $this->assertSame(4, $data['rows']->total());
+ $this->assertSame(370.0, $data['summary']['amount_total']);
}
- public function test_detail_template_filters_and_paginates_approved_rows(): void
+ public function test_detail_template_filters_and_paginates_approved_paid_rows(): void
{
$data = $this->pageData->details(Request::create(
'/1/workspace/financial-operations/management-expenses/details',
@@ -94,14 +94,14 @@ class ManagementExpensesPageDataTest extends TestCase
],
));
- $this->assertSame(2, $data['pagination']['total']);
- $this->assertSame(125.0, $data['summary']['amount_total']);
+ $this->assertSame(1, $data['pagination']['total']);
+ $this->assertSame(100.0, $data['summary']['amount_total']);
$this->assertSame(
['审批编号', '部门', '用途', '分类', '二级', '三级', '金额', '是否进费比', '是否分摊'],
array_values(ManagementExpensesPageData::DETAIL_COLUMNS),
);
$this->assertSame(
- ['5602.04', '5602.04'],
+ ['5602.04'],
array_column($data['rows'], 'business_id'),
);
$this->assertSame('不进费比', $data['rows'][0]['fee_ratio']);