From 1555c361d533361d06cf4f3de7d050ef80fb8ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com> Date: Mon, 20 Mar 2023 14:15:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=B7=BB=E5=8A=A0=E3=80=81?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8E=BB=E9=99=A4=E6=98=B5=E7=A7=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=8A=E5=85=B6=E5=AE=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/template/学员批量导入模板.xlsx | Bin 9787 -> 9741 bytes src/api/user.ts | 2 -- src/pages/member/compenents/create.tsx | 24 +++++++++------- src/pages/member/compenents/update.tsx | 38 +++++++++++-------------- src/pages/member/index.tsx | 14 +++------ 5 files changed, 34 insertions(+), 44 deletions(-) diff --git a/public/template/学员批量导入模板.xlsx b/public/template/学员批量导入模板.xlsx index 5d2d155edfe94642174fdb6237b8d692a1a7d48d..8a92d6889627b4ea735c522568517b9622efe49c 100644 GIT binary patch delta 1966 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 diff --git a/src/api/user.ts b/src/api/user.ts index c359a69..169dd87 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -51,7 +51,6 @@ export function updateUser( id: number, email: string, name: string, - nickname: string, avatar: string, password: string, idCard: string, @@ -59,7 +58,6 @@ export function updateUser( ) { return client.put(`/backend/v1/user/${id}`, { email, - nickname, name, avatar, password, diff --git a/src/pages/member/compenents/create.tsx b/src/pages/member/compenents/create.tsx index bba42a8..ab09bf0 100644 --- a/src/pages/member/compenents/create.tsx +++ b/src/pages/member/compenents/create.tsx @@ -117,16 +117,16 @@ export const MemberCreate: React.FC = ({ open, onCancel }) => { autoComplete="off" > - +
@@ -153,11 +153,11 @@ export const MemberCreate: React.FC = ({ open, onCancel }) => { /> - + = ({ open, onCancel }) => { > - + diff --git a/src/pages/member/compenents/update.tsx b/src/pages/member/compenents/update.tsx index a2db4b5..b5511a8 100644 --- a/src/pages/member/compenents/update.tsx +++ b/src/pages/member/compenents/update.tsx @@ -79,7 +79,6 @@ export const MemberUpdate: React.FC = ({ form.setFieldsValue({ email: user.email, name: user.name, - nickname: user.nickname, avatar: user.avatar, idCard: user.id_card, dep_ids: depIds, @@ -131,7 +130,6 @@ export const MemberUpdate: React.FC = ({ id, values.email, values.name, - values.nickname, values.avatar, values.password || "", values.idCard, @@ -173,16 +171,16 @@ export const MemberUpdate: React.FC = ({ autoComplete="off" > - +
@@ -198,38 +196,34 @@ export const MemberUpdate: React.FC = ({ )}
- + - + - + - + diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx index 94f6cb6..f3c5651 100644 --- a/src/pages/member/index.tsx +++ b/src/pages/member/index.tsx @@ -13,7 +13,6 @@ const { confirm } = Modal; interface DataType { id: React.Key; - nickname: string; name: string; email: string; created_at: string; @@ -48,12 +47,7 @@ export const MemberPage: React.FC = () => { dataIndex: "id", }, { - title: "学员昵称", - dataIndex: "nickname", - render: (text: string) => {text}, - }, - { - title: "学员姓名", + title: "姓名", dataIndex: "name", render: (text: string) => {text}, }, @@ -118,7 +112,7 @@ export const MemberPage: React.FC = () => { setLoading(true); user .userList(page, size, { - nickname: nickname, + name: nickname, email: email, id_card: id_card, dep_ids: depIds, @@ -223,14 +217,14 @@ export const MemberPage: React.FC = () => {
- 昵称： + 姓名： { setNickname(e.target.value); }} style={{ width: 160 }} - placeholder="请输入昵称" + placeholder="请输入姓名" />