From eaa1d1f00e36740baaca2d43aab01d7d6133cb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E6=9C=A8?= <594326199@qq.com> Date: Wed, 4 Nov 2026 13:22:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B2=BE=E7=AE=80=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E9=93=BE=E6=8E=A5=E9=A1=B5=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../return-share.blade.php | 19 ++++++++----------- .../SupplierReconciliationDingTalkTest.php | 10 +++++++++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/resources/views/business/pages/supplier-reconciliation/return-share.blade.php b/resources/views/business/pages/supplier-reconciliation/return-share.blade.php index 8cd9f494..ea375ac9 100644 --- a/resources/views/business/pages/supplier-reconciliation/return-share.blade.php +++ b/resources/views/business/pages/supplier-reconciliation/return-share.blade.php @@ -75,7 +75,6 @@
-
本月退货行数{{ number_format($summary['count']) }}
厂家净扣减数量{{ number_format($summary['qty'], 2) }} 件
厂家净扣减金额¥{{ number_format($summary['amount'], 2) }}
确认状态待 {{ $summary['pending'] }} · 已 {{ $summary['confirmed'] }} · 异 {{ $summary['disputed'] }}
@@ -98,25 +97,24 @@ - - + + - - - - + + + - + 发货时间明细供应商条形码 商品名称发货量单价 - 金额供应商条码备注 + 金额备注 标题wms配货单号仓库名称 快递单号类型确认状态 @@ -131,7 +129,6 @@ {{ $row['qty'] ?? '—' }} {{ number_format((float) ($row['unit_price'] ?? 0), 2) }} {{ number_format((float) ($row['amount'] ?? 0), 2) }} - {{ $row['supplier_barcode'] ?? '—' }} {{ $row['remark'] ?? '—' }} @if (($row['_accounting_label'] ?? '') !== '' && ($row['_accounting_label'] ?? '') !== '厂家扣减') @@ -157,7 +154,7 @@ @empty -
没有退货明细。
+
没有退货明细。
@endforelse diff --git a/tests/Feature/Business/SupplierReconciliationDingTalkTest.php b/tests/Feature/Business/SupplierReconciliationDingTalkTest.php index ce762bac..d6ebf0f9 100644 --- a/tests/Feature/Business/SupplierReconciliationDingTalkTest.php +++ b/tests/Feature/Business/SupplierReconciliationDingTalkTest.php @@ -600,13 +600,21 @@ class SupplierReconciliationDingTalkTest extends FeatureTestCase ->assertSeeText('发货时间') ->assertSeeText('wms配货单号') ->assertSeeText('SHARE-PENDING') - ->assertSeeText('SHARE-CONFIRMED'); + ->assertSeeText('SHARE-CONFIRMED') + ->assertDontSeeText('本月退货行数') + ->assertDontSeeText('供应商条码'); $response->assertSee('table-layout: fixed', false) ->assertSee('overflow-x: hidden', false) ->assertSee('', false) ->assertDontSee('min-width: 1580px', false); $html = (string) $response->getContent(); + $tableStart = strpos($html, ''); + $tableEnd = strpos($html, '
', $tableStart); + $this->assertNotFalse($tableStart); + $this->assertNotFalse($tableEnd); + $tableHtml = substr($html, $tableStart, $tableEnd - $tableStart); + $this->assertSame(14, substr_count($tableHtml, '')); $summaryStart = strpos($html, '
'); $summaryEnd = strpos($html, '
', $summaryStart); $this->assertNotFalse($summaryStart); -- 2.47.2