WuYongJie/CaiWuXiTong
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

供应商对账：厂家端退货表表头与退货明细完全一致 #374

Merged
renshen merged 1 commits from feature/sumu-return-header-match into main 2026-10-17 10:53:13 +08:00
Conversation 0 Commits 1 Files Changed 2 +22 -10
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
resources/views/business/pages/supplier-reconciliation/supplier-data.blade.php
View File

@ -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>

4
tests/Feature/Business/SupplierReconciliationTest.php
View File

@ -131,6 +131,10 @@ class SupplierReconciliationTest extends FeatureTestCase
->assertSeeText('合计扣减')
->assertSeeText('全部确认无异议')
->assertSeeText('待确认')
->assertSeeText('月份')
->assertSeeText('条形码')
->assertSeeText('商品名称')
->assertSeeText('发货时间')
->assertSeeText('ZSJ-1');
}