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
@@ -1,4 +1,5 @@
import { useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import {
Button,
Card,
@@ -27,6 +28,7 @@ import {
} from '@dukang/shared-types';
import { fmtTime } from '../lib/constants';
import { downloadExcelCsv } from '../lib/exportExcel';
import { appendExportColumns } from '../lib/export-columns';
import { request } from '../lib/api';
import { useAdminList } from '../lib/useAdminList';
import { useAdminListColumns } from '../lib/useAdminListColumns';
@@ -98,6 +100,7 @@ const STATUS_COLORS: Record<string, string> = {
};
export default function LogisticsBillsPage() {
const navigate = useNavigate();
const [form] = Form.useForm();
const [summaryForm] = Form.useForm();
const [filters, setFilters] = useState<Record<string, string>>({});
@@ -202,6 +205,7 @@ export default function LogisticsBillsPage() {
if (filters.providerId) qs.set('providerId', filters.providerId);
if (filters.year) qs.set('year', filters.year);
if (filters.month) qs.set('month', filters.month);
appendExportColumns(qs, exportColumnKeys);
const result = await request<{ csv: string; count: number }>(
`/admin/logistics-bills/export?${qs}`,
);
@@ -250,6 +254,7 @@ export default function LogisticsBillsPage() {
const billColumns: ColumnsType<BillRow> = [
{
title: '账单号',
key: '账单号',
dataIndex: 'billNo',
width: 170,
render: (v, row) => (
@@ -258,42 +263,49 @@ export default function LogisticsBillsPage() {
},
{
title: '承运商',
key: '承运商',
width: 140,
render: (_, r) => `${r.providerName || ''} (${r.providerCode || ''})`,
},
{
title: '账期',
key: '账期',
width: 200,
render: (_, r) =>
`${String(r.periodStart || '').slice(0, 10)} ~ ${String(r.periodEnd || '').slice(0, 10)}`,
},
{
title: '结算方式',
key: '结算方式',
dataIndex: 'settlementMethod',
width: 100,
render: (v) =>
LOGISTICS_SETTLEMENT_METHOD_LABELS[v as LogisticsSettlementMethod] || v,
},
{ title: '订单数', dataIndex: 'orderCount', width: 80 },
{ title: '瓶数', dataIndex: 'bottleCount', width: 80 },
{ title: '订单数', key: '订单数', dataIndex: 'orderCount', width: 80 },
{ title: '瓶数', key: '瓶数', dataIndex: 'bottleCount', width: 80 },
{
title: '物流费',
key: '物流费',
dataIndex: 'logisticsAmount',
width: 110,
render: (v) => `¥${Number(v).toFixed(2)}`,
},
{
title: '收款户名',
key: '收款户名',
width: 100,
render: (_, r) => providerBank(r)?.bankAccountName || '—',
},
{
title: '收款账号',
key: '收款账号',
width: 140,
render: (_, r) => providerBank(r)?.bankAccountNo || '—',
},
{
title: '状态',
key: '状态',
dataIndex: 'status',
width: 90,
render: (s) => <Tag color={STATUS_COLORS[s] || 'default'}>{STATUS_LABELS[s] || s}</Tag>,
@@ -398,7 +410,7 @@ export default function LogisticsBillsPage() {
},
];
const { columns, settingsButton, settingsModal } = useAdminListColumns('finance-logistics-bills', billColumns, {
const { columns, settingsButton, settingsModal, exportColumnKeys } = useAdminListColumns('finance-logistics-bills', billColumns, {
page,
pageSize,
});
@@ -627,7 +639,20 @@ export default function LogisticsBillsPage() {
pagination={false}
dataSource={detail.items ?? []}
columns={[
{ title: '订单号', dataIndex: 'orderNo' },
{
title: '订单号',
dataIndex: 'orderNo',
render: (v: string) =>
v ? (
<AdminPrimaryLink
onClick={() => navigate(`/orders?orderNo=${encodeURIComponent(v)}`)}
>
{v}
</AdminPrimaryLink>
) : (
'—'
),
},
{ title: '瓶数', dataIndex: 'quantity', width: 70 },
{
title: '物流费',