V4.0.9版本更新合伙人H5端调整
This commit is contained in:
@@ -103,6 +103,11 @@ function partnerDashLabel(p?: {
|
||||
return company || person || (p.phone || '').trim() || '—';
|
||||
}
|
||||
|
||||
function weekMonday(d: Dayjs) {
|
||||
const wd = d.day();
|
||||
return d.subtract(wd === 0 ? 6 : wd - 1, 'day').startOf('day');
|
||||
}
|
||||
|
||||
export default function PartnerBillsPage() {
|
||||
const [form] = Form.useForm();
|
||||
const [filters, setFilters] = useState<Record<string, string>>({});
|
||||
@@ -113,8 +118,7 @@ export default function PartnerBillsPage() {
|
||||
const qs = new URLSearchParams();
|
||||
if (filters.status) qs.set('status', filters.status);
|
||||
if (filters.partnerId) qs.set('partnerId', filters.partnerId);
|
||||
if (filters.year) qs.set('year', filters.year);
|
||||
if (filters.month) qs.set('month', filters.month);
|
||||
if (filters.weekStartYmd) qs.set('weekStartYmd', filters.weekStartYmd);
|
||||
return qs;
|
||||
},
|
||||
[filters],
|
||||
@@ -136,19 +140,18 @@ export default function PartnerBillsPage() {
|
||||
.catch(() => {});
|
||||
}, []);
|
||||
|
||||
async function generateBill(values: { partnerId?: string; month: Dayjs }) {
|
||||
const year = values.month.year();
|
||||
const month = values.month.month() + 1;
|
||||
async function generateBill(values: { partnerId?: string; week: Dayjs }) {
|
||||
const weekStartYmd = weekMonday(values.week).format('YYYY-MM-DD');
|
||||
if (!values.partnerId) {
|
||||
const result = await request<{ success: number; failed: number; total: number }>(
|
||||
'/admin/partner-bills/generate-all',
|
||||
{ method: 'POST', body: JSON.stringify({ year, month }) },
|
||||
{ method: 'POST', body: JSON.stringify({ weekStartYmd }) },
|
||||
);
|
||||
message.success(`已生成 ${result.success}/${result.total} 份账单${result.failed ? `，失败 ${result.failed}` : ''}`);
|
||||
} else {
|
||||
await request('/admin/partner-bills/generate', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ partnerId: values.partnerId, year, month }),
|
||||
body: JSON.stringify({ partnerId: values.partnerId, weekStartYmd }),
|
||||
});
|
||||
message.success('账单已生成（待审核）');
|
||||
}
|
||||
@@ -259,10 +262,9 @@ export default function PartnerBillsPage() {
|
||||
const qs = new URLSearchParams();
|
||||
if (filters.status) qs.set('status', filters.status);
|
||||
if (filters.partnerId) qs.set('partnerId', filters.partnerId);
|
||||
if (filters.year) qs.set('year', filters.year);
|
||||
if (filters.month) qs.set('month', filters.month);
|
||||
if (filters.weekStartYmd) qs.set('weekStartYmd', filters.weekStartYmd);
|
||||
const result = await request<{ csv: string; count: number }>(`/admin/partner-bills/export?${qs}`);
|
||||
const suffix = filters.year && filters.month ? `${filters.year}-${filters.month}` : 'all';
|
||||
const suffix = filters.weekStartYmd || 'all';
|
||||
downloadExcelCsv(result.csv, `合伙人账单_${suffix}.csv`);
|
||||
message.success(`已导出 ${result.count} 条`);
|
||||
} finally {
|
||||
@@ -274,7 +276,9 @@ export default function PartnerBillsPage() {
|
||||
const partnerName = (r: Row) => partnerDashLabel(r.partnerAccount ?? r.partner);
|
||||
const partnerBank = (r: Row) => r.partnerAccount ?? r.partner;
|
||||
const selectedRows = (data?.items ?? []).filter((r) => selectedKeys.includes(r.id));
|
||||
const canSend = selectedRows.filter((r) => r.status === 'PENDING_REVIEW' || r.status === 'REJECTED');
|
||||
const canSend = selectedRows.filter(
|
||||
(r) => (r.status === 'PENDING_REVIEW' || r.status === 'REJECTED') && Number(r.totalAmount) > 0,
|
||||
);
|
||||
const canPay = selectedRows.filter((r) => r.status === 'UNPAID');
|
||||
const payAmount = canPay.reduce((s, r) => s + Number(r.totalAmount), 0);
|
||||
|
||||
@@ -313,8 +317,9 @@ export default function PartnerBillsPage() {
|
||||
{
|
||||
title: '合计应付',
|
||||
dataIndex: 'totalAmount',
|
||||
width: 110,
|
||||
render: (v) => `¥${Number(v).toFixed(2)}`,
|
||||
width: 130,
|
||||
render: (v) =>
|
||||
Number(v) <= 0 ? '¥0.00（不同步）' : `¥${Number(v).toFixed(2)}`,
|
||||
},
|
||||
{
|
||||
title: '收款户名',
|
||||
@@ -350,7 +355,7 @@ export default function PartnerBillsPage() {
|
||||
<Button type="link" size="small" onClick={() => void openDetail(row.id)}>
|
||||
明细
|
||||
</Button>
|
||||
{(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && (
|
||||
{(row.status === 'PENDING_REVIEW' || row.status === 'REJECTED') && Number(row.totalAmount) > 0 && (
|
||||
<Button type="link" size="small" onClick={() => sendBills([row.id])}>
|
||||
发送
|
||||
</Button>
|
||||
@@ -383,7 +388,7 @@ export default function PartnerBillsPage() {
|
||||
<AdminListHeader
|
||||
title="合伙人账单"
|
||||
settings={settingsButton}
|
||||
description="每月 1 日 8:00 自动生成上月账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款"
|
||||
description="每周一 8:00 自动生成上周账单（待审核）→ 发送合伙人确认 → 未打款 → 已打款。零元账单不同步给合伙人。"
|
||||
/>
|
||||
|
||||
{summary && (
|
||||
@@ -401,12 +406,11 @@ export default function PartnerBillsPage() {
|
||||
form={form}
|
||||
layout="inline"
|
||||
style={{ marginBottom: 16 }}
|
||||
onFinish={(v: { partnerId?: string; status?: string; month?: Dayjs }) => {
|
||||
onFinish={(v: { partnerId?: string; status?: string; week?: Dayjs }) => {
|
||||
setFilters({
|
||||
partnerId: v.partnerId || '',
|
||||
status: v.status || '',
|
||||
year: v.month ? String(v.month.year()) : '',
|
||||
month: v.month ? String(v.month.month() + 1) : '',
|
||||
weekStartYmd: v.week ? weekMonday(v.week).format('YYYY-MM-DD') : '',
|
||||
});
|
||||
setPage(1);
|
||||
}}
|
||||
@@ -424,8 +428,8 @@ export default function PartnerBillsPage() {
|
||||
}))}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item name="month" label="账期月">
|
||||
<DatePicker picker="month" />
|
||||
<Form.Item name="week" label="账期周">
|
||||
<DatePicker picker="week" />
|
||||
</Form.Item>
|
||||
<Form.Item name="status" label="状态">
|
||||
<Select
|
||||
@@ -503,11 +507,11 @@ export default function PartnerBillsPage() {
|
||||
<Form
|
||||
form={genForm}
|
||||
layout="vertical"
|
||||
initialValues={{ month: dayjs().subtract(1, 'month') }}
|
||||
initialValues={{ week: weekMonday(dayjs().subtract(1, 'week')) }}
|
||||
onFinish={generateBill}
|
||||
>
|
||||
<Form.Item name="month" label="账单月份" rules={[{ required: true }]}>
|
||||
<DatePicker picker="month" style={{ width: '100%' }} />
|
||||
<Form.Item name="week" label="账单周（选任意一天，按周一起算）" rules={[{ required: true }]}>
|
||||
<DatePicker picker="week" style={{ width: '100%' }} />
|
||||
</Form.Item>
|
||||
<Form.Item name="partnerId" label="指定合伙人（留空则全部主合伙人）">
|
||||
<Select
|
||||
|
||||
Reference in New Issue
Block a user