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 @@ - - - - - + + + + + + + @forelse ($returnPanel['rows'] as $row) + + + + + @@ -205,8 +212,9 @@ - - + + + @empty - + @endforelse
发货量单价金额预估单价预估金额供应商条码备注标题wms配货单号仓库名称快递单号发货时间原条码类型操作月份发货时间明细供应商条形码商品名称发货量单价金额预估单价预估金额供应商条码备注标题wms配货单号仓库名称快递单号标记多标签创建人对账人类型操作
{{ $row['summary_month'] ?? '—' }}{{ $row['send_time'] ?? '—' }}{{ $row['supplier'] ?? '—' }}{{ $row['barcode'] ?? '—' }}{{ $row['sku_name'] ?? '—' }} {{ $row['qty'] ?? '—' }} {{ $row['unit_price'] ?? '—' }} {{ $row['amount'] ?? '—' }}{{ $row['wms_pick_no'] ?? '—' }} {{ $row['warehouse'] ?? '—' }} {{ $row['express_no'] ?? '—' }}{{ $row['send_time'] ?? '—' }}{{ $row['barcode'] ?? '—' }}{{ $row['labels'] ?? '—' }}{{ $row['creator'] ?? '—' }}{{ $row['reconciler'] ?? '—' }} 退货 @@ -232,13 +240,13 @@
该厂家暂无退货数据。
该厂家暂无退货数据。

- 列名取自《退货明细》原始表头(标记多标签、创建人、对账人、退货单备注等内部字段不展示),左右滑动查看全部。 + 列名与「供应商应付(终版)→ 退货对账」的退货明细表头一致,左右滑动查看全部。 退货共 {{ number_format($returnPanel['total_rows']) }} 行,按导入顺序展示,每页 {{ $returnPanel['per_page'] }} 行(第 {{ $returnPanel['page'] }} / {{ $returnPanel['pages'] }} 页)。 金额列为空的行以预估金额参与扣减,与采购方记账口径一致。

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'); }