| 
					
				 | 
			
			
				@@ -1,6 +1,6 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import React from 'react'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { Tag, Modal, Input, Spin, Switch, Select, message, Popconfirm, Button, Cascader, Icon } from 'antd'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import { provinceSelect, provinceList, getProvince } from '../../../NewDicProvinceList.js'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import { provinceSelect, provinceList, getProvince ,citySelect} from '../../../NewDicProvinceList.js'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { companySearch } from '../../../tools.js'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import ajax from 'jquery/src/ajax/xhr.js'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import $ from 'jquery/src/ajax'; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -148,7 +148,9 @@ const TheModal = React.createClass({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					'email': this.state.email, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					'mobile': this.state.mobile, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					'position': this.state.position, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-					'locations': theArr, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					//'locations': theArr, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					'province':this.state.addressSearch.length?this.state.addressSearch[0]:'', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					'city':this.state.addressSearch.length?this.state.addressSearch[1]:'', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					'departmentId':departmentIds, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					'superiorId': this.state.superiorId 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				}), 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -344,6 +346,10 @@ const TheModal = React.createClass({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				this.loadLocations(nextProps.data.id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		let proCity=[]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		let province=nextProps.data ? parseInt(nextProps.data.province) : ''; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		let city = nextProps.data ? parseInt(nextProps.data.city) : ''; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		proCity.push(province,city); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		let nextState = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			visible: nextProps.show, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			id: nextProps.data ? nextProps.data.id : '', 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -351,6 +357,8 @@ const TheModal = React.createClass({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			email: nextProps.data ? nextProps.data.email : '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			mobile: nextProps.data ? nextProps.data.mobile : '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			position: nextProps.data ? nextProps.data.position : '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			addressSearch:proCity, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			addressProvince:nextProps.data ? nextProps.data.province : '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			department: nextProps.data ? nextProps.data.departmentName : '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			departmentId:nextProps.data ? nextProps.data.departmentId : '', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			superiorId: nextProps.data ? nextProps.data.superiorId : '', 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -440,7 +448,8 @@ const TheModal = React.createClass({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     onOk={this.postData} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     onCancel={this.handleCancel} > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     <Spin spinning={this.state.loading} > 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        {this.state.theSwitch ? <div className="modal-box"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        {this.state.theSwitch ?  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        	<div className="modal-box"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             <ul className="modal-content clearfix"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 <li className="list"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     <span className='modal-text'>名字</span> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -496,7 +505,7 @@ const TheModal = React.createClass({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             </ul> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             <div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 <span className='modal-text' style={{ verticalAlign: 'top' }}>地区</span> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                {window.showPermissionList && window.showRoleList ? <div style={{ display: 'inline-block', width: '88%' }}> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                              {/*  {window.showPermissionList && window.showRoleList ? <div style={{ display: 'inline-block', width: '88%' }}> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                     {this.state.locations.map((item, i) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                         return <ProvinceAdd 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             provinceList={this.state.provinceList} 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -516,7 +525,11 @@ const TheModal = React.createClass({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                 return getProvince(c) + ' ' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             }) : '')}</Tag> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                         })} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    </div>} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    </div>}*/} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                                
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				                <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			    				   onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			                    
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         </div> : <div className="modal-box"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 <ul className="modal-content clearfix"> 
			 |