diff --git a/public/template/学员批量导入模板.xlsx b/public/template/学员批量导入模板.xlsx index 5d2d155..8a92d68 100644 Binary files a/public/template/学员批量导入模板.xlsx and b/public/template/学员批量导入模板.xlsx differ 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="请输入姓名" />