From 3215e24a462ee364ead6709b0ef238b1f43015c4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 21 二月 2024 16:15:14 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/system/user/index.jsx | 144 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 112 insertions(+), 32 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index 7504506..70fe28f 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal, Row, Col, Card, Tree, Input } from 'antd';
+import { Button, message, Modal, Row, Col, Card, Tree, Input, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
@@ -10,8 +10,10 @@
import { PlusOutlined, ExportOutlined, DownOutlined } from '@ant-design/icons';
import Http from '@/utils/http';
import Edit from './components/edit'
+import Pwd from './components/pwd'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
-import { transformTreeData } from '@/utils/tree-util'
+import { transformTreeData, getTreeAllKeys } from '@/utils/tree-util'
+import { statusMap } from '@/utils/enum-util'
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -87,6 +89,25 @@
}
};
+const handlePwd = async (val) => {
+ const hide = message.loading('姝ｅ湪閲嶇疆');
+ try {
+ const resp = await Http.doPost('api/user/reset/pwd', val);
+ if (resp.code === 200) {
+ message.success('閲嶇疆鎴愬姛');
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error('閲嶇疆澶辫触璇烽噸璇曪紒');
+ return false;
+ } finally {
+ hide();
+ }
+};
+
const Main = () => {
const formTableRef = useRef();
@@ -97,6 +118,8 @@
const [searchParam, setSearchParam] = useState({});
const [boxHeight, setBoxHeight] = useState();
const [deptTreeData, setDeptTreeData] = useState([]);
+ const [deptExpandedKeys, setDeptExpandedKeys] = useState([]);
+ const [pwdModalVisible, setPwdModalVisible] = useState(false);
useEffect(() => {
const handleResize = () => setBoxHeight(window.innerHeight - 368);
@@ -104,8 +127,12 @@
handleResize();
Http.doPostPromise('/api/dept/tree', {}, (res) => {
- const treeData = transformTreeData(res.data);
+ const rootMenu = { id: 0, name: '鍏ㄩ儴', value: 0, children: [] };
+ rootMenu.children = res.data;
+ const treeData = transformTreeData([rootMenu]);
setDeptTreeData(treeData);
+ const treeAllKeys = getTreeAllKeys(treeData);
+ setDeptExpandedKeys(treeAllKeys);
})
return () => window.removeEventListener('resize', handleResize);
@@ -116,15 +143,14 @@
title: 'No',
dataIndex: 'index',
valueType: 'indexBorder',
- width: 48,
+ width: 30,
},
{
- title: '鏄电О',
+ title: '鍚嶇О',
dataIndex: 'nickname',
valueType: 'text',
hidden: false,
- width: 140,
- copyable: true,
+ width: 100,
filterDropdown: (props) => <TextFilter
name='nickname'
{...props}
@@ -133,11 +159,11 @@
/>,
},
{
- title: '璐﹀彿',
+ title: '鐧诲綍璐﹀彿',
dataIndex: 'username',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 100,
filterDropdown: (props) => <TextFilter
name='username'
{...props}
@@ -150,7 +176,7 @@
dataIndex: 'password',
valueType: 'password',
hidden: true,
- width: 140,
+ width: 100,
filterDropdown: (props) => <TextFilter
name='password'
{...props}
@@ -162,7 +188,7 @@
title: '澶村儚',
dataIndex: 'avatar',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='avatar'
@@ -189,7 +215,7 @@
dataIndex: 'sex$',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 80,
filterDropdown: (props) => <SelectFilter
name='sex'
{...props}
@@ -207,7 +233,7 @@
dataIndex: 'phone',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 100,
filterDropdown: (props) => <TextFilter
name='phone'
{...props}
@@ -219,7 +245,7 @@
title: '閭',
dataIndex: 'email',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='email'
@@ -250,14 +276,21 @@
dataIndex: 'deptId$',
valueType: 'text',
hidden: false,
- width: 140,
- filterDropdown: (props) => <LinkFilter
- name='deptId'
- major='dept'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
+ width: 100,
+ render: (_, record) => {
+ if (_ && _ !== '-') {
+ return <Tag color={""}>{_}</Tag>
+ } else {
+ return '-'
+ }
+ },
+ // filterDropdown: (props) => <LinkFilter
+ // name='deptId'
+ // major='dept'
+ // {...props}
+ // actionRef={actionRef}
+ // setSearchParam={setSearchParam}
+ // />,
},
{
title: '鐪熷疄濮撳悕',
@@ -316,7 +349,11 @@
dataIndex: 'status$',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 80,
+ render: (_, record) => {
+ const status = statusMap[record.status]
+ return <Tag color={status.color}>{status.text}</Tag>
+ },
filterDropdown: (props) => <SelectFilter
name='status'
{...props}
@@ -385,7 +422,7 @@
{
title: '鎿嶄綔',
dataIndex: 'option',
- width: 140,
+ width: 150,
valueType: 'option',
render: (_, record) => [
<Button
@@ -397,6 +434,16 @@
}}
>
缂栬緫
+ </Button>,
+ <Button
+ type="link"
+ key="pwd"
+ onClick={() => {
+ setPwdModalVisible(true);
+ setCurrentRow(record);
+ }}
+ >
+ 閲嶇疆瀵嗙爜
</Button>,
<Button
type="link"
@@ -433,7 +480,7 @@
<Col lg={6} md={24}>
<Card title="閮ㄩ棬" style={{ width: '100%', height: 'calc(100vh - 200px)' }}>
<Input
- style={{ marginBottom: 8 }}
+ style={{ marginBottom: 10 }}
placeholder="Search"
onChange={(e) => {
const { value } = e.target;
@@ -442,13 +489,20 @@
/>
<Tree
showLine
- switcherIcon={<DownOutlined />}
blockNode
- defaultExpandAll
- onSelect={(selectedKeys, info) => {
- console.log(selectedKeys[0]);
- }}
+ defaultExpandAll // 寮傛鍔犺浇澶辨晥
+ expandedKeys={deptExpandedKeys}
+ onExpand={setDeptExpandedKeys}
treeData={deptTreeData}
+ switcherIcon={<DownOutlined />}
+ onSelect={(selectedKeys, info) => {
+ const deptId = selectedKeys[0];
+ setSearchParam(prevState => ({
+ ...prevState,
+ deptId: deptId
+ }));
+ actionRef.current?.reload();
+ }}
/>
</Card>
</Col>
@@ -460,7 +514,7 @@
formRef={formTableRef}
columns={columns}
cardBordered
- scroll={{ x: 1300, y: boxHeight }}
+ scroll={{ y: boxHeight }}
dateFormatter="string"
pagination={{ pageSize: 20 }}
search={false}
@@ -504,7 +558,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,
@@ -564,6 +618,7 @@
<Edit
open={modalVisible}
values={currentRow || {}}
+ treeData={deptTreeData}
onCancel={
() => {
setModalVisible(false);
@@ -587,6 +642,31 @@
}
}
/>
+
+ <Pwd
+ open={pwdModalVisible}
+ values={currentRow || {}}
+ onCancel={
+ () => {
+ setPwdModalVisible(false);
+ setCurrentRow(undefined);
+ }
+ }
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handlePwd({ ...values })
+ }
+ if (ok) {
+ setPwdModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }
+ }
+ />
</Row>
</PageContainer>
);
--
Gitblit v1.9.1