refactor(finance)!: 事实维度与接口字段统一改名 channel
- migration 114 将 sales_daily_facts.fulfillment_mode 重命名为 channel - DTO/查询参数/前端类型从 fulfillmentMode 统一为 channel - 成本中心类型 FulfillmentMode 更名为 FulfillmentChannel,并补齐卡券/待分类/归档取值 - 销售事实响应分组改为 byChannel
This commit is contained in:
@@ -55,7 +55,7 @@ import { formatAdminDateTime } from '@/utils/admin-time'
|
||||
type OrderFilterForm = {
|
||||
keyword?: string
|
||||
provider?: string
|
||||
fulfillmentMode?: string
|
||||
channel?: string
|
||||
payStatus?: string
|
||||
taskStatus?: string
|
||||
dateRange?: unknown
|
||||
@@ -74,7 +74,7 @@ export default function AdminOrdersPage() {
|
||||
const filters = {
|
||||
keyword: searchParams.get('keyword') || '',
|
||||
provider: searchParams.get('provider') || '',
|
||||
fulfillmentMode: searchParams.get('fulfillmentMode') || '',
|
||||
channel: searchParams.get('channel') || '',
|
||||
payStatus: searchParams.get('payStatus') || '',
|
||||
taskStatus: searchParams.get('taskStatus') || '',
|
||||
dateFrom: searchParams.get('dateFrom') || '',
|
||||
@@ -86,7 +86,7 @@ export default function AdminOrdersPage() {
|
||||
[
|
||||
filters.dateFrom,
|
||||
filters.dateTo,
|
||||
filters.fulfillmentMode,
|
||||
filters.channel,
|
||||
filters.keyword,
|
||||
filters.payStatus,
|
||||
filters.provider,
|
||||
@@ -106,7 +106,7 @@ export default function AdminOrdersPage() {
|
||||
form.setFieldsValue({
|
||||
keyword: filters.keyword || undefined,
|
||||
provider: filters.provider || undefined,
|
||||
fulfillmentMode: filters.fulfillmentMode || undefined,
|
||||
channel: filters.channel || undefined,
|
||||
payStatus: filters.payStatus || undefined,
|
||||
taskStatus: filters.taskStatus || undefined,
|
||||
dateRange:
|
||||
@@ -117,7 +117,7 @@ export default function AdminOrdersPage() {
|
||||
}, [
|
||||
filters.dateFrom,
|
||||
filters.dateTo,
|
||||
filters.fulfillmentMode,
|
||||
filters.channel,
|
||||
filters.keyword,
|
||||
filters.payStatus,
|
||||
filters.provider,
|
||||
@@ -277,14 +277,14 @@ export default function AdminOrdersPage() {
|
||||
title: '交付 / 状态',
|
||||
minWidth: 230,
|
||||
render: (_, row) => {
|
||||
const fulfillmentMode = resolveOrderFulfillmentMode(row)
|
||||
const channel = resolveOrderFulfillmentMode(row)
|
||||
const voucherLabel = resolveVoucherStateLabel(row.voucherState)
|
||||
|
||||
return (
|
||||
<div className="cell-stack" style={{ gap: 4 }}>
|
||||
<Space size={[0, 4]} wrap>
|
||||
<Tag color={fulfillmentMode.color} style={{ margin: 0, fontSize: 11 }}>
|
||||
{fulfillmentMode.label}
|
||||
<Tag color={channel.color} style={{ margin: 0, fontSize: 11 }}>
|
||||
{channel.label}
|
||||
</Tag>
|
||||
{row.hasVoucher && voucherLabel ? (
|
||||
<Tag color="gold" style={{ margin: 0, fontSize: 11 }}>
|
||||
@@ -413,7 +413,7 @@ export default function AdminOrdersPage() {
|
||||
form.setFieldsValue({
|
||||
keyword: undefined,
|
||||
provider: undefined,
|
||||
fulfillmentMode: undefined,
|
||||
channel: undefined,
|
||||
payStatus: undefined,
|
||||
taskStatus: undefined,
|
||||
dateRange: undefined,
|
||||
@@ -474,7 +474,7 @@ export default function AdminOrdersPage() {
|
||||
}}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item name="fulfillmentMode">
|
||||
<Form.Item name="channel">
|
||||
<Select
|
||||
allowClear
|
||||
placeholder="履约模式"
|
||||
|
||||
Reference in New Issue
Block a user