feat(customers): 增加商户编号并补齐生日提醒信息

录入、列表和导入导出带上商户编号。生日提醒展示与录入一致的商户资料,旧阴历生日仍按农历提醒。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-09-11 14:55:24 +08:00
co-authored by Cursor
parent d981e53330
commit c81962b732
15 changed files with 214 additions and 172 deletions
+12 -20
View File
@@ -5,7 +5,6 @@ import { isStaff, isSuperAdmin } from "@/lib/acl";
import { fmtDate, maskPhone } from "@/lib/utils";
import { Card } from "@/components/ui/card";
import { Table, THead, TR, TH, TD } from "@/components/ui/table";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { CustomerToolbar } from "./customer-toolbar";
import { DeleteButton } from "./delete-button";
@@ -66,6 +65,7 @@ export default async function CustomersPage({
<THead>
<tr>
<TH>商户名称</TH>
<TH>商户编号</TH>
<TH>联系人</TH>
<TH>结算人</TH>
<TH>产品明细</TH>
@@ -81,7 +81,7 @@ export default async function CustomersPage({
<tbody>
{rows.length === 0 && (
<tr>
<TD colSpan={11} className="py-14 text-center text-[var(--color-muted-foreground)]">
<TD colSpan={12} className="py-14 text-center text-[var(--color-muted-foreground)]">
暂无数据
</TD>
</tr>
@@ -92,6 +92,7 @@ export default async function CustomersPage({
return (
<TR key={c.id}>
<TD className="font-medium">{c.customerName}</TD>
<TD className="font-medium break-all">{c.customerNo || "—"}</TD>
<TD>
<div>{c.contacts}</div>
<div className="text-xs tabular-nums text-[var(--color-muted-foreground)]">
@@ -107,19 +108,7 @@ export default async function CustomersPage({
<TD className="max-w-[280px] whitespace-normal break-words">{c.detail}</TD>
<TD>{c.deposit}</TD>
<TD>{c.buy}</TD>
<TD>
<span className="tabular-nums">{fmtDate(c.birthday)}</span>
{c.birthday && (
<Badge tone={c.birthdayType === 2 ? "warning" : "info"} className="ml-2">
{c.birthdayType === 2 ? "农历" : "阳历"}
</Badge>
)}
{c.birthday && (
<Badge tone="neutral" className="ml-2">
{c.birthdayOwner === 1 ? "结算人" : "联系人"}
</Badge>
)}
</TD>
<TD className="tabular-nums">{fmtDate(c.birthday)}</TD>
<TD>{c.salesman}</TD>
<TD className="tabular-nums">{fmtDate(c.reportDate)}</TD>
<TD className="max-w-[280px] whitespace-normal break-words">{c.remark}</TD>
@@ -159,16 +148,19 @@ export default async function CustomersPage({
<div className="flex items-start justify-between gap-3">
<div className="min-w-0">
<div className="truncate font-medium">{c.customerName}</div>
<div className="mt-0.5 break-all text-xs text-[var(--color-muted-foreground)]">
编号 {c.customerNo || "—"}
</div>
<div className="mt-1 text-xs text-[var(--color-muted-foreground)]">
{c.salesman}
{c.reportDate ? ` · ${fmtDate(c.reportDate)}` : ""}
</div>
</div>
{c.birthday && (
<Badge tone={c.birthdayType === 2 ? "warning" : "info"} className="shrink-0">
{c.birthdayType === 2 ? "农历" : "阳历"} {fmtDate(c.birthday)}
</Badge>
)}
{c.birthday ? (
<span className="shrink-0 text-xs tabular-nums text-[var(--color-muted-foreground)]">
{fmtDate(c.birthday)}
</span>
) : null}
</div>
<dl className="mt-3 grid grid-cols-2 gap-x-3 gap-y-2 text-sm">
<div>