v4.0.11HQ后端优化(快链、账单日等)
CI / verify (pull_request) Has been cancelled

This commit is contained in:
2026-09-02 15:45:12 +08:00
parent 1000b489a0
commit 6880b5daf4
31 changed files with 1014 additions and 402 deletions
+19 -6
View File
@@ -29,6 +29,7 @@ import { useAdminListColumns } from '../lib/useAdminListColumns';
import { AdminListHeader } from '../components/AdminListHeader';
import { AdminPrimaryLink } from '../components/AdminPrimaryLink';
import { downloadBase64File } from '../lib/exportExcel';
import { exportColumnsBody } from '../lib/export-columns';
import {
ADMIN_OPTIONS_PAGE_SIZE,
DELIVERY_PROVIDER_LABELS,
@@ -265,8 +266,9 @@ function buildExportPayload(
format: OrderExportFormat,
filters: OrderExportFilters,
selectedIds: string[],
columns?: string[],
) {
const payload: Record<string, unknown> = { scope, format };
const payload: Record<string, unknown> = { scope, format, ...exportColumnsBody(columns ?? []) };
if (scope === 'selected') {
payload.ids = selectedIds;
return payload;
@@ -671,6 +673,7 @@ export default function OrdersPage() {
status: selectedStatuses(values.status).length ? values.status : initialStatuses,
},
selectedRowKeys,
exportColumnKeys,
);
const result = await request<OrderExportResult>('/admin/orders/export', {
method: 'POST',
@@ -688,6 +691,7 @@ export default function OrdersPage() {
const baseColumns: ColumnsType<AdminOrderRow> = [
{
title: '订单号',
key: '订单号',
dataIndex: 'orderNo',
width: 180,
render: (v, row) => (
@@ -699,7 +703,7 @@ export default function OrdersPage() {
},
{
title: '用户',
key: 'user',
key: '用户',
width: 200,
render: (_, row) =>
row.user?.id ? (
@@ -712,7 +716,7 @@ export default function OrdersPage() {
},
{
title: '商品',
key: 'productName',
key: '商品',
width: 180,
render: (_, row) => (
<Space size={4} wrap>
@@ -726,12 +730,14 @@ export default function OrdersPage() {
},
{
title: '规格',
key: '规格',
dataIndex: 'productSpec',
width: 140,
render: (v: string | undefined) => v || '—',
},
{
title: '数量',
key: '数量',
dataIndex: 'quantity',
width: 80,
render: (v: number | undefined, row) =>
@@ -739,12 +745,14 @@ export default function OrdersPage() {
},
{
title: '配送方式',
key: '配送方式',
dataIndex: 'deliveryType',
width: 100,
render: (v: string | undefined) => DELIVERY_TYPE_LABELS[v ?? ''] || v || '—',
},
{
title: '状态',
key: '状态',
dataIndex: 'status',
width: 100,
render: (s: string) => (
@@ -753,42 +761,47 @@ export default function OrdersPage() {
},
{
title: '实付',
key: '实付',
dataIndex: 'payAmount',
width: 90,
render: (v: number) => `¥${v}`,
},
{
title: '运费',
key: 'logisticsFee',
key: '运费',
width: 90,
render: (_, row) =>
row.delivery?.logisticsFee == null ? '—' : `¥${Number(row.delivery.logisticsFee).toFixed(2)}`,
},
{
title: '好客权益',
key: '好客权益',
width: 200,
render: (_, row) => formatBenefitBrief(row),
},
{
title: '收货人',
key: '收货人',
dataIndex: 'receiverName',
width: 90,
render: (v: string | undefined) => v || '—',
},
{
title: '电话',
key: '电话',
dataIndex: 'receiverPhone',
width: 120,
render: (v: string | undefined) => v || '—',
},
{
title: '地址',
key: 'receiverAddress',
key: '地址',
width: 260,
render: (_, row) => formatReceiverAddress(row) || '—',
},
{
title: '下单时间',
key: '下单时间',
dataIndex: 'createdAt',
width: 170,
render: fmtTime,
@@ -823,7 +836,7 @@ export default function OrdersPage() {
},
];
const { columns, settingsButton, settingsModal } = useAdminListColumns('orders', baseColumns, {
const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('orders', baseColumns, {
page,
pageSize,
});