From 1621f48324c81e7f293727395f3a89a9a7ade578 Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期四, 22 五月 2025 18:35:47 +0800
Subject: [PATCH] 修改bug
---
management/src/pages/setting/user/index.jsx | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/management/src/pages/setting/user/index.jsx b/management/src/pages/setting/user/index.jsx
index 995c7f4..33bb389 100644
--- a/management/src/pages/setting/user/index.jsx
+++ b/management/src/pages/setting/user/index.jsx
@@ -29,6 +29,7 @@
const [modalVisible1, handleModalVisibles1] = useState(false);
const [roleList, setRoleList] = useState([]);
const [unitId, setUnitId] = useState('');
+ const [openKeys, setOpenKeys] = useState([]);
const access = useAccess();
const [items, setItems] = useState([]);
const { SubMenu } = Menu;
@@ -92,7 +93,7 @@
if (item.children && item.children.length > 0) {
return (
<SubMenu
- key={item.key}
+ key={item.id}
title={node(item)}
onTitleClick={(e) => {
if (e && e.domEvent) {
@@ -113,12 +114,11 @@
if (e && e.domEvent) {
e.domEvent.stopPropagation();
}
- const itemId = item.id || item.key;
- setUnitId(itemId);
+ setUnitId(item.id);
const values = form.getFieldsValue();
actionRef.current.reload(values);
}}
- key={item.key}
+ key={item.id}
>
{node(item)}
</Menu.Item>
@@ -218,20 +218,20 @@
dataIndex: 'accountLevel',
// （1=市级账号，2=区县账号，3=街道账号，4=社区账号）
render: (text, record) => {
- record.list.length>0&&record.list.map(item=>{
+ record.list.length > 0 && record.list.map(item => {
item.str = ''
- if(item.level==1){
- item.str = '市'
- }else if(item.level==2){
- item.str = '区县' + '/' + item.districts
- }else if(item.level==3){
+ if (item.level == 1) {
+ item.str = '市'
+ } else if (item.level == 2) {
+ item.str = '区县' + '/' + item.districts
+ } else if (item.level == 3) {
item.str = '街道' + '/' + item.districts + '/' + item.street
- }else{
+ } else {
item.str = '社区' + '/' + item.districts + '/' + item.street + '/' + item.community
}
return item.str;
})
- return record.list.map(item=>item.str).join('、');
+ return record.list.map(item => item.str).join('、');
},
valueEnum: {
1: '市',
@@ -340,9 +340,9 @@
form={form}
labelWidth={100}
initialValues={{ type: 1 }}
- onReset={(values) => {
- fetchUnit(values);
+ onReset={() => {
setUnitId('');
+ setOpenKeys([]);
actionRef.current.reload();
}}
onFinish={(values) => {
@@ -352,7 +352,7 @@
}}
>
<ProFormText name="name" label="组织结构名称" />
- <ProFormSelect name="type" label="筛选维度" options={[{
+ <ProFormSelect name="type" label="筛选维度" options={[{
label: '当前组织结构',
value: 1,
}, {
@@ -376,8 +376,11 @@
</Button> */}
</Space>
- <Menu
+ <Menu
mode="inline"
+ selectedKeys={unitId ? [unitId] : []}
+ openKeys={openKeys}
+ onOpenChange={setOpenKeys}
onClick={({ key, domEvent }) => {
domEvent.stopPropagation();
}}
@@ -388,6 +391,11 @@
<Col span={20} style={{ minHeight: 650 }}>
<ProTable
rowKey="id"
+ onReset={() => {
+ setUnitId('');
+ setOpenKeys([]);
+ actionRef.current.reset();
+ }}
actionRef={actionRef}
columns={columns}
pagination={{
--
Gitblit v1.7.1