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
+10 -4
View File
@@ -26,6 +26,8 @@ import { fmtTime } from '../lib/constants';
import { downloadExcelCsv } from '../lib/exportExcel';
import { request, type HqProfile } from '../lib/api';
import { useAdminList } from '../lib/useAdminList';
import { useAdminListColumns } from '../lib/useAdminListColumns';
type Row = {
id: string;
@@ -235,8 +237,8 @@ export default function WineryBillsPage() {
const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
const selectedAmount = selectedRows.reduce((s, r) => s + Number(r.wineryAmount), 0);
const columns: ColumnsType<Row> = [
{ title: '账单号', dataIndex: 'billNo', width: 170, ellipsis: true },
const baseColumns: ColumnsType<Row> = [
{ title: '账单号', dataIndex: 'billNo', width: 170 },
{
title: '账单日',
dataIndex: 'billDate',
@@ -290,8 +292,11 @@ export default function WineryBillsPage() {
},
];
const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-winery-bills', baseColumns, { page, pageSize });
return (
<div>
{settingsModal}
<div
style={{
display: 'flex',
@@ -305,6 +310,7 @@ export default function WineryBillsPage() {
<Typography.Title level={4} style={{ margin: 0 }}>
</Typography.Title>
{settingsButton}
<Typography.Text type="secondary">
T+3 8:00 3 / × {ratePct}%绿 0
@@ -398,7 +404,7 @@ export default function WineryBillsPage() {
onChange: setSelectedKeys,
getCheckboxProps: (r) => ({ disabled: !canConfirmWineryPay(r) }),
}}
scroll={{ x: 1100 }}
scroll={{ x: 'max-content' }}
pagination={{
current: page,
pageSize,
@@ -456,7 +462,7 @@ export default function WineryBillsPage() {
pagination={false}
dataSource={detail.items ?? []}
columns={[
{ title: '订单号', dataIndex: 'orderNo', ellipsis: true },
{ title: '订单号', dataIndex: 'orderNo' },
{
title: '配送',
dataIndex: 'deliveryType',