新增报价规则
@@ -97,7 +101,7 @@
modal.addEventListener('click', (event) => { if (event.target === modal) close(); });
root.querySelectorAll('[data-surcharge-edit]').forEach((button) => button.addEventListener('click', () => {
const row = button.closest('[data-surcharge-row]'); const data = JSON.parse(row.dataset.rule); editingRow = row; title.textContent = '编辑报价规则';
- ['courier', 'mode', 'standard', 'condition', 'effective_at', 'remark'].forEach((key) => { const field = form.elements.namedItem(key); if (field) field.value = data[key] || ''; });
+ ['courier', 'scope', 'mode', 'standard', 'condition', 'effective_at', 'reconciler', 'remark'].forEach((key) => { const field = form.elements.namedItem(key); if (field) field.value = data[key] || ''; });
const selectedTypes = (data.type || '').split('、').map((item) => item.trim()).filter(Boolean);
form.querySelectorAll('input[name="types[]"]').forEach((checkbox) => { checkbox.checked = selectedTypes.includes(checkbox.value); });
modal.classList.add('is-open');
@@ -112,14 +116,14 @@
if (!selectedTypes.length) { form.querySelector('#surcharge-form-types').focus(); return; }
values.type = selectedTypes.join('、');
if (editingRow) {
- const cells = editingRow.querySelectorAll('td'); [values.courier, values.type, values.mode, values.standard, values.condition, values.effective_at, values.remark].forEach((value, index) => { cells[index + 1].textContent = value || '—'; });
+ const cells = editingRow.querySelectorAll('td'); [[1, values.courier], [2, values.scope], [3, values.type], [4, values.mode], [5, values.standard], [6, values.condition], [7, values.effective_at], [8, values.reconciler], [10, values.remark]].forEach(([index, value]) => { cells[index].textContent = value || '—'; });
} else {
const table = root.querySelector('.sm-table tbody'); const empty = table.querySelector('.sm-empty')?.closest('tr'); empty?.remove(); const row = document.createElement('tr');
const cells = [
- `演示-${Date.now().toString().slice(-4)}`, values.courier, values.type, values.mode,
- values.standard, values.condition, values.effective_at, '已启用', values.remark || '—',
+ `演示-${Date.now().toString().slice(-4)}`, values.courier, values.scope, values.type, values.mode,
+ values.standard, values.condition, values.effective_at, values.reconciler, '已启用', values.remark || '—',
];
- cells.forEach((value, index) => { const cell = document.createElement('td'); cell.textContent = value; if ([4, 5, 8].includes(index)) cell.classList.add('wrap'); if (index === 7) { cell.textContent = ''; const badge = document.createElement('span'); badge.className = 'sm-badge is-active'; badge.dataset.status = ''; badge.textContent = '已启用'; cell.appendChild(badge); } row.appendChild(cell); });
+ cells.forEach((value, index) => { const cell = document.createElement('td'); cell.textContent = value; if ([5, 6, 10].includes(index)) cell.classList.add('wrap'); if (index === 9) { cell.textContent = ''; const badge = document.createElement('span'); badge.className = 'sm-badge is-active'; badge.dataset.status = ''; badge.textContent = '已启用'; cell.appendChild(badge); } row.appendChild(cell); });
const actionCell = document.createElement('td'); const actionWrap = document.createElement('div'); actionWrap.className = 'sm-actions'; const toggleButton = document.createElement('button'); toggleButton.className = 'sm-button'; toggleButton.type = 'button'; toggleButton.dataset.surchargeToggle = ''; toggleButton.textContent = '停用'; actionWrap.appendChild(toggleButton); actionCell.appendChild(actionWrap); row.appendChild(actionCell); table.appendChild(row);
toggleButton.addEventListener('click', () => { const badge = row.querySelector('[data-status]'); const active = badge.textContent.trim() === '已启用'; badge.textContent = active ? '已停用' : '已启用'; badge.classList.toggle('is-active', !active); badge.classList.toggle('is-inactive', active); toggleButton.textContent = active ? '启用' : '停用'; });
}
diff --git a/tests/Feature/Business/CourierSurchargePageTest.php b/tests/Feature/Business/CourierSurchargePageTest.php
index 9a8a545e..8446b77c 100644
--- a/tests/Feature/Business/CourierSurchargePageTest.php
+++ b/tests/Feature/Business/CourierSurchargePageTest.php
@@ -24,6 +24,11 @@ class CourierSurchargePageTest extends FeatureTestCase
->assertSeeText('结算方式')
->assertSeeText('计价标准')
->assertSeeText('生效条件')
+ ->assertSeeText('快递归属')
+ ->assertSeeText('自有快递')
+ ->assertSeeText('代发仓')
+ ->assertSeeText('对账人')
+ ->assertSeeText('张会计')
->assertSeeText('附加费类型（可多选）')
->assertSee('name="types[]"', false)
->assertSeeText('曹县德邦')
@@ -46,11 +51,15 @@ class CourierSurchargePageTest extends FeatureTestCase
'section' => 'courier-payables',
'page' => 'courier-surcharge',
'courier' => '常州松宇货运',
+ 'scope' => '代发仓',
+ 'reconciler' => '李会计',
'status' => '已启用',
]))
->assertOk()
->assertSeeText('常州松宇货运')
->assertSeeText('送货费')
+ ->assertSeeText('代发仓')
+ ->assertSeeText('李会计')
->assertSeeText('当前规则')
->assertDontSee('
曹县德邦 | ', false)
->assertDontSee('
霸州百世快运-雅柏 | ', false);
--
2.47.2
From e6118f102d837de583744ddc192b3d183255211e Mon Sep 17 00:00:00 2001
From: zhoushengchen <3057083327@qq.com>
Date: Wed, 2 Sep 2026 14:57:31 +0800
Subject: [PATCH 5/7] fix: move reconciler after courier scope
---
.../courier-payables/courier-surcharge.blade.php | 16 ++++++++--------
.../Business/CourierSurchargePageTest.php | 1 +
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/resources/views/business/pages/courier-payables/courier-surcharge.blade.php b/resources/views/business/pages/courier-payables/courier-surcharge.blade.php
index cc847214..e68ba726 100644
--- a/resources/views/business/pages/courier-payables/courier-surcharge.blade.php
+++ b/resources/views/business/pages/courier-payables/courier-surcharge.blade.php
@@ -50,9 +50,9 @@
+
-
@@ -60,9 +60,9 @@
rule报价规则列表
规则按生效时间应用到后续结算页面
-
| 规则编号 | 快递名称 | 快递归属 | 附加费类型 | 结算方式 | 计价标准 | 生效条件 | 生效日期 | 对账人 | 状态 | 备注 | 操作 |
|---|
+ | 规则编号 | 快递名称 | 快递归属 | 对账人 | 附加费类型 | 结算方式 | 计价标准 | 生效条件 | 生效日期 | 状态 | 备注 | 操作 |
|---|
@forelse ($rows as $row)
- | {{ $row['id'] }} | {{ $row['courier'] }} | {{ $row['scope'] }} | {{ $row['type'] }} | {{ $row['mode'] }} | {{ $row['standard'] }} | {{ $row['condition'] }} | {{ $row['effective_at'] }} | {{ $row['reconciler'] }} | {{ $row['status'] }} | {{ $row['remark'] ?: '—' }} | |
+ | {{ $row['id'] }} | {{ $row['courier'] }} | {{ $row['scope'] }} | {{ $row['reconciler'] }} | {{ $row['type'] }} | {{ $row['mode'] }} | {{ $row['standard'] }} | {{ $row['condition'] }} | {{ $row['effective_at'] }} | {{ $row['status'] }} | {{ $row['remark'] ?: '—' }} | |
@empty
没有符合条件的报价规则，请点击“新增报价规则”。 |
@endforelse
@@ -75,12 +75,12 @@
@@ -116,14 +116,14 @@
if (!selectedTypes.length) { form.querySelector('#surcharge-form-types').focus(); return; }
values.type = selectedTypes.join('、');
if (editingRow) {
- const cells = editingRow.querySelectorAll('td'); [[1, values.courier], [2, values.scope], [3, values.type], [4, values.mode], [5, values.standard], [6, values.condition], [7, values.effective_at], [8, values.reconciler], [10, values.remark]].forEach(([index, value]) => { cells[index].textContent = value || '—'; });
+ const cells = editingRow.querySelectorAll('td'); [[1, values.courier], [2, values.scope], [3, values.reconciler], [4, values.type], [5, values.mode], [6, values.standard], [7, values.condition], [8, values.effective_at], [10, values.remark]].forEach(([index, value]) => { cells[index].textContent = value || '—'; });
} else {
const table = root.querySelector('.sm-table tbody'); const empty = table.querySelector('.sm-empty')?.closest('tr'); empty?.remove(); const row = document.createElement('tr');
const cells = [
- `演示-${Date.now().toString().slice(-4)}`, values.courier, values.scope, values.type, values.mode,
- values.standard, values.condition, values.effective_at, values.reconciler, '已启用', values.remark || '—',
+ `演示-${Date.now().toString().slice(-4)}`, values.courier, values.scope, values.reconciler, values.type, values.mode,
+ values.standard, values.condition, values.effective_at, '已启用', values.remark || '—',
];
- cells.forEach((value, index) => { const cell = document.createElement('td'); cell.textContent = value; if ([5, 6, 10].includes(index)) cell.classList.add('wrap'); if (index === 9) { cell.textContent = ''; const badge = document.createElement('span'); badge.className = 'sm-badge is-active'; badge.dataset.status = ''; badge.textContent = '已启用'; cell.appendChild(badge); } row.appendChild(cell); });
+ cells.forEach((value, index) => { const cell = document.createElement('td'); cell.textContent = value; if ([6, 7, 10].includes(index)) cell.classList.add('wrap'); if (index === 9) { cell.textContent = ''; const badge = document.createElement('span'); badge.className = 'sm-badge is-active'; badge.dataset.status = ''; badge.textContent = '已启用'; cell.appendChild(badge); } row.appendChild(cell); });
const actionCell = document.createElement('td'); const actionWrap = document.createElement('div'); actionWrap.className = 'sm-actions'; const toggleButton = document.createElement('button'); toggleButton.className = 'sm-button'; toggleButton.type = 'button'; toggleButton.dataset.surchargeToggle = ''; toggleButton.textContent = '停用'; actionWrap.appendChild(toggleButton); actionCell.appendChild(actionWrap); row.appendChild(actionCell); table.appendChild(row);
toggleButton.addEventListener('click', () => { const badge = row.querySelector('[data-status]'); const active = badge.textContent.trim() === '已启用'; badge.textContent = active ? '已停用' : '已启用'; badge.classList.toggle('is-active', !active); badge.classList.toggle('is-inactive', active); toggleButton.textContent = active ? '启用' : '停用'; });
}
diff --git a/tests/Feature/Business/CourierSurchargePageTest.php b/tests/Feature/Business/CourierSurchargePageTest.php
index 8446b77c..6d401371 100644
--- a/tests/Feature/Business/CourierSurchargePageTest.php
+++ b/tests/Feature/Business/CourierSurchargePageTest.php
@@ -31,6 +31,7 @@ class CourierSurchargePageTest extends FeatureTestCase
->assertSeeText('张会计')
->assertSeeText('附加费类型（可多选）')
->assertSee('name="types[]"', false)
+ ->assertSeeInOrder(['快递名称 | ', '快递归属 | ', '对账人 | '], false)
->assertSeeText('曹县德邦')
->assertSeeText('超长费')
->assertSeeText('按尺寸/最长边')
--
2.47.2
From 67f7a8ad6f9ccf339162123a130b07df8f4b1e6f Mon Sep 17 00:00:00 2001
From: zhoushengchen <3057083327@qq.com>
Date: Wed, 2 Sep 2026 16:14:53 +0800
Subject: [PATCH 6/7] feat: persist courier surcharge quote maintenance
---
.../CourierSurchargeQuoteRepository.php | 201 ++++++++++++++++++
.../Business/CourierSurchargeQuotes.php | 88 ++++++++
app/Http/Controllers/Business/Pages.php | 84 +-------
app/Models/Business/CourierSurchargeQuote.php | 51 +++++
..._create_courier_surcharge_quotes_table.php | 43 ++++
.../courier-surcharge.blade.php | 45 ++--
routes/admin.php | 10 +
.../Business/CourierSurchargePageTest.php | 89 +++++++-
8 files changed, 497 insertions(+), 114 deletions(-)
create mode 100644 app/Business/CourierSurchargeQuoteRepository.php
create mode 100644 app/Http/Controllers/Business/CourierSurchargeQuotes.php
create mode 100644 app/Models/Business/CourierSurchargeQuote.php
create mode 100644 database/migrations/2026_09_02_000000_create_courier_surcharge_quotes_table.php
diff --git a/app/Business/CourierSurchargeQuoteRepository.php b/app/Business/CourierSurchargeQuoteRepository.php
new file mode 100644
index 00000000..1d0af5a7
--- /dev/null
+++ b/app/Business/CourierSurchargeQuoteRepository.php
@@ -0,0 +1,201 @@
+getTable());
+ } catch (QueryException) {
+ return false;
+ }
+ }
+
+ /**
+ * @param array $filters
+ * @return array{ready:bool, rows:Collection, summary:array, options:array}
+ */
+ public function pageData(array $filters): array
+ {
+ if (! $this->ready()) {
+ return [
+ 'ready' => false,
+ 'rows' => collect(),
+ 'summary' => ['total' => 0, 'active' => 0, 'inactive' => 0, 'couriers' => 0],
+ 'options' => $this->emptyOptions(),
+ ];
+ }
+
+ try {
+ $all = CourierSurchargeQuote::query()
+ ->orderByDesc('effective_at')
+ ->orderByDesc('id')
+ ->get();
+ } catch (QueryException) {
+ return [
+ 'ready' => false,
+ 'rows' => collect(),
+ 'summary' => ['total' => 0, 'active' => 0, 'inactive' => 0, 'couriers' => 0],
+ 'options' => $this->emptyOptions(),
+ ];
+ }
+
+ $filtered = $all->filter(function (CourierSurchargeQuote $quote) use ($filters): bool {
+ foreach (['courier', 'scope', 'reconciler', 'mode'] as $key) {
+ if (($filters[$key] ?? '') !== '' && (string) $quote->{$key} !== $filters[$key]) {
+ return false;
+ }
+ }
+
+ if (($filters['type'] ?? '') !== '' && ! in_array($filters['type'], (array) $quote->types, true)) {
+ return false;
+ }
+
+ if (($filters['status'] ?? '') !== '' && $quote->statusLabel() !== $filters['status']) {
+ return false;
+ }
+
+ $keyword = trim((string) ($filters['keyword'] ?? ''));
+ if ($keyword !== '') {
+ $searchable = implode('|', [
+ $quote->courier,
+ $quote->scope,
+ $quote->reconciler,
+ $quote->typeLabel(),
+ $quote->mode,
+ $quote->standard,
+ $quote->condition,
+ (string) $quote->remark,
+ ]);
+
+ if (! str_contains($searchable, $keyword)) {
+ return false;
+ }
+ }
+
+ return true;
+ })->values();
+
+ return [
+ 'ready' => true,
+ 'rows' => $filtered->map(fn (CourierSurchargeQuote $quote): array => $this->present($quote)),
+ 'summary' => [
+ 'total' => $filtered->count(),
+ 'active' => $filtered->where('status', CourierSurchargeQuote::STATUS_ACTIVE)->count(),
+ 'inactive' => $filtered->where('status', CourierSurchargeQuote::STATUS_INACTIVE)->count(),
+ 'couriers' => $filtered->pluck('courier')->unique()->count(),
+ ],
+ 'options' => [
+ 'couriers' => $all->pluck('courier')->filter()->unique()->sort()->values(),
+ 'types' => collect(self::TYPES),
+ 'modes' => collect(self::MODES),
+ 'scopes' => self::SCOPES,
+ 'reconcilers' => $all->pluck('reconciler')->filter()->unique()->sort()->values(),
+ 'statuses' => ['已启用', '已停用'],
+ ],
+ ];
+ }
+
+ /** @param array $data */
+ public function create(array $data, int $userId): CourierSurchargeQuote
+ {
+ return CourierSurchargeQuote::query()->create($this->attributes($data, $userId) + [
+ 'status' => CourierSurchargeQuote::STATUS_ACTIVE,
+ 'created_by' => $userId,
+ ]);
+ }
+
+ /** @param array $data */
+ public function update(CourierSurchargeQuote $quote, array $data, int $userId): CourierSurchargeQuote
+ {
+ $quote->update($this->attributes($data, $userId));
+
+ return $quote->fresh();
+ }
+
+ public function setStatus(CourierSurchargeQuote $quote, string $status, int $userId): CourierSurchargeQuote
+ {
+ abort_unless(in_array($status, [CourierSurchargeQuote::STATUS_ACTIVE, CourierSurchargeQuote::STATUS_INACTIVE], true), 422, '报价规则状态不合法。');
+
+ $quote->forceFill(['status' => $status, 'updated_by' => $userId])->save();
+
+ return $quote->fresh();
+ }
+
+ /** @param array $data */
+ private function attributes(array $data, int $userId): array
+ {
+ return [
+ 'company_id' => company_id(),
+ 'courier' => trim((string) $data['courier']),
+ 'scope' => trim((string) $data['scope']),
+ 'reconciler' => trim((string) $data['reconciler']),
+ 'types' => array_values(array_unique(array_map('strval', $data['types']))),
+ 'mode' => trim((string) $data['mode']),
+ 'standard' => trim((string) $data['standard']),
+ 'condition' => trim((string) $data['condition']),
+ 'effective_at' => $data['effective_at'],
+ 'remark' => trim((string) ($data['remark'] ?? '')) ?: null,
+ 'updated_by' => $userId,
+ ];
+ }
+
+ /** @return array */
+ private function present(CourierSurchargeQuote $quote): array
+ {
+ return [
+ 'id' => 'SUR-' . str_pad((string) $quote->id, 3, '0', STR_PAD_LEFT),
+ 'db_id' => $quote->id,
+ 'courier' => $quote->courier,
+ 'scope' => $quote->scope,
+ 'reconciler' => $quote->reconciler,
+ 'types' => array_values((array) $quote->types),
+ 'type' => $quote->typeLabel(),
+ 'mode' => $quote->mode,
+ 'standard' => $quote->standard,
+ 'condition' => $quote->condition,
+ 'effective_at' => optional($quote->effective_at)->format('Y-m-d'),
+ 'status_code' => $quote->status,
+ 'status' => $quote->statusLabel(),
+ 'remark' => $quote->remark,
+ ];
+ }
+
+ /** @return array */
+ private function emptyOptions(): array
+ {
+ return [
+ 'couriers' => collect(),
+ 'types' => collect(self::TYPES),
+ 'modes' => collect(self::MODES),
+ 'scopes' => self::SCOPES,
+ 'reconcilers' => collect(),
+ 'statuses' => ['已启用', '已停用'],
+ ];
+ }
+}
diff --git a/app/Http/Controllers/Business/CourierSurchargeQuotes.php b/app/Http/Controllers/Business/CourierSurchargeQuotes.php
new file mode 100644
index 00000000..62633b9f
--- /dev/null
+++ b/app/Http/Controllers/Business/CourierSurchargeQuotes.php
@@ -0,0 +1,88 @@
+middleware('auth');
+ $this->middleware('company.identify');
+ $this->middleware('business.page:courier-payables,courier-surcharge');
+ }
+
+ public function store(Request $request): RedirectResponse
+ {
+ abort_unless($this->quotes->ready(), 503, '附加费报价数据表尚未完成迁移，请联系管理员。');
+
+ $this->quotes->create($this->validated($request), (int) user_id());
+
+ return $this->redirect()->with('success', '报价规则已新增并保存。');
+ }
+
+ public function update(Request $request, CourierSurchargeQuote $quote): RedirectResponse
+ {
+ $this->ensureCompany($quote);
+ abort_unless($this->quotes->ready(), 503, '附加费报价数据表尚未完成迁移，请联系管理员。');
+
+ $this->quotes->update($quote, $this->validated($request), (int) user_id());
+
+ return $this->redirect()->with('success', '报价规则已更新并保存。');
+ }
+
+ public function setStatus(Request $request, CourierSurchargeQuote $quote): RedirectResponse
+ {
+ $this->ensureCompany($quote);
+ abort_unless($this->quotes->ready(), 503, '附加费报价数据表尚未完成迁移，请联系管理员。');
+
+ $status = $request->validate([
+ 'status' => ['required', 'in:' . CourierSurchargeQuote::STATUS_ACTIVE . ',' . CourierSurchargeQuote::STATUS_INACTIVE],
+ ])['status'];
+ $this->quotes->setStatus($quote, $status, (int) user_id());
+
+ return $this->redirect()->with('success', '报价规则状态已更新。');
+ }
+
+ /** @return array */
+ private function validated(Request $request): array
+ {
+ $data = $request->validate([
+ 'courier' => ['required', 'string', 'max:191'],
+ 'scope' => ['required', 'in:' . implode(',', CourierSurchargeQuoteRepository::SCOPES)],
+ 'reconciler' => ['required', 'string', 'max:100'],
+ 'types' => ['required', 'array', 'min:1', 'max:11'],
+ 'types.*' => ['string', 'in:' . implode(',', CourierSurchargeQuoteRepository::TYPES)],
+ 'mode' => ['required', 'in:' . implode(',', CourierSurchargeQuoteRepository::MODES)],
+ 'standard' => ['required', 'string', 'max:2000'],
+ 'condition' => ['required', 'string', 'max:2000'],
+ 'effective_at' => ['required', 'date_format:Y-m-d'],
+ 'remark' => ['nullable', 'string', 'max:2000'],
+ ]);
+
+ $data['courier'] = trim($data['courier']);
+ $data['reconciler'] = trim($data['reconciler']);
+ $data['types'] = array_values(array_unique($data['types']));
+
+ return $data;
+ }
+
+ private function ensureCompany(CourierSurchargeQuote $quote): void
+ {
+ abort_unless((int) $quote->company_id === (int) company_id(), 404, '报价规则不存在。');
+ }
+
+ private function redirect(): RedirectResponse
+ {
+ return redirect()->route('business.pages.show', [
+ 'company_id' => company_id() ?: 1,
+ 'section' => 'courier-payables',
+ 'page' => 'courier-surcharge',
+ ]);
+ }
+}
diff --git a/app/Http/Controllers/Business/Pages.php b/app/Http/Controllers/Business/Pages.php
index 2ef0be60..66742150 100644
--- a/app/Http/Controllers/Business/Pages.php
+++ b/app/Http/Controllers/Business/Pages.php
@@ -11,6 +11,7 @@ use App\Models\Banking\MarketingAccountBill;
use App\Models\Business\CourierAgreementSignature;
use App\Models\Business\CourierSigningSubject;
use App\Models\Business\InstallationDetail;
+use App\Business\CourierSurchargeQuoteRepository;
use App\Models\StoreReceivables\StoreZhongcaiReconciliation;
use App\Utilities\SidebarPermissions;
use Illuminate\Http\Request;
@@ -71,6 +72,7 @@ class Pages extends Controller
private readonly DingPayableWorkflowMirrorRepository $dingPayableWorkflows,
private readonly SupplierPayableReportRepository $supplierPayableReports,
private readonly UpstreamQueryCacheFactory $upstreamCaches,
+ private readonly CourierSurchargeQuoteRepository $courierSurchargeQuotes,
) {
$this->middleware('auth');
$this->middleware('company.identify');
@@ -461,45 +463,6 @@ class Pages extends Controller
*/
protected function contentForCourierSurcharge(): array
{
- $rows = collect([
- [
- 'id' => 'SUR-001', 'courier' => '曹县德邦', 'scope' => '自有快递', 'reconciler' => '张会计', 'type' => '超长费',
- 'mode' => '按尺寸/最长边', 'standard' => '最长边 > 160 cm：8 元/单',
- 'condition' => '最长边超过 160 cm', 'effective_at' => '2026-09-01',
- 'status' => '已启用', 'remark' => '大件渠道标准',
- ],
- [
- 'id' => 'SUR-002', 'courier' => '曹县德邦', 'scope' => '自有快递', 'reconciler' => '张会计', 'type' => '拦截费',
- 'mode' => '固定单价', 'standard' => '20 元/单（小件）',
- 'condition' => '查件结扣单类型=拦截', 'effective_at' => '2026-09-01',
- 'status' => '已启用', 'remark' => '小件渠道适用',
- ],
- [
- 'id' => 'SUR-003', 'courier' => '常州松宇货运', 'scope' => '代发仓', 'reconciler' => '李会计', 'type' => '送货费',
- 'mode' => '按体积', 'standard' => '体积 ≤ 10 m³：50 元/单',
- 'condition' => '计费体积不超过 10 m³', 'effective_at' => '2026-09-01',
- 'status' => '已启用', 'remark' => '送货上门费用',
- ],
- [
- 'id' => 'SUR-004', 'courier' => '霸州百世快运-雅柏', 'scope' => '代发仓', 'reconciler' => '李会计', 'type' => '退回费',
- 'mode' => '按重量', 'standard' => '2 元/kg',
- 'condition' => '退回件，按结算重量计费', 'effective_at' => '2026-09-01',
- 'status' => '已启用', 'remark' => '退回费通用标准',
- ],
- [
- 'id' => 'SUR-005', 'courier' => '常州德邦', 'scope' => '自有快递', 'reconciler' => '王会计', 'type' => '上楼费',
- 'mode' => '聚工单客服核实', 'standard' => '读取聚工单附加费明细',
- 'condition' => '存在客服核实的上楼工单', 'effective_at' => '2026-09-01',
- 'status' => '已启用', 'remark' => '不在本页直接填写金额',
- ],
- [
- 'id' => 'SUR-006', 'courier' => '方建顺心捷达', 'scope' => '代发仓', 'reconciler' => '待指定', 'type' => '拦截费',
- 'mode' => '发出运费倍数', 'standard' => '发出运费 × 2',
- 'condition' => '拦截成功，关联发出运费', 'effective_at' => '2026-09-01',
- 'status' => '已启用', 'remark' => '双向运费',
- ],
- ]);
-
$clean = static fn (mixed $value, int $length = 60): string => mb_substr(trim((string) $value), 0, $length);
$filters = [
'keyword' => $clean(request('keyword', ''), 40),
@@ -510,48 +473,15 @@ class Pages extends Controller
'reconciler' => $clean(request('reconciler', ''), 40),
'status' => $clean(request('status', ''), 20),
];
- $filtered = $rows->filter(static function (array $row) use ($filters): bool {
- foreach (['courier', 'type', 'mode', 'scope', 'reconciler', 'status'] as $key) {
- if ($filters[$key] !== '' && $row[$key] !== $filters[$key]) {
- return false;
- }
- }
- if ($filters['keyword'] !== ''
- && ! str_contains($row['courier'], $filters['keyword'])
- && ! str_contains($row['type'], $filters['keyword'])
- && ! str_contains($row['standard'], $filters['keyword'])
- && ! str_contains($row['condition'], $filters['keyword'])
- && ! str_contains($row['scope'], $filters['keyword'])
- && ! str_contains($row['reconciler'], $filters['keyword'])) {
- return false;
- }
-
- return true;
- })->values();
+ $data = $this->courierSurchargeQuotes->pageData($filters);
return [
'view' => 'business.pages.courier-payables.courier-surcharge',
- 'courierSurchargeRows' => $filtered,
+ 'courierSurchargeRows' => $data['rows'],
'courierSurchargeFilters' => $filters,
- 'courierSurchargeSummary' => [
- 'total' => $filtered->count(),
- 'active' => $filtered->where('status', '已启用')->count(),
- 'inactive' => $filtered->where('status', '已停用')->count(),
- 'couriers' => $filtered->pluck('courier')->unique()->count(),
- 'types' => $filtered->pluck('type')->unique()->count(),
- ],
- 'courierSurchargeOptions' => [
- 'couriers' => $rows->pluck('courier')->unique()->sort()->values(),
- // 文档定义的十类附加费全部进入筛选器，即使当前演示样例暂未覆盖每一类。
- 'types' => collect([
- '退回费', '拦截费', '改地址', '异形件', '超长费',
- '上楼费', '送货费', '超区费', '安装费', '保费', '发出运费附加',
- ]),
- 'modes' => collect(['固定单价', '按重量', '按体积', '按尺寸/最长边', '聚工单客服核实', '取发出运费', '发出运费倍数', '按账单']),
- 'scopes' => ['自有快递', '代发仓'],
- 'reconcilers' => $rows->pluck('reconciler')->unique()->sort()->values(),
- 'statuses' => ['已启用', '已停用'],
- ],
+ 'courierSurchargeSummary' => $data['summary'],
+ 'courierSurchargeOptions' => $data['options'],
+ 'courierSurchargeReady' => $data['ready'],
];
}
diff --git a/app/Models/Business/CourierSurchargeQuote.php b/app/Models/Business/CourierSurchargeQuote.php
new file mode 100644
index 00000000..8cf53c08
--- /dev/null
+++ b/app/Models/Business/CourierSurchargeQuote.php
@@ -0,0 +1,51 @@
+ 'integer',
+ 'types' => 'array',
+ 'effective_at' => 'date:Y-m-d',
+ 'created_by' => 'integer',
+ 'updated_by' => 'integer',
+ ];
+
+ public function statusLabel(): string
+ {
+ return $this->status === self::STATUS_ACTIVE ? '已启用' : '已停用';
+ }
+
+ public function typeLabel(): string
+ {
+ return implode('、', array_values(array_filter(array_map(
+ static fn ($type): string => trim((string) $type),
+ (array) $this->types,
+ ))));
+ }
+}
diff --git a/database/migrations/2026_09_02_000000_create_courier_surcharge_quotes_table.php b/database/migrations/2026_09_02_000000_create_courier_surcharge_quotes_table.php
new file mode 100644
index 00000000..50dffe09
--- /dev/null
+++ b/database/migrations/2026_09_02_000000_create_courier_surcharge_quotes_table.php
@@ -0,0 +1,43 @@
+increments('id');
+ $table->unsignedInteger('company_id');
+ $table->string('courier', 191);
+ $table->string('scope', 32);
+ $table->string('reconciler', 100);
+ $table->text('types');
+ $table->string('mode', 64);
+ $table->text('standard');
+ $table->text('condition');
+ $table->date('effective_at');
+ $table->string('status', 16)->default('active');
+ $table->text('remark')->nullable();
+ $table->unsignedInteger('created_by')->nullable();
+ $table->unsignedInteger('updated_by')->nullable();
+ $table->timestamps();
+ $table->softDeletes();
+
+ $table->index(['company_id', 'status'], 'courier_surcharge_company_status_index');
+ $table->index(['company_id', 'courier'], 'courier_surcharge_company_courier_index');
+ $table->index(['company_id', 'effective_at'], 'courier_surcharge_company_effective_index');
+ });
+ }
+
+ public function down(): void
+ {
+ Schema::dropIfExists('business_courier_surcharge_quotes');
+ }
+};
diff --git a/resources/views/business/pages/courier-payables/courier-surcharge.blade.php b/resources/views/business/pages/courier-payables/courier-surcharge.blade.php
index e68ba726..a4690207 100644
--- a/resources/views/business/pages/courier-payables/courier-surcharge.blade.php
+++ b/resources/views/business/pages/courier-payables/courier-surcharge.blade.php
@@ -3,6 +3,7 @@
$filters = $courierSurchargeFilters ?? [];
$summary = $courierSurchargeSummary ?? [];
$options = $courierSurchargeOptions ?? [];
+ $ready = (bool) ($courierSurchargeReady ?? false);
$statusClass = static fn (string $status): string => $status === '已启用' ? 'is-active' : 'is-inactive';
@endphp
@@ -34,7 +35,7 @@
@media (max-width:620px) { .sm-summary { grid-template-columns:repeat(2,1fr); } .sm-summary__intro { grid-column:span 2; } .sm-metric { border-left:0; border-top:1px solid var(--sm-border); } .sm-toolbar,.sm-form { grid-template-columns:minmax(0,1fr); } .sm-form__types { grid-template-columns:repeat(2,minmax(0,1fr)); } .sm-actions,.sm-form__field--full,.sm-form__foot { grid-column:auto; } .sm-actions .sm-button { flex:1; } }
- edit_note附加费报价维护原型 · 演示数据 先维护“快递 + 归属 + 附加费类型 + 结算方式 + 标准 + 对账人”，后续结算页面将按启用中的报价规则计算。当前新增、编辑和启停操作只在本页演示，刷新后恢复样例，尚未写入共享业务镜像。
+ {{ $ready ? 'verified' : 'info' }}{{ $ready ? '正式维护数据' : '数据表尚未就绪' }} {{ $ready ? '报价规则已保存到当前公司数据表，刷新页面后仍会保留；后续结算页面将按启用中的规则计算。' : '附加费报价数据表尚未完成迁移，当前不能保存规则。请由管理员在目标数据库完成迁移后再使用本页。' }}