v3.5.8和v3.5.9版本更新
CI / verify (pull_request) Has been cancelled

This commit is contained in:
2026-08-25 09:20:32 +08:00
parent 7304c7a8e1
commit 5935024ea8
101 changed files with 7640 additions and 5364 deletions
+11 -6
View File
@@ -26,6 +26,7 @@ import type { ColumnsType } from 'antd/es/table';
import dayjs, { type Dayjs } from 'dayjs';
import { ORDER_TYPE_LABELS } from '@dukang/shared-types';
import { request, type AdminOrderItem, type AdminOrderRow, type HqProfile, type Paginated } from '../lib/api';
import { useAdminListColumns } from '../lib/useAdminListColumns';
import { downloadBase64File } from '../lib/exportExcel';
import {
ADMIN_OPTIONS_PAGE_SIZE,
@@ -590,7 +591,7 @@ export default function OrdersPage() {
}
}
const columns: ColumnsType<AdminOrderRow> = [
const baseColumns: ColumnsType<AdminOrderRow> = [
{
title: '商品',
width: 240,
@@ -686,11 +687,18 @@ export default function OrdersPage() {
},
];
const { columns, settingsButton, settingsModal } = useAdminListColumns('orders', baseColumns, {
page,
pageSize,
});
return (
<div>
{settingsModal}
<Space style={{ marginBottom: 20, width: '100%', justifyContent: 'space-between' }}>
<Typography.Title level={4} style={{ margin: 0 }}></Typography.Title>
<Space size={12}>
{settingsButton}
<Button onClick={() => window.open('/orders/big-screen', 'dukang-big-screen')}></Button>
{canProxyOrder ? (
<Button type="primary" onClick={() => setProxyOpen(true)}>
@@ -830,7 +838,7 @@ export default function OrdersPage() {
loading={loading}
columns={columns}
dataSource={data?.items ?? []}
scroll={{ x: 1100 }}
scroll={{ x: 'max-content' }}
rowSelection={{
selectedRowKeys,
preserveSelectedRowKeys: true,
@@ -1014,7 +1022,7 @@ export default function OrdersPage() {
locale={{ emptyText: '暂无关联核销单' }}
dataSource={detail.redeemRecords ?? []}
columns={[
{ title: '核销号', dataIndex: 'redeemNo', width: 160, ellipsis: true },
{ title: '核销号', dataIndex: 'redeemNo', width: 160 },
{
title: '角色',
dataIndex: 'role',
@@ -1025,7 +1033,6 @@ export default function OrdersPage() {
{
title: '门店',
dataIndex: ['store', 'name'],
ellipsis: true,
render: (v: string | undefined, row) =>
v ? `${v}${row.store?.cityName ? `${row.store.cityName}` : ''}` : '—',
},
@@ -1141,7 +1148,6 @@ export default function OrdersPage() {
{
title: '备注',
dataIndex: 'remark',
ellipsis: true,
render: (v) => v || '—',
},
{
@@ -1436,7 +1442,6 @@ export default function OrdersPage() {
{
title: '商品',
width: 160,
ellipsis: true,
render: (_, row) =>
row.productName
? `${row.productName}${row.quantity != null ? ` ×${row.quantity}` : ''}`