liting2017 7 yıl önce
ebeveyn
işleme
c77676953e

+ 18 - 25
js/component/manageCenter/set/userManagementS/user.jsx

@@ -57,7 +57,8 @@ const User = Form.create()(React.createClass({
 							userNo: thisdata.userNo,
 							departmentName: thisdata.departmentName, //部门名称
 							departmentId: thisdata.departmentId, //部门id
-							roles:thisdata.roles[0]
+							roles:thisdata.roles[0],
+							rolesId:thisdata.rolesId
 						});
 					};
 					this.state.pagination.current = data.data.pageNo ? data.data.pageNo : '0';
@@ -91,6 +92,7 @@ const User = Form.create()(React.createClass({
 				pageSize: 10,
 				onChange: function(page) {
 					this.loadData(page);
+					this.state.selectedRowKeys=[]
 				}.bind(this),
 				showTotal: function(total) {
 					return '共' + total + '条数据';
@@ -293,6 +295,7 @@ const User = Form.create()(React.createClass({
 		let statust;
 		let mobiles;
 		let names;
+		let rolesId=[];
 		for(let idx = 0; idx < this.state.selectedRows.length; idx++) {
 			let rowItem = this.state.selectedRows[idx];
 			if(rowItem.id) {
@@ -300,9 +303,10 @@ const User = Form.create()(React.createClass({
 				statust=rowItem.status;
 				names=rowItem.name;
 				mobiles=rowItem.mobile;
+				rolesId=rowItem.rolesId
 			};
 		};
-		if(statust!='锁定'){
+		console.log(rolesId)
 			this.setState({
 				selectedRowKeys: [],
 				loading: true
@@ -313,12 +317,13 @@ const User = Form.create()(React.createClass({
 				crossDomain: false,
 				url: globalConfig.context + "/api/admin/superviser/updateAdmin",
 				data: {
+					roles:rolesId,
 					data:JSON.stringify({
 						id: deletedIds,
 						status: '锁定',
 						name: names,
-						mobile: mobiles
-					})
+						mobile: mobiles,
+					}),
 				}
 			}).done(function(data) {
 				if(!data.error.length) {
@@ -331,9 +336,7 @@ const User = Form.create()(React.createClass({
 				};
 				this.loadData();
 			}.bind(this));
-		}else{
-			message.warning('已是锁定状态')
-		}
+	
 	},
 	//激活
 	activation() {
@@ -341,6 +344,7 @@ const User = Form.create()(React.createClass({
 		let statust;
 		let mobiles;
 		let names;
+		let rolesId=[]
 		for(let idx = 0; idx < this.state.selectedRows.length; idx++) {
 			let rowItem = this.state.selectedRows[idx];
 			if(rowItem.id) {
@@ -348,9 +352,10 @@ const User = Form.create()(React.createClass({
 				statust=rowItem.status;
 				names=rowItem.name;
 				mobiles=rowItem.mobile;
+				rolesId=rowItem.rolesId
 			};
 		};
-		if(statust!='正常'){
+		
 			this.setState({
 				selectedRowKeys: [],
 				loading: true
@@ -361,11 +366,12 @@ const User = Form.create()(React.createClass({
 				crossDomain: false,
 				url: globalConfig.context + "/api/admin/superviser/updateAdmin",
 				data: {
+					roles:rolesId,
 					data:JSON.stringify({
 						id: deletedIds,
 						status: '正常',
 						name: names,
-						mobile: mobiles
+						mobile: mobiles,
 					})
 				}
 			}).done(function(data) {
@@ -379,23 +385,15 @@ const User = Form.create()(React.createClass({
 				};
 				this.loadData();
 			}.bind(this));
-		}else{
-			message.warning('已是激活状态')
-		}
 	},
 	//删除
 	delectRow() {
 		let deletedIds;
-		let statust;
-		let mobiles;
-		let names;
+		
 		for(let idx = 0; idx < this.state.selectedRows.length; idx++) {
 			let rowItem = this.state.selectedRows[idx];
 			if(rowItem.id) {
 				deletedIds=rowItem.id;
-				statust=rowItem.status;
-				names=rowItem.name;
-				mobiles=rowItem.mobile
 			};
 		};
 		this.setState({
@@ -406,14 +404,9 @@ const User = Form.create()(React.createClass({
 			method: "POST",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context + "/api/admin/superviser/updateAdmin",
+			url: globalConfig.context + "/api/admin/superviser/deleteById",
 			data: {
-				data:JSON.stringify({
-					id: deletedIds,
-					status:'注销',
-					name: names,
-					mobile: mobiles
-				})
+				id: deletedIds,	
 			}
 		}).done(function(data) {
 			if(!data.error.length) {