Merge remote-tracking branch 'origin/master'

xjj

2024-02-27 dbc5fc7f7c8ef73b6b175f6b421b0c64efe89e33

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

@@ -151,16 +151,6 @@
                        />
                    </ProForm.Group>
                    <ProForm.Group>
                        {/* <ProFormSelect
                            name="status"
                            label="状态"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            options={[
                                { label: '正常', value: 1 },
                                { label: '禁用', value: 0 },
                            ]}
                        /> */}
                        <ProFormRadio.Group
                            name="status"
                            label="状态"
@@ -177,7 +167,11 @@
                            label="角色"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            rules={[{ required: true, message: '角色不能为空!' }]}
                            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