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 | 423 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 269 insertions(+), 154 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index 3ab1242..70fe28f 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -1,16 +1,19 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Button, message, Modal } from 'antd';
+import { Button, message, Modal, Row, Col, Card, Tree, Input, Tag } from 'antd';
import {
FooterToolbar,
PageContainer,
ProTable,
LightFilter,
} from '@ant-design/pro-components';
-import { PlusOutlined, ExportOutlined } from '@ant-design/icons';
+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, getTreeAllKeys } from '@/utils/tree-util'
+import { statusMap } from '@/utils/enum-util'
const handleSave = async (val) => {
const hide = message.loading('姝ｅ湪娣诲姞');
@@ -86,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();
@@ -94,13 +116,25 @@
const [modalVisible, setModalVisible] = useState(false);
const [currentRow, setCurrentRow] = useState();
const [searchParam, setSearchParam] = useState({});
-
- const [boxHeight, setBoxHeight] = useState(window.innerHeight - 450);
-
+ const [boxHeight, setBoxHeight] = useState();
+ const [deptTreeData, setDeptTreeData] = useState([]);
+ const [deptExpandedKeys, setDeptExpandedKeys] = useState([]);
+ const [pwdModalVisible, setPwdModalVisible] = useState(false);
useEffect(() => {
- const handleResize = () => setBoxHeight(window.innerHeight - 450);
+ 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);
+ })
+
return () => window.removeEventListener('resize', handleResize);
}, []);
@@ -109,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}
@@ -126,11 +159,11 @@
/>,
},
{
- title: '璐﹀彿',
+ title: '鐧诲綍璐﹀彿',
dataIndex: 'username',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 100,
filterDropdown: (props) => <TextFilter
name='username'
{...props}
@@ -143,7 +176,7 @@
dataIndex: 'password',
valueType: 'password',
hidden: true,
- width: 140,
+ width: 100,
filterDropdown: (props) => <TextFilter
name='password'
{...props}
@@ -155,7 +188,7 @@
title: '澶村儚',
dataIndex: 'avatar',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='avatar'
@@ -182,7 +215,7 @@
dataIndex: 'sex$',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 80,
filterDropdown: (props) => <SelectFilter
name='sex'
{...props}
@@ -200,7 +233,7 @@
dataIndex: 'phone',
valueType: 'text',
hidden: false,
- width: 140,
+ width: 100,
filterDropdown: (props) => <TextFilter
name='phone'
{...props}
@@ -212,7 +245,7 @@
title: '閭',
dataIndex: 'email',
valueType: 'text',
- hidden: false,
+ hidden: true,
width: 140,
filterDropdown: (props) => <TextFilter
name='email'
@@ -243,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: '鐪熷疄濮撳悕',
@@ -309,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}
@@ -378,7 +422,7 @@
{
title: '鎿嶄綔',
dataIndex: 'option',
- width: 140,
+ width: 150,
valueType: 'option',
render: (_, record) => [
<Button
@@ -390,6 +434,16 @@
}}
>
缂栬緫
+ </Button>,
+ <Button
+ type="link"
+ key="pwd"
+ onClick={() => {
+ setPwdModalVisible(true);
+ setCurrentRow(record);
+ }}
+ >
+ 閲嶇疆瀵嗙爜
</Button>,
<Button
type="link"
@@ -417,142 +471,203 @@
];
return (
- <PageContainer>
- <div style={{ width: '100%', float: 'right' }}>
- <ProTable
- key="user"
- rowKey="id"
- actionRef={actionRef}
- formRef={formTableRef}
- columns={columns}
- cardBordered
- scroll={{ x: 1300, y: boxHeight }}
- dateFormatter="string"
- pagination={{ pageSize: 20 }}
- search={false}
- toolbar={{
- search: {
- onSearch: (value) => {
+ <PageContainer
+ header={{
+ breadcrumb: {},
+ }}
+ >
+ <Row gutter={[16, 24]}>
+ <Col lg={6} md={24}>
+ <Card title="閮ㄩ棬" style={{ width: '100%', height: 'calc(100vh - 200px)' }}>
+ <Input
+ style={{ marginBottom: 10 }}
+ placeholder="Search"
+ onChange={(e) => {
+ const { value } = e.target;
+ console.log(value);
+ }}
+ />
+ <Tree
+ showLine
+ blockNode
+ defaultExpandAll // 寮傛鍔犺浇澶辨晥
+ expandedKeys={deptExpandedKeys}
+ onExpand={setDeptExpandedKeys}
+ treeData={deptTreeData}
+ switcherIcon={<DownOutlined />}
+ onSelect={(selectedKeys, info) => {
+ const deptId = selectedKeys[0];
setSearchParam(prevState => ({
...prevState,
- condition: value
+ deptId: deptId
}));
actionRef.current?.reload();
- },
- },
- filter: (
- <LightFilter
- onValuesChange={(val) => {
- }}
- >
- </LightFilter>
- ),
- actions: [
- <Button
- type="primary"
- key="save"
- onClick={async () => {
- setModalVisible(true)
- }}
- >
- <PlusOutlined />
- 娣诲姞
- </Button>,
- <Button
- key="export"
- onClick={async () => {
- handleExport();
- }}
- >
- <ExportOutlined />
- 瀵煎嚭
- </Button>,
- ],
- }}
- request={(params, sorter, filter) =>
- Http.doPostPromise('/api/user/page', { ...params, ...searchParam }, (res) => {
- return {
- data: res.data.records,
- total: res.data.total,
- success: true,
- }
- })
- }
- rowSelection={{
- onChange: (ids, rows) => {
- setSelectedRows(rows);
- }
- }}
- columnsState={{
- persistenceKey: 'pro-table-user',
- persistenceType: 'localStorage',
- defaultValue: {
- option: { fixed: 'right', disable: true },
- },
- onChange(value) {
- },
- }}
- />
- </div>
-
- {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?.();
- }
+ }}
+ />
+ </Card>
+ </Col>
+ <Col lg={18} md={24}>
+ <ProTable
+ key="user"
+ rowKey="id"
+ actionRef={actionRef}
+ formRef={formTableRef}
+ columns={columns}
+ cardBordered
+ scroll={{ y: boxHeight }}
+ dateFormatter="string"
+ pagination={{ pageSize: 20 }}
+ search={false}
+ toolbar={{
+ search: {
+ onSearch: (value) => {
+ setSearchParam(prevState => ({
+ ...prevState,
+ condition: value
+ }));
+ actionRef.current?.reload();
},
- });
+ },
+ filter: (
+ <LightFilter
+ onValuesChange={(val) => {
+ }}
+ >
+ </LightFilter>
+ ),
+ actions: [
+ <Button
+ type="primary"
+ key="save"
+ onClick={async () => {
+ setModalVisible(true)
+ }}
+ >
+ <PlusOutlined />
+ 娣诲姞
+ </Button>,
+ <Button
+ key="export"
+ onClick={async () => {
+ handleExport();
+ }}
+ >
+ <ExportOutlined />
+ 瀵煎嚭
+ </Button>,
+ ],
}}
- >
- 鎵归噺鍒犻櫎
- </Button>
- </FooterToolbar>
- )}
+ request={(params, sorter, filter) =>
+ Http.doPostPromise('/api/user/page1', { ...params, ...searchParam }, (res) => {
+ return {
+ data: res.data.records,
+ total: res.data.total,
+ success: true,
+ }
+ })
+ }
+ rowSelection={{
+ onChange: (ids, rows) => {
+ setSelectedRows(rows);
+ }
+ }}
+ columnsState={{
+ persistenceKey: 'pro-table-user',
+ persistenceType: 'localStorage',
+ defaultValue: {
+ option: { fixed: 'right', disable: true },
+ },
+ onChange(value) {
+ },
+ }}
+ />
+ </Col>
- <Edit
- open={modalVisible}
- values={currentRow || {}}
- onCancel={
- () => {
- setModalVisible(false);
- setCurrentRow(undefined);
- }
- }
- onSubmit={async (values) => {
- let ok = false;
- if (values.id) {
- ok = await handleUpdate({ ...values })
- } else {
- ok = await handleSave({ ...values })
- }
- if (ok) {
- setModalVisible(false);
- setCurrentRow(undefined);
- if (actionRef.current) {
- actionRef.current.reload();
+ {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}
+ values={currentRow || {}}
+ treeData={deptTreeData}
+ onCancel={
+ () => {
+ setModalVisible(false);
+ setCurrentRow(undefined);
}
}
- }
- }
- />
+ onSubmit={async (values) => {
+ let ok = false;
+ if (values.id) {
+ ok = await handleUpdate({ ...values })
+ } else {
+ ok = await handleSave({ ...values })
+ }
+ if (ok) {
+ setModalVisible(false);
+ setCurrentRow(undefined);
+ if (actionRef.current) {
+ actionRef.current.reload();
+ }
+ }
+ }
+ }
+ />
+
+ <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