liting2017 7 years ago
parent
commit
f880aeeb34

+ 4 - 61
js/component/manageCenter/set/userManagementS/addjurisdiction.jsx

@@ -130,71 +130,14 @@ const Addjurisdiction = Form.create()(React.createClass({
                     };
                     };
                     thisData = {};
                     thisData = {};
                 }; 
                 }; 
-                let Times = new Date(thisData.createTime);
-                let upTimes = new Date(thisData.updateTime);
-                let createY=Times.getFullYear();
-                let createH=Times.getHours();
-                let createF=Times.getMinutes();
-                let createS=Times.getSeconds();
-                let createM,createD;
-                if(createM<10){
-                	createM='0'+Times.getMonth()
-                }else{
-                	createM=Times.getMonth();
-                };
-                if(createD<10){
-                	createD='0'+Times.getDate()
-                }else{
-                	createD=Times.getDate();
-                };
-                //秒、分处理
-                if(createS<10){
-                	createS='0'+Times.getSeconds()
-                }else{
-                	createS=Times.getSeconds();
-                };
-                if(createF<10){
-                	createF='0'+Times.getMinutes()
-                }else{
-                	createF=Times.getMinutes();
-                };
-                let createTimes=createY+'-'+createM+'-'+createD+' '+createH+':'+createF+':'+createS;
-                //更新时间
-                let updateY=upTimes.getFullYear();
-                let updateH=upTimes.getHours();
-                let updateF=upTimes.getMinutes();
-                let updateS=upTimes.getSeconds();
-                let updateM,updateD;
-                if(updateM<10){
-                	updateM='0'+upTimes.getMonth()
-                }else{
-                	updateM=upTimes.getMonth();
-                };
-                if(updateD<10){
-                	updateD='0'+upTimes.getDate()
-                }else{
-                	updateD=upTimes.getDate();
-                };
-                //m秒。分处理
-                if(updateS<10){
-                	updateS='0'+upTimes.getSeconds()
-                }else{
-                	updateS=upTimes.getSeconds();
-                };
-                if(updateF<10){
-                	updateF='0'+upTimes.getMinutes()
-                }else{
-                	updateF=upTimes.getMinutes();
-                };
-                let updateTimes=updateY+'-'+updateM+'-'+updateD+' '+updateH+':'+updateF+':'+updateS;
                 this.setState({
                 this.setState({
                 	ids:thisData.id,
                 	ids:thisData.id,
                 	name:thisData.name, //接口名称
                 	name:thisData.name, //接口名称
 					url:thisData.url,//接口路径
 					url:thisData.url,//接口路径
 					preModule:thisData.preModule,//接口上级模板功能
 					preModule:thisData.preModule,//接口上级模板功能
                 	createId:thisData.createId,
                 	createId:thisData.createId,
-                	createTime:createTimes,
-                	updateTime:updateTimes,
+                	createTime:(new Date(thisData.createTime)).toLocaleString(),
+                	updateTime:(new Date(thisData.updateTime)).toLocaleString(),
                 	autNo:thisData.autNo,
                 	autNo:thisData.autNo,
                 	auto:thisData.superId,
                 	auto:thisData.superId,
                 });                  
                 });                  
@@ -310,8 +253,8 @@ const Addjurisdiction = Form.create()(React.createClass({
 					                           <span>{this.state.updateTime}</span>
 					                           <span>{this.state.updateTime}</span>
 					                    </FormItem>
 					                    </FormItem>
 				                    </div>	
 				                    </div>	
-			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-			                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+			                    <FormItem className="half-middle">
+			                        <Button className="set-submit" type="primary" htmlType="submit" style={{marginLeft:'150px'}}>保存</Button>  
 			                        <Button className="set-submit" type="ghost" onClick={this.handleCancel}>取消</Button>
 			                        <Button className="set-submit" type="ghost" onClick={this.handleCancel}>取消</Button>
 			                    </FormItem> 
 			                    </FormItem> 
 			                </Spin>
 			                </Spin>

+ 1 - 42
js/component/manageCenter/set/userManagementS/newRole.jsx

@@ -3,49 +3,8 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Tree} f
 import ajax from 'jquery/src/ajax/xhr.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 import './userMangagement.less';
 import './userMangagement.less';
-import {} from '../../../dataDic.js';
 const TreeNodet = Tree.TreeNode;
 const TreeNodet = Tree.TreeNode;
 
 
-const treeData = [
-   {
-	title: '0-0',
-	key: '0-0',
-	children: [
-			{
-				title: '0-0-0',
-				key: '0-0-0',
-				children: [
-					{ title: '0-0-0-0', key: '0-0-0-0' },
-					{ title: '0-0-0-1', key: '0-0-0-1' },
-					{ title: '0-0-0-2', key: '0-0-0-2' },
-					],
-			}, 
-			{
-			title: '0-0-1',
-			key: '0-0-1',
-			children: [
-				{ title: '0-0-1-0', key: '0-0-1-0' },
-				{ title: '0-0-1-1', key: '0-0-1-1' },
-				{ title: '0-0-1-2', key: '0-0-1-2' },
-			],
-		}, {
-			title: '0-0-2',
-			key: '0-0-2',
-		}],
-	},
-	{
-	title: '0-1',
-	key: '0-1',
-	children: [
-		{ title: '0-1-0-0', key: '0-1-0-0' },
-		{ title: '0-1-0-1', key: '0-1-0-1' },
-		{ title: '0-1-0-2', key: '0-1-0-2' },
-	],
-}, {
-	title: '0-2',
-	key: '0-2',
-}];
-
 const Newrole = Form.create()(React.createClass({
 const Newrole = Form.create()(React.createClass({
 	addloadData() {
 	addloadData() {
 		this.setState({
 		this.setState({
@@ -182,7 +141,7 @@ const Newrole = Form.create()(React.createClass({
 			}
 			}
 		}else{
 		}else{
 			this.setState({
 			this.setState({
-				selectedRowKeyst: [],
+				checkedKeys: [],
 				datauser: {},
 				datauser: {},
 				roleName:''
 				roleName:''
 			})
 			})

+ 2 - 7
js/component/manageCenter/set/userManagementS/roles.jsx

@@ -25,24 +25,19 @@ const Roles=Form.create()(React.createClass({
             },
             },
             success: function (data) {
             success: function (data) {
                 let theArr = [];
                 let theArr = [];
-                if (!data.data.list) {
+                if (!data.data) {
                     if (data.error && data.error.length) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
                         message.warning(data.error[0].message);
                     };
                     };
                 } else {
                 } else {
                     for (let i = 0; i < data.data.list.length; i++) {
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
                         let thisdata = data.data.list[i];
-//                      let idLists=[];
-//                      thisdata.permissions.map(function(itt){
-//							idLists.push(itt.id)
-//						});
                         theArr.push({
                         theArr.push({
                              key: i,
                              key: i,
 	                         id: thisdata.id,
 	                         id: thisdata.id,
 	                         roleName: thisdata.roleName,
 	                         roleName: thisdata.roleName,
 	                         creater:thisdata.creater,
 	                         creater:thisdata.creater,
-	                         createTime:thisdata.createTime,
-	                        // selectedRowKeyst:idLists
+	                         createTime:thisdata.createTimez,
                         });
                         });
                     };
                     };
                     this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.current = data.data.pageNo;