From dd8617c818e31d19863cc03d103bc83f209666f6 Mon Sep 17 00:00:00 2001
From: hejianhao <15708179461@qq.com>
Date: 星期五, 23 五月 2025 19:16:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
---
management/src/pages/setting/user/index.jsx | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/management/src/pages/setting/user/index.jsx b/management/src/pages/setting/user/index.jsx
index 33bb389..6c8aeee 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 [tier, setTier] = useState(0);
const [openKeys, setOpenKeys] = useState([]);
const access = useAccess();
const [items, setItems] = useState([]);
@@ -99,7 +100,9 @@
if (e && e.domEvent) {
e.domEvent.stopPropagation();
}
+ console.log('item', item);
setUnitId(item.id);
+ setTier(item.tier);
const values = form.getFieldsValue();
actionRef.current.reload(values);
}}
@@ -114,6 +117,8 @@
if (e && e.domEvent) {
e.domEvent.stopPropagation();
}
+ console.log('item////////////', item);
+ setTier(item.tier);
setUnitId(item.id);
const values = form.getFieldsValue();
actionRef.current.reload(values);
@@ -238,7 +243,6 @@
2: '区县',
3: '街道',
4: '社区',
- 5: '党员',
},
},
{
@@ -342,6 +346,7 @@
initialValues={{ type: 1 }}
onReset={() => {
setUnitId('');
+ setTier('');
setOpenKeys([]);
actionRef.current.reload();
}}
@@ -393,6 +398,7 @@
rowKey="id"
onReset={() => {
setUnitId('');
+ setTier('');
setOpenKeys([]);
actionRef.current.reset();
}}
@@ -411,10 +417,13 @@
request={(params) => {
let obj = { ...params };
if (unitId) {
- obj.departmentId = unitId;
+ obj.code = unitId;
}
- if (params.departmentId) {
- obj.departmentId = params.departmentId[params.departmentId.length - 1];
+ // if (params.departmentId) {
+ // obj.departmentId = params.departmentId[params.departmentId.length - 1];
+ // }
+ if (tier && !params.accountLevel) {
+ obj.accountLevel = tier;
}
if (form.getFieldValue('type')) {
obj.type = form.getFieldValue('type');
--
Gitblit v1.7.1