From 2ca2802ce607e7d78927d23e42b5a82eef2c83e0 Mon Sep 17 00:00:00 2001
From: zhoushengchen <3057083327@qq.com>
Date: Tue, 13 Oct 2026 13:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E5=8A=A0=E8=B4=B9=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=EF=BC=9A=E5=AF=BC=E5=85=A5/=E6=98=8E=E7=BB=86=E5=A4=B4?=
 =?UTF-8?q?=E6=94=B6=E7=B4=A7=EF=BC=8C=E7=BB=93=E6=9E=9C=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=B9=B6=E5=85=A5=E5=AF=BC=E5=85=A5=E8=A1=8C=E5=8F=B3=E4=BE=A7?=
 =?UTF-8?q?=EF=BC=8C=E6=98=8E=E7=BB=86=E5=8C=BA=E5=8A=A0=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courier-surcharge-settlement.blade.php    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/resources/views/business/pages/courier-payables/courier-surcharge-settlement.blade.php b/resources/views/business/pages/courier-payables/courier-surcharge-settlement.blade.php
index fc8c1304..1a55c0f9 100644
--- a/resources/views/business/pages/courier-payables/courier-surcharge-settlement.blade.php
+++ b/resources/views/business/pages/courier-payables/courier-surcharge-settlement.blade.php
@@ -141,18 +141,20 @@
         .settlement-button--primary { border-color: var(--settlement-accent); background: var(--settlement-accent); color: #fff; }
         .settlement-button .material-icons-outlined { font-size: .95rem; }
         .settlement-import-bar { display: flex; flex-wrap: wrap; align-items: end; gap: .45rem .75rem; margin-top: .45rem; padding: .5rem .9rem; border: 1px solid var(--settlement-border); border-radius: .75rem; background: #fff; }
-        .settlement-import-bar .settlement-field { flex: 0 1 22rem; }
+        .settlement-import-bar .settlement-field { flex: 0 1 18rem; }
         .settlement-import-bar input[type="file"] { width: 100%; height: 1.9rem; padding: .25rem .5rem; border: 1px dashed var(--settlement-border); border-radius: .4rem; background: #fffdf8; color: var(--settlement-ink); font: inherit; }
         .settlement-import-bar .settlement-table-hint { align-self: center; flex-basis: 100%; }
+        .settlement-import-meta { display: flex; flex-wrap: wrap; align-items: center; gap: .15rem .9rem; margin-left: auto; align-self: center; color: var(--settlement-muted); font-size: .7rem; }
+        .settlement-import-meta strong { color: var(--settlement-ink); }
 
         .settlement-table-surface { overflow: visible; border: 1px solid var(--settlement-border); border-radius: .75rem; background: #fff; }
-        .settlement-table-head { display: flex; align-items: flex-start; justify-content: space-between; flex-wrap: wrap; gap: .75rem 1rem; padding: .85rem 1.15rem; border-bottom: 1px solid var(--settlement-border); }
+        .settlement-table-head { display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; gap: .4rem .9rem; padding: .5rem .9rem; border-bottom: 1px solid var(--settlement-border); }
+        .settlement-table-head .finance-table-controls { margin: 0; padding: 0; border: 0; background: transparent; }
         .settlement-table-title { display: flex; align-items: center; gap: .45rem; font-size: .9rem; font-weight: 700; }
         .settlement-table-title .material-icons-outlined { color: var(--settlement-accent); font-size: 1.1rem; }
-        .settlement-table-hint { color: var(--settlement-muted); font-size: .72rem; }
-        .settlement-table-meta { display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; gap: .6rem 1rem; padding: .65rem 1.15rem; border-bottom: 1px solid var(--settlement-border); background: #fffdf8; color: var(--settlement-muted); font-size: .72rem; }
-        .settlement-table-meta strong { color: var(--settlement-ink); }
-        .settlement-table-scroll { max-height: min(62vh, 42rem); overflow: auto; overscroll-behavior: contain; scrollbar-gutter: stable both-edges; }
+        .settlement-table-hint { color: var(--settlement-muted); font-size: .68rem; }
+        .settlement-table-scroll { overflow: auto; overscroll-behavior: contain; scrollbar-gutter: stable both-edges; }
+        .surcharge-settlement-page .settlement-table-scroll { max-height: max(14rem, min(calc(100vh - 12rem), 46rem)); }
         .settlement-table { width: max-content; min-width: 100%; border-collapse: separate; border-spacing: 0; font-size: .75rem; }
         .settlement-table th,
         .settlement-table td { min-width: 7.5rem; padding: .62rem .7rem; border-right: 1px solid var(--settlement-border); border-bottom: 1px solid var(--settlement-border); text-align: left; vertical-align: top; white-space: nowrap; }
@@ -246,12 +248,12 @@
             <button class="settlement-button settlement-button--primary" type="submit"><span class="material-icons-outlined" aria-hidden="true">upload_file</span>导入并下载结果</button>
             <a class="settlement-button" href="{{ route('business.courier-surcharge.settlement.import-template') }}"><span class="material-icons-outlined" aria-hidden="true">download</span>下载导入模板</a>
         </div>
-        <span class="settlement-table-hint">首行需包含「单号」「附加费类型」，建议提供「快递名称」；「金额」可选，填了会返回导入金额与差异金额（系统金额 − 导入金额）。未生成结算行的运单用导入核验获取字段明细。</span>
+        <div class="settlement-import-meta" role="status"><span>当前筛选结果：<strong>{{ number_format((int) ($summary['count'] ?? $rows->total()), 0) }}</strong> 条</span><span>数据状态：{{ $syncLabel }}@if (! empty($sync['last_succeeded_at']))，最近同步 {{ $sync['last_succeeded_at'] }}@endif</span></div>
+        <span class="settlement-table-hint">首行需包含「单号」「附加费类型」，建议提供「快递名称」；「金额」可选，填了会返回与系统的差异金额。</span>
     </form>
 
     <div class="settlement-table-surface" data-finance-table-surface>
-        <div class="settlement-table-head"><div><div class="settlement-table-title"><span class="material-icons-outlined" aria-hidden="true">table_view</span>附加费结算明细</div><div class="settlement-table-hint">快递名称和附加费类型固定显示，其余字段可在“列设置”中调整；点击行可高亮标记。</div></div><div class="finance-table-controls" data-finance-controls><span class="settlement-table-hint">列设置按当前用户和本页面保存</span></div></div>
-        <div class="settlement-table-meta"><span>当前筛选结果：<strong>{{ number_format((int) ($summary['count'] ?? $rows->total()), 0) }}</strong> 条</span><span>数据状态：{{ $syncLabel }}@if (! empty($sync['last_succeeded_at']))，最近同步 {{ $sync['last_succeeded_at'] }}@endif</span></div>
+        <div class="settlement-table-head"><div><div class="settlement-table-title"><span class="material-icons-outlined" aria-hidden="true">table_view</span>附加费结算明细</div><div class="settlement-table-hint">快递名称和附加费类型固定显示，其余字段可在“列设置”中调整；点击行可高亮标记。</div></div><div class="finance-table-controls" data-finance-controls></div></div>
         <div class="settlement-table-scroll finance-table-scroll-owner">
             <table class="settlement-table" data-finance-table data-finance-table-name="courier-surcharge-settlement" data-finance-table-key="{{ auth()->id() }}:{{ company_id() }}:courier-payables:courier-surcharge:settlement:details" aria-label="附加费结算明细">
                 <thead><tr>
-- 
2.47.2