Merge remote-tracking branch 'origin/master'

xjj

2024-02-27 dbc5fc7f7c8ef73b6b175f6b421b0c64efe89e33

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

@@ -4,7 +4,9 @@
    ProFormDigit,
    ProFormText,
    ProFormSelect,
    ProFormTreeSelect
    ProFormTreeSelect,
    ProFormTextArea,
    ProFormRadio
} from '@ant-design/pro-components';
import { Form, Modal } from 'antd';
import moment from 'moment';
@@ -149,8 +151,7 @@
                        />
                    </ProForm.Group>
                    <ProForm.Group>

                        <ProFormSelect
                        <ProFormRadio.Group
                            name="status"
                            label="状态"
                            colProps={{ md: 12, xl: 12 }}
@@ -160,8 +161,25 @@
                                { label: '禁用', value: 0 },
                            ]}
                        />
                        <ProFormSelect
                            name="roleIds"
                            mode="multiple"
                            label="角色"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            rules={[{ required: true, type: 'array', message: '角色不能为空!' }]}
                            request={async ({ keyWords }) => {
                                const resp = await Http.doPostForm('api/role/query', { condition: keyWords });
                                return resp.data;
                            }}
                        />
                    </ProForm.Group>

                    <ProFormTextArea
                        name="memo"
                        label="备注"
                        colProps={{ md: 24, xl: 24 }}
                        placeholder="请输入"
                    />
                </ProForm>
            </Modal>
        </>