From bd1955e9769104e96d6877c251a1ab49a6e21f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E6=9C=A8?= <594326199@qq.com>
Date: Tue, 20 Oct 2026 11:38:47 +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=9A=90=E8=97=8F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=AE=B0=E5=BD=95=E5=B9=B6=E8=B0=83=E6=95=B4=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplier-data.blade.php                   | 46 ++++++++++---------
 .../supplier-reconciliation/index.blade.php   |  7 ---
 .../Business/SupplierReconciliationTest.php   |  7 +++
 3 files changed, 31 insertions(+), 29 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 f5fce02b..28c79a3c 100644
--- a/resources/views/business/pages/supplier-reconciliation/supplier-data.blade.php
+++ b/resources/views/business/pages/supplier-reconciliation/supplier-data.blade.php
@@ -124,28 +124,6 @@
     </div>
 
     @if ($selectedSupplier !== '')
-        <div class="sr-card">
-            <h2>{{ $selectedSupplier }} · 上传记录</h2>
-            <div class="sr-scroll">
-                <table>
-                    <thead>
-                        <tr><th scope="col">上传时间</th><th scope="col">文件名</th><th scope="col">行数</th></tr>
-                    </thead>
-                    <tbody>
-                        @forelse ($uploads as $upload)
-                            <tr>
-                                <td class="sr-muted">{{ $upload['uploaded_at'] ?? '—' }}</td>
-                                <td>{{ $upload['filename'] ?? '—' }}</td>
-                                <td class="is-num">{{ number_format((int) ($upload['rows'] ?? 0)) }}</td>
-                            </tr>
-                        @empty
-                            <tr><td colspan="3"><div class="sr-empty">该厂家还没有上传过对账单。</div></td></tr>
-                        @endforelse
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
         <div class="sr-card">
             <h2>{{ $selectedSupplier }} · 上传的对账数据（共 {{ number_format($statementTotal) }} 行）</h2>
             <div class="sr-scroll">
@@ -445,6 +423,30 @@
         </div>
     @endif
 
+    @if ($selectedSupplier !== '')
+        <div class="sr-card">
+            <h2>{{ $selectedSupplier }} · 上传记录</h2>
+            <div class="sr-scroll">
+                <table>
+                    <thead>
+                        <tr><th scope="col">上传时间</th><th scope="col">文件名</th><th scope="col">行数</th></tr>
+                    </thead>
+                    <tbody>
+                        @forelse ($uploads as $upload)
+                            <tr>
+                                <td class="sr-muted">{{ $upload['uploaded_at'] ?? '—' }}</td>
+                                <td>{{ $upload['filename'] ?? '—' }}</td>
+                                <td class="is-num">{{ number_format((int) ($upload['rows'] ?? 0)) }}</td>
+                            </tr>
+                        @empty
+                            <tr><td colspan="3"><div class="sr-empty">该厂家还没有上传过对账单。</div></td></tr>
+                        @endforelse
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    @endif
+
     <script>
         (() => {
             const form = document.querySelector('[data-return-filter-form]');
diff --git a/resources/views/portal/supplier-reconciliation/index.blade.php b/resources/views/portal/supplier-reconciliation/index.blade.php
index decd31fe..b819ebfe 100644
--- a/resources/views/portal/supplier-reconciliation/index.blade.php
+++ b/resources/views/portal/supplier-reconciliation/index.blade.php
@@ -93,13 +93,6 @@
                     单价或金额留空时会按数量自动补齐。
                 </p>
                 <div class="sp-summary">
-                    @if (! empty($uploads[0]))
-                        <span>最近上传：{{ $uploads[0]['uploaded_at'] ?? '—' }}</span>
-                        <span>文件：{{ $uploads[0]['filename'] ?? '—' }}</span>
-                        <span>行数：{{ number_format((int) ($uploads[0]['rows'] ?? 0)) }}</span>
-                    @else
-                        <span>当前还没有上传过对账单。</span>
-                    @endif
                     <span>退货件数：{{ $formatReturnQty($returnPanel['return_qty']) }} 件</span>
                     <span>退货金额：￥{{ number_format($returnPanel['total_amount'], 2) }}</span>
                 </div>
diff --git a/tests/Feature/Business/SupplierReconciliationTest.php b/tests/Feature/Business/SupplierReconciliationTest.php
index 97063eda..a227727a 100644
--- a/tests/Feature/Business/SupplierReconciliationTest.php
+++ b/tests/Feature/Business/SupplierReconciliationTest.php
@@ -145,6 +145,12 @@ class SupplierReconciliationTest extends FeatureTestCase
         $response->assertSee('sr-return-scroll', false);
 
         $html = (string) $response->getContent();
+        $uploadHistoryPosition = strpos($html, ' · 上传记录');
+        $returnPanelPosition = strpos($html, '退货扣减确认');
+        $this->assertNotFalse($uploadHistoryPosition, '内部页面应保留上传记录。');
+        $this->assertNotFalse($returnPanelPosition, '内部页面应正常渲染退货面板。');
+        $this->assertGreaterThan($returnPanelPosition, $uploadHistoryPosition, '上传记录应移动到页面最下面。');
+
         $tableStart = strpos($html, '<table class="sr-return-table">');
         $tableEnd = $tableStart === false ? false : strpos($html, '</table>', $tableStart);
         $this->assertNotFalse($tableStart, '厂家退货表应正常渲染。');
@@ -239,6 +245,7 @@ class SupplierReconciliationTest extends FeatureTestCase
             ->assertDontSeeText('PORTAL-20')
             ->assertDontSeeText('OTHER-SUPPLIER-RETURN')
             ->assertDontSeeText('鸣飞家具')
+            ->assertDontSeeText('最近上传')
             ->assertDontSee('supplier-name-options', false)
             ->assertSee('sp-return-scroll', false)
             ->assertSee('id="portal-return-date-from"', false)
-- 
2.47.2