diff --git a/modules/EcommerceFinance/View/SupplierReconciliationPageData.php b/modules/EcommerceFinance/View/SupplierReconciliationPageData.php index 1cdccf30..85f62c0b 100644 --- a/modules/EcommerceFinance/View/SupplierReconciliationPageData.php +++ b/modules/EcommerceFinance/View/SupplierReconciliationPageData.php @@ -389,6 +389,10 @@ class SupplierReconciliationPageData $page = max((int) request()->query('rows_page', 1), 1); $statementRows = $this->statements->rows($supplier, $companyId); $returnData = $this->returnPanelData($supplier, $companyId, request()->query()); + $now = \Illuminate\Support\Carbon::now(); + $accountingMonth = $now->copy()->subMonthNoOverflow()->startOfMonth(); + $uploadDeadline = $now->copy()->startOfMonth()->addDays(4)->setTime(23, 59, 59); + $returnDeadline = $now->copy()->startOfMonth()->addDays(12)->setTime(18, 0); return [ 'statementRows' => array_slice($statementRows, ($page - 1) * self::PER_PAGE, self::PER_PAGE), @@ -398,6 +402,11 @@ class SupplierReconciliationPageData 'returnWarehouses' => $returnData['returnWarehouses'], 'rowsPage' => $page, 'perPage' => self::PER_PAGE, + 'accountingMonthKey' => $accountingMonth->format('Y-m'), + 'accountingMonthLabel' => $accountingMonth->format('Y年n月'), + 'uploadDeadlineLabel' => $uploadDeadline->format('n月j日') . ' 24:00', + 'returnDeadlineLabel' => $returnDeadline->format('n月j日') . ' 18:00', + 'returnDeadlinePassed' => $now->greaterThan($returnDeadline), ]; } diff --git a/resources/views/portal/supplier-reconciliation/index.blade.php b/resources/views/portal/supplier-reconciliation/index.blade.php index 40f3ea4b..88c621f1 100644 --- a/resources/views/portal/supplier-reconciliation/index.blade.php +++ b/resources/views/portal/supplier-reconciliation/index.blade.php @@ -2,371 +2,797 @@ 供应商对账 -
- @php - $formatReturnQty = static function (mixed $value): string { - $quantity = (float) $value; + @php + $latestUpload = $uploads[0] ?? null; + $hasUpload = (int) ($statementTotal ?? 0) > 0; + $formatReturnQty = static function (mixed $value): string { + $quantity = (float) $value; - return number_format($quantity, abs($quantity - round($quantity)) < 0.00001 ? 0 : 2); - }; - @endphp + return number_format($quantity, abs($quantity - round($quantity)) < 0.00001 ? 0 : 2); + }; + $pendingAmount = (float) ($returnPanel['pending_amount'] ?? 0); + $hasPendingReturns = (float) ($returnPanel['pending_qty'] ?? 0) > 0.00001; + $stepOneClass = $hasUpload ? 'is-done' : 'is-current'; + $stepTwoClass = $hasUpload ? 'is-done' : ''; + $stepThreeClass = $hasPendingReturns ? 'is-current' : ($hasUpload ? 'is-done' : ''); + @endphp + +
- @if (is_string(session('success'))) -
{{ session('success') }}
- @endif - @if ($errors->has('import')) - - @endif +
+
+
+ SUPPLIER RECONCILIATION +

{{ $supplier }} · 厂家对账

+

仅展示当前账号绑定厂家的上传数据与退货明细。先上传对账单,再核对退货扣减并提交确认或异议。

+
+
+
当前厂家{{ $supplier }}
+
本次账期{{ $accountingMonthLabel }}
+
{{ $returnDeadlinePassed ? '退货确认已截止' : '退货确认截止' }}{{ $returnDeadlineLabel }}
+
+
-
-
-

{{ $supplier }} · 厂家对账

-

当前登录账号只显示本厂家的上传数据和退货数据,其他厂家数据不会展示。

-
-
- 下载对账单模板 -
- @csrf - - -
-
-

- 请在每月 5 号前上传上月对账单。表头名称、顺序和列数必须与模板完全一致;快递名称、快递单号可留空; - 采购单号建议填写,系统会按采购单号+日期+条码与我方数据核对; - 单价或金额留空时会按数量自动补齐。 -

-
- 退货件数:{{ $formatReturnQty($returnPanel['return_qty']) }} 件 - 退货金额:¥{{ number_format($returnPanel['total_amount'], 2) }} -
-
+ @if (is_string(session('success'))) +
{{ session('success') }}
+ @endif + @if ($errors->has('import')) + + @endif -
-

退货明细(全部退货数据)

-

- 这里展示本厂家的全部退货数据(包含待确认、已确认和异议中),按导入顺序排列。 - @if ($returnPanel['is_filtered']) - 当前筛选结果:{{ $formatReturnQty($returnPanel['return_qty']) }} 件,退货金额 ¥{{ number_format($returnPanel['total_amount'], 2) }}。 - @endif -

-
-
- 退货件数 - {{ $formatReturnQty($returnPanel['return_qty']) }}件 + + +
+ + {{ $returnDeadlinePassed ? '退货确认已截止' : '退货最终确认截止' }}:{{ $returnDeadlineLabel }}。 逾期未确认且未提出异议的记录,视为默认无异议,并按我方退货数据结算;已经提出异议的记录继续等待财务复核。 +
+ +
+
+
+

1上传对账单

+

模板列名和顺序需保持一致,系统上传后立即校验。格式不正确时整份退回,不会覆盖当前有效版本。

- @endif -
- -
- - - - - -
- 快捷日期 - - - - + {{ $hasUpload ? '已上传' : '待上传' }}
-
- - 重置 - - 导出当前筛选结果 + + - -
- - - - - - - - - - - - @forelse ($returnPanel['rows'] as $row) - $row['_accounting_target'] === '物流'])> - - - - - - - - - - - - - - - - - @empty - - @endforelse - -
发货时间明细供应商条形码商品名称发货量单价金额供应商条码备注标题wms配货单号仓库名称快递单号类型操作
{{ $row['send_time'] ?? '—' }}{{ $row['supplier'] ?? '—' }}{{ $row['barcode'] ?? '—' }}{{ $row['sku_name'] ?? '—' }}{{ $row['qty'] ?? '—' }}{{ $row['unit_price'] ?? '—' }}{{ $row['amount'] ?? '—' }}{{ $row['supplier_barcode'] ?? '—' }} - {{ $row['remark'] ?? '—' }} - @if ($row['_accounting_target'] !== '厂家') - {{ $row['_accounting_label'] }} - @endif - @if ($row['_accounting_note'] !== '按厂家退货扣减') -
{{ $row['_accounting_note'] }}
- @endif -
{{ $row['title'] ?? '—' }}{{ $row['wms_pick_no'] ?? '—' }}{{ $row['warehouse'] ?? '—' }}{{ $row['express_no'] ?? '—' }}退货 - - @if ($row['status'] === 'confirmed') - 已确认 - @elseif ($row['status'] === 'disputed') - 异议中 - @else -
- @csrf - - -
-
- @csrf - - -
- @endif -
-
没有符合当前查询条件的退货数据。
-
- - @if ($returnPanel['pages'] > 1) - @php - $pageCount = $returnPanel['pages']; - $pageCurrent = $returnPanel['page']; - $pageStart = max(1, min($pageCurrent - 4, $pageCount - 8)); - $pageEnd = min($pageCount, $pageStart + 8); - $pageUrl = fn (int $number): string => route('portal.supplier-reconciliation.index', array_merge($returnPanel['filter_query'], [ - 'rows_page' => $rowsPage > 1 ? $rowsPage : null, - 'return_page' => $number, - ])); - @endphp -
- 第 {{ $pageCurrent }} / {{ $pageCount }} 页(每页 {{ $returnPanel['per_page'] }} 行) - @if ($pageCurrent > 1) - 上一页 - @endif - @for ($number = $pageStart; $number <= $pageEnd; $number++) - {{ $number }} - @endfor - @if ($pageCurrent < $pageCount) - 下一页 - @endif -
- @endif - -
-
+ @csrf - @foreach ($returnPanel['filter_query'] as $filterName => $filterValue) - - @endforeach -
- 确认后退货扣减生效;异议行在财务复核前暂不扣减。 -
-
-
-

{{ $supplier }} · 我上传的对账数据(共 {{ number_format($statementTotal) }} 行)

-
- - - - - - - - - - @forelse ($statementRows as $row) - - - - - - - - - - - - - @empty - - @endforelse - -
快递名称快递单号单据编号(采购单号)创建时间供应商条码规格名称数量单价金额
{{ $row['expressName'] ?? '—' }}{{ $row['expressNo'] ?? '—' }}{{ $row['purchaseNo'] ?? '—' }}{{ $row['createdAt'] ?? '—' }}{{ $row['supplier'] ?? '—' }}{{ $row['barcode'] ?? '—' }}{{ $row['skuName'] ?? '—' }}{{ $row['qty'] ?? '—' }}{{ $row['unitPrice'] ?? '—' }}{{ $row['amount'] ?? '—' }}
还没有上传过对账单。
-
- @if ($statementTotal > $perPage) - @php - $statementPageCount = max((int) ceil($statementTotal / $perPage), 1); - $statementPageStart = max(1, min($rowsPage - 4, $statementPageCount - 8)); - $statementPageEnd = min($statementPageCount, $statementPageStart + 8); - $statementPageUrl = fn (int $number): string => route('portal.supplier-reconciliation.index', array_merge($returnPanel['filter_query'], [ - 'rows_page' => $number, - 'return_page' => $returnPanel['page'] > 1 ? $returnPanel['page'] : null, - ])); - @endphp -
- 第 {{ $rowsPage }} / {{ $statementPageCount }} 页(每页 {{ $perPage }} 行) - @if ($rowsPage > 1) - 上一页 - @endif - @for ($number = $statementPageStart; $number <= $statementPageEnd; $number++) - {{ $number }} - @endfor - @if ($rowsPage < $statementPageCount) - 下一页 +
+ 采购单号建议填写,系统会按采购单号、日期和条码与结算数据匹配。 + 单价或金额留空时会按数量补齐。 +
+ + @if ($latestUpload) +
+ 最近上传:{{ $latestUpload['uploaded_at'] ?? '—' }} + 文件:{{ $latestUpload['filename'] ?? '—' }} + 行数:{{ (int) ($latestUpload['rows'] ?? 0) }} + @if (! empty($uploads[1])) + 上一版本:{{ $uploads[1]['uploaded_at'] ?? '—' }} + @endif +
+ @endif + + @if ($hasUpload) +
+ + 查看已上传对账数据 + {{ number_format($statementTotal) }} 行 + +
+ + + + + + + + + + + + + + + + + @foreach ($statementRows as $row) + + + + + + + + + + + + + @endforeach + +
快递名称快递单号单据编号(采购单号)创建时间供应商条码规格名称数量单价金额
{{ $row['expressName'] ?? '—' }}{{ $row['expressNo'] ?? '—' }}{{ $row['purchaseNo'] ?? '—' }}{{ $row['createdAt'] ?? '—' }}{{ $row['supplier'] ?? '—' }}{{ $row['barcode'] ?? '—' }}{{ $row['skuName'] ?? '—' }}{{ $row['qty'] ?? '—' }}{{ $row['unitPrice'] ?? '—' }}{{ $row['amount'] ?? '—' }}
+
+ @if ($statementTotal > $perPage) + @php + $statementPageCount = max((int) ceil($statementTotal / $perPage), 1); + $statementPageStart = max(1, min($rowsPage - 4, $statementPageCount - 8)); + $statementPageEnd = min($statementPageCount, $statementPageStart + 8); + $statementPageUrl = fn (int $number): string => route('portal.supplier-reconciliation.index', array_merge($returnPanel['filter_query'], [ + 'rows_page' => $number, + 'return_page' => $returnPanel['page'] > 1 ? $returnPanel['page'] : null, + ])); + @endphp + + @endif +
+ @endif +
+ +
+
+
+

2退货扣减确认

+

查看本厂家全部退货数据。系统只记录你的确认或异议,不会代替厂家点击确认。

+
+ {{ $hasPendingReturns ? '待确认 ¥' . number_format($pendingAmount, 2) : '已处理' }} +
+ +
+
+ 退货件数 + {{ $formatReturnQty($returnPanel['return_qty']) }}件 +
+
+ 退货金额 + ¥{{ number_format($returnPanel['total_amount'], 2) }} +
+
+ 已确认 + {{ $formatReturnQty($returnPanel['confirmed_qty']) }}件 + ¥{{ number_format($returnPanel['confirmed_amount'], 2) }} +
+
+ 异议中 + {{ $formatReturnQty($returnPanel['disputed_qty']) }}件 + ¥{{ number_format($returnPanel['disputed_amount'], 2) }} +
+
+ 待确认 + {{ $formatReturnQty($returnPanel['pending_qty']) }}件 + ¥{{ number_format($returnPanel['pending_amount'], 2) }} +
+ @if ($returnPanel['accounting_summary']['logistics_rows'] > 0) +
+ 转物流记账 + {{ $formatReturnQty($returnPanel['accounting_summary']['logistics_qty']) }}件 + ¥{{ number_format($returnPanel['accounting_summary']['logistics_amount'], 2) }} +
@endif
- @endif + + @if ($returnPanel['is_filtered']) +
+ 当前筛选 {{ $formatReturnQty($returnPanel['return_qty']) }} 件,退货金额 ¥{{ number_format($returnPanel['total_amount'], 2) }}。 +
+ @endif + +
+ + + + + +
+ 快捷日期 + + + + +
+
+ + 重置 + 导出当前筛选 +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + @forelse ($returnPanel['rows'] as $row) + $row['_accounting_target'] === '物流'])> + + + + + + + + + + + + + + + + @empty + + @endforelse + +
发货时间明细供应商条形码商品名称发货量单价金额供应商条码备注标题wms配货单号仓库名称快递单号确认状态
{{ $row['send_time'] ?? '—' }}{{ $row['supplier'] ?? '—' }}{{ $row['barcode'] ?? '—' }}{{ $row['sku_name'] ?? '—' }}{{ $row['qty'] ?? '—' }}{{ $row['unit_price'] ?? '—' }}{{ $row['amount'] ?? '—' }}{{ $row['supplier_barcode'] ?? '—' }} + {{ $row['remark'] ?? '—' }} + @if ($row['_accounting_target'] !== '厂家') + {{ $row['_accounting_label'] }} +
{{ $row['_accounting_note'] }}
+ @endif +
{{ $row['title'] ?? '—' }}{{ $row['wms_pick_no'] ?? '—' }}{{ $row['warehouse'] ?? '—' }}{{ $row['express_no'] ?? '—' }} +
+ @if ($row['status'] === 'confirmed') + 已确认 + @elseif ($row['status'] === 'disputed') + 异议中 + @else +
+ @csrf + + +
+
+ @csrf + + +
+ @endif +
+
没有符合当前查询条件的退货数据。
+
+ + @if ($returnPanel['pages'] > 1) + @php + $pageCount = $returnPanel['pages']; + $pageCurrent = $returnPanel['page']; + $pageStart = max(1, min($pageCurrent - 4, $pageCount - 8)); + $pageEnd = min($pageCount, $pageStart + 8); + $pageUrl = fn (int $number): string => route('portal.supplier-reconciliation.index', array_merge($returnPanel['filter_query'], [ + 'rows_page' => $rowsPage > 1 ? $rowsPage : null, + 'return_page' => $number, + ])); + @endphp + + @endif + + + +
+ + 系统只发送到期提醒,不代替厂家点击确认。 逾期后,财务结算会按“默认无异议”处理,但页面仍保留厂家的原始确认状态和提醒记录,方便追溯。 +
+
+