From 7c7ede7d496b9ce778321913197fd491fbb26f55 Mon Sep 17 00:00:00 2001 From: luishou Date: Wed, 23 Sep 2026 10:48:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(customers):=20=E5=95=86=E6=88=B7=E6=B3=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=96=87=E6=A1=88=E7=BB=9F=E4=B8=80=E4=B8=BA?= =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=86=8C=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 界面、校验与导入导出表头同步更名,并保留旧表头兼容。 Co-authored-by: Cursor --- prisma/schema.prisma | 2 +- src/app/(dashboard)/customers/actions.ts | 13 +++++++------ .../customers/birthday/birthday-columns.ts | 2 +- src/app/(dashboard)/customers/customer-form.tsx | 4 ++-- src/app/(dashboard)/customers/customer-view.tsx | 2 +- src/app/(dashboard)/customers/page.tsx | 2 +- src/app/(dashboard)/customers/query.ts | 2 +- src/app/(dashboard)/customers/template/route.ts | 4 ++-- src/app/(dashboard)/page.tsx | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 54fac4b..b461b50 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -16,7 +16,7 @@ datasource db { /// 客户(系统核心,~1.4 万行) model Customer { id Int @id @default(autoincrement()) - customerName String? @default("") @map("customer_name") // 商户注名称 + customerName String? @default("") @map("customer_name") // 商户注册名称 businessName String? @map("business_name") // 商户经营名称 customerNo String? @map("customer_no") @db.Text // 商户编号,数字与字母,区分大小写,不限位数 contacts String? // 联系人 diff --git a/src/app/(dashboard)/customers/actions.ts b/src/app/(dashboard)/customers/actions.ts index c157bbb..9e8158d 100644 --- a/src/app/(dashboard)/customers/actions.ts +++ b/src/app/(dashboard)/customers/actions.ts @@ -19,7 +19,7 @@ const customerNoSchema = z .refine((s) => s === "" || /^[A-Za-z0-9]+$/.test(s), "商户编号只能包含数字和字母,区分大小写"); const schema = z.object({ - customerName: z.string().trim().min(1, "商户注名称必填").max(500), + customerName: z.string().trim().min(1, "商户注册名称必填").max(500), businessName: z.string().trim().min(1, "商户经营名称必填").max(500), customerNo: customerNoSchema, contacts: z.string().trim().min(1, "联系人必填").max(500), @@ -41,14 +41,14 @@ const schema = z.object({ remark: z.string().trim().optional().default(""), }); -// 新增商户更严格:注名称无空格、联系人/结算人手机号必填 11 位、押金/买断/生日必填(仅用于 create,编辑仍用 schema) +// 新增商户更严格:注册名称无空格、联系人/结算人手机号必填 11 位、押金/买断/生日必填(仅用于 create,编辑仍用 schema) const createSchema = schema.extend({ customerName: z .string() .trim() - .min(1, "商户注名称必填") + .min(1, "商户注册名称必填") .max(500) - .refine((s) => !/\s/.test(s), "商户注名称不能包含空格"), + .refine((s) => !/\s/.test(s), "商户注册名称不能包含空格"), contactsPhone: z.string().trim().regex(/^1\d{10}$/, "联系人手机号必须为 11 位数字"), balanceUserPhone: z.string().trim().regex(/^1\d{10}$/, "结算人手机号必须为 11 位数字"), deposit: z.string().trim().min(1, "押金必填"), @@ -147,8 +147,9 @@ export async function deleteCustomer(id: number): Promise { // ============ Excel 导入 ============ const HEADER_MAP: Record = { - 商户注名称: "customerName", + 商户注册名称: "customerName", // 兼容旧版导入模板表头 + 商户注名称: "customerName", 商户名称: "customerName", 商户经营名称: "businessName", 商户编号: "customerNo", @@ -194,7 +195,7 @@ export async function importCustomers(formData: FormData): Promise } const errors: string[] = []; - if (!rec.customerName) errors.push("商户注名称必填"); + if (!rec.customerName) errors.push("商户注册名称必填"); if (!rec.businessName) errors.push("商户经营名称必填"); if (rec.customerNo && !/^[A-Za-z0-9]+$/.test(rec.customerNo)) { errors.push("商户编号只能包含数字和字母"); diff --git a/src/app/(dashboard)/customers/birthday/birthday-columns.ts b/src/app/(dashboard)/customers/birthday/birthday-columns.ts index 5d03576..0b8a508 100644 --- a/src/app/(dashboard)/customers/birthday/birthday-columns.ts +++ b/src/app/(dashboard)/customers/birthday/birthday-columns.ts @@ -24,7 +24,7 @@ export type BirthdayColumnDef = { }; export const BIRTHDAY_COLUMNS: BirthdayColumnDef[] = [ - { key: "customerName", label: "商户注名称", defaultVisible: true, className: "w-[11%]" }, + { key: "customerName", label: "商户注册名称", defaultVisible: true, className: "w-[11%]" }, { key: "businessName", label: "商户经营名称", defaultVisible: true, className: "w-[11%]" }, { key: "customerNo", label: "商户编号", defaultVisible: true, className: "w-[9%]" }, { key: "balanceUser", label: "结算人", defaultVisible: true, className: "w-[11%]" }, diff --git a/src/app/(dashboard)/customers/customer-form.tsx b/src/app/(dashboard)/customers/customer-form.tsx index df02d31..bb4382d 100644 --- a/src/app/(dashboard)/customers/customer-form.tsx +++ b/src/app/(dashboard)/customers/customer-form.tsx @@ -102,12 +102,12 @@ export function CustomerForm({
{hasBasic && (
- + diff --git a/src/app/(dashboard)/customers/page.tsx b/src/app/(dashboard)/customers/page.tsx index 1c8a897..e2f3a65 100644 --- a/src/app/(dashboard)/customers/page.tsx +++ b/src/app/(dashboard)/customers/page.tsx @@ -64,7 +64,7 @@ export default async function CustomersPage({ - + diff --git a/src/app/(dashboard)/customers/query.ts b/src/app/(dashboard)/customers/query.ts index 3ca98c4..74da771 100644 --- a/src/app/(dashboard)/customers/query.ts +++ b/src/app/(dashboard)/customers/query.ts @@ -33,7 +33,7 @@ export function buildCustomerWhere(sp: CustomerSearch): Prisma.CustomerWhereInpu /** 导出/导入的列定义(表头 ↔ 字段) */ export const EXCEL_COLUMNS: { header: string; key: string }[] = [ - { header: "商户注名称", key: "customerName" }, + { header: "商户注册名称", key: "customerName" }, { header: "商户经营名称", key: "businessName" }, { header: "商户编号", key: "customerNo" }, { header: "联系人", key: "contacts" }, diff --git a/src/app/(dashboard)/customers/template/route.ts b/src/app/(dashboard)/customers/template/route.ts index 4d21063..c9294a8 100644 --- a/src/app/(dashboard)/customers/template/route.ts +++ b/src/app/(dashboard)/customers/template/route.ts @@ -9,7 +9,7 @@ export async function GET() { } const headers = [ - "商户注名称", + "商户注册名称", "商户经营名称", "商户编号", "联系人", @@ -27,7 +27,7 @@ export async function GET() { // 示例行(用户导入前需删除此行) const example = [ - "模板注名称_此行删除", + "模板注册名称_此行删除", "模板经营名称", "Ab12Cd", "侯磊", diff --git a/src/app/(dashboard)/page.tsx b/src/app/(dashboard)/page.tsx index f7a0404..0b33cb1 100644 --- a/src/app/(dashboard)/page.tsx +++ b/src/app/(dashboard)/page.tsx @@ -129,7 +129,7 @@ export default async function DashboardPage() {
商户注名称商户注册名称 商户经营名称 商户编号 联系人
- +
商户注名称商户注册名称 商户经营名称 商户编号 联系人