refactor(finance)!: 事实维度与接口字段统一改名 channel
- migration 114 将 sales_daily_facts.fulfillment_mode 重命名为 channel - DTO/查询参数/前端类型从 fulfillmentMode 统一为 channel - 成本中心类型 FulfillmentMode 更名为 FulfillmentChannel,并补齐卡券/待分类/归档取值 - 销售事实响应分组改为 byChannel
This commit is contained in:
@@ -32,7 +32,7 @@ import { ADMIN_DEFAULT_PAGE_SIZE, buildAdminTablePagination } from '@/utils/admi
|
||||
import { hasAdminPermission } from '@/utils/admin-auth'
|
||||
import { formatMoney } from './panels/shared'
|
||||
|
||||
type FilterForm = { dateRange?: unknown; provider?: string; fulfillmentMode?: string }
|
||||
type FilterForm = { dateRange?: unknown; provider?: string; channel?: string }
|
||||
|
||||
const FULFILLMENT_MODE_OPTIONS = [
|
||||
{ value: '', label: '全部履约方式' },
|
||||
@@ -71,8 +71,8 @@ export default function AdminSalesProfitPage() {
|
||||
dateFrom: string
|
||||
dateTo: string
|
||||
provider: string
|
||||
fulfillmentMode: string
|
||||
}>({ dateFrom: defaultDateFrom, dateTo: defaultDateTo, provider: '', fulfillmentMode: '' })
|
||||
channel: string
|
||||
}>({ dateFrom: defaultDateFrom, dateTo: defaultDateTo, provider: '', channel: '' })
|
||||
const [page, setPage] = useState(1)
|
||||
const [pageSize, setPageSize] = useState(ADMIN_DEFAULT_PAGE_SIZE)
|
||||
const [rebuilding, setRebuilding] = useState(false)
|
||||
@@ -96,7 +96,7 @@ export default function AdminSalesProfitPage() {
|
||||
dateFrom: range[0] ? dayjs(range[0]).format('YYYY-MM-DD') : '',
|
||||
dateTo: range[1] ? dayjs(range[1]).format('YYYY-MM-DD') : '',
|
||||
provider: values.provider || '',
|
||||
fulfillmentMode: values.fulfillmentMode || '',
|
||||
channel: values.channel || '',
|
||||
})
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ export default function AdminSalesProfitPage() {
|
||||
dateFrom: defaultDateFrom,
|
||||
dateTo: defaultDateTo,
|
||||
provider: '',
|
||||
fulfillmentMode: '',
|
||||
channel: '',
|
||||
})
|
||||
}
|
||||
|
||||
@@ -180,12 +180,10 @@ export default function AdminSalesProfitPage() {
|
||||
},
|
||||
]
|
||||
|
||||
const fulfillmentModeColumns: TableColumnsType<
|
||||
NonNullable<typeof overview>['byFulfillmentMode'][number]
|
||||
> = [
|
||||
const channelColumns: TableColumnsType<NonNullable<typeof overview>['byChannel'][number]> = [
|
||||
{
|
||||
title: '履约方式',
|
||||
dataIndex: 'fulfillmentMode',
|
||||
dataIndex: 'channel',
|
||||
render: (value: string) => FULFILLMENT_MODE_LABEL[value] || value,
|
||||
},
|
||||
{ title: '订单项', dataIndex: 'itemCount', width: 90 },
|
||||
@@ -223,7 +221,7 @@ export default function AdminSalesProfitPage() {
|
||||
},
|
||||
{
|
||||
title: '履约方式',
|
||||
dataIndex: 'fulfillmentMode',
|
||||
dataIndex: 'channel',
|
||||
width: 100,
|
||||
render: (value: string) => FULFILLMENT_MODE_LABEL[value] || value,
|
||||
},
|
||||
@@ -263,7 +261,7 @@ export default function AdminSalesProfitPage() {
|
||||
initialValues={{
|
||||
dateRange: [dayjs().subtract(29, 'day'), dayjs()],
|
||||
provider: '',
|
||||
fulfillmentMode: '',
|
||||
channel: '',
|
||||
}}
|
||||
>
|
||||
<Form.Item name="dateRange" label="销售日期">
|
||||
@@ -280,7 +278,7 @@ export default function AdminSalesProfitPage() {
|
||||
]}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item name="fulfillmentMode" label="履约方式">
|
||||
<Form.Item name="channel" label="履约方式">
|
||||
<Select style={{ width: 150 }} options={FULFILLMENT_MODE_OPTIONS} />
|
||||
</Form.Item>
|
||||
<Form.Item>
|
||||
@@ -425,10 +423,10 @@ export default function AdminSalesProfitPage() {
|
||||
label: '履约方式',
|
||||
children: (
|
||||
<PercentTable
|
||||
rowKey="fulfillmentMode"
|
||||
rowKey="channel"
|
||||
size="small"
|
||||
columns={fulfillmentModeColumns}
|
||||
dataSource={overview?.byFulfillmentMode || []}
|
||||
columns={channelColumns}
|
||||
dataSource={overview?.byChannel || []}
|
||||
loading={overviewQuery.isLoading}
|
||||
pagination={false}
|
||||
scroll={{ x: 800 }}
|
||||
|
||||
Reference in New Issue
Block a user