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 5825aa11..6b20e592 100644 --- a/resources/views/business/pages/courier-payables/courier-surcharge.blade.php +++ b/resources/views/business/pages/courier-payables/courier-surcharge.blade.php @@ -6,9 +6,28 @@ $ready = (bool) ($courierSurchargeReady ?? false); $typeUsage = $courierSurchargeTypeUsage ?? []; $statusClass = static fn (string $status): string => $status === '已启用' ? 'is-active' : 'is-inactive'; + $columns = [ + ['key' => 'id', 'label' => '规则编号', 'fixed' => true, 'exportable' => true], + ['key' => 'courier', 'label' => '快递名称', 'exportable' => true], + ['key' => 'scope', 'label' => '快递归属', 'exportable' => true], + ['key' => 'reconciler', 'label' => '对账人', 'exportable' => true], + ['key' => 'type', 'label' => '附加费类型', 'exportable' => true], + ['key' => 'mode', 'label' => '结算方式', 'exportable' => true], + ['key' => 'standard', 'label' => '计价标准', 'exportable' => true], + ['key' => 'condition', 'label' => '生效条件', 'exportable' => true], + ['key' => 'effective_at', 'label' => '生效日期', 'exportable' => true], + ['key' => 'status', 'label' => '状态', 'exportable' => true], + ['key' => 'remark', 'label' => '备注', 'exportable' => true], + ['key' => 'actions', 'label' => '操作', 'fixed' => true, 'exportable' => false], + ]; + $columnStorageKey = sprintf( + 'caiwu:table-columns:%d:%d:courier-surcharge:quotes', + (int) auth()->id(), + (int) company_id(), + ); @endphp -
+
@@ -62,15 +83,31 @@
-
报价规则列表
规则按生效时间应用到后续结算页面
-
+
报价规则列表
规则按生效时间应用到后续结算页面
+
当前筛选结果(全部):{{ $rows->count() }} 条规则编号与操作列固定显示;列设置仅保存于当前用户
+
规则编号快递名称快递归属对账人附加费类型结算方式计价标准生效条件生效日期状态备注操作
+ @foreach ($columns as $column) + + @endforeach + @forelse ($rows as $row) - + + + @empty - + @endforelse
@if (empty($column['fixed']))@endif{{ $column['label'] }}
{{ $row['id'] }}{{ $row['courier'] }}{{ $row['scope'] }}{{ $row['reconciler'] }}{{ $row['type'] }}{{ $row['mode'] }}{{ $row['standard'] }}{{ $row['condition'] }}{{ $row['effective_at'] }}{{ $row['status'] }}{{ $row['remark'] ?: '—' }}
@csrf
{{ $row['id'] }}{{ $row['courier'] }}{{ $row['scope'] }}{{ $row['reconciler'] }}{{ $row['type'] }}{{ $row['mode'] }}{{ $row['standard'] }}{{ $row['condition'] }}{{ $row['effective_at'] }}{{ $row['status'] }}{{ $row['remark'] ?: '—' }}
@csrf
没有符合条件的报价规则,请点击“新增报价规则”。
没有符合条件的报价规则,请点击“新增报价规则”。
-
维护建议:固定单价、按重量、按体积、按尺寸/最长边等方式直接维护标准;聚工单客服核实、取发出运费和按账单等方式只维护触发条件,具体金额由后续结算链路读取业务凭证。
+
维护建议:固定单价、按重量、按体积、按尺寸/最长边等方式直接维护标准;聚工单客服核实、取发出运费和按账单等方式只维护触发条件,具体金额由后续结算链路读取业务凭证。当前筛选结果可导出为 CSV;本页暂未启用批量导入,避免在未确认字段规则前覆盖维护数据。
diff --git a/tests/Feature/Business/CourierSurchargePageTest.php b/tests/Feature/Business/CourierSurchargePageTest.php index 1ab3dea9..b0f86695 100644 --- a/tests/Feature/Business/CourierSurchargePageTest.php +++ b/tests/Feature/Business/CourierSurchargePageTest.php @@ -37,8 +37,18 @@ class CourierSurchargePageTest extends FeatureTestCase ->assertSeeText('对账人') ->assertSeeText('张会计') ->assertSeeText('附加费类型(可多选)') + ->assertSeeText('列设置') + ->assertSeeText('导出当前列') + ->assertSeeText('导出全部字段') + ->assertSeeText('规则编号与操作列固定显示') + ->assertSee('data-column-storage-key="caiwu:table-columns:', false) + ->assertSee('data-surcharge-table', false) + ->assertSee('data-column-check', false) + ->assertSee('data-surcharge-export-current', false) + ->assertSee('data-surcharge-export-all', false) + ->assertSee('data-column-reset', false) ->assertSee('name="types[]"', false) - ->assertSeeInOrder(['快递名称', '快递归属', '对账人'], false) + ->assertSeeInOrder(['data-column-key="courier"', 'data-column-key="scope"', 'data-column-key="reconciler"'], false) ->assertSeeText('曹县德邦') ->assertSeeText('超长费') ->assertSeeText('按尺寸/最长边')