@@ -124,7 +124,7 @@ export default async function CustomersPage({
| {fmtDate(c.reportDate)} |
{c.remark} |
-
+
{/* 弹窗展示用的手机号在服务端预处理:超管和业务员看明文,其余角色脱敏 */}
+
+ {rows.length === 0 && (
+
+ 暂无数据
+
+ )}
+ {rows.map((c) => {
+ const { phone: _legacyPhone, ...rest } = c;
+ return (
+
+
+
+ {c.customerName}
+
+ {c.salesman}
+ {c.reportDate ? ` · ${fmtDate(c.reportDate)}` : ""}
+
+
+ {c.birthday && (
+
+ {c.birthdayType === 2 ? "农历" : "阳历"} {fmtDate(c.birthday)}
+
+ )}
+
+
+
+ - 联系人
+ - {c.contacts || "—"}
+ -
+ {superAdmin ? c.contactsPhone : maskPhone(c.contactsPhone)}
+
+
+
+ - 结算人
+ - {c.balanceUser || "—"}
+ -
+ {superAdmin ? c.balanceUserPhone : maskPhone(c.balanceUserPhone)}
+
+
+ {c.detail && (
+
+ - 产品明细
+ - {c.detail}
+
+ )}
+
+
+
+
+
+
+ {superAdmin && }
+
+
+ );
+ })}
+
+
{/* 分页 */}
-
+
共 {total.toLocaleString()} 条
@@ -172,7 +236,7 @@ function PageLink({
}) {
if (disabled) {
return (
- {label}
+ {label}
);
}
const params = new URLSearchParams();
@@ -183,7 +247,7 @@ function PageLink({
return (
{label}
diff --git a/src/app/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx
index dcb62d6..80b376a 100644
--- a/src/app/(dashboard)/layout.tsx
+++ b/src/app/(dashboard)/layout.tsx
@@ -18,7 +18,7 @@ export default async function DashboardLayout({
return (
-
+
-
+
);
}
@@ -49,7 +49,7 @@ export function PasswordForm() {
-
+
);
}
diff --git a/src/app/(dashboard)/me/page.tsx b/src/app/(dashboard)/me/page.tsx
index ef07ca6..e6db08a 100644
--- a/src/app/(dashboard)/me/page.tsx
+++ b/src/app/(dashboard)/me/page.tsx
@@ -19,9 +19,9 @@ export default async function MePage() {
-
- {admin.nickname}
-
+
+ {admin.nickname}
+
{admin.username}
{roleLabel}
diff --git a/src/app/(dashboard)/page.tsx b/src/app/(dashboard)/page.tsx
index 87130a5..102d619 100644
--- a/src/app/(dashboard)/page.tsx
+++ b/src/app/(dashboard)/page.tsx
@@ -80,21 +80,21 @@ export default async function DashboardPage() {
return (
{/* 统计卡片 */}
-
+
{stats.map((s) => {
const Icon = s.icon;
return (
-
+
-
+
-
- {s.label}
- {s.value}
+
@@ -121,40 +121,70 @@ export default async function DashboardPage() {
最近报单商户
查看全部
-
-
-
- | 商户名称 |
- 联系人 |
- 业务员 |
- 报单时间 |
- 生日 |
-
-
-
- {recent.map((c) => (
-
- | {c.customerName} |
- {c.contacts} |
- {c.salesman} |
- {fmtDate(c.reportDate)} |
-
- {fmtDate(c.birthday)}
- {c.birthday && (
-
- {c.birthdayType === 2 ? "农历" : "阳历"}
-
- )}
- |
-
- ))}
-
-
+
+
+
+
+ | 商户名称 |
+ 联系人 |
+ 业务员 |
+ 报单时间 |
+ 生日 |
+
+
+
+ {recent.map((c) => (
+
+ | {c.customerName} |
+ {c.contacts} |
+ {c.salesman} |
+ {fmtDate(c.reportDate)} |
+
+ {fmtDate(c.birthday)}
+ {c.birthday && (
+
+ {c.birthdayType === 2 ? "农历" : "阳历"}
+
+ )}
+ |
+
+ ))}
+
+
+
+
+ {recent.length === 0 && (
+
+ 暂无报单
+
+ )}
+ {recent.map((c) => (
+
+
+ {c.customerName}
+
+ {c.contacts || "—"}
+ {c.salesman ? ` · ${c.salesman}` : ""}
+
+
+
+
+ {fmtDate(c.reportDate)}
+
+ {c.birthday && (
+
+ {c.birthdayType === 2 ? "农历" : "阳历"} {fmtDate(c.birthday)}
+
+ )}
+
+
+ ))}
+
);
diff --git a/src/app/(dashboard)/rbac/admins/admin-form.tsx b/src/app/(dashboard)/rbac/admins/admin-form.tsx
index 78f08d1..009c1c0 100644
--- a/src/app/(dashboard)/rbac/admins/admin-form.tsx
+++ b/src/app/(dashboard)/rbac/admins/admin-form.tsx
@@ -61,7 +61,7 @@ export function AdminForm({
)}
-
+
diff --git a/src/app/(dashboard)/rbac/admins/page.tsx b/src/app/(dashboard)/rbac/admins/page.tsx
index 41fc429..51bd510 100644
--- a/src/app/(dashboard)/rbac/admins/page.tsx
+++ b/src/app/(dashboard)/rbac/admins/page.tsx
@@ -26,12 +26,12 @@ export default async function AdminsPage() {
return (
-
-
-
+
-
+
@@ -75,6 +75,39 @@ export default async function AdminsPage() {
+
+
+ {admins.map((a) => (
+
+
+
+
+
+ {a.nickname}
+ {adminRole.get(a.id) ? (
+ {adminRole.get(a.id)}
+ ) : (
+ 未分配
+ )}
+
+
+ {a.username}
+
+
+
+
+
+
+
+
+
+
+ ))}
+
);
}
diff --git a/src/app/(dashboard)/rbac/permissions/page.tsx b/src/app/(dashboard)/rbac/permissions/page.tsx
index 60292ae..f7e6780 100644
--- a/src/app/(dashboard)/rbac/permissions/page.tsx
+++ b/src/app/(dashboard)/rbac/permissions/page.tsx
@@ -44,12 +44,12 @@ export default async function PermissionsPage() {
return (
-
-
-
+
-
+
@@ -85,6 +85,26 @@ export default async function PermissionsPage() {
+
+
+ {rows.map(({ p, depth }) => (
+
+
+
+ {p.title || p.name}
+ {p.name}
+
+ {p.isMenu ? 菜单 : 操作}
+
+
+
+
+
+
+
+
+ ))}
+
);
}
diff --git a/src/app/(dashboard)/rbac/permissions/permission-form.tsx b/src/app/(dashboard)/rbac/permissions/permission-form.tsx
index f95005e..802e319 100644
--- a/src/app/(dashboard)/rbac/permissions/permission-form.tsx
+++ b/src/app/(dashboard)/rbac/permissions/permission-form.tsx
@@ -27,7 +27,7 @@ export function PermissionForm({
const v = defaultValues ?? {};
return (
|