From bda7ece70a9a82da97d1adaf948bd7720e8368de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E6=9C=A8?= <594326199@qq.com>
Date: Sat, 17 Oct 2026 10:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AF=B9=E8=B4=A6?=
 =?UTF-8?q?=EF=BC=9A=E5=8E=82=E5=AE=B6=E7=AB=AF=E9=80=80=E8=B4=A7=E8=A1=A8?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E4=B8=8E=E3=80=8C=E9=80=80=E8=B4=A7=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=EF=BC=88=E7=BB=88=E7=89=88=EF=BC=89=E3=80=8D=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E6=98=8E=E7=BB=86=E5=AE=8C=E5=85=A8=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

之前按旧截图少了月份/条形码/商品名称、把条形码写成原条码，厂家看不到日期和条码。现在列头照搬退货明细（月份/发货时间/明细供应商/条形码/商品名称/发货量/单价/金额/预估单价/预估金额/供应商条码/备注/标题/wms配货单号/仓库名称/快递单号/标记多标签/创建人/对账人）+ 类型/操作。
---
 .../supplier-data.blade.php                   | 28 ++++++++++++-------
 .../Business/SupplierReconciliationTest.php   |  4 +++
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/resources/views/business/pages/supplier-reconciliation/supplier-data.blade.php b/resources/views/business/pages/supplier-reconciliation/supplier-data.blade.php
index e1c65c4b..d4071706 100644
--- a/resources/views/business/pages/supplier-reconciliation/supplier-data.blade.php
+++ b/resources/views/business/pages/supplier-reconciliation/supplier-data.blade.php
@@ -28,7 +28,7 @@
         }
         .supplier-reconciliation-page .sr-return-banner .material-icons-outlined { color: var(--vip-content-accent-dark, #856632); font-size: 18px; }
         .supplier-reconciliation-page .sr-return-status { display: flex; flex-wrap: wrap; gap: 4px 10px; color: var(--vip-content-muted, #595959); font-size: .75rem; }
-        .supplier-reconciliation-page .sr-return-table { min-width: 1400px; }
+        .supplier-reconciliation-page .sr-return-table { min-width: 1900px; }
         .supplier-reconciliation-page .sr-type-tag {
             display: inline-flex; align-items: center; height: 22px; padding: 0 8px;
             border-radius: 4px; background: #EFEAE0; color: #595959; font-size: .75rem; white-space: nowrap;
@@ -184,16 +184,23 @@
                 <table class="sr-return-table">
                     <thead>
                         <tr>
-                            <th scope="col">发货量</th><th scope="col">单价</th><th scope="col">金额</th>
-                            <th scope="col">预估单价</th><th scope="col">预估金额</th><th scope="col">供应商条码</th>
-                            <th scope="col">备注</th><th scope="col">标题</th><th scope="col">wms配货单号</th>
-                            <th scope="col">仓库名称</th><th scope="col">快递单号</th><th scope="col">发货时间</th>
-                            <th scope="col">原条码</th><th scope="col">类型</th><th scope="col">操作</th>
+                            <th scope="col">月份</th><th scope="col">发货时间</th><th scope="col">明细供应商</th>
+                            <th scope="col">条形码</th><th scope="col">商品名称</th><th scope="col">发货量</th>
+                            <th scope="col">单价</th><th scope="col">金额</th><th scope="col">预估单价</th>
+                            <th scope="col">预估金额</th><th scope="col">供应商条码</th><th scope="col">备注</th>
+                            <th scope="col">标题</th><th scope="col">wms配货单号</th><th scope="col">仓库名称</th>
+                            <th scope="col">快递单号</th><th scope="col">标记多标签</th><th scope="col">创建人</th>
+                            <th scope="col">对账人</th><th scope="col">类型</th><th scope="col">操作</th>
                         </tr>
                     </thead>
                     <tbody>
                         @forelse ($returnPanel['rows'] as $row)
                             <tr>
+                                <td>{{ $row['summary_month'] ?? '—' }}</td>
+                                <td>{{ $row['send_time'] ?? '—' }}</td>
+                                <td>{{ $row['supplier'] ?? '—' }}</td>
+                                <td>{{ $row['barcode'] ?? '—' }}</td>
+                                <td>{{ $row['sku_name'] ?? '—' }}</td>
                                 <td class="is-num">{{ $row['qty'] ?? '—' }}</td>
                                 <td class="is-num">{{ $row['unit_price'] ?? '—' }}</td>
                                 <td class="is-num">{{ $row['amount'] ?? '—' }}</td>
@@ -205,8 +212,9 @@
                                 <td>{{ $row['wms_pick_no'] ?? '—' }}</td>
                                 <td>{{ $row['warehouse'] ?? '—' }}</td>
                                 <td>{{ $row['express_no'] ?? '—' }}</td>
-                                <td>{{ $row['send_time'] ?? '—' }}</td>
-                                <td>{{ $row['barcode'] ?? '—' }}</td>
+                                <td>{{ $row['labels'] ?? '—' }}</td>
+                                <td>{{ $row['creator'] ?? '—' }}</td>
+                                <td>{{ $row['reconciler'] ?? '—' }}</td>
                                 <td><span class="sr-type-tag">退货</span></td>
                                 <td>
                                     <span class="sr-return-actions">
@@ -232,13 +240,13 @@
                                 </td>
                             </tr>
                         @empty
-                            <tr><td colspan="15"><div class="sr-empty">该厂家暂无退货数据。</div></td></tr>
+                            <tr><td colspan="21"><div class="sr-empty">该厂家暂无退货数据。</div></td></tr>
                         @endforelse
                     </tbody>
                 </table>
             </div>
             <p class="sr-hint">
-                列名取自《退货明细》原始表头（标记多标签、创建人、对账人、退货单备注等内部字段不展示），左右滑动查看全部。
+                列名与「供应商应付（终版）→ 退货对账」的退货明细表头一致，左右滑动查看全部。
                 退货共 {{ number_format($returnPanel['total_rows']) }} 行，按导入顺序展示，每页 {{ $returnPanel['per_page'] }} 行（第 {{ $returnPanel['page'] }} / {{ $returnPanel['pages'] }} 页）。
                 金额列为空的行以预估金额参与扣减，与采购方记账口径一致。
             </p>
diff --git a/tests/Feature/Business/SupplierReconciliationTest.php b/tests/Feature/Business/SupplierReconciliationTest.php
index 0a3d1651..915374c3 100644
--- a/tests/Feature/Business/SupplierReconciliationTest.php
+++ b/tests/Feature/Business/SupplierReconciliationTest.php
@@ -131,6 +131,10 @@ class SupplierReconciliationTest extends FeatureTestCase
             ->assertSeeText('合计扣减')
             ->assertSeeText('全部确认无异议')
             ->assertSeeText('待确认')
+            ->assertSeeText('月份')
+            ->assertSeeText('条形码')
+            ->assertSeeText('商品名称')
+            ->assertSeeText('发货时间')
             ->assertSeeText('ZSJ-1');
     }
 
-- 
2.47.2