From bfb1487adb822d76a72ac6fa8ee35c01a1f5cda9 Mon Sep 17 00:00:00 2001 From: qiuxiang Date: Tue, 1 Sep 2026 14:27:55 +0800 Subject: [PATCH] feat: align pdd reconciliation headers --- .../partials/embedded-table.blade.php | 21 ++++++++++++++++++- .../ZhongcaiReconciliationPlatformTest.php | 7 +++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/resources/views/store_receivables/zhongcai_reconciliations/partials/embedded-table.blade.php b/resources/views/store_receivables/zhongcai_reconciliations/partials/embedded-table.blade.php index f64e3016..a7cb6a5a 100644 --- a/resources/views/store_receivables/zhongcai_reconciliations/partials/embedded-table.blade.php +++ b/resources/views/store_receivables/zhongcai_reconciliations/partials/embedded-table.blade.php @@ -37,6 +37,12 @@ '创建人', '标签', '所属利润中心', '负责平台', 'ID', '实收', '差异', '是否退款', '备注', '问题件', ]; + $pddHeaders = [ + '日期', '订单编号', '财务售价', '财务运费', '财务佣金', '财务空包费', + '财务打款金额', '笔数', '备注', '正确店铺', '负责人', '账户', '类型', + '创建人', '标签', '所属利润中心', '负责平台', 'ID', '实收', '差异', + '退款', '小额打款', + ]; $platformIds = [ 'all' => $pageIds->all(), ] + array_fill_keys(array_keys($platformTabs), []); @@ -136,7 +142,7 @@
- + @endforeach + + + @foreach ($pddHeaders as $header) + + @endforeach + @if ($records->isEmpty()) diff --git a/tests/Feature/Business/ZhongcaiReconciliationPlatformTest.php b/tests/Feature/Business/ZhongcaiReconciliationPlatformTest.php index 60367ce5..aac8221d 100644 --- a/tests/Feature/Business/ZhongcaiReconciliationPlatformTest.php +++ b/tests/Feature/Business/ZhongcaiReconciliationPlatformTest.php @@ -77,6 +77,13 @@ class ZhongcaiReconciliationPlatformTest extends FeatureTestCase '正确店铺', '负责人', '账户', '类型', '创建人', '标签', '所属利润中心', '负责平台', 'ID', '实收', '差异', '是否退款', '备注', '问题件', ], false) + ->assertSee('data-platform-header="pdd"', false) + ->assertSeeInOrder([ + 'data-platform-header="pdd"', '日期', '订单编号', '财务售价', '财务运费', + '财务佣金', '财务空包费', '财务打款金额', '笔数', '备注', + '正确店铺', '负责人', '账户', '类型', '创建人', '标签', '所属利润中心', + '负责平台', 'ID', '实收', '差异', '退款', '小额打款', + ], false) ->assertSee('JD-TEST-001') ->assertSee('DY-TEST-001') ->assertSee('TM-TEST-001')
isEmpty()) disabled @endif @@ -207,6 +213,19 @@ {{ $header }}
+ isEmpty()) disabled @endif + x-bind:disabled="platformIds[activePlatform].length === 0" + x-on:change="selected = $event.target.checked ? platformIds[activePlatform] : []" + x-bind:checked="selected.length === platformIds[activePlatform].length && selected.length > 0" + class="h-4 w-4 rounded border-gray-300 text-green" /> + {{ $header }}