|
|
@@ -1,251 +1,261 @@
|
|
1
|
|
-
|
|
2
|
|
-import { Row, Col, Card, Tree, Form, Tabs, TreeSelect, Input, InputNumber, Modal, Button, message } from 'antd'
|
|
|
1
|
+import {
|
|
|
2
|
+ Row,
|
|
|
3
|
+ Col,
|
|
|
4
|
+ Card,
|
|
|
5
|
+ Tree,
|
|
|
6
|
+ Form,
|
|
|
7
|
+ Tabs,
|
|
|
8
|
+ TreeSelect,
|
|
|
9
|
+ Input,
|
|
|
10
|
+ InputNumber,
|
|
|
11
|
+ Modal,
|
|
|
12
|
+ Button,
|
|
|
13
|
+ message,
|
|
|
14
|
+ Icon,
|
|
|
15
|
+} from 'antd';
|
|
3
|
16
|
import React, { useState, useEffect } from 'react';
|
|
4
|
17
|
import request from '@/utils/request';
|
|
5
|
18
|
import apis from '@/services/apis';
|
|
6
|
19
|
import moment from 'moment';
|
|
7
|
20
|
import TreedataFrom from './form';
|
|
8
|
21
|
import TreedataAdd from './addForm';
|
|
9
|
|
-import { values } from 'lodash';
|
|
|
22
|
+import { connect } from 'dva';
|
|
|
23
|
+import { add } from 'lodash';
|
|
|
24
|
+
|
|
10
|
25
|
const { TreeNode, DirectoryTree } = Tree;
|
|
11
|
26
|
const FormItem = Form.Item;
|
|
12
|
27
|
const { Search } = Input;
|
|
13
|
28
|
const { TabPane } = Tabs;
|
|
14
|
29
|
|
|
15
|
|
-const treeData = []
|
|
16
|
|
-const updateTreeData = fetch(apis.Institution.instiAlert); //接口
|
|
17
|
|
-
|
|
18
|
|
-
|
|
19
|
|
-
|
|
20
|
|
-// const item = this.info.node.key
|
|
21
|
|
-
|
|
22
|
|
-class TreeDemo extends React.Component {
|
|
23
|
|
- formRef = React.createRef();
|
|
24
|
|
-
|
|
25
|
|
- constructor(props) {
|
|
26
|
|
- super(props)
|
|
27
|
|
- this.state = {
|
|
28
|
|
- // autoExpandParent: false,
|
|
29
|
|
- // treeTitle: [info.node.props],
|
|
30
|
|
- // checkedKeys: ['0-0-0'],
|
|
31
|
|
- expandedKeys: [],//展开的key
|
|
32
|
|
- checkedKeys: [],//选中的key
|
|
33
|
|
- autoExpandParent: true,
|
|
34
|
|
- searchValue: '',
|
|
35
|
|
- selectedKeys: [],//搜索得key
|
|
36
|
|
- checked: true,
|
|
37
|
|
- treeData: [],
|
|
38
|
|
- testarr: []
|
|
|
30
|
+const getTreeFrom = arr => {
|
|
|
31
|
+ const copy = (arr || []).map(it => ({ ...it, children: undefined }));
|
|
|
32
|
+
|
|
|
33
|
+ const tree = [];
|
|
|
34
|
+ for (let inx in copy) {
|
|
|
35
|
+ const it = copy[inx];
|
|
|
36
|
+ const key = it.institutionCode;
|
|
|
37
|
+ const node = {
|
|
|
38
|
+ key,
|
|
|
39
|
+ value: it.institutionId,
|
|
|
40
|
+ title: it.institutionName,
|
|
|
41
|
+ children: it.children,
|
|
|
42
|
+ parent: it.parent,
|
|
39
|
43
|
};
|
|
40
|
|
- }
|
|
41
|
|
-
|
|
42
|
|
-
|
|
43
|
|
- // onExpand = expandedKeys => {
|
|
44
|
|
- // this.setState({
|
|
45
|
|
- // expandedKeys,
|
|
46
|
|
- // autoExpandParent: false,
|
|
47
|
|
- // });
|
|
48
|
|
- // };
|
|
49
|
|
-
|
|
50
|
|
-
|
|
|
44
|
+ const parent = key.length === 2 ? undefined : key.substring(0, key.length - 2);
|
|
|
45
|
+
|
|
|
46
|
+ if (parent) {
|
|
|
47
|
+ for (let cur of copy) {
|
|
|
48
|
+ if ((cur.institutionCode || cur.key) === parent) {
|
|
|
49
|
+ node.parent = cur;
|
|
|
50
|
+ cur.children = [...(cur.children || []), node];
|
|
|
51
|
+ break;
|
|
|
52
|
+ }
|
|
|
53
|
+ }
|
|
|
54
|
+ }
|
|
51
|
55
|
|
|
52
|
|
- // --------标签页
|
|
53
|
|
- callback = (key) => {
|
|
54
|
|
- console.log(key);
|
|
|
56
|
+ copy[inx] = node;
|
|
|
57
|
+ tree.push(node);
|
|
55
|
58
|
}
|
|
56
|
|
-
|
|
57
|
|
-
|
|
58
|
|
- onExpand = expandedKeys => {
|
|
59
|
|
- console.log('onExpand', expandedKeys);
|
|
60
|
|
-
|
|
61
|
|
- // 如果没有将 autoExpandParent 设置为 false，如果子项展开，父项不能折叠。
|
|
62
|
|
- // 或者，您可以删除所有扩展的子键。
|
|
63
|
|
- this.setState({
|
|
64
|
|
- expandedKeys,
|
|
65
|
|
- autoExpandParent: false,
|
|
66
|
|
- });
|
|
|
59
|
+ return tree.filter(x => !x.parent);
|
|
|
60
|
+};
|
|
|
61
|
+
|
|
|
62
|
+const Organization = props => {
|
|
|
63
|
+ const { user, ...leftProps } = props;
|
|
|
64
|
+
|
|
|
65
|
+ const [value, setValue] = useState('');
|
|
|
66
|
+ const [type, setType] = useState();
|
|
|
67
|
+ const [visible, setVisible] = useState(false);
|
|
|
68
|
+ const [institutionData, setInstitutionData] = useState({});
|
|
|
69
|
+ const [confirmLoading, setConfirmLoading] = useState(false);
|
|
|
70
|
+
|
|
|
71
|
+ const handleOk = () => {
|
|
|
72
|
+ setConfirmLoading(true);
|
|
|
73
|
+ try {
|
|
|
74
|
+ if (value) {
|
|
|
75
|
+ if (type == 'add') {
|
|
|
76
|
+ request({
|
|
|
77
|
+ ...apis.Institution.instSave,
|
|
|
78
|
+ data: { parentInstitutionId: institutionData.value, institutionName: value },
|
|
|
79
|
+ })
|
|
|
80
|
+ .then(data => {
|
|
|
81
|
+ props.dispatch({
|
|
|
82
|
+ type: 'user/saveOrganization',
|
|
|
83
|
+ payload: user.institutionList.concat(data),
|
|
|
84
|
+ });
|
|
|
85
|
+ setConfirmLoading(false);
|
|
|
86
|
+ setVisible(false);
|
|
|
87
|
+
|
|
|
88
|
+ message.info('操作成功');
|
|
|
89
|
+ })
|
|
|
90
|
+ .catch(err => {
|
|
|
91
|
+ message.info(err.msg || err.message);
|
|
|
92
|
+ });
|
|
|
93
|
+ } else {
|
|
|
94
|
+ request({
|
|
|
95
|
+ ...apis.Institution.instiAlert,
|
|
|
96
|
+ urlData: { id: institutionData.value },
|
|
|
97
|
+ data: { institutionName: value },
|
|
|
98
|
+ })
|
|
|
99
|
+ .then(data => {
|
|
|
100
|
+ props.dispatch({
|
|
|
101
|
+ type: 'user/saveOrganization',
|
|
|
102
|
+ payload: user.institutionList.map(x => {
|
|
|
103
|
+ if (x.institutionId == institutionData.value) {
|
|
|
104
|
+ return { ...x, institutionName: value };
|
|
|
105
|
+ }
|
|
|
106
|
+ return x;
|
|
|
107
|
+ }),
|
|
|
108
|
+ });
|
|
|
109
|
+ setConfirmLoading(false);
|
|
|
110
|
+ setVisible(false);
|
|
|
111
|
+ message.info('操作成功');
|
|
|
112
|
+ })
|
|
|
113
|
+ .catch(err => {
|
|
|
114
|
+ message.info(err.msg || err.message);
|
|
|
115
|
+ });
|
|
|
116
|
+ }
|
|
|
117
|
+ }
|
|
|
118
|
+ } catch (err) {
|
|
|
119
|
+ console.error(err);
|
|
|
120
|
+ }
|
|
67
|
121
|
};
|
|
68
|
122
|
|
|
69
|
|
- handelSex = e => {
|
|
70
|
|
- this.setState({
|
|
71
|
|
- sex: e.target.value
|
|
72
|
|
- });
|
|
73
|
|
- console.log(value);
|
|
|
123
|
+ const handleCancel = () => {
|
|
|
124
|
+ setVisible(false);
|
|
74
|
125
|
};
|
|
75
|
126
|
|
|
76
|
|
- //修改
|
|
77
|
|
-
|
|
78
|
|
- onChangethis = async (value) => {
|
|
79
|
|
- //获取tree的修改前数据
|
|
80
|
|
- const testarr = this.state.treeData
|
|
81
|
|
- //把tree的修改前数据赋修改代存数据
|
|
82
|
|
- // let Data1 = this.state.treeData
|
|
83
|
|
- console.log('value*********>>', value)
|
|
84
|
|
- // console.log('Data1------------>', Data1)
|
|
85
|
|
- // urlData: { id: value.institutionId }
|
|
86
|
|
- // //修改树的数据存在Data1
|
|
87
|
|
- // for (var i = 0; i < testarr.length; i++) {
|
|
88
|
|
- // // console.log('ID------------>', Data1[i].key);
|
|
89
|
|
- // if (testarr[i].key == value.institutionId) {
|
|
90
|
|
- // Data1[i] = value
|
|
91
|
|
- // const res = request(`/api/admin/institution/${Data1[i].institutionId}`, {
|
|
92
|
|
- // method: 'PUT',
|
|
93
|
|
- // data: value,
|
|
94
|
|
- // })
|
|
95
|
|
- // console.log('*************', value)
|
|
96
|
|
- // // console.log('*institutionName*****', institutionName)
|
|
97
|
|
-
|
|
98
|
|
- // if (res.success) {
|
|
99
|
|
- // message.success("成功")
|
|
100
|
|
- // } else {
|
|
101
|
|
- // message.error("失败")
|
|
102
|
|
- // }
|
|
103
|
|
- // }
|
|
104
|
|
- // }
|
|
105
|
|
- // this.setState({
|
|
106
|
|
- // treeData1: Data1
|
|
107
|
|
- // }, () => {
|
|
108
|
|
- // message.success('修改成功！')
|
|
109
|
|
- // })
|
|
110
|
|
-
|
|
111
|
|
- }
|
|
112
|
|
-
|
|
|
127
|
+ const add = row => {
|
|
|
128
|
+ setVisible(true);
|
|
|
129
|
+ setType('add');
|
|
|
130
|
+ setValue();
|
|
|
131
|
+ setInstitutionData(row);
|
|
|
132
|
+ };
|
|
113
|
133
|
|
|
114
|
|
- //单击赋值
|
|
115
|
|
- onSelect = (values, info) => {
|
|
116
|
|
- this.setState({ values }, () => {
|
|
117
|
|
- this.formRef.current.setFieldsValue({
|
|
118
|
|
- ...info.node.props,
|
|
119
|
|
- // institutionId: info.node.props.institutionId,//event
|
|
120
|
|
- // day: moment(info.node.props.day)
|
|
121
|
|
- })
|
|
122
|
|
- console.log(info.node.props);
|
|
123
|
|
- })
|
|
124
|
|
- }
|
|
|
134
|
+ const edit = row => {
|
|
|
135
|
+ setVisible(true);
|
|
|
136
|
+ setType('edit');
|
|
|
137
|
+ setValue(row.title);
|
|
|
138
|
+ setInstitutionData(row);
|
|
|
139
|
+ };
|
|
125
|
140
|
|
|
126
|
|
- //首次加载
|
|
127
|
|
- async institutionTree(params) {
|
|
128
|
|
- let arr = []
|
|
129
|
|
- return request('/api/admin/institution/list', {
|
|
130
|
|
- method: 'GET',
|
|
131
|
|
- data: params,
|
|
132
|
|
- }).then((testarr2) => {
|
|
133
|
|
- this.setState({ testarr: testarr2 }, () => {
|
|
134
|
|
- // console.log("testarr2")
|
|
135
|
|
- // console.log(this.state.testarr)
|
|
136
|
|
- // title: 'institutionId',
|
|
137
|
|
- // name: 'institutionName',
|
|
138
|
|
- // key: '0-0-0',
|
|
139
|
|
- const arr2 = this.state.testarr
|
|
140
|
|
- for (var i = 0; i < this.state.testarr.length; i++) {
|
|
141
|
|
- let list = {
|
|
142
|
|
- title: '',
|
|
143
|
|
- institutionName: 'institutionName',
|
|
144
|
|
- // name: 'institutionId',
|
|
145
|
|
- institutionId: 'institutionId',
|
|
146
|
|
- key: '0-0-0',
|
|
147
|
|
- }
|
|
148
|
|
- list.institutionName = arr2[i].institutionName
|
|
149
|
|
- list.title = arr2[i].institutionName
|
|
150
|
|
- list.institutionId = arr2[i].institutionId
|
|
151
|
|
- list.key = arr2[i].institutionId
|
|
152
|
|
- // '0' + i.toString
|
|
153
|
|
- arr.push(list)
|
|
154
|
|
- }
|
|
155
|
|
- // console.log("arr")
|
|
156
|
|
- // console.log(arr)
|
|
157
|
|
- this.setState({
|
|
158
|
|
- treeData: arr
|
|
|
141
|
+ const onDelete = row => {
|
|
|
142
|
+ Modal.confirm({
|
|
|
143
|
+ title: '确认要删除该组织吗？',
|
|
|
144
|
+ okText: '确认',
|
|
|
145
|
+ okType: 'danger',
|
|
|
146
|
+ cancelText: '取消',
|
|
|
147
|
+ onOk() {
|
|
|
148
|
+ request({
|
|
|
149
|
+ ...apis.Institution.instiDelete,
|
|
|
150
|
+ urlData: { id: row.value },
|
|
159
|
151
|
})
|
|
|
152
|
+ .then(data => {
|
|
|
153
|
+ props.dispatch({
|
|
|
154
|
+ type: 'user/saveOrganization',
|
|
|
155
|
+ payload: user.institutionList.filter(x => x.institutionId != row.value),
|
|
|
156
|
+ });
|
|
|
157
|
+ setConfirmLoading(false);
|
|
|
158
|
+ setVisible(false);
|
|
|
159
|
+ message.info('删除成功');
|
|
|
160
|
+ })
|
|
|
161
|
+ .catch(err => {
|
|
|
162
|
+ console.log(err);
|
|
|
163
|
+ message.info(err.msg || err.message);
|
|
|
164
|
+ });
|
|
|
165
|
+ },
|
|
|
166
|
+ onCancel() {
|
|
|
167
|
+ console.log('Cancel');
|
|
|
168
|
+ },
|
|
|
169
|
+ });
|
|
|
170
|
+ };
|
|
160
|
171
|
|
|
161
|
|
- })
|
|
162
|
|
- // console.log(this.getTreeData)
|
|
163
|
|
- })
|
|
164
|
|
- }
|
|
165
|
|
-
|
|
166
|
|
-
|
|
167
|
|
-
|
|
168
|
|
-
|
|
169
|
|
- UNSAFE_componentWillMount() {
|
|
170
|
|
- this.institutionTree([])
|
|
171
|
|
-
|
|
172
|
|
- }
|
|
173
|
|
-
|
|
174
|
|
-
|
|
175
|
|
- renderTreeNodes = data =>
|
|
176
|
|
- (data || []).map(item => {//初始化data
|
|
|
172
|
+ const getTitle = item => {
|
|
|
173
|
+ return (
|
|
|
174
|
+ <>
|
|
|
175
|
+ {item.title}{' '}
|
|
|
176
|
+ <Icon
|
|
|
177
|
+ type="plus"
|
|
|
178
|
+ onClick={e => {
|
|
|
179
|
+ e.stopPropagation(), add(item);
|
|
|
180
|
+ }}
|
|
|
181
|
+ />{' '}
|
|
|
182
|
+ <Icon
|
|
|
183
|
+ type="edit"
|
|
|
184
|
+ onClick={e => {
|
|
|
185
|
+ e.stopPropagation(), edit(item);
|
|
|
186
|
+ }}
|
|
|
187
|
+ />{' '}
|
|
|
188
|
+ <Icon
|
|
|
189
|
+ type="delete"
|
|
|
190
|
+ onClick={e => {
|
|
|
191
|
+ e.stopPropagation(), onDelete(item);
|
|
|
192
|
+ }}
|
|
|
193
|
+ />
|
|
|
194
|
+ </>
|
|
|
195
|
+ );
|
|
|
196
|
+ };
|
|
|
197
|
+ const renderTreeNodes = data =>
|
|
|
198
|
+ data.map(item => {
|
|
177
|
199
|
if (item.children) {
|
|
178
|
200
|
return (
|
|
179
|
|
- <TreeNode title={item.title} key={item.key} dataRef={item} >
|
|
180
|
|
- {this.renderTreeNodes(item.children)}
|
|
181
|
|
- </TreeNode >
|
|
|
201
|
+ <TreeNode title={getTitle(item)} key={item.key} dataRef={item}>
|
|
|
202
|
+ {renderTreeNodes(item.children)}
|
|
|
203
|
+ </TreeNode>
|
|
182
|
204
|
);
|
|
183
|
205
|
}
|
|
184
|
|
- return <TreeNode key={item.key} {...item} />;
|
|
|
206
|
+ return <TreeNode key={item.key} {...item} title={getTitle(item)} />;
|
|
185
|
207
|
});
|
|
186
|
208
|
|
|
187
|
|
-
|
|
188
|
|
-
|
|
189
|
|
-
|
|
190
|
|
-
|
|
191
|
|
- render() {
|
|
192
|
|
- const { searchValue, autoExpandParent, expandedKeys, checkedKeys } = this.state;
|
|
193
|
|
- return (
|
|
194
|
|
- <Card>
|
|
195
|
|
- <Row >
|
|
196
|
|
- <Col xs={{ span: 5, offset: 1 }} lg={{ span: 6, offset: 0 }}>
|
|
197
|
|
- <Card>
|
|
198
|
|
- <FormItem
|
|
199
|
|
- label="管辖部门"
|
|
200
|
|
- >
|
|
201
|
|
- <Search style={{ marginBottom: 8 }} placeholder="Search" onChange={this.onChange} />
|
|
202
|
|
- <Tree
|
|
203
|
|
- // api={apis.Institution.instIist}
|
|
204
|
|
- // checkable
|
|
205
|
|
- onExpand={this.onExpand}
|
|
206
|
|
- expandedKeys={expandedKeys}
|
|
207
|
|
- autoExpandParent={autoExpandParent}
|
|
208
|
|
- // checkedKeys={checkedKeys}
|
|
209
|
|
-
|
|
210
|
|
- showLine
|
|
211
|
|
- // defaultExpandedKeys={['0-0']}
|
|
212
|
|
- onSelect={this.onSelect}
|
|
213
|
|
- treeData={this.state.treeData}
|
|
214
|
|
- // treeData={loop(gData)}
|
|
215
|
|
- // api={apis.Institution.instIist}
|
|
216
|
|
- >
|
|
217
|
|
- {this.renderTreeNodes(this.state.treeData)}
|
|
218
|
|
- {/* 动态渲染 */}
|
|
219
|
|
- </Tree >
|
|
220
|
|
- </FormItem>
|
|
221
|
|
- </Card>
|
|
222
|
|
- </Col>
|
|
223
|
|
- <Col xs={{ span: 10, offset: 10 }} lg={{ span: 10, offset: 4 }}>
|
|
224
|
|
- <Card>
|
|
225
|
|
- <Tabs defaultActiveKey='1' onChange={this.callback} >
|
|
226
|
|
- <TabPane tab='编辑' key='1'>
|
|
227
|
|
- <TreedataFrom
|
|
228
|
|
- ref={this.formRef}
|
|
229
|
|
- api={apis.Institution.instiAlert}
|
|
230
|
|
- triggerRef={this.bindRef}
|
|
231
|
|
- onChangethis={this.onChangethis}
|
|
232
|
|
- onSubmit={this.onChangethis}
|
|
233
|
|
- />
|
|
234
|
|
- </TabPane>
|
|
235
|
|
- {/* <TabPane tab='新增' key='2'>
|
|
236
|
|
- <TreedataAdd
|
|
237
|
|
- >
|
|
238
|
|
- </TreedataAdd>
|
|
239
|
|
- </TabPane> */}
|
|
240
|
|
-
|
|
241
|
|
- </Tabs>
|
|
242
|
|
- </Card>
|
|
243
|
|
- </Col>
|
|
244
|
|
- </Row>
|
|
|
209
|
+ return (
|
|
|
210
|
+ <>
|
|
|
211
|
+ <Card style={{ minHeight: '500px' }}>
|
|
|
212
|
+ <Tree
|
|
|
213
|
+ defaultExpandAll
|
|
|
214
|
+ >
|
|
|
215
|
+ {renderTreeNodes(getTreeFrom(user.institutionList) || [])}
|
|
|
216
|
+ </Tree>
|
|
245
|
217
|
</Card>
|
|
246
|
|
- );
|
|
247
|
|
- }
|
|
248
|
|
-
|
|
249
|
|
-}
|
|
250
|
|
-
|
|
251
|
|
-export default TreeDemo
|
|
|
218
|
+ <Modal
|
|
|
219
|
+ title={type == 'add' ? '新增' : '编辑'}
|
|
|
220
|
+ visible={visible}
|
|
|
221
|
+ onOk={handleOk}
|
|
|
222
|
+ confirmLoading={confirmLoading}
|
|
|
223
|
+ onCancel={handleCancel}
|
|
|
224
|
+ >
|
|
|
225
|
+ {type == 'add' && <p>上级公司:{institutionData.title}</p>}
|
|
|
226
|
+ <Input value={value} onChange={e => setValue(e.target.value)}></Input>
|
|
|
227
|
+ </Modal>
|
|
|
228
|
+ </>
|
|
|
229
|
+ );
|
|
|
230
|
+};
|
|
|
231
|
+
|
|
|
232
|
+export default connect(({ user }) => ({
|
|
|
233
|
+ user: user.currentUser,
|
|
|
234
|
+}))(Organization);
|
|
|
235
|
+
|
|
|
236
|
+// import React, { useEffect, useMemo, useRef, useState } from 'react'
|
|
|
237
|
+// import { TreeSelect } from 'antd'
|
|
|
238
|
+// import { connect } from 'dva'
|
|
|
239
|
+
|
|
|
240
|
+// const InstitutionSelect = React.forwardRef((props, ref) => {
|
|
|
241
|
+
|
|
|
242
|
+// const { user, ...leftProps } = props
|
|
|
243
|
+
|
|
|
244
|
+// const [expandedKeys, setExpandedKeys] = useState([])
|
|
|
245
|
+
|
|
|
246
|
+// const treeData = useMemo(() => {
|
|
|
247
|
+// return getTreeFrom(user.institutionList) || []
|
|
|
248
|
+// }, [user.institutionList])
|
|
|
249
|
+
|
|
|
250
|
+// useEffect(() => {
|
|
|
251
|
+// setExpandedKeys((user.institutionList || []).map((x) => x.institutionCode))
|
|
|
252
|
+// }, [user.institutionList])
|
|
|
253
|
+
|
|
|
254
|
+// return (
|
|
|
255
|
+// <TreeSelect allowClear treeExpandedKeys={expandedKeys} onTreeExpand={setExpandedKeys} {...leftProps} treeData={treeData} />
|
|
|
256
|
+// )
|
|
|
257
|
+// })
|
|
|
258
|
+
|
|
|
259
|
+// export default connect(({ user }) => ({
|
|
|
260
|
+// user: user.currentUser,
|
|
|
261
|
+// }))(InstitutioSnelect)
|
zlisen
3 gadus atpakaļ