feat(customers): 增加商户编号并补齐生日提醒信息
录入、列表和导入导出带上商户编号。生日提醒展示与录入一致的商户资料,旧阴历生日仍按农历提醒。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -11,8 +11,15 @@ import { isSuperAdmin } from "@/lib/acl";
|
||||
import { fmtDate, parseDate } from "@/lib/utils";
|
||||
|
||||
// 校验规则对齐老系统必填项(customer_name/contacts/balance_user/detail/salesman/report_date)
|
||||
const customerNoSchema = z
|
||||
.string()
|
||||
.trim()
|
||||
.min(1, "商户编号必填")
|
||||
.regex(/^[A-Za-z0-9]+$/, "商户编号只能包含数字和字母,区分大小写");
|
||||
|
||||
const schema = z.object({
|
||||
customerName: z.string().trim().min(1, "商户名称必填").max(500),
|
||||
customerNo: customerNoSchema,
|
||||
contacts: z.string().trim().min(1, "联系人必填").max(500),
|
||||
balanceUser: z.string().trim().min(1, "结算人必填").max(500),
|
||||
detail: z.string().trim().min(1, "产品明细必填"),
|
||||
@@ -26,8 +33,8 @@ const schema = z.object({
|
||||
balanceUserPhone: z.string().trim().optional().default(""),
|
||||
deposit: z.string().trim().optional().default(""),
|
||||
buy: z.string().trim().optional().default(""),
|
||||
birthdayType: z.coerce.number().int().min(1).max(2).default(1),
|
||||
birthdayOwner: z.coerce.number().int().min(1).max(2).default(2),
|
||||
birthdayType: z.coerce.number().refine((n) => n === 1, "生日类型只能是阳历"),
|
||||
birthdayOwner: z.coerce.number().refine((n) => n === 1, "生日归属只能是结算人"),
|
||||
birthday: z.string().trim().optional().default(""),
|
||||
remark: z.string().trim().optional().default(""),
|
||||
});
|
||||
@@ -57,6 +64,7 @@ export type ActionState = { error?: string };
|
||||
function pickForm(formData: FormData) {
|
||||
return {
|
||||
customerName: formData.get("customerName"),
|
||||
customerNo: formData.get("customerNo"),
|
||||
contacts: formData.get("contacts"),
|
||||
balanceUser: formData.get("balanceUser"),
|
||||
detail: formData.get("detail"),
|
||||
@@ -66,8 +74,8 @@ function pickForm(formData: FormData) {
|
||||
balanceUserPhone: formData.get("balanceUserPhone") ?? "",
|
||||
deposit: formData.get("deposit") ?? "",
|
||||
buy: formData.get("buy") ?? "",
|
||||
birthdayType: formData.get("birthdayType") ?? 1,
|
||||
birthdayOwner: formData.get("birthdayOwner") ?? 2,
|
||||
birthdayType: 1,
|
||||
birthdayOwner: 1,
|
||||
birthday: formData.get("birthday") ?? "",
|
||||
remark: formData.get("remark") ?? "",
|
||||
};
|
||||
@@ -105,7 +113,15 @@ export async function updateCustomer(
|
||||
const r = schema.safeParse(pickForm(formData));
|
||||
if (!r.success) return { error: r.error.issues[0].message };
|
||||
|
||||
await prisma.customer.update({ where: { id }, data: toData(r.data) });
|
||||
const existing = await prisma.customer.findUnique({
|
||||
where: { id },
|
||||
select: { birthdayType: true },
|
||||
});
|
||||
const data = toData(r.data);
|
||||
// 改版前的阴历生日不能在保存其它字段时改成阳历,否则明年提醒日会错
|
||||
if (existing?.birthdayType === 2) data.birthdayType = 2;
|
||||
|
||||
await prisma.customer.update({ where: { id }, data });
|
||||
revalidatePath("/customers");
|
||||
redirect("/customers");
|
||||
}
|
||||
@@ -125,6 +141,7 @@ export async function deleteCustomer(id: number): Promise<void> {
|
||||
|
||||
const HEADER_MAP: Record<string, string> = {
|
||||
商户名称: "customerName",
|
||||
商户编号: "customerNo",
|
||||
联系人: "contacts",
|
||||
联系人电话: "contactsPhone",
|
||||
结算人: "balanceUser",
|
||||
@@ -134,8 +151,6 @@ const HEADER_MAP: Record<string, string> = {
|
||||
产品明细: "detail",
|
||||
押金: "deposit",
|
||||
买断: "buy",
|
||||
生日类型: "birthdayType",
|
||||
生日归属: "birthdayOwner",
|
||||
生日: "birthday",
|
||||
业务员: "salesman",
|
||||
报单日期: "reportDate",
|
||||
@@ -170,6 +185,8 @@ export async function importCustomers(formData: FormData): Promise<ImportResult>
|
||||
|
||||
const errors: string[] = [];
|
||||
if (!rec.customerName) errors.push("商户名称必填");
|
||||
if (!rec.customerNo) errors.push("商户编号必填");
|
||||
else if (!/^[A-Za-z0-9]+$/.test(rec.customerNo)) errors.push("商户编号只能包含数字和字母");
|
||||
const reportDate = parseDate(rec.reportDate);
|
||||
if (!rec.reportDate || !reportDate) errors.push("报单日期必填且格式为 YYYY-MM-DD");
|
||||
if (rec.birthday && !parseDate(rec.birthday)) errors.push("生日格式应为 YYYY-MM-DD");
|
||||
@@ -179,6 +196,7 @@ export async function importCustomers(formData: FormData): Promise<ImportResult>
|
||||
} else {
|
||||
validData.push({
|
||||
customerName: rec.customerName,
|
||||
customerNo: rec.customerNo,
|
||||
contacts: rec.contacts || null,
|
||||
contactsPhone: rec.contactsPhone || null,
|
||||
balanceUser: rec.balanceUser || null,
|
||||
@@ -189,8 +207,8 @@ export async function importCustomers(formData: FormData): Promise<ImportResult>
|
||||
buy: rec.buy || null,
|
||||
salesman: rec.salesman || null,
|
||||
remark: rec.remark || null,
|
||||
birthdayType: rec.birthdayType === "阴历" || rec.birthdayType === "2" ? 2 : 1,
|
||||
birthdayOwner: rec.birthdayOwner === "结算人" || rec.birthdayOwner === "1" ? 1 : 2,
|
||||
birthdayType: 1,
|
||||
birthdayOwner: 1,
|
||||
birthday: parseDate(rec.birthday),
|
||||
reportDate,
|
||||
});
|
||||
|
||||
@@ -1,27 +1,29 @@
|
||||
import type { ReactNode } from "react";
|
||||
import { Prisma } from "@prisma/client";
|
||||
import { prisma } from "@/lib/prisma";
|
||||
import { auth } from "@/lib/auth";
|
||||
import { isSuperAdmin } from "@/lib/acl";
|
||||
import { birthdayMatchLists } from "@/lib/lunar";
|
||||
import { isStaff, isSuperAdmin } from "@/lib/acl";
|
||||
import { birthdayMatchLists, lunarBirthdaySolarThisYear } from "@/lib/lunar";
|
||||
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 { BirthdayControl } from "./birthday-control";
|
||||
|
||||
type Row = {
|
||||
id: number;
|
||||
customerName: string | null;
|
||||
customerNo: string | null;
|
||||
contacts: string | null;
|
||||
contactsPhone: string | null;
|
||||
balanceUser: string | null;
|
||||
balanceUserPhone: string | null;
|
||||
phone: string | null; // 旧公共电话,仅作新字段为空时的回退
|
||||
phone: string | null; // 旧公共电话,仅作结算人手机号为空时的回退
|
||||
detail: string | null;
|
||||
deposit: string | null;
|
||||
buy: string | null;
|
||||
salesman: string | null;
|
||||
reportDate: Date | null;
|
||||
birthday: Date | null;
|
||||
birthdayType: number | null;
|
||||
birthdayOwner: number | null;
|
||||
remark: string | null;
|
||||
};
|
||||
|
||||
@@ -33,13 +35,19 @@ function baseDate(s?: string): Date {
|
||||
return new Date();
|
||||
}
|
||||
|
||||
function showPhone(raw: string | null | undefined, full: boolean) {
|
||||
const value = raw?.trim() || "";
|
||||
if (!value) return "—";
|
||||
return full ? value : maskPhone(value);
|
||||
}
|
||||
|
||||
export default async function BirthdayPage({
|
||||
searchParams,
|
||||
}: {
|
||||
searchParams: Promise<{ mode?: string; date?: string }>;
|
||||
}) {
|
||||
const session = await auth();
|
||||
const superAdmin = isSuperAdmin(session?.user?.roles);
|
||||
const fullPhone = isSuperAdmin(session?.user?.roles) || isStaff(session?.user?.roles);
|
||||
const sp = await searchParams;
|
||||
const mode = sp.mode === "week" ? "week" : "today";
|
||||
const dateStr = sp.date ?? "";
|
||||
@@ -54,16 +62,19 @@ export default async function BirthdayPage({
|
||||
SELECT
|
||||
id,
|
||||
customer_name AS customerName,
|
||||
customer_no AS customerNo,
|
||||
contacts,
|
||||
contacts_phone AS contactsPhone,
|
||||
balance_user AS balanceUser,
|
||||
balance_user_phone AS balanceUserPhone,
|
||||
phone,
|
||||
detail,
|
||||
deposit,
|
||||
buy,
|
||||
salesman,
|
||||
report_date AS reportDate,
|
||||
birthday,
|
||||
birthday_type AS birthdayType,
|
||||
birthday_owner AS birthdayOwner,
|
||||
remark
|
||||
FROM customers
|
||||
WHERE deleted_at IS NULL AND (
|
||||
@@ -79,98 +90,73 @@ export default async function BirthdayPage({
|
||||
<Card className="flex flex-col gap-3 p-3 sm:flex-row sm:flex-wrap sm:items-center sm:justify-between">
|
||||
<BirthdayControl mode={mode} date={dateStr} />
|
||||
<div className="text-sm text-[var(--color-muted-foreground)] sm:pr-1">
|
||||
命中 <span className="font-semibold text-[var(--color-foreground)]">{rows.length}</span> 位商户
|
||||
共 <span className="font-semibold text-[var(--color-foreground)]">{rows.length}</span> 位商户过生日
|
||||
</div>
|
||||
</Card>
|
||||
|
||||
<Card className="hidden overflow-hidden md:block">
|
||||
<Table>
|
||||
<THead>
|
||||
<tr>
|
||||
<TH>商户名称</TH>
|
||||
<TH>归属人</TH>
|
||||
<TH>业务员</TH>
|
||||
<TH>生日</TH>
|
||||
<TH>历法</TH>
|
||||
<TH>归属</TH>
|
||||
</tr>
|
||||
</THead>
|
||||
<tbody>
|
||||
{rows.length === 0 && (
|
||||
<tr>
|
||||
<TD colSpan={6} className="py-14 text-center text-[var(--color-muted-foreground)]">
|
||||
该时段暂无生日商户
|
||||
</TD>
|
||||
</tr>
|
||||
)}
|
||||
{rows.map((c) => {
|
||||
// 生日归属人的姓名和手机号;新手机号为空时回退旧公共 phone(历史数据)
|
||||
const ownerName = c.birthdayOwner === 1 ? c.balanceUser : c.contacts;
|
||||
const ownerPhone =
|
||||
(c.birthdayOwner === 1 ? c.balanceUserPhone : c.contactsPhone) || c.phone;
|
||||
return (
|
||||
<TR key={c.id}>
|
||||
<TD className="font-medium">{c.customerName}</TD>
|
||||
<TD>
|
||||
<div>{ownerName}</div>
|
||||
<div className="text-xs tabular-nums text-[var(--color-muted-foreground)]">
|
||||
{superAdmin ? ownerPhone : maskPhone(ownerPhone)}
|
||||
</div>
|
||||
</TD>
|
||||
<TD>{c.salesman}</TD>
|
||||
<TD className="tabular-nums">{fmtDate(c.birthday)}</TD>
|
||||
<TD>
|
||||
<Badge tone={c.birthdayType === 2 ? "warning" : "info"}>
|
||||
{c.birthdayType === 2 ? "农历" : "阳历"}
|
||||
</Badge>
|
||||
</TD>
|
||||
<TD>{c.birthdayOwner === 1 ? "结算人" : "联系人"}</TD>
|
||||
</TR>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</Table>
|
||||
</Card>
|
||||
{rows.length === 0 && (
|
||||
<Card className="py-14 text-center text-sm text-[var(--color-muted-foreground)]">
|
||||
没有过生日的商户
|
||||
</Card>
|
||||
)}
|
||||
|
||||
<div className="space-y-3 md:hidden">
|
||||
{rows.length === 0 && (
|
||||
<Card className="py-14 text-center text-sm text-[var(--color-muted-foreground)]">
|
||||
该时段暂无生日商户
|
||||
</Card>
|
||||
)}
|
||||
<div className="space-y-3">
|
||||
{rows.map((c) => {
|
||||
const ownerName = c.birthdayOwner === 1 ? c.balanceUser : c.contacts;
|
||||
const ownerPhone =
|
||||
(c.birthdayOwner === 1 ? c.balanceUserPhone : c.contactsPhone) || c.phone;
|
||||
const balancePhone = c.balanceUserPhone || c.phone;
|
||||
const lunar = Number(c.birthdayType) === 2;
|
||||
const solarThisYear = lunar ? lunarBirthdaySolarThisYear(fmtDate(c.birthday)) : null;
|
||||
return (
|
||||
<Card key={c.id} className="p-4">
|
||||
<Card key={c.id} className="p-4 md:p-5">
|
||||
<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-1 text-xs text-[var(--color-muted-foreground)]">
|
||||
{c.salesman || "—"}
|
||||
<div className="truncate text-base font-semibold">{c.customerName || "—"}</div>
|
||||
<div className="mt-0.5 break-all text-xs text-[var(--color-muted-foreground)]">
|
||||
编号 {c.customerNo || "—"}
|
||||
</div>
|
||||
</div>
|
||||
<div className="shrink-0 text-right">
|
||||
<div className="text-xs text-[var(--color-muted-foreground)]">
|
||||
{lunar ? "今年是" : "生日"}
|
||||
</div>
|
||||
<div className="mt-0.5 text-sm font-medium tabular-nums">
|
||||
{lunar ? solarThisYear || fmtDate(c.birthday) : fmtDate(c.birthday)}
|
||||
</div>
|
||||
</div>
|
||||
<Badge tone={c.birthdayType === 2 ? "warning" : "info"} className="shrink-0">
|
||||
{c.birthdayType === 2 ? "农历" : "阳历"}
|
||||
</Badge>
|
||||
</div>
|
||||
<dl className="mt-3 grid grid-cols-2 gap-x-3 gap-y-2 text-sm">
|
||||
<div>
|
||||
<dt className="text-xs text-[var(--color-muted-foreground)]">归属人</dt>
|
||||
<dd>{ownerName || "—"}</dd>
|
||||
<dd className="text-xs tabular-nums text-[var(--color-muted-foreground)]">
|
||||
{superAdmin ? ownerPhone : maskPhone(ownerPhone)}
|
||||
</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt className="text-xs text-[var(--color-muted-foreground)]">生日</dt>
|
||||
<dd className="tabular-nums">{fmtDate(c.birthday)}</dd>
|
||||
<dd className="text-xs text-[var(--color-muted-foreground)]">
|
||||
{c.birthdayOwner === 1 ? "结算人" : "联系人"}
|
||||
</dd>
|
||||
</div>
|
||||
</dl>
|
||||
|
||||
<div className="mt-4 grid grid-cols-2 gap-x-4 gap-y-3 sm:grid-cols-3">
|
||||
<Field label="商户名称" value={c.customerName} />
|
||||
<Field label="商户编号" value={c.customerNo} />
|
||||
<Field label="业务员" value={c.salesman} />
|
||||
<Field label="报单日期" value={fmtDate(c.reportDate)} />
|
||||
<Field label="联系人" value={c.contacts} />
|
||||
<Field label="联系人手机号">
|
||||
<Phone value={showPhone(c.contactsPhone, fullPhone)} callable={fullPhone} />
|
||||
</Field>
|
||||
<Field label="结算人" value={c.balanceUser} />
|
||||
<Field label="结算人手机号">
|
||||
<Phone value={showPhone(balancePhone, fullPhone)} callable={fullPhone} />
|
||||
</Field>
|
||||
<Field label="生日">
|
||||
{lunar ? (
|
||||
<span>
|
||||
农历 {fmtDate(c.birthday).slice(5) || "—"}
|
||||
<span className="mt-0.5 block text-xs text-[var(--color-warning)]">
|
||||
按农历过生日{solarThisYear ? `,今年是 ${solarThisYear}` : ""}
|
||||
</span>
|
||||
</span>
|
||||
) : (
|
||||
fmtDate(c.birthday) || "—"
|
||||
)}
|
||||
</Field>
|
||||
<Field label="押金" value={c.deposit} />
|
||||
<Field label="买断" value={c.buy} />
|
||||
</div>
|
||||
|
||||
<div className="mt-3 space-y-3 border-t pt-3">
|
||||
<Field label="产品明细" value={c.detail} pre />
|
||||
<Field label="备注" value={c.remark} pre />
|
||||
</div>
|
||||
</Card>
|
||||
);
|
||||
})}
|
||||
@@ -178,3 +164,33 @@ export default async function BirthdayPage({
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function Field({
|
||||
label,
|
||||
value,
|
||||
pre,
|
||||
children,
|
||||
}: {
|
||||
label: string;
|
||||
value?: string | null;
|
||||
pre?: boolean;
|
||||
children?: ReactNode;
|
||||
}) {
|
||||
return (
|
||||
<div className="min-w-0">
|
||||
<div className="text-xs text-[var(--color-muted-foreground)]">{label}</div>
|
||||
<div className={pre ? "mt-0.5 whitespace-pre-wrap break-words text-sm" : "mt-0.5 break-words text-sm"}>
|
||||
{children ?? (value?.trim() ? value : "—")}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function Phone({ value, callable }: { value: string; callable: boolean }) {
|
||||
if (!callable || value === "—") return <span className="tabular-nums">{value}</span>;
|
||||
return (
|
||||
<a href={`tel:${value}`} className="tabular-nums text-[var(--color-primary)] hover:underline">
|
||||
{value}
|
||||
</a>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3,13 +3,14 @@
|
||||
import { useActionState } from "react";
|
||||
import Link from "next/link";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Input, Textarea, Select } from "@/components/ui/input";
|
||||
import { Input, Textarea } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { fmtDate } from "@/lib/utils";
|
||||
import type { ActionState } from "./actions";
|
||||
|
||||
type CustomerValues = {
|
||||
customerName?: string | null;
|
||||
customerNo?: string | null;
|
||||
contacts?: string | null;
|
||||
contactsPhone?: string | null;
|
||||
balanceUser?: string | null;
|
||||
@@ -17,9 +18,8 @@ type CustomerValues = {
|
||||
detail?: string | null;
|
||||
deposit?: string | null;
|
||||
buy?: string | null;
|
||||
birthdayType?: number | null;
|
||||
birthdayOwner?: number | null;
|
||||
birthday?: Date | null;
|
||||
birthdayType?: number | null;
|
||||
salesman?: string | null;
|
||||
reportDate?: Date | null;
|
||||
remark?: string | null;
|
||||
@@ -108,6 +108,14 @@ export function CustomerForm({
|
||||
pattern={requireAll ? "\\S+" : undefined}
|
||||
title={requireAll ? "商户名称不能包含空格" : undefined}
|
||||
/>
|
||||
<Field
|
||||
label="商户编号"
|
||||
name="customerNo"
|
||||
defaultValue={v.customerNo}
|
||||
required
|
||||
pattern="[A-Za-z0-9]+"
|
||||
title="只能填写数字和字母,区分大小写,位数不限"
|
||||
/>
|
||||
<Field label="业务员" name="salesman" defaultValue={v.salesman} required />
|
||||
<Field
|
||||
label="报单日期"
|
||||
@@ -151,24 +159,6 @@ export function CustomerForm({
|
||||
|
||||
<FormSection title="生日">
|
||||
<div className="grid grid-cols-1 gap-x-5 gap-y-4 sm:grid-cols-2 lg:grid-cols-3">
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="birthdayOwner">
|
||||
生日归属<span className="ml-0.5 text-[var(--color-danger)]">*</span>
|
||||
</Label>
|
||||
<Select id="birthdayOwner" name="birthdayOwner" defaultValue={String(v.birthdayOwner ?? 2)}>
|
||||
<option value="1">结算人</option>
|
||||
<option value="2">联系人</option>
|
||||
</Select>
|
||||
</div>
|
||||
<div className="space-y-1.5">
|
||||
<Label htmlFor="birthdayType">
|
||||
生日类型<span className="ml-0.5 text-[var(--color-danger)]">*</span>
|
||||
</Label>
|
||||
<Select id="birthdayType" name="birthdayType" defaultValue={String(v.birthdayType ?? 1)}>
|
||||
<option value="1">阳历</option>
|
||||
<option value="2">阴历</option>
|
||||
</Select>
|
||||
</div>
|
||||
<Field
|
||||
label="生日"
|
||||
name="birthday"
|
||||
@@ -177,6 +167,11 @@ export function CustomerForm({
|
||||
required={requireAll}
|
||||
/>
|
||||
</div>
|
||||
{v.birthdayType === 2 && (
|
||||
<p className="text-sm text-[var(--color-warning)]">
|
||||
这个生日是按农历记的。
|
||||
</p>
|
||||
)}
|
||||
</FormSection>
|
||||
|
||||
<FormSection title="其它">
|
||||
|
||||
@@ -84,7 +84,7 @@ export function CustomerToolbar({
|
||||
<Search className="pointer-events-none absolute left-2.5 top-1/2 h-4 w-4 -translate-y-1/2 text-[var(--color-muted-foreground)]" />
|
||||
<Input
|
||||
name="keyword"
|
||||
placeholder="商户 / 联系人 / 联系电话 / 业务员"
|
||||
placeholder="商户 / 编号 / 联系人 / 电话 / 业务员"
|
||||
defaultValue={defaultKeyword}
|
||||
className="w-full pl-8 sm:w-64"
|
||||
/>
|
||||
|
||||
@@ -9,6 +9,7 @@ import { fmtDate, cn } from "@/lib/utils";
|
||||
type CustomerViewProps = {
|
||||
customer: {
|
||||
customerName?: string | null;
|
||||
customerNo?: string | null;
|
||||
contacts?: string | null;
|
||||
contactsPhone?: string | null;
|
||||
balanceUser?: string | null;
|
||||
@@ -16,8 +17,6 @@ type CustomerViewProps = {
|
||||
detail?: string | null;
|
||||
deposit?: string | null;
|
||||
buy?: string | null;
|
||||
birthdayType?: number | null;
|
||||
birthdayOwner?: number | null;
|
||||
birthday?: Date | null;
|
||||
salesman?: string | null;
|
||||
reportDate?: Date | null;
|
||||
@@ -43,11 +42,8 @@ export function CustomerView({ customer }: CustomerViewProps) {
|
||||
};
|
||||
}, [open]);
|
||||
|
||||
const birthdayLabel = customer.birthdayType === 2 ? "阴历" : "阳历";
|
||||
const birthdayOwnerLabel = customer.birthdayOwner === 1 ? "结算人" : "联系人";
|
||||
|
||||
// 各分区是否至少有一个字段,用于隐藏整块为空的小标题
|
||||
const hasBasic = !!(customer.customerName || customer.detail);
|
||||
const hasBasic = !!(customer.customerName || customer.customerNo || customer.detail);
|
||||
const hasContacts = !!(customer.contacts || customer.contactsPhone);
|
||||
const hasBalanceUser = !!(customer.balanceUser || customer.balanceUserPhone);
|
||||
const hasBusiness = !!(customer.deposit || customer.buy || customer.salesman || customer.reportDate);
|
||||
@@ -85,6 +81,7 @@ export function CustomerView({ customer }: CustomerViewProps) {
|
||||
{hasBasic && (
|
||||
<Section title="基本">
|
||||
<InfoRow label="商户名称" value={customer.customerName} />
|
||||
<InfoRow label="商户编号" value={customer.customerNo} />
|
||||
<InfoRow label="产品明细" value={customer.detail} className="whitespace-pre-wrap" />
|
||||
</Section>
|
||||
)}
|
||||
@@ -102,8 +99,6 @@ export function CustomerView({ customer }: CustomerViewProps) {
|
||||
)}
|
||||
{customer.birthday && (
|
||||
<Section title="生日">
|
||||
<InfoRow label="生日类型" value={birthdayLabel} />
|
||||
<InfoRow label="生日归属" value={birthdayOwnerLabel} />
|
||||
<InfoRow label="生日" value={fmtDate(customer.birthday)} />
|
||||
</Section>
|
||||
)}
|
||||
|
||||
@@ -32,6 +32,7 @@ export async function GET(req: NextRequest) {
|
||||
for (const c of rows) {
|
||||
aoa.push([
|
||||
c.customerName ?? "",
|
||||
c.customerNo ?? "",
|
||||
c.contacts ?? "",
|
||||
c.contactsPhone ?? "",
|
||||
c.balanceUser ?? "",
|
||||
@@ -39,8 +40,6 @@ export async function GET(req: NextRequest) {
|
||||
c.detail ?? "",
|
||||
c.deposit ?? "",
|
||||
c.buy ?? "",
|
||||
c.birthdayType === 2 ? "阴历" : "阳历",
|
||||
c.birthdayOwner === 1 ? "结算人" : "联系人",
|
||||
fmtDate(c.birthday),
|
||||
c.salesman ?? "",
|
||||
fmtDate(c.reportDate),
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -14,6 +14,7 @@ export function buildCustomerWhere(sp: CustomerSearch): Prisma.CustomerWhereInpu
|
||||
if (keyword) {
|
||||
where.OR = [
|
||||
{ customerName: { contains: keyword } },
|
||||
{ customerNo: { contains: keyword } },
|
||||
{ contacts: { contains: keyword } },
|
||||
{ contactsPhone: { contains: keyword } },
|
||||
{ balanceUser: { contains: keyword } },
|
||||
@@ -32,6 +33,7 @@ export function buildCustomerWhere(sp: CustomerSearch): Prisma.CustomerWhereInpu
|
||||
/** 导出/导入的列定义(表头 ↔ 字段) */
|
||||
export const EXCEL_COLUMNS: { header: string; key: string }[] = [
|
||||
{ header: "商户名称", key: "customerName" },
|
||||
{ header: "商户编号", key: "customerNo" },
|
||||
{ header: "联系人", key: "contacts" },
|
||||
{ header: "联系人电话", key: "contactsPhone" },
|
||||
{ header: "结算人", key: "balanceUser" },
|
||||
@@ -39,8 +41,6 @@ export const EXCEL_COLUMNS: { header: string; key: string }[] = [
|
||||
{ header: "产品明细", key: "detail" },
|
||||
{ header: "押金", key: "deposit" },
|
||||
{ header: "买断", key: "buy" },
|
||||
{ header: "生日类型", key: "birthdayType" },
|
||||
{ header: "生日归属", key: "birthdayOwner" },
|
||||
{ header: "生日", key: "birthday" },
|
||||
{ header: "业务员", key: "salesman" },
|
||||
{ header: "报单日期", key: "reportDate" },
|
||||
|
||||
@@ -10,6 +10,7 @@ export async function GET() {
|
||||
|
||||
const headers = [
|
||||
"商户名称",
|
||||
"商户编号",
|
||||
"联系人",
|
||||
"联系人电话",
|
||||
"结算人",
|
||||
@@ -17,8 +18,6 @@ export async function GET() {
|
||||
"产品明细",
|
||||
"押金",
|
||||
"买断",
|
||||
"生日类型",
|
||||
"生日归属",
|
||||
"生日",
|
||||
"业务员",
|
||||
"报单日期",
|
||||
@@ -28,6 +27,7 @@ export async function GET() {
|
||||
// 示例行(用户导入前需删除此行)
|
||||
const example = [
|
||||
"模板名称_此行删除",
|
||||
"Ab12Cd",
|
||||
"侯磊",
|
||||
"13813855555",
|
||||
"张三",
|
||||
@@ -35,8 +35,6 @@ export async function GET() {
|
||||
"POS+CRM",
|
||||
"100",
|
||||
"100",
|
||||
"阴历",
|
||||
"联系人",
|
||||
"生日格式要求:2022-06-21",
|
||||
"A",
|
||||
"报单日期格式要求:2022-06-21",
|
||||
|
||||
@@ -6,7 +6,6 @@ import { birthdayMatchLists } from "@/lib/lunar";
|
||||
import { fmtDate } from "@/lib/utils";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { Table, THead, TR, TH, TD } from "@/components/ui/table";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { MonthlyReportChart, type MonthPoint } from "./report-chart";
|
||||
|
||||
export default async function DashboardPage() {
|
||||
@@ -131,6 +130,7 @@ export default async function DashboardPage() {
|
||||
<THead>
|
||||
<tr>
|
||||
<TH>商户名称</TH>
|
||||
<TH>商户编号</TH>
|
||||
<TH>联系人</TH>
|
||||
<TH>业务员</TH>
|
||||
<TH>报单时间</TH>
|
||||
@@ -141,17 +141,11 @@ export default async function DashboardPage() {
|
||||
{recent.map((c) => (
|
||||
<TR key={c.id}>
|
||||
<TD className="font-medium">{c.customerName}</TD>
|
||||
<TD className="break-all">{c.customerNo || "—"}</TD>
|
||||
<TD>{c.contacts}</TD>
|
||||
<TD>{c.salesman}</TD>
|
||||
<TD className="tabular-nums">{fmtDate(c.reportDate)}</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>
|
||||
)}
|
||||
</TD>
|
||||
<TD className="tabular-nums">{fmtDate(c.birthday)}</TD>
|
||||
</TR>
|
||||
))}
|
||||
</tbody>
|
||||
@@ -167,6 +161,11 @@ export default async function DashboardPage() {
|
||||
<div key={c.id} className="flex items-start justify-between gap-3 px-4 py-3">
|
||||
<div className="min-w-0">
|
||||
<div className="truncate font-medium">{c.customerName}</div>
|
||||
{c.customerNo ? (
|
||||
<div className="mt-0.5 break-all text-xs text-[var(--color-muted-foreground)]">
|
||||
编号 {c.customerNo}
|
||||
</div>
|
||||
) : null}
|
||||
<div className="mt-1 text-xs text-[var(--color-muted-foreground)]">
|
||||
{c.contacts || "—"}
|
||||
{c.salesman ? ` · ${c.salesman}` : ""}
|
||||
@@ -176,11 +175,11 @@ export default async function DashboardPage() {
|
||||
<div className="text-xs tabular-nums text-[var(--color-muted-foreground)]">
|
||||
{fmtDate(c.reportDate)}
|
||||
</div>
|
||||
{c.birthday && (
|
||||
<Badge tone={c.birthdayType === 2 ? "warning" : "info"} className="mt-1">
|
||||
{c.birthdayType === 2 ? "农历" : "阳历"} {fmtDate(c.birthday)}
|
||||
</Badge>
|
||||
)}
|
||||
{c.birthday ? (
|
||||
<div className="mt-1 text-xs tabular-nums text-[var(--color-muted-foreground)]">
|
||||
{fmtDate(c.birthday)}
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
|
||||
Reference in New Issue
Block a user