From 23fe5b4b5bc01b1a3fc22f64fe1305ea86446236 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 12:00:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../return-share.blade.php | 19 ++++++++++--------- .../SupplierReconciliationDingTalkTest.php | 9 +++++++++ 2 files changed, 19 insertions(+), 9 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 f05d0d69..5f475384 100644 --- a/resources/views/business/pages/supplier-reconciliation/return-share.blade.php +++ b/resources/views/business/pages/supplier-reconciliation/return-share.blade.php @@ -2,15 +2,6 @@ 供应商退货明细 · {{ $supplier }} · {{ $month }} - @if ($summary['pending'] > 0) -
- @csrf - -
- @endif 下载 Excel 下载 CSV @@ -30,6 +21,9 @@ .supplier-return-share .share-stat { display: grid; gap: 5px; padding: 13px 15px; border: 1px solid #ded7c9; border-radius: 9px; background: #fff; } .supplier-return-share .share-stat span { color: #686053; font-size: .75rem; } .supplier-return-share .share-stat strong { font-size: 1.25rem; font-variant-numeric: tabular-nums; } + .supplier-return-share .share-confirm-action { display: flex; align-items: stretch; padding: 12px; border: 1px solid #d5c6a8; border-radius: 9px; background: #fffaf0; } + .supplier-return-share .share-confirm-action button { width: 100%; padding: 0 16px; border: 0; border-radius: 7px; background: #4f8a52; color: #fff; font-size: .8125rem; font-weight: 700; cursor: pointer; } + .supplier-return-share .share-confirm-action button:hover { background: #407346; } .supplier-return-share .share-table-card { overflow: hidden; border: 1px solid #ded7c9; border-radius: 10px; background: #fff; } .supplier-return-share .share-table-title { display: flex; flex-wrap: wrap; align-items: center; gap: 10px; padding: 14px 16px; border-bottom: 1px solid #eee8dd; } .supplier-return-share .share-table-title h2 { flex: 1 1 auto; margin: 0; font-size: .9375rem; font-weight: 700; } @@ -86,6 +80,13 @@
厂家净扣减数量{{ number_format($summary['qty'], 2) }} 件
厂家净扣减金额¥{{ number_format($summary['amount'], 2) }}
确认状态待 {{ $summary['pending'] }} · 已 {{ $summary['confirmed'] }} · 异 {{ $summary['disputed'] }}
+ @if ($summary['pending'] > 0) +
+ @csrf + +
+ @endif
diff --git a/tests/Feature/Business/SupplierReconciliationDingTalkTest.php b/tests/Feature/Business/SupplierReconciliationDingTalkTest.php index 1327c1d0..64d607eb 100644 --- a/tests/Feature/Business/SupplierReconciliationDingTalkTest.php +++ b/tests/Feature/Business/SupplierReconciliationDingTalkTest.php @@ -603,6 +603,15 @@ class SupplierReconciliationDingTalkTest extends FeatureTestCase ->assertSeeText('SHARE-CONFIRMED'); $html = (string) $response->getContent(); + $summaryStart = strpos($html, '', $summaryStart); + $this->assertNotFalse($summaryStart); + $this->assertNotFalse($summaryEnd); + $summaryHtml = substr($html, $summaryStart, $summaryEnd - $summaryStart); + $this->assertGreaterThan( + strpos($summaryHtml, '确认状态'), + strpos($summaryHtml, '全部确认无异议'), + ); $this->assertMatchesRegularExpression( '/href="([^"]*supplier-returns[^"]*\/excel[^"]*)"/', $html, -- 2.47.2