#

luxiaotao1123

2024-02-21 362681c7d3fed99e5772cb1defd3d754ab5f973a

#

 zy-asrs-flow/src/pages/system/user/components/edit.jsx

@@ -4,7 +4,7 @@
    ProFormDigit,
    ProFormText,
    ProFormSelect,
    ProFormDateTimePicker
    ProFormTreeSelect
} from '@ant-design/pro-components';
import { Form, Modal } from 'antd';
import moment from 'moment';
@@ -57,18 +57,19 @@
                        hidden={true}
                    />
                    <ProForm.Group>
                        <ProFormSelect
                        <ProFormTreeSelect
                            name="deptId"
                            label="所属部门"
                            colProps={{ md: 12, xl: 12 }}
                            fieldProps={{ precision: 0 }}
                            placeholder="请选择"
                            showSearch
                            debounceTime={300}
                            request={async ({ keyWords }) => {
                                const resp = await Http.doPostForm('api/dept/query', { condition: keyWords });
                                return resp.data;
                            params={props.treeData}
                            request={async () => {
                                return props.treeData;
                            }}
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            fieldProps={{
                                treeDefaultExpandedKeys: [0]
                            }}
                            rules={[{ required: true, message: "所属部门不能为空" }]}
                        />
                        <ProFormText
                            name="nickname"
@@ -100,12 +101,33 @@
                            label="手机号"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            ules={[
                                {
                                  pattern: /^1[3456789]\d{9}$/,
                                  message: '请输入正确的手机号码!',
                                },
                                {
                                  required: false,
                                  message: '手机号码不能为空!',
                                },
                              ]}
                            
                        />
                        <ProFormText
                            name="email"
                            label="邮箱"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            rules={[
                                {
                                  type: 'email',
                                  message: '请输入正确的邮箱地址!',
                                },
                                {
                                  required: false,
                                  message: '邮箱不能为空!',
                                },
                              ]}
                        />
                    </ProForm.Group>
                    <ProForm.Group>

 zy-asrs-flow/src/pages/system/user/index.jsx

@@ -125,12 +125,11 @@
            width: 30,
        },
        {
            title: '昵称',
            title: '名称',
            dataIndex: 'nickname',
            valueType: 'text',
            hidden: false,
            width: 100,
            copyable: true,
            filterDropdown: (props) => <TextFilter
                name='nickname'
                {...props}
@@ -139,7 +138,7 @@
            />,
        },
        {
            title: '账号',
            title: '登录账号',
            dataIndex: 'username',
            valueType: 'text',
            hidden: false,
@@ -587,6 +586,7 @@
                <Edit
                    open={modalVisible}
                    values={currentRow || {}}
                    treeData={deptTreeData}
                    onCancel={
                        () => {
                            setModalVisible(false);