Przeglądaj źródła

用户详情分巴

dev01 2 lat temu
rodzic
commit
b9ef8dc870

+ 1 - 1
js/component/manageCenter/set/amoeba/barList.jsx

@@ -548,7 +548,7 @@ class Source extends Component {
                     <Select.Option value={2}>各大区管理中心&集团经开综</Select.Option>
                     <Select.Option value={2}>各大区管理中心&集团经开综</Select.Option>
                     <Select.Option value={3}>各事业部&区经管开综</Select.Option>
                     <Select.Option value={3}>各事业部&区经管开综</Select.Option>
                     <Select.Option value={4}>各战区&区事业部</Select.Option>
                     <Select.Option value={4}>各战区&区事业部</Select.Option>
-                    <Select.Option value={5}>各巴&小巴</Select.Option>
+                    <Select.Option value={5}>各巴&小巴</Select.Option>
                   </Select>
                   </Select>
                 </FormItem>
                 </FormItem>
                 <FormItem>
                 <FormItem>

+ 35 - 11
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
 import React from 'react';
-import { Icon, Modal, message, AutoComplete, Spin, Input, Select, Button, Form, Popconfirm } from 'antd';
+import { Icon, Modal, message, AutoComplete, Spin, Input, Select, Button, Form, Popconfirm, TreeSelect } from 'antd';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 import './userMangagement.less';
 import './userMangagement.less';
 import { cityArr, station, post } from '../../../dataDic.js';
 import { cityArr, station, post } from '../../../dataDic.js';
@@ -114,6 +114,10 @@ const Newuser = Form.create()(React.createClass({
                 return false;
                 return false;
             }
             }
         }
         }
+        // if (this.state.ambId == null || this.state.ambId == undefined) {
+        //     message.warning('请选择所属巴');
+        //     return false;
+        // }
         let theorgCodeUrl = [];
         let theorgCodeUrl = [];
         if (this.state.orgCodeUrl.length) {
         if (this.state.orgCodeUrl.length) {
             let picArr = [];
             let picArr = [];
@@ -149,7 +153,8 @@ const Newuser = Form.create()(React.createClass({
                     reviewer: this.state.reviewer,
                     reviewer: this.state.reviewer,
                     district: this.state.district,
                     district: this.state.district,
                     headPortraitUrl: theorgCodeUrl.length ? theorgCodeUrl : '',
                     headPortraitUrl: theorgCodeUrl.length ? theorgCodeUrl : '',
-                    entryTime: this.state.selTime
+                    entryTime: this.state.selTime,
+                    ambId: this.state.ambId,
                 })
                 })
             }
             }
         }).done(function (data) {
         }).done(function (data) {
@@ -252,10 +257,8 @@ const Newuser = Form.create()(React.createClass({
                         position: thisdata.position ? thisdata.position : undefined,
                         position: thisdata.position ? thisdata.position : undefined,
                         superior: thisdata.superior,
                         superior: thisdata.superior,
                         superiorId: thisdata.superiorId,//上级Id
                         superiorId: thisdata.superiorId,//上级Id
-
                         reviewerName: thisdata.reviewerName,
                         reviewerName: thisdata.reviewerName,
                         reviewer: thisdata.reviewer,
                         reviewer: thisdata.reviewer,
-
                         theTypes: '',
                         theTypes: '',
                         duty: thisdata.duty ? thisdata.duty : undefined,//职务
                         duty: thisdata.duty ? thisdata.duty : undefined,//职务
                         status: Number(thisdata.status),
                         status: Number(thisdata.status),
@@ -265,7 +268,8 @@ const Newuser = Form.create()(React.createClass({
                         orgCodeUrl: thisdata.headPortraitUrl ? splitUrl(thisdata.headPortraitUrl, ',', globalConfig.avatarHost + '/upload') : [],
                         orgCodeUrl: thisdata.headPortraitUrl ? splitUrl(thisdata.headPortraitUrl, ',', globalConfig.avatarHost + '/upload') : [],
                         role: this.props.role,
                         role: this.props.role,
                         entryTime: thisdata.entryTime ? moment(thisdata.entryTime, 'YYYY-MM-DD') : undefined,
                         entryTime: thisdata.entryTime ? moment(thisdata.entryTime, 'YYYY-MM-DD') : undefined,
-                        selTime: thisdata.entryTime
+                        selTime: thisdata.entryTime,
+                        ambId: !!thisdata.ambId && Number(thisdata.ambId), // 分巴id
                     });
                     });
                 }.bind(this),
                 }.bind(this),
             }).always(function () {
             }).always(function () {
@@ -275,7 +279,6 @@ const Newuser = Form.create()(React.createClass({
             }.bind(this));
             }.bind(this));
         }
         }
     },
     },
-
     //重置密码
     //重置密码
     resetPwd() {
     resetPwd() {
         this.setState({
         this.setState({
@@ -333,6 +336,7 @@ const Newuser = Form.create()(React.createClass({
             })
             })
         }
         }
     },
     },
+
     render() {
     render() {
         const FormItem = Form.Item
         const FormItem = Form.Item
         const formItemLayout = {
         const formItemLayout = {
@@ -556,12 +560,12 @@ const Newuser = Form.create()(React.createClass({
                                         </Select>
                                         </Select>
                                     </FormItem>
                                     </FormItem>
                                 </div>
                                 </div>
-
-                                <div className="clearfix pictures">
+                                <div className="clearfix">
                                     <FormItem
                                     <FormItem
-                                        labelCol={{ span: 4 }}
-                                        wrapperCol={{ span: 18 }}
-                                        label="用户头像" >
+                                        className="half-item"
+                                        {...formItemLayout}
+                                        label="用户头像"
+                                    >
                                         <PicturesWall
                                         <PicturesWall
                                             domId={'newUser1'}
                                             domId={'newUser1'}
                                             pictureSign="customer_sys_file"
                                             pictureSign="customer_sys_file"
@@ -569,6 +573,26 @@ const Newuser = Form.create()(React.createClass({
                                             pictureUrl={this.state.orgCodeUrl} />
                                             pictureUrl={this.state.orgCodeUrl} />
                                         <p>图片建议:要清晰。</p>
                                         <p>图片建议:要清晰。</p>
                                     </FormItem>
                                     </FormItem>
+                                    <FormItem
+                                        className="half-item"
+                                        {...formItemLayout}
+                                        label="分巴"
+                                    >
+                                        <TreeSelect
+                                            style={{ width: 200 }}
+                                            value={this.state.ambId}
+                                            dropdownStyle={{ maxHeight: 300, overflow: 'auto' }}
+                                            treeData={this.props.level1Data}
+                                            placeholder="请选择"
+                                            showSearch
+                                            treeNodeFilterProp="title"
+                                            onChange={(e) => {
+                                                this.setState({
+                                                    ambId: e,
+                                                });
+                                            }}
+                                        />
+                                    </FormItem>
                                 </div>
                                 </div>
                             </div>
                             </div>
                             <FormItem wrapperCol={{ span: 12, offset: 4 }}>
                             <FormItem wrapperCol={{ span: 12, offset: 4 }}>

+ 70 - 19
js/component/manageCenter/set/userManagementS/user.jsx

@@ -236,11 +236,11 @@ const User = Form.create()(React.createClass({
 				dataIndex: 'status',
 				dataIndex: 'status',
 				key: 'status',
 				key: 'status',
 				render: (text) =>
 				render: (text) =>
-				<span style={{ color: ["green", "red"][text] }}>
-					{text == 0
-						? "正常" : text == 1
-							? "停用" : "-"}
-				</span>
+					<span style={{ color: ["green", "red"][text] }}>
+						{text == 0
+							? "正常" : text == 1
+								? "停用" : "-"}
+					</span>
 			},
 			},
 			{
 			{
 				title: '最后登录时间',
 				title: '最后登录时间',
@@ -339,6 +339,7 @@ const User = Form.create()(React.createClass({
 		this.loadData();
 		this.loadData();
 		this.departmentList();
 		this.departmentList();
 		this.rolesList();
 		this.rolesList();
+		this.getList();
 	},
 	},
 	tableRowClick(record, index) {
 	tableRowClick(record, index) {
 		this.rolesArrS(record)
 		this.rolesArrS(record)
@@ -475,7 +476,6 @@ const User = Form.create()(React.createClass({
 			});
 			});
 		}.bind(this));
 		}.bind(this));
 	},
 	},
-
 	//锁定
 	//锁定
 	locking() {
 	locking() {
 		let deletedIds;
 		let deletedIds;
@@ -624,6 +624,7 @@ const User = Form.create()(React.createClass({
 			this.loadData(this.state.page);
 			this.loadData(this.state.page);
 		};
 		};
 	},
 	},
+
 	search() {
 	search() {
 		this.state.userDetaile = false
 		this.state.userDetaile = false
 		this.loadData();
 		this.loadData();
@@ -733,6 +734,55 @@ const User = Form.create()(React.createClass({
 			changeList: newArr
 			changeList: newArr
 		});
 		});
 	},
 	},
+	// 筛选数据
+	getList() {
+		this.setState({
+			loading: true,
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/amb/selectAll",
+			success: function (data) {
+				this.setState({
+					loading: false,
+				});
+				if (data.error && data.error.length === 0) {
+					let menuList = data.data
+					this.setState({
+						level1Data: menuList ? this.handleTreeData(menuList) : []
+					});
+				} else {
+					message.warning(data.error[0].message);
+				}
+			}.bind(this),
+		}).always(
+			function () {
+				this.setState({
+					loading: false,
+				});
+			}.bind(this)
+		);
+	},
+	// 树状默认数据处理
+	handleTreeData(treeData) {
+		let nodeDta = [];
+		treeData.map(item => {
+			let treeObj = {};
+			treeObj.key = item.id
+			treeObj.id = item.id
+			treeObj.value = item.id
+			treeObj.label = item.name
+			treeObj.title = item.name
+			treeObj.lvl = item.lvl
+			treeObj.parentId = item.parentId
+			item.list ? treeObj.children = this.handleTreeData(item.list) : null;
+			nodeDta.push(treeObj)
+		})
+		return nodeDta
+	},
+
 	render() {
 	render() {
 		const rowSelection = {
 		const rowSelection = {
 			selectedRowKeys: this.state.selectedRowKeys,
 			selectedRowKeys: this.state.selectedRowKeys,
@@ -887,10 +937,9 @@ const User = Form.create()(React.createClass({
 								</Button>
 								</Button>
 								<Button onClick={this.reset}>重置</Button>
 								<Button onClick={this.reset}>重置</Button>
 								<Button
 								<Button
-									style={{ background: "red", border: "none", color: "#fff" }}
+									style={{ background: "red", border: "none", color: "#fff", display: "none" }}
 									disabled={!hasSelected}
 									disabled={!hasSelected}
 									onClick={this.delectRow}
 									onClick={this.delectRow}
-									style={{ display: "none" }}
 								>
 								>
 									删除
 									删除
 									<Icon type="minus" />
 									<Icon type="minus" />
@@ -977,16 +1026,18 @@ const User = Form.create()(React.createClass({
 							/>
 							/>
 						</Spin>
 						</Spin>
 					</div>
 					</div>
-					{this.state.showDesc && <Newuser
-						role={this.state.role}
-						addId={this.state.addId}
-						roleArr={this.state.roleArr}
-						departmentArr={this.state.departmentArr}
-						userDetaile={this.state.userDetaile}
-						datauser={this.state.datauser}
-						showDesc={this.state.showDesc}
-						closeDesc={this.closeDesc}
-					/>}
+					{this.state.showDesc &&
+						<Newuser
+							role={this.state.role}
+							addId={this.state.addId}
+							roleArr={this.state.roleArr}
+							departmentArr={this.state.departmentArr}
+							userDetaile={this.state.userDetaile}
+							datauser={this.state.datauser}
+							showDesc={this.state.showDesc}
+							closeDesc={this.closeDesc}
+							level1Data={this.state.level1Data}
+						/>}
 					<div className="patent-desc">
 					<div className="patent-desc">
 						<Modal
 						<Modal
 							maskClosable={false}
 							maskClosable={false}
@@ -1024,7 +1075,7 @@ const User = Form.create()(React.createClass({
 										style={{
 										style={{
 											cursor: 'pointer',
 											cursor: 'pointer',
 										}}
 										}}
-										// onRowClick={this.tableRowClick}
+									// onRowClick={this.tableRowClick}
 									/>
 									/>
 								</Spin>
 								</Spin>
 							</div>
 							</div>