diff --git a/src/pages/system/post/create-position.tsx b/src/pages/system/post/create-position.tsx index abde3ce..baed599 100644 --- a/src/pages/system/post/create-position.tsx +++ b/src/pages/system/post/create-position.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react' +import React, { useEffect, useState } from 'react' import { Form, Input, InputNumber, Radio, Modal, Switch } from 'antd'; import positonService from '@/request/service/positon'; import { useRequest } from '@/hooks/use-request'; @@ -68,7 +68,7 @@ const PositionEditor: React.FC = (props) => { width={640} onOk={save} onCancel={() => onCancel()} - confirmLoading= {saveLoading} + confirmLoading={saveLoading} destroyOnClose >
= (props) => { - = (props) => { - + { dataIndex: 'sort', align: 'center', }, + { + title: '备注', + key: 'remark', + dataIndex: 'remark', + align: 'center', + }, { title: '状态', key: 'status', diff --git a/src/pages/system/role/index.tsx b/src/pages/system/role/index.tsx index 6dff3e1..93def4a 100644 --- a/src/pages/system/role/index.tsx +++ b/src/pages/system/role/index.tsx @@ -100,6 +100,12 @@ export default () => { dataIndex: 'sort', align: 'center', }, + { + title: '备注', + key: 'remark', + dataIndex: 'remark', + align: 'center', + }, { title: '状态', key: 'status', @@ -160,7 +166,7 @@ export default () => { return ( <> -
+
diff --git a/src/pages/system/user/create-user.tsx b/src/pages/system/user/create-user.tsx index d9414d4..6d70749 100644 --- a/src/pages/system/user/create-user.tsx +++ b/src/pages/system/user/create-user.tsx @@ -59,6 +59,8 @@ const UserEditor: React.FC = (props) => { if (visible) { if (data) { form.setFieldsValue(data); + } else { + form.setFieldValue("status", 0); } setUpdateEditPassword(true) } else { @@ -91,12 +93,12 @@ const UserEditor: React.FC = (props) => { <> {isEdit? "编辑用户": "添加用户"}
} + title={
{isEdit ? "编辑用户" : "添加用户"}
} width={640} onOk={save} onCancel={() => onCancel()} destroyOnClose - confirmLoading= {saveLoading} + confirmLoading={saveLoading} > = (props) => { { const shouldUpdate = shouldUpdateEditPassword; - if(shouldUpdateEditPassword) { + if (shouldUpdateEditPassword) { setUpdateEditPassword(false) } return shouldUpdate @@ -195,7 +197,13 @@ const UserEditor: React.FC = (props) => { - +