From 074513acdfed38c8537a046801ee5dbc8f01e2eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 二月 2024 10:06:42 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/user/index.jsx | 124 +++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 61 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index b385852..dae8e2a 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -7,7 +7,7 @@
ProTable,
LightFilter,
} from '@ant-design/pro-components';
-import { PlusOutlined, ExportOutlined, DownOutlined } from '@ant-design/icons';
+import { PlusOutlined, ExportOutlined, DownOutlined, DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
import Http from '@/utils/http';
import Edit from './components/edit'
import Pwd from './components/pwd'
@@ -121,19 +121,24 @@
const [deptExpandedKeys, setDeptExpandedKeys] = useState([]);
const [pwdModalVisible, setPwdModalVisible] = useState(false);
+ const loadDeptTreeData = (param) => {
+ Http.doPostPromise('/api/dept/tree', param, (res) => {
+ const rootMenu = { id: 0, name: '鍏ㄩ儴', value: 0, children: [] };
+ rootMenu.children = res.data;
+ // const treeData = transformTreeData([rootMenu]);
+ const treeData = transformTreeData(res.data);
+ setDeptTreeData(treeData);
+ const treeAllKeys = getTreeAllKeys(treeData);
+ setDeptExpandedKeys(treeAllKeys);
+ })
+ }
+
useEffect(() => {
const handleResize = () => setBoxHeight(window.innerHeight - 368);
window.addEventListener('resize', handleResize);
handleResize();
- Http.doPostPromise('/api/dept/tree', {}, (res) => {
- const rootMenu = { id: 0, name: '鍏ㄩ儴', value: 0, children: [] };
- rootMenu.children = res.data;
- const treeData = transformTreeData([rootMenu]);
- setDeptTreeData(treeData);
- const treeAllKeys = getTreeAllKeys(treeData);
- setDeptExpandedKeys(treeAllKeys);
- })
+ loadDeptTreeData();
return () => window.removeEventListener('resize', handleResize);
}, []);
@@ -448,7 +453,7 @@
<Button
type="link"
danger
- key="batchRemove"
+ key="remove"
onClick={async () => {
Modal.confirm({
title: '鍒犻櫎',
@@ -484,26 +489,30 @@
placeholder="Search"
onChange={(e) => {
const { value } = e.target;
- console.log(value);
+ loadDeptTreeData({
+ condition: value
+ })
}}
/>
- <Tree
- showLine
- blockNode
- defaultExpandAll // 寮傛鍔犺浇澶辨晥
- expandedKeys={deptExpandedKeys}
- onExpand={setDeptExpandedKeys}
- treeData={deptTreeData}
- switcherIcon={<DownOutlined />}
- onSelect={(selectedKeys, info) => {
- const deptId = selectedKeys[0];
- setSearchParam(prevState => ({
- ...prevState,
- deptId: deptId
- }));
- actionRef.current?.reload();
- }}
- />
+ <div style={{height: 'calc(100vh - 350px)', overflowY: 'auto' }}>
+ <Tree
+ showLine
+ blockNode
+ defaultExpandAll // 寮傛鍔犺浇澶辨晥
+ expandedKeys={deptExpandedKeys}
+ onExpand={setDeptExpandedKeys}
+ treeData={deptTreeData}
+ switcherIcon={<DownOutlined />}
+ onSelect={(selectedKeys, info) => {
+ const deptId = selectedKeys[0];
+ setSearchParam(prevState => ({
+ ...prevState,
+ deptId: deptId
+ }));
+ actionRef.current?.reload();
+ }}
+ />
+ </div>
</Card>
</Col>
<Col lg={18} md={24}>
@@ -538,6 +547,30 @@
actions: [
<Button
type="primary"
+ danger
+ key="removeBatch"
+ hidden={selectedRows?.length === 0}
+ onClick={async () => {
+ Modal.confirm({
+ title: '鏄惁纭鍒犻櫎鎵�閫夋暟鎹」?',
+ icon: <ExclamationCircleOutlined />,
+ content: '璇疯皑鎱庢搷浣�',
+ async onOk() {
+ const success = await handleRemove(selectedRows);
+ if (success) {
+ setSelectedRows([]);
+ actionRef.current.reload();
+ }
+ },
+ onCancel() { },
+ });
+ }}
+ >
+ <DeleteOutlined />
+ 鍒犻櫎
+ </Button>,
+ <Button
+ type="primary"
key="save"
onClick={async () => {
setModalVisible(true)
@@ -558,7 +591,7 @@
],
}}
request={(params, sorter, filter) =>
- Http.doPostPromise('/api/user/page', { ...params, ...searchParam }, (res) => {
+ Http.doPostPromise('/api/user/page1', { ...params, ...searchParam }, (res) => {
return {
data: res.data.records,
total: res.data.total,
@@ -566,6 +599,7 @@
}
})
}
+ tableAlertRender={false}
rowSelection={{
onChange: (ids, rows) => {
setSelectedRows(rows);
@@ -582,38 +616,6 @@
}}
/>
</Col>
-
- {selectedRows?.length > 0 && (
- <FooterToolbar
- extra={
- <div>
- 宸查�夋嫨
- <a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
- 椤�
- </div>
- }
- >
- <Button
- key="remove"
- danger
- onClick={async () => {
- Modal.confirm({
- title: '鍒犻櫎',
- content: '纭畾鍒犻櫎璇ラ」鍚楋紵',
- onOk: async () => {
- const success = await handleRemove(selectedRows);
- if (success) {
- setSelectedRows([]);
- actionRef.current?.reloadAndRest?.();
- }
- },
- });
- }}
- >
- 鎵归噺鍒犻櫎
- </Button>
- </FooterToolbar>
- )}
<Edit
open={modalVisible}
--
Gitblit v1.9.1