学员添加、编辑去除昵称字段及其它优化

This commit is contained in:
禺狨 2023-03-20 14:15:25 +08:00
parent 5a12f0d79f
commit 1555c361d5
5 changed files with 34 additions and 44 deletions

View File

@ -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,

View File

@ -117,16 +117,16 @@ export const MemberCreate: React.FC<PropInterface> = ({ open, onCancel }) => {
autoComplete="off"
>
<Form.Item
label="学员姓名"
label="姓名"
name="name"
rules={[{ required: true, message: "请输入学员姓名!" }]}
rules={[{ required: true, message: "请输入姓名!" }]}
>
<Input style={{ width: 200 }} placeholder="请输入学员姓名" />
<Input style={{ width: 200 }} placeholder="请输入姓名" />
</Form.Item>
<Form.Item
label="学员头像"
label="头像"
name="avatar"
rules={[{ required: true, message: "请上传学员头像!" }]}
rules={[{ required: true, message: "请上传头像!" }]}
>
<div className="c-flex">
<div className="d-flex">
@ -153,11 +153,11 @@ export const MemberCreate: React.FC<PropInterface> = ({ open, onCancel }) => {
/>
</Form.Item>
<Form.Item
label="学员邮箱"
label="邮箱"
name="email"
rules={[{ required: true, message: "请输入学员邮箱!" }]}
rules={[{ required: true, message: "请输入邮箱!" }]}
>
<Input style={{ width: 200 }} placeholder="请输入学员邮箱" />
<Input style={{ width: 200 }} placeholder="请输入邮箱" />
</Form.Item>
<Form.Item
label="身份证号"
@ -166,14 +166,18 @@ export const MemberCreate: React.FC<PropInterface> = ({ open, onCancel }) => {
>
<Input style={{ width: 200 }} placeholder="请输入身份证号" />
</Form.Item>
<Form.Item label="学员部门" name="dep_ids">
<Form.Item
label="部门"
name="dep_ids"
rules={[{ required: true, message: "请选择部门!" }]}
>
<Cascader
style={{ width: 200 }}
options={departments}
onChange={onChange}
multiple
maxTagCount="responsive"
placeholder="请选择学员部门"
placeholder="请选择部门"
/>
</Form.Item>
</Form>

View File

@ -79,7 +79,6 @@ export const MemberUpdate: React.FC<PropInterface> = ({
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<PropInterface> = ({
id,
values.email,
values.name,
values.nickname,
values.avatar,
values.password || "",
values.idCard,
@ -173,16 +171,16 @@ export const MemberUpdate: React.FC<PropInterface> = ({
autoComplete="off"
>
<Form.Item
label="学员姓名"
label="姓名"
name="name"
rules={[{ required: true, message: "请输入学员姓名!" }]}
rules={[{ required: true, message: "请输入姓名!" }]}
>
<Input style={{ width: 200 }} placeholder="请输入学员姓名" />
<Input style={{ width: 200 }} placeholder="请输入姓名" />
</Form.Item>
<Form.Item
label="学员头像"
label="头像"
name="avatar"
rules={[{ required: true, message: "请上传学员头像!" }]}
rules={[{ required: true, message: "请上传头像!" }]}
>
<div className="c-flex">
<div className="d-flex">
@ -198,38 +196,34 @@ export const MemberUpdate: React.FC<PropInterface> = ({
)}
</div>
</Form.Item>
<Form.Item
label="登录密码"
name="password"
rules={[{ required: true, message: "请输入登录密码!" }]}
>
<Form.Item label="登录密码" name="password">
<Input.Password
style={{ width: 200 }}
placeholder="请输入登录密码"
/>
</Form.Item>
<Form.Item
label="学员邮箱"
label="邮箱"
name="email"
rules={[{ required: true, message: "请输入学员邮箱!" }]}
rules={[{ required: true, message: "请输入邮箱!" }]}
>
<Input style={{ width: 200 }} placeholder="请输入学员邮箱" />
<Input style={{ width: 200 }} placeholder="请输入邮箱" />
</Form.Item>
<Form.Item
label="身份证号"
name="idCard"
rules={[{ required: true, message: "请输入身份证号!" }]}
>
<Form.Item label="身份证号" name="idCard">
<Input style={{ width: 200 }} placeholder="请输入身份证号" />
</Form.Item>
<Form.Item label="学员部门" name="dep_ids">
<Form.Item
label="部门"
name="dep_ids"
rules={[{ required: true, message: "请选择部门!" }]}
>
<Cascader
style={{ width: 200 }}
options={departments}
onChange={onChange}
multiple
maxTagCount="responsive"
placeholder="请选择学员部门"
placeholder="请选择部门"
/>
</Form.Item>
</Form>

View File

@ -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) => <span>{text}</span>,
},
{
title: "学员姓名",
title: "姓名",
dataIndex: "name",
render: (text: string) => <span>{text}</span>,
},
@ -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 = () => {
</div>
<div className="d-flex">
<div className="d-flex mr-24">
<Typography.Text></Typography.Text>
<Typography.Text></Typography.Text>
<Input
value={nickname}
onChange={(e) => {
setNickname(e.target.value);
}}
style={{ width: 160 }}
placeholder="请输入昵称"
placeholder="请输入姓名"
/>
</div>
<div className="d-flex mr-24">