@@ -27,10 +27,10 @@ const CreateForm = (props) => { | |||||
<Form.Item name="id" hidden={true}> | <Form.Item name="id" hidden={true}> | ||||
<Input /> | <Input /> | ||||
</Form.Item> | </Form.Item> | ||||
<Form.Item name="code" label="机构编码" rules={[{ required: true, max: 64 }]}> | |||||
<Input placeholder="请输入机构编码" /> | |||||
<Form.Item name="code" label="组织编码" rules={[{ required: true, max: 64 }]}> | |||||
<Input placeholder="请输入组织编码" /> | |||||
</Form.Item> | </Form.Item> | ||||
<Form.Item name="name" label="机构名称" rules={[{ required: true, max: 64 }]}> | |||||
<Form.Item name="name" label="组织名称" rules={[{ required: true, max: 64 }]}> | |||||
<Input placeholder="请输入名称" /> | <Input placeholder="请输入名称" /> | ||||
</Form.Item> | </Form.Item> | ||||
<Form.Item name="pid" label="上级名称" rules={[{ required: true }]}> | <Form.Item name="pid" label="上级名称" rules={[{ required: true }]}> | ||||
@@ -45,9 +45,9 @@ const CreateForm = (props) => { | |||||
<Form.Item | <Form.Item | ||||
name="type" | name="type" | ||||
label="机构类型" | |||||
label="组织类型" | |||||
defaultValue={props.values.type} | defaultValue={props.values.type} | ||||
rules={[{ required: true, message: '请选择机构类型' }]} | |||||
rules={[{ required: true, message: '请选择组织类型' }]} | |||||
> | > | ||||
<Select placeholder="请选择机构类型"> | <Select placeholder="请选择机构类型"> | ||||
<OptGroup> | <OptGroup> | ||||
@@ -28,7 +28,6 @@ const OrgForm = (props) => { | |||||
<Form | <Form | ||||
layout="vertical" | layout="vertical" | ||||
preserve={false} | preserve={false} | ||||
layout="horizontal" | |||||
labelCol={{ | labelCol={{ | ||||
span: 4, | span: 4, | ||||
}} | }} | ||||
@@ -17,7 +17,6 @@ const PwdForm = (props) => { | |||||
<Form | <Form | ||||
layout="vertical" | layout="vertical" | ||||
preserve={false} | preserve={false} | ||||
layout="horizontal" | |||||
labelCol={{ | labelCol={{ | ||||
span: 4, | span: 4, | ||||
}} | }} | ||||
@@ -17,7 +17,6 @@ const RoleForm = (props) => { | |||||
<Form | <Form | ||||
layout="vertical" | layout="vertical" | ||||
preserve={false} | preserve={false} | ||||
layout="horizontal" | |||||
labelCol={{ | labelCol={{ | ||||
span: 4, | span: 4, | ||||
}} | }} | ||||
@@ -111,7 +111,7 @@ const userManager = () => { | |||||
api.GetRoleDic().then(r => { | api.GetRoleDic().then(r => { | ||||
var arr = []; | var arr = []; | ||||
for (var key in r.data) { | for (var key in r.data) { | ||||
arr.push(<Select.Option value={key}>{r.data[key]}</Select.Option>) | |||||
arr.push(<Option value={key}>{r.data[key]}</Option>) | |||||
} | } | ||||
SetselectData(arr); | SetselectData(arr); | ||||
api.GetUserRole(id).then(r => { | api.GetUserRole(id).then(r => { | ||||
@@ -232,6 +232,10 @@ const userManager = () => { | |||||
dataIndex: 'adminType', | dataIndex: 'adminType', | ||||
hideInSearch: true, | hideInSearch: true, | ||||
valueEnum: { | valueEnum: { | ||||
0: { | |||||
text: '无', | |||||
status: 'Default', | |||||
}, | |||||
1: { | 1: { | ||||
text: '超级管理员', | text: '超级管理员', | ||||
status: 'Processing', | status: 'Processing', | ||||
@@ -252,11 +256,11 @@ const userManager = () => { | |||||
hideInSearch: true, | hideInSearch: true, | ||||
valueEnum: { | valueEnum: { | ||||
0: { | 0: { | ||||
text: '正常', | |||||
text: '启用', | |||||
status: 'Processing', | status: 'Processing', | ||||
}, | }, | ||||
1: { | 1: { | ||||
text: '停用', | |||||
text: '禁用', | |||||
status: 'Success', | status: 'Success', | ||||
}, | }, | ||||
}, | }, | ||||
@@ -425,7 +429,7 @@ const userManager = () => { | |||||
onFinish={async (value) => { | onFinish={async (value) => { | ||||
const values = { | const values = { | ||||
sysUserId: stepFormValues.id, | sysUserId: stepFormValues.id, | ||||
orgId: value.orgId, | |||||
sysOrgId: value.orgId, | |||||
}; | }; | ||||
const success = await handleGrantData(values); | const success = await handleGrantData(values); | ||||
if (success) { | if (success) { | ||||