From d40461a69af706f420a690af96f4a9ce62e4dce2 Mon Sep 17 00:00:00 2001
From: leijiaping <leietal@163.com>
Date: Tue, 27 Oct 2026 13:29:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=B9=E9=87=8F=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81Excel=E5=AF=BC=E5=85=A5=E4=B8=8E=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=8B=E8=BD=BD;=E6=9C=BA=E6=9E=84=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E9=A1=B5=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7(=E6=89=8B=E6=9C=BA=E5=8F=B7/=E5=A7=93=E5=90=8D),?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BF=AE=E6=94=B9=E5=A7=93=E5=90=8D=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/user.ts                              |   5 +
 .../edit-user-dialog.tsx}                     |   8 +-
 .../user/-hooks => hooks}/useSaveUser.ts      |   0
 src/routes/admin/org-account/index.tsx        |  23 ++
 .../-components/BatchCreateUserDialog.tsx     | 289 +++++++++++++++---
 src/routes/admin/user/index.tsx               |   2 +-
 6 files changed, 276 insertions(+), 51 deletions(-)
 rename src/{routes/admin/user/-components/EditUserDialog.tsx => components/edit-user-dialog.tsx} (93%)
 rename src/{routes/admin/user/-hooks => hooks}/useSaveUser.ts (100%)

diff --git a/src/apis/user.ts b/src/apis/user.ts
index f2ba8c0..f68779d 100644
--- a/src/apis/user.ts
+++ b/src/apis/user.ts
@@ -23,6 +23,11 @@ export const createUser = (data: any, config?: any) => {
   return http.post("/user/create_org_user", data, config);
 };
 
+// 批量创建用户（单条失败不影响其他条目，返回与入参顺序对应的逐条结果）
+export const batchCreateUser = (data: any[]) => {
+  return http.post("/user/batch_create_org_user", data);
+};
+
 export const getUserOrg = () => {
   return http.get("/uc/org/find");
 };
diff --git a/src/routes/admin/user/-components/EditUserDialog.tsx b/src/components/edit-user-dialog.tsx
similarity index 93%
rename from src/routes/admin/user/-components/EditUserDialog.tsx
rename to src/components/edit-user-dialog.tsx
index 74b6799..402527d 100644
--- a/src/routes/admin/user/-components/EditUserDialog.tsx
+++ b/src/components/edit-user-dialog.tsx
@@ -20,7 +20,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 import { Spinner } from "@/components/ui/spinner";
 import { Input } from "@/components/ui/input";
-import { useSaveUser } from "../-hooks/useSaveUser";
+import { useSaveUser } from "@/hooks/useSaveUser";
 import { useEffect, useMemo } from "react";
 import { Alert, AlertDescription } from "@/components/ui/alert";
 
@@ -57,7 +57,9 @@ export function EditUserDialog({
   refetch,
   data,
 }: EditUserDialogProps) {
-  const isNewUser = useMemo(() => !data?.id, [data]);
+  // 用户管理页行主键为 id，机构账号页行主键为 userId
+  const recordId = data?.userId ?? data?.id;
+  const isNewUser = useMemo(() => !recordId, [recordId]);
   const formSchema = useMemo(() => getFormSchema(isNewUser), [isNewUser]);
 
   const form = useForm<z.infer<typeof formSchema>>({
@@ -89,7 +91,7 @@ export function EditUserDialog({
   }, [open, data, form]);
 
   const onSubmit = (values: z.infer<typeof formSchema>) => {
-    save({ id: data?.id, ...values });
+    save({ id: recordId, ...values });
   };
 
   return (
diff --git a/src/routes/admin/user/-hooks/useSaveUser.ts b/src/hooks/useSaveUser.ts
similarity index 100%
rename from src/routes/admin/user/-hooks/useSaveUser.ts
rename to src/hooks/useSaveUser.ts
diff --git a/src/routes/admin/org-account/index.tsx b/src/routes/admin/org-account/index.tsx
index ee7ae73..ccaae94 100644
--- a/src/routes/admin/org-account/index.tsx
+++ b/src/routes/admin/org-account/index.tsx
@@ -17,6 +17,7 @@ import { useFetchList } from "./-hooks/useFetchList";
 import { useUserStatusActions } from "@/hooks/use-user-status-actions";
 import { UserActionConfirmDialog } from "./-components/UserActionConfirmDialog";
 import { ResetUserPasswordDialog } from "@/components/reset-user-password-dialog";
+import { EditUserDialog } from "@/components/edit-user-dialog";
 import { useUserStore } from "@/stores/user";
 import { DateRangePicker } from "@/components/date-range-picker";
 
@@ -40,6 +41,7 @@ export function useColumns({
   handleDisable,
   handleCancelUser,
   handleResetPassword,
+  handleEditUser,
 }: any) {
   const currentUserId = useUserStore((state: any) => state.user?.id);
   return [
@@ -133,6 +135,13 @@ export function useColumns({
         }
         return (
           <div className="space-x-2">
+            <Button
+              size="sm"
+              variant="outline"
+              onClick={() => handleEditUser(record)}
+            >
+              修改
+            </Button>
             <Button
               size="sm"
               variant="outline"
@@ -206,12 +215,20 @@ function RouteComponent() {
     setOpenResetPasswordDialog(true);
   };
 
+  // 修改用户（手机号/姓名）
+  const [openEditUserDialog, setOpenEditUserDialog] = useState(false);
+  const handleEditUser = (record: any) => {
+    setCurrentEntity(record);
+    setOpenEditUserDialog(true);
+  };
+
   const { table, query, search } = useFetchList(() =>
     useColumns({
       handleEnable,
       handleDisable,
       handleCancelUser,
       handleResetPassword,
+      handleEditUser,
     }),
   );
 
@@ -252,6 +269,12 @@ function RouteComponent() {
         setOpen={setOpenResetPasswordDialog}
         data={currentEntity}
       />
+      <EditUserDialog
+        open={openEditUserDialog}
+        setOpen={setOpenEditUserDialog}
+        data={currentEntity}
+        refetch={query?.refetch}
+      />
       <div className="p-4 box-border min-h-full space-y-4">
         <div>
           <div className="text-lg">机构账号</div>
diff --git a/src/routes/admin/user/-components/BatchCreateUserDialog.tsx b/src/routes/admin/user/-components/BatchCreateUserDialog.tsx
index 5d21510..e12d5cf 100644
--- a/src/routes/admin/user/-components/BatchCreateUserDialog.tsx
+++ b/src/routes/admin/user/-components/BatchCreateUserDialog.tsx
@@ -1,6 +1,8 @@
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
-import { createUser } from "@/apis/user";
+import * as XLSX from "xlsx";
+import { Download, FileSpreadsheet, Upload } from "lucide-react";
+import { batchCreateUser } from "@/apis/user";
 import { Button } from "@/components/ui/button";
 import {
   Dialog,
@@ -12,6 +14,7 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import { Spinner } from "@/components/ui/spinner";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Textarea } from "@/components/ui/textarea";
 
 type BatchCreateUserDialogProps = {
@@ -25,10 +28,17 @@ type FailedItem = {
   msg: string;
 };
 
+type ParsedRow = {
+  phone: string;
+  realName: string;
+  line: string;
+};
+
 const PHONE_RE = /^1\d{10}$/;
+const MAX_BATCH = 500;
 
 const parseText = (text: string) => {
-  const rows: { phone: string; realName: string; line: string }[] = [];
+  const rows: ParsedRow[] = [];
   const failed: FailedItem[] = [];
 
   text.split("\n").forEach((raw) => {
@@ -49,22 +59,59 @@ const parseText = (text: string) => {
   return { rows, failed };
 };
 
+// Excel 行解析:取前两列为手机号/姓名,自动跳过模板表头行
+const parseExcel = (matrix: unknown[][]) => {
+  const rows: ParsedRow[] = [];
+  const failed: FailedItem[] = [];
+
+  let data = (matrix || [])
+    .map((row) => (row || []).map((cell) => String(cell ?? "").trim()))
+    .filter((cells) => cells.some((cell) => cell !== ""));
+  if (data.length > 0 && data[0][0].includes("手机")) {
+    data = data.slice(1);
+  }
+
+  data.forEach((cells) => {
+    const line = cells.join(", ");
+    const [phone, realName] = cells;
+    if (!phone || !realName) {
+      failed.push({ line, msg: "格式错误，应为「手机号,姓名」" });
+      return;
+    }
+    if (!PHONE_RE.test(phone)) {
+      failed.push({ line, msg: "手机号格式不正确" });
+      return;
+    }
+    rows.push({ phone, realName, line });
+  });
+
+  return { rows, failed };
+};
+
 export function BatchCreateUserDialog({
   open,
   setOpen,
   refetch,
 }: BatchCreateUserDialogProps) {
+  const [mode, setMode] = useState<"text" | "excel">("text");
   const [text, setText] = useState("");
   const [isPending, setIsPending] = useState(false);
-  const [progress, setProgress] = useState({ done: 0, total: 0 });
   const [failed, setFailed] = useState<FailedItem[]>([]);
+  const [fileName, setFileName] = useState("");
+  const [excelResult, setExcelResult] = useState<{
+    rows: ParsedRow[];
+    failed: FailedItem[];
+  }>({ rows: [], failed: [] });
+  const fileRef = useRef<HTMLInputElement>(null);
 
   useEffect(() => {
     if (open) {
+      setMode("text");
       setText("");
       setIsPending(false);
-      setProgress({ done: 0, total: 0 });
       setFailed([]);
+      setFileName("");
+      setExcelResult({ rows: [], failed: [] });
     }
   }, [open]);
 
@@ -78,42 +125,96 @@ export function BatchCreateUserDialog({
     setOpen(nextOpen);
   };
 
+  const downloadTemplate = () => {
+    const worksheet = XLSX.utils.aoa_to_sheet([
+      ["手机号", "姓名"],
+      ["13800000001", "张三"],
+      ["13800000002", "李四"],
+    ]);
+    worksheet["!cols"] = [{ wch: 20 }, { wch: 24 }];
+    const workbook = XLSX.utils.book_new();
+    XLSX.utils.book_append_sheet(workbook, worksheet, "用户列表");
+    XLSX.writeFile(workbook, "批量创建用户模板.xlsx");
+  };
+
+  const onFilePicked = async (file?: File) => {
+    if (!file) return;
+    try {
+      const buffer = await file.arrayBuffer();
+      const workbook = XLSX.read(buffer, { type: "array" });
+      const worksheet = workbook.Sheets[workbook.SheetNames[0]];
+      if (!worksheet) {
+        toast.error("文件中没有工作表");
+        return;
+      }
+      const matrix = XLSX.utils.sheet_to_json<unknown[]>(worksheet, {
+        header: 1,
+        defval: "",
+      });
+      const result = parseExcel(matrix);
+      if (result.rows.length === 0 && result.failed.length === 0) {
+        toast.error("文件中没有用户数据");
+        return;
+      }
+      setFileName(file.name);
+      setExcelResult(result);
+    } catch {
+      toast.error("文件解析失败，请使用下载的模板填写");
+    } finally {
+      if (fileRef.current) {
+        fileRef.current.value = "";
+      }
+    }
+  };
+
   const onSubmit = async () => {
-    const { rows, failed: invalid } = parseText(text);
+    const { rows, failed: invalid } =
+      mode === "text" ? parseText(text) : excelResult;
     if (rows.length === 0) {
       if (invalid.length > 0) {
         setFailed(invalid);
       } else {
-        toast.error("请输入用户数据");
+        toast.error(mode === "text" ? "请输入用户数据" : "请先选择 Excel 文件");
       }
       return;
     }
-
-    const failures: FailedItem[] = [...invalid];
-    setIsPending(true);
-    setProgress({ done: 0, total: rows.length });
-
-    for (let index = 0; index < rows.length; index++) {
-      const { phone, realName, line } = rows[index];
-      try {
-        await createUser({ phone, realName }, { silent: true });
-      } catch (err: any) {
-        failures.push({ line, msg: err?.msg || "创建失败" });
-      }
-      setProgress({ done: index + 1, total: rows.length });
+    if (rows.length + invalid.length > MAX_BATCH) {
+      toast.error(`单次批量创建不能超过 ${MAX_BATCH} 条`);
+      return;
     }
 
-    setIsPending(false);
-    refetch?.();
+    setIsPending(true);
+    try {
+      const res: any = await batchCreateUser(
+        rows.map(({ phone, realName }) => ({ phone, realName })),
+      );
+      // 返回结果与入参顺序一一对应,失败项回显原始行内容
+      const results: any[] = res?.data || [];
+      const failures: FailedItem[] = [...invalid];
+      results.forEach((result, index) => {
+        if (!result?.success) {
+          failures.push({
+            line: rows[index]?.line ?? "",
+            msg: result?.msg || "创建失败",
+          });
+        }
+      });
 
-    const failedCount = failures.length;
-    const successCount = rows.length - (failedCount - invalid.length);
-    if (failedCount > 0) {
-      setFailed(failures);
-      toast.error(`创建完成：成功 ${successCount} 条，失败 ${failedCount} 条`);
-    } else {
-      toast.success(`创建成功：共 ${rows.length} 条`);
-      setOpen(false);
+      refetch?.();
+
+      if (failures.length > 0) {
+        setFailed(failures);
+        toast.error(
+          `创建完成：成功 ${results.length - (failures.length - invalid.length)} 条，失败 ${failures.length} 条`,
+        );
+      } else {
+        toast.success(`创建成功：共 ${results.length} 条`);
+        setOpen(false);
+      }
+    } catch {
+      // 请求整体失败已由拦截器统一 toast
+    } finally {
+      setIsPending(false);
     }
   };
 
@@ -127,7 +228,7 @@ export function BatchCreateUserDialog({
           <DialogDescription>
             {failed.length > 0
               ? `以下 ${failed.length} 条数据创建失败，修正后可重新提交`
-              : "每行一个用户，格式为「手机号,姓名」，支持逗号、空格或制表符分隔"}
+              : "支持贴内容或上传 Excel 文件导入，每条用户为「手机号,姓名」"}
           </DialogDescription>
         </DialogHeader>
 
@@ -147,23 +248,117 @@ export function BatchCreateUserDialog({
             ))}
           </div>
         ) : (
-          <div className="space-y-2">
-            <Textarea
-              value={text}
-              onChange={(event) => setText(event.target.value)}
-              placeholder={"13800000001,张三\n13800000002,李四"}
-              className="h-[240px] resize-none font-mono"
-              disabled={isPending}
-            />
-            <div className="flex items-center justify-between text-xs text-black/50">
-              <span>已输入 {lineCount} 条</span>
-              {isPending && (
-                <span>
-                  正在创建 {progress.done}/{progress.total}...
-                </span>
+          <Tabs value={mode} onValueChange={(v) => setMode(v as any)}>
+            <TabsList className="w-full mb-2">
+              <TabsTrigger value="text" disabled={isPending} className="flex-1">
+                贴内容导入
+              </TabsTrigger>
+              <TabsTrigger value="excel" disabled={isPending} className="flex-1">
+                Excel 导入
+              </TabsTrigger>
+            </TabsList>
+
+            <TabsContent value="text" className="space-y-2">
+              <Textarea
+                value={text}
+                onChange={(event) => setText(event.target.value)}
+                placeholder={"13800000001,张三\n13800000002,李四"}
+                className="h-[240px] resize-none font-mono"
+                disabled={isPending}
+              />
+              <div className="flex items-center justify-between text-xs text-black/50">
+                <span>已输入 {lineCount} 条</span>
+                {isPending && <span>正在创建...</span>}
+              </div>
+            </TabsContent>
+
+            <TabsContent value="excel" className="space-y-2">
+              <div className="flex items-center gap-2">
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={downloadTemplate}
+                  disabled={isPending}
+                  className="shrink-0"
+                >
+                  <Download />
+                  下载模板
+                </Button>
+                <Button
+                  className="flex-1"
+                  size="sm"
+                  onClick={() => fileRef.current?.click()}
+                  disabled={isPending}
+                >
+                  <Upload />
+                  {excelResult.rows.length > 0 || excelResult.failed.length > 0
+                    ? "重新选择文件"
+                    : "选择文件"}
+                </Button>
+                <input
+                  ref={fileRef}
+                  type="file"
+                  accept=".xlsx,.xls"
+                  className="hidden"
+                  onChange={(event) =>
+                    onFilePicked(event.target.files?.[0] as File | undefined)
+                  }
+                  disabled={isPending}
+                />
+              </div>
+
+              {fileName ? (
+                <div className="h-[200px] rounded-md border p-3 space-y-2 overflow-auto">
+                  <div className="flex items-center gap-2 text-sm">
+                    <FileSpreadsheet className="size-4 text-green-600" />
+                    <span className="break-all">{fileName}</span>
+                  </div>
+                  <div className="text-xs text-black/50">
+                    <div>
+                      解析出有效数据{" "}
+                      <span className="text-black font-medium">
+                        {excelResult.rows.length}
+                      </span>{" "}
+                      条
+                      {excelResult.failed.length > 0 && (
+                        <>
+                          ，格式错误{" "}
+                          <span className="text-red-600 font-medium">
+                            {excelResult.failed.length}
+                          </span>{" "}
+                          条（提交后将展示明细）
+                        </>
+                      )}
+                    </div>
+                    {excelResult.rows.length > 0 && (
+                      <div className="mt-1 max-h-[130px] overflow-auto font-mono">
+                        {excelResult.rows
+                          .slice(0, 5)
+                          .map((row) => (
+                            <div key={row.line}>
+                              {row.phone}, {row.realName}
+                            </div>
+                          ))}
+                        {excelResult.rows.length > 5 && (
+                          <div>...共 {excelResult.rows.length} 条</div>
+                        )}
+                      </div>
+                    )}
+                  </div>
+                </div>
+              ) : (
+                <div className="h-[200px] rounded-md border border-dashed flex flex-col items-center justify-center gap-1 text-xs text-black/50">
+                  <span>请先下载模板，按模板格式填写后上传</span>
+                  <span>支持 .xlsx / .xls 文件，最多 {MAX_BATCH} 条</span>
+                </div>
               )}
-            </div>
-          </div>
+
+              <div className="flex items-center justify-between text-xs text-black/50">
+                <span />
+                {isPending && <span>正在创建...</span>}
+              </div>
+            </TabsContent>
+          </Tabs>
         )}
 
         <DialogFooter>
diff --git a/src/routes/admin/user/index.tsx b/src/routes/admin/user/index.tsx
index a68dee1..aedd526 100644
--- a/src/routes/admin/user/index.tsx
+++ b/src/routes/admin/user/index.tsx
@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button";
 import { DataTable } from "@/components/data-table";
 import { useFetchList } from "./-hooks/useFetchList";
 import { useState } from "react";
-import { EditUserDialog } from "./-components/EditUserDialog";
+import { EditUserDialog } from "@/components/edit-user-dialog";
 import { BatchCreateUserDialog } from "./-components/BatchCreateUserDialog";
 import { CancelUserConfirmDialog } from "./-components/CancelUserConfirmDialog";
 import { Badge } from "@/components/ui/badge";