From 11f3eda668c5f8697bf880251ae53ef0fb3d6dfb Mon Sep 17 00:00:00 2001 From: ZHENG XIAOYI Date: Mon, 2 Mar 2026 14:02:16 +0800 Subject: [PATCH] Change department to position --- src/pages/EmployeeSerials.tsx | 39 ++++++++++++++++++++--------------- src/pages/PublicQuery.tsx | 2 +- src/services/api.ts | 4 ++-- src/types/index.ts | 2 +- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/pages/EmployeeSerials.tsx b/src/pages/EmployeeSerials.tsx index 8590a15..7e0dd35 100644 --- a/src/pages/EmployeeSerials.tsx +++ b/src/pages/EmployeeSerials.tsx @@ -61,7 +61,7 @@ function EmployeeSerialsPage() { } }; - const handleGenerate = async (values: { companyName: string; department: string; employeeName: string; quantity: number }) => { + const handleGenerate = async (values: { companyName: string; position: string; employeeName: string; quantity: number }) => { setGenerateLoading(true); try { const result = await employeeSerialApi.generate(values); @@ -110,18 +110,23 @@ function EmployeeSerialsPage() { setSelectedSerial(serial); editForm.setFieldsValue({ companyName: serial.companyName, - department: serial.department, + position: serial.position, // 映射 position 到 position employeeName: serial.employeeName, isActive: serial.isActive, }); setEditModalVisible(true); }; - const handleUpdate = async (values: { companyName?: string; department?: string; employeeName?: string; isActive?: boolean }) => { + const handleUpdate = async (values: { companyName?: string; position?: string; employeeName?: string; isActive?: boolean }) => { if (!selectedSerial) return; setEditLoading(true); try { - await employeeSerialApi.update(selectedSerial.serialNumber, values); + await employeeSerialApi.update(selectedSerial.serialNumber, { + companyName: values.companyName, + position: values.position, // 映射 position 到 position + employeeName: values.employeeName, + isActive: values.isActive, + }); message.success('更新成功'); setEditModalVisible(false); loadSerials(); @@ -205,9 +210,9 @@ function EmployeeSerialsPage() { key: 'companyName', }, { - title: '部门', - dataIndex: 'department', - key: 'department', + title: '职位', + dataIndex: 'position', + key: 'position', }, { title: '员工姓名', @@ -288,7 +293,7 @@ function EmployeeSerialsPage() { extra={ - + - +

企业名称: {generatedData.serials?.[0]?.companyName}

-

部门: {generatedData.serials?.[0]?.department}

+

职位: {generatedData.serials?.[0]?.position}

员工姓名: {generatedData.serials?.[0]?.employeeName}

生成数量: {generatedData.serials?.length || 0}

@@ -521,7 +526,7 @@ function EmployeeSerialsPage() { {selectedSerial?.serialNumber}

- {selectedSerial?.companyName} - {selectedSerial?.department} - {selectedSerial?.employeeName} + {selectedSerial?.companyName} - {selectedSerial?.position} - {selectedSerial?.employeeName}

)} diff --git a/src/pages/PublicQuery.tsx b/src/pages/PublicQuery.tsx index 190a44a..2936398 100644 --- a/src/pages/PublicQuery.tsx +++ b/src/pages/PublicQuery.tsx @@ -149,7 +149,7 @@ function PublicQueryPage() { {serialType === 'employee' && (result as EmployeeSerialResult).department && ( <>
- 部门 + 职位 {(result as EmployeeSerialResult).department}
diff --git a/src/services/api.ts b/src/services/api.ts index 349a08e..3b917b3 100644 --- a/src/services/api.ts +++ b/src/services/api.ts @@ -221,7 +221,7 @@ export const dashboardApi = { export const employeeSerialApi = { generate: async (data: { companyName: string; - department: string; + position: string; employeeName: string; quantity: number; serialPrefix?: string; @@ -290,7 +290,7 @@ export const employeeSerialApi = { update: async (serialNumber: string, data: { companyName?: string; - department?: string; + position?: string; employeeName?: string; isActive?: boolean; }) => { diff --git a/src/types/index.ts b/src/types/index.ts index db56c9a..b8872eb 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -94,7 +94,7 @@ export interface CompanyFilter { export interface EmployeeSerial { serialNumber: string; companyName: string; - department: string; + position: string; employeeName: string; isActive: boolean; createdAt: string;