优化订单履约分流与后台筛选

This commit is contained in:
yml2213
2026-09-02 11:59:38 +08:00
parent 50c526a855
commit de63daf1ac
19 changed files with 1269 additions and 162 deletions
@@ -2,14 +2,20 @@ import { SearchOutlined, ReloadOutlined } from '@ant-design/icons'
import { Button, Card, Form, Input, Select, Space, Table, Typography } from 'antd'
import type { TableColumnsType } from 'antd'
import { useQuery } from '@tanstack/react-query'
import { useMemo } from 'react'
import { useEffect, useMemo } from 'react'
import { useNavigate, useSearchParams } from 'react-router'
import { AdminRangePicker } from '@/components/admin/AdminDatePicker'
import PageHeader from '@/components/admin/PageHeader'
import StatusTag from '@/components/admin/StatusTag'
import dayjs from '@/lib/dayjs'
import { fetchAdminOrders } from '@/services/admin'
import type { AdminOrderListItem } from '@/types/admin'
import { adminPayStatusOptions } from '@/utils/admin-options'
import {
adminOrderExecutorOptions,
adminPayStatusOptions,
adminTaskStatusOptions,
} from '@/utils/admin-options'
import {
ADMIN_DEFAULT_PAGE_SIZE,
buildAdminTablePagination,
@@ -18,25 +24,40 @@ import {
import { formatAdminDateTime } from '@/utils/admin-time'
type OrderFilterForm = {
platformOrderId?: string
keyword?: string
executorKey?: string
payStatus?: string
skuCode?: string
taskStatus?: string
dateRange?: unknown
}
export default function AdminOrdersPage() {
const navigate = useNavigate()
const [form] = Form.useForm<OrderFilterForm>()
const [searchParams, setSearchParams] = useSearchParams()
const page = Number(searchParams.get('page') || 1) || 1
const pageSize = resolveAdminPageSize(searchParams.get('pageSize'), ADMIN_DEFAULT_PAGE_SIZE)
const filters = {
platformOrderId: searchParams.get('platformOrderId') || '',
keyword: searchParams.get('keyword') || '',
executorKey: searchParams.get('executorKey') || '',
payStatus: searchParams.get('payStatus') || '',
skuCode: searchParams.get('skuCode') || '',
taskStatus: searchParams.get('taskStatus') || '',
dateFrom: searchParams.get('dateFrom') || '',
dateTo: searchParams.get('dateTo') || '',
}
const queryParams = useMemo(
() => ({ page, pageSize, ...filters }),
[filters.platformOrderId, filters.payStatus, filters.skuCode, page, pageSize],
[
filters.dateFrom,
filters.dateTo,
filters.executorKey,
filters.keyword,
filters.payStatus,
filters.taskStatus,
page,
pageSize,
],
)
const query = useQuery({
queryKey: ['admin-orders', queryParams],
@@ -44,6 +65,27 @@ export default function AdminOrdersPage() {
})
const data = query.data?.data
useEffect(() => {
form.setFieldsValue({
keyword: filters.keyword || undefined,
executorKey: filters.executorKey || undefined,
payStatus: filters.payStatus || undefined,
taskStatus: filters.taskStatus || undefined,
dateRange:
filters.dateFrom && filters.dateTo
? [dayjs(filters.dateFrom), dayjs(filters.dateTo)]
: undefined,
})
}, [
filters.dateFrom,
filters.dateTo,
filters.executorKey,
filters.keyword,
filters.payStatus,
filters.taskStatus,
form,
])
const columns: TableColumnsType<AdminOrderListItem> = [
{
title: '订单信息',
@@ -96,10 +138,24 @@ export default function AdminOrdersPage() {
]
function applyFilters(values: OrderFilterForm) {
setSearchParams(cleanParams({ ...values, page: 1, pageSize }))
const { dateRange, ...restValues } = values
const [dateFrom, dateTo] = Array.isArray(dateRange)
? dateRange.map((item: { format?: (pattern: string) => string }) =>
item?.format ? item.format('YYYY-MM-DD') : '',
)
: ['', '']
setSearchParams(cleanParams({ ...restValues, dateFrom, dateTo, page: 1, pageSize }))
}
function resetFilters() {
form.setFieldsValue({
keyword: undefined,
executorKey: undefined,
payStatus: undefined,
taskStatus: undefined,
dateRange: undefined,
})
setSearchParams(cleanParams({ page: 1, pageSize }))
}
@@ -109,13 +165,25 @@ export default function AdminOrdersPage() {
<Card>
<Form<OrderFilterForm>
form={form}
layout="inline"
initialValues={filters}
onFinish={applyFilters}
className="filter-form"
>
<Form.Item name="platformOrderId">
<Input allowClear placeholder="平台订单号" />
<Form.Item name="keyword">
<Input
allowClear
placeholder="订单号 / 商品标题 / SKU 标题 / 买家 / 店铺"
style={{ width: 320 }}
/>
</Form.Item>
<Form.Item name="executorKey">
<Select
allowClear
placeholder="履约渠道"
options={adminOrderExecutorOptions}
style={{ minWidth: 150 }}
/>
</Form.Item>
<Form.Item name="payStatus">
<Select
@@ -125,8 +193,18 @@ export default function AdminOrdersPage() {
style={{ minWidth: 140 }}
/>
</Form.Item>
<Form.Item name="skuCode">
<Input allowClear placeholder="SKU 标识" />
<Form.Item name="taskStatus">
<Select
allowClear
showSearch
optionFilterProp="label"
placeholder="任务状态"
options={adminTaskStatusOptions}
style={{ minWidth: 170 }}
/>
</Form.Item>
<Form.Item name="dateRange">
<AdminRangePicker />
</Form.Item>
<Form.Item>
<Space>