From 9d6e2a85d2aa01dc59fe177f5e00aaa0577620fc Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 20 Nov 2026 11:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=BB=8F=E8=90=A5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=A8=8E=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在财务经营分析表的公司类型后新增税务类型列,并同步页面、行数据和 CSV 导出。 --- app/Http/Controllers/Business/Pages.php | 3 +++ .../pages/financial-operations/financial-analysis.blade.php | 2 +- tests/Feature/Settings/NavigationTest.php | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php index 99d92da6..e04a5e8b 100644 --- a/app/Http/Controllers/Business/Pages.php +++ b/app/Http/Controllers/Business/Pages.php @@ -158,6 +158,7 @@ class Pages extends Controller private const FINANCIAL_ANALYSIS_COLUMNS = [ 'month' => ['label' => '时间', 'type' => 'text'], 'company_type' => ['label' => '公司类型', 'type' => 'text'], + 'taxpayer_type' => ['label' => '税务类型', 'type' => 'text'], 'company_name' => ['label' => '公司名称', 'type' => 'text'], 'platform' => ['label' => '平台', 'type' => 'text'], 'store_name' => ['label' => '店铺', 'type' => 'text'], @@ -3755,6 +3756,7 @@ class Pages extends Controller $subjectMatcher->apply($subject, $subjectMap); $row['company_name'] = $subject->company_name; $row['company_type'] = $subject->company_type; + $row['taxpayer_type'] = $subject->taxpayer_type; $costsAvailable = true; $totalCost = 0.0; @@ -3783,6 +3785,7 @@ class Pages extends Controller 'platform' => $platform, 'store_name' => $storeName, 'company_type' => null, + 'taxpayer_type' => null, 'company_name' => null, 'bill_income' => 0.0, 'refund' => 0.0, diff --git a/resources/views/business/pages/financial-operations/financial-analysis.blade.php b/resources/views/business/pages/financial-operations/financial-analysis.blade.php index 39884e8f..a9bd17f0 100644 --- a/resources/views/business/pages/financial-operations/financial-analysis.blade.php +++ b/resources/views/business/pages/financial-operations/financial-analysis.blade.php @@ -28,7 +28,7 @@ .financial-analysis-summary .item span { color:var(--vip-content-muted,#595959); font-size:.7rem; } .financial-analysis-summary .item b { font-size:.95rem; font-variant-numeric:tabular-nums; } .financial-analysis-table-wrap { overflow:auto; border:1px solid var(--vip-border,#D8D2C7); border-radius:.5rem; background:#fff; } - .financial-analysis-table { width:100%; min-width:210rem; border-collapse:separate; border-spacing:0; font-size:.78rem; } + .financial-analysis-table { width:100%; min-width:216rem; border-collapse:separate; border-spacing:0; font-size:.78rem; } .financial-analysis-table th,.financial-analysis-table td { padding:.55rem .65rem; border-right:1px solid var(--vip-border,#D8D2C7); border-bottom:1px solid var(--vip-border,#D8D2C7); white-space:nowrap; vertical-align:top; } .financial-analysis-table th { position:sticky; top:0; z-index:1; background:var(--vip-content-accent-soft,#F7F0DE); text-align:left; font-weight:700; } .financial-analysis-table tr:hover td { background:#fcfaf4; } diff --git a/tests/Feature/Settings/NavigationTest.php b/tests/Feature/Settings/NavigationTest.php index 8d92c7fd..54d0dbf6 100644 --- a/tests/Feature/Settings/NavigationTest.php +++ b/tests/Feature/Settings/NavigationTest.php @@ -216,6 +216,7 @@ class NavigationTest extends FeatureTestCase $headers = [ '时间', '公司类型', + '税务类型', '公司名称', '平台', '店铺', @@ -333,7 +334,7 @@ class NavigationTest extends FeatureTestCase ->get(route('business.financial-operations.financial-analysis.export')) ->streamedContent(); $this->assertStringContainsString( - '淘系支付宝,测试店铺,1000.00,-40.00,-80.00,880.00,300.00,,,10.00,20.00', + '2026-11,,,,淘系支付宝,测试店铺,1000.00,-40.00,-80.00,880.00,300.00,,,10.00,20.00', $csv, ); }