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

fix: 精简厂家退货链接页字段 #855

Merged
renshen merged 1 commits from fix/supplier-return-share-fields into main 2026-11-04 13:23:07 +08:00
Conversation 0 Commits 1 Files Changed 2 +17 -12
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
resources/views/business/pages/supplier-reconciliation/return-share.blade.php
View File

@ -75,7 +75,6 @@
</section>
<section class="share-summary">
<div class="share-stat"><span>本月退货行数</span><strong>{{ number_format($summary['count']) }}</strong></div>
<div class="share-stat"><span>厂家净扣减数量</span><strong>{{ number_format($summary['qty'], 2) }} 件</strong></div>
<div class="share-stat"><span>厂家净扣减金额</span><strong>￥{{ number_format($summary['amount'], 2) }}</strong></div>
<div class="share-stat"><span>确认状态</span><strong style="font-size:.9375rem">待 {{ $summary['pending'] }} · 已 {{ $summary['confirmed'] }} · 异 {{ $summary['disputed'] }}</strong></div>
@ -98,25 +97,24 @@
<colgroup>
<col style="width: 6%">
<col style="width: 5%">
<col style="width: 10%">
<col style="width: 14%">
<col style="width: 12%">
<col style="width: 18%">
<col style="width: 4%">
<col style="width: 5%">
<col style="width: 5%">
<col style="width: 10%">
<col style="width: 10%">
<col style="width: 6%">
<col style="width: 5%">
<col style="width: 5%">
<col style="width: 8%">
<col style="width: 6%">
<col style="width: 7%">
<col style="width: 8%">
<col style="width: 4%">
<col style="width: 4%">
<col style="width: 6%">
</colgroup>
<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">备注</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>
</tr>
@ -131,7 +129,6 @@
<td class="is-num">{{ $row['qty'] ?? '—' }}</td>
<td class="is-num">{{ number_format((float) ($row['unit_price'] ?? 0), 2) }}</td>
<td class="is-num">{{ number_format((float) ($row['amount'] ?? 0), 2) }}</td>
<td class="is-barcode">{{ $row['supplier_barcode'] ?? '—' }}</td>
<td class="is-remark">
{{ $row['remark'] ?? '—' }}
@if (($row['_accounting_label'] ?? '') !== '' && ($row['_accounting_label'] ?? '') !== '厂家扣减')
@ -157,7 +154,7 @@
</td>
</tr>
@empty
<tr><td colspan="15"><div class="share-empty">没有退货明细。</div></td></tr>
<tr><td colspan="14"><div class="share-empty">没有退货明细。</div></td></tr>
@endforelse
</tbody>
</table>

10
tests/Feature/Business/SupplierReconciliationDingTalkTest.php
View File

@ -600,13 +600,21 @@ class SupplierReconciliationDingTalkTest extends FeatureTestCase
->assertSeeText('发货时间')
->assertSeeText('wms配货单号')
->assertSeeText('SHARE-PENDING')
->assertSeeText('SHARE-CONFIRMED');
->assertSeeText('SHARE-CONFIRMED')
->assertDontSeeText('本月退货行数')
->assertDontSeeText('供应商条码');
$response->assertSee('table-layout: fixed', false)
->assertSee('overflow-x: hidden', false)
->assertSee('<colgroup>', false)
->assertDontSee('min-width: 1580px', false);
$html = (string) $response->getContent();
$tableStart = strpos($html, '<table>');
$tableEnd = strpos($html, '</table>', $tableStart);
$this->assertNotFalse($tableStart);
$this->assertNotFalse($tableEnd);
$tableHtml = substr($html, $tableStart, $tableEnd - $tableStart);
$this->assertSame(14, substr_count($tableHtml, '<th scope="col">'));
$summaryStart = strpos($html, '<section class="share-summary">');
$summaryEnd = strpos($html, '</section>', $summaryStart);
$this->assertNotFalse($summaryStart);