fix: 调整厂家全部确认按钮位置 #852

Merged
renshen merged 1 commits from fix/supplier-confirm-button-position into main 2026-11-04 12:00:34 +08:00
2 changed files with 19 additions and 9 deletions

View File

@ -2,15 +2,6 @@
<x-slot name="title">供应商退货明细 · {{ $supplier }} · {{ $month }}</x-slot>
<x-slot name="buttons">
@if ($summary['pending'] > 0)
<form method="POST" action="{{ $confirmUrl }}" class="inline-block mb-3 sm:mb-0 mr-2"
onsubmit="return confirm('确认本月全部待确认退货均无异议?确认结果会立即回传财务系统,异议中的记录不会被覆盖。')">
@csrf
<button type="submit" class="bg-green text-white px-3 py-1.5 rounded-lg text-sm font-medium leading-6 hover:bg-green-700">
全部确认无异议({{ $summary['pending'] }} 行)
</button>
</form>
@endif
<a href="{{ $excelUrl }}" class="bg-green text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-lg text-sm font-medium leading-6 hover:bg-green-700">下载 Excel</a>
<a href="{{ $csvUrl }}" class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-lg text-sm font-medium leading-6">下载 CSV</a>
<button type="button" onclick="window.print()" class="px-3 py-1.5 mb-3 sm:mb-0 bg-gray-100 hover:bg-gray-200 rounded-lg text-sm font-medium leading-6">打印</button>
@ -30,6 +21,9 @@
.supplier-return-share .share-stat { display: grid; gap: 5px; padding: 13px 15px; border: 1px solid #ded7c9; border-radius: 9px; background: #fff; }
.supplier-return-share .share-stat span { color: #686053; font-size: .75rem; }
.supplier-return-share .share-stat strong { font-size: 1.25rem; font-variant-numeric: tabular-nums; }
.supplier-return-share .share-confirm-action { display: flex; align-items: stretch; padding: 12px; border: 1px solid #d5c6a8; border-radius: 9px; background: #fffaf0; }
.supplier-return-share .share-confirm-action button { width: 100%; padding: 0 16px; border: 0; border-radius: 7px; background: #4f8a52; color: #fff; font-size: .8125rem; font-weight: 700; cursor: pointer; }
.supplier-return-share .share-confirm-action button:hover { background: #407346; }
.supplier-return-share .share-table-card { overflow: hidden; border: 1px solid #ded7c9; border-radius: 10px; background: #fff; }
.supplier-return-share .share-table-title { display: flex; flex-wrap: wrap; align-items: center; gap: 10px; padding: 14px 16px; border-bottom: 1px solid #eee8dd; }
.supplier-return-share .share-table-title h2 { flex: 1 1 auto; margin: 0; font-size: .9375rem; font-weight: 700; }
@ -86,6 +80,13 @@
<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>
@if ($summary['pending'] > 0)
<form method="POST" action="{{ $confirmUrl }}" class="share-confirm-action"
onsubmit="return confirm('确认本月全部待确认退货均无异议?确认结果会立即回传财务系统,异议中的记录不会被覆盖。')">
@csrf
<button type="submit">全部确认无异议({{ $summary['pending'] }} 行)</button>
</form>
@endif
</section>
<section class="share-table-card">

View File

@ -603,6 +603,15 @@ class SupplierReconciliationDingTalkTest extends FeatureTestCase
->assertSeeText('SHARE-CONFIRMED');
$html = (string) $response->getContent();
$summaryStart = strpos($html, '<section class="share-summary">');
$summaryEnd = strpos($html, '</section>', $summaryStart);
$this->assertNotFalse($summaryStart);
$this->assertNotFalse($summaryEnd);
$summaryHtml = substr($html, $summaryStart, $summaryEnd - $summaryStart);
$this->assertGreaterThan(
strpos($summaryHtml, '确认状态'),
strpos($summaryHtml, '全部确认无异议'),
);
$this->assertMatchesRegularExpression(
'/href="([^"]*supplier-returns[^"]*\/excel[^"]*)"/',
$html,