Merge branch 'main' into dev_match

This commit is contained in:
2026-11-07 10:41:19 +08:00
15 changed files with 265 additions and 49 deletions
@@ -42,6 +42,7 @@ const CHANNEL_LABEL: Record<VoucherConsumeChannel, string> = {
manual: '人工客服',
on_account: '统一结算',
third_party_voucher: '第三方卡券',
unmatched: '未命中渠道兜底',
}
const MODE_OPTIONS: Record<
@@ -75,6 +76,10 @@ const MODE_OPTIONS: Record<
{ value: 'after_order_received', label: '收到订单后' },
{ value: 'manual', label: '人工核销' },
],
unmatched: [
{ value: 'after_order_received', label: '未命中渠道后' },
{ value: 'manual', label: '人工核销' },
],
}
type PolicyRow = {
@@ -103,6 +108,7 @@ const CHANNEL_FILTER_OPTIONS: Array<{ value: VoucherConsumeChannel; label: strin
{ value: 'manual', label: CHANNEL_LABEL.manual },
{ value: 'third_party_voucher', label: CHANNEL_LABEL.third_party_voucher },
{ value: 'on_account', label: CHANNEL_LABEL.on_account },
{ value: 'unmatched', label: CHANNEL_LABEL.unmatched },
]
const JOB_STATUS_FILTER_OPTIONS: Array<{
@@ -2399,10 +2399,12 @@ export default function WorkOrdersPanel() {
setPage(1)
}}
/>
<Button type="primary" icon={<SearchOutlined />} onClick={searchOrders}>
查询
</Button>
<Button onClick={clearOrderFilters}>清空筛选</Button>
<div className="worker-orders-filter-actions">
<Button type="primary" icon={<SearchOutlined />} onClick={searchOrders}>
查询
</Button>
<Button onClick={clearOrderFilters}>清空筛选</Button>
</div>
</div>
<div className="worker-orders-mock">
<Typography.Text type="secondary">本地 Mock</Typography.Text>