liting2017 7 年之前
父节点
当前提交
f08a15e6b2

+ 32 - 4
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -1,10 +1,10 @@
 import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete,DatePicker} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {orderType} from '../../../../dataDic.js';  
-import {splitUrl,getOrderType,getOrderStage,getOrderState,getTransactionProject,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
+import {splitUrl,getOrderType,getOrderStage,getProjectState,getOrderState,getTransactionProject,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
 const Option = AutoComplete.Option;
 //图片组件
 const PicturesWall = React.createClass({
@@ -430,7 +430,8 @@ const NewService = Form.create()(React.createClass({
     signBitt(){
 		this.setState({
 			contractNo:this.state.contractNo,
-			signVisible:true
+			signVisible:true,
+			entryTime:undefined
 		})
     },
     signBittOk(){
@@ -585,6 +586,13 @@ const NewService = Form.create()(React.createClass({
 	temporary(){
 		this.temporarySave(true)
 	},
+		//签单时间选择
+    selTime(e,index){
+    	this.setState({
+    		entryTime:e,
+    		selTime:index
+    	})
+    },
 	signSub(e){
 		e.preventDefault();
 		this.setState({
@@ -601,7 +609,8 @@ const NewService = Form.create()(React.createClass({
 				signFirstPayment:this.state.signFirstPayment,
 				approval:this.state.approval,
 				orderRemarks:this.state.orderRemarks,
-				contractNo:this.state.contractNo
+				contractNo:this.state.contractNo,
+				signTime:this.state.selTime
 			}
 		}).done(function(data) {
 			this.setState({
@@ -947,6 +956,11 @@ const NewService = Form.create()(React.createClass({
 							                            label="立项时间" >  
 							                            <span>{orderDetaiel.setUpTime}</span>
 						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="项目状态" >  
+							                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
+						                    		</FormItem>
 					                    		</div>
 					                    		<div>
 								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
@@ -1208,6 +1222,20 @@ const NewService = Form.create()(React.createClass({
 					                    		<span className="mandatory">*</span>
 						                </FormItem>
 				                    </div>
+				                    <div className="clearfix">
+				                    	<FormItem 
+				                            {...formItemLayout}
+				                            label="签单时间" >   
+				                            <DatePicker
+				                              style={{marginTop:"2px"}}
+										      showTime
+										      format="YYYY-MM-DD"
+										      placeholder="选择签单时间"
+										      value={this.state.entryTime}
+										      onChange={(e,time)=>{this.selTime(e,time)}}
+										    />
+			                    		</FormItem>
+			                    	</div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
 			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>  
 			                        <Button className="submitSave" type="ghost" onClick={this.signBittOk}>返回</Button>

+ 6 - 1
js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx

@@ -42,7 +42,7 @@ const ServiceManage=Form.create()(React.createClass({
 				orderStatus:this.state.orderStatusSearch,
 				orderChannel:this.state.orderChannel,
 				intention:this.state.intentOrder?1:0,
-				formal:this.state.formalOrder?1:0
+				formal:this.state.formalOrder?1:0,
             },
             success: function (data) {
                 let theArr = [];
@@ -72,6 +72,7 @@ const ServiceManage=Form.create()(React.createClass({
 	                         salesmanName:thisdata.salesmanName,
 	                         financeName:thisdata.financeName,
 	                         technicianName:thisdata.technicianName,
+	                         signTime:thisdata.signTime
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -180,6 +181,10 @@ const ServiceManage=Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 },{
+                    title: '签单时间',
+                    dataIndex: 'signTime',
+                    key: 'signTime'
+                },{
                     title: '订单客户',
                     dataIndex: 'buyerName',
                     key: 'buyerName',

+ 6 - 1
js/component/manageCenter/order/flowSettlement/billManage/myBillDetaile.jsx

@@ -4,7 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {} from '../../../../dataDic.js';
-import {getOrderType ,getOrderChannel , getOrderState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
+import {getOrderType ,getOrderChannel , getOrderState ,getProjectState,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
 
 
 const MyBillDetaile = Form.create()(React.createClass({
@@ -438,6 +438,11 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            label="立项时间" >  
 				                            <span>{seeOrderDetaiel.setUpTime}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(seeOrderDetaiel.projectStage)}</span>
+						                </FormItem>
 		                    		</div>
 		                        </div>
 			                </Spin>

+ 6 - 1
js/component/manageCenter/order/flowSettlement/billManagement/myBillDetaile.jsx

@@ -3,7 +3,7 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
-import {getOrderType ,getOrderChannel , getOrderState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
+import {getOrderType ,getOrderChannel , getOrderState, getProjectState,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
 import moment from 'moment';
 
 const MyBillDetaile = Form.create()(React.createClass({
@@ -437,6 +437,11 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            label="立项时间" >  
 				                            <span>{seeOrderDetaiel.setUpTime}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(seeOrderDetaiel.projectStage)}</span>
+						                </FormItem>
 		                    		</div>
 		                        </div>
 			                </Spin>

+ 6 - 1
js/component/manageCenter/order/flowSettlement/billQuery/myBillDetaile.jsx

@@ -4,7 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {} from '../../../../dataDic.js';
-import {getOrderType ,getOrderChannel , getOrderState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
+import {getOrderType ,getOrderChannel , getOrderState,getProjectState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
 
 
 const MyBillDetaile = Form.create()(React.createClass({
@@ -438,6 +438,11 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            label="立项时间" >  
 				                            <span>{seeOrderDetaiel.setUpTime}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(seeOrderDetaiel.projectStage)}</span>
+						                </FormItem>
 		                    		</div>
 		                        </div>
 			                </Spin>

+ 6 - 1
js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx

@@ -4,7 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {} from '../../../../dataDic.js';
-import {getOrderType ,getOrderChannel , getOrderState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
+import {getOrderType ,getOrderChannel , getOrderState ,getProjectState,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
 import moment from 'moment';
 
 const MyBillDetaile = Form.create()(React.createClass({
@@ -441,6 +441,11 @@ const MyBillDetaile = Form.create()(React.createClass({
 				                            label="立项时间" >  
 				                            <span>{seeOrderDetaiel.setUpTime}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(seeOrderDetaiel.projectStage)}</span>
+						                </FormItem>
 		                    		</div>
 		                        </div>
 			                </Spin>

+ 32 - 9
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -1,10 +1,10 @@
 import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete,DatePicker} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {orderType} from '../../../../dataDic.js';  
-import {splitUrl,getOrderType,getOrderStage,getOrderState,getTransactionProject,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
+import {splitUrl,getOrderType,getOrderStage,getProjectState,getOrderState,getTransactionProject,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
 const Option = AutoComplete.Option;
 //图片组件
 const PicturesWall = React.createClass({
@@ -457,13 +457,9 @@ const NewService = Form.create()(React.createClass({
     signBitt(){
     	this.setState({
 			contractNo:this.state.contractNo,
-			signVisible:true
+			signVisible:true,
+			entryTime:undefined
     	})
-//  	if(this.state.contractNo){
-//  		
-//  	}else{
-//  		message.warning("请输入合同编号!")
-//  	}
     },
     signBittOk(){
     	this.setState({
@@ -679,6 +675,13 @@ const NewService = Form.create()(React.createClass({
 	temporary(){
 		this.temporarySave(true)
 	},
+	//签单时间选择
+    selTime(e,index){
+    	this.setState({
+    		entryTime:e,
+    		selTime:index
+    	})
+    },
 	signSub(e){
 		e.preventDefault();
 		this.setState({
@@ -695,7 +698,8 @@ const NewService = Form.create()(React.createClass({
 				signFirstPayment:this.state.signFirstPayment,
 				approval:this.state.approval,
 				orderRemarks:this.state.orderRemarks,
-				contractNo:this.state.contractNo
+				contractNo:this.state.contractNo,
+				signTime:this.state.selTime
 			}
 		}).done(function(data) {
 			this.setState({
@@ -1230,6 +1234,11 @@ const NewService = Form.create()(React.createClass({
 							                            label="立项时间" >  
 							                            <span>{orderDetaiel.setUpTime}</span>
 						                    		</FormItem>
+						                    		<FormItem className="half-item"
+							                            {...formItemLayout}
+							                            label="项目状态" >  
+							                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
+						                    		</FormItem>
 					                    		</div>
 					                    		<div>
 								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
@@ -1509,6 +1518,20 @@ const NewService = Form.create()(React.createClass({
 					                    		<span className="mandatory">*</span>
 						                </FormItem>
 				                    </div>
+				                    <div className="clearfix">
+				                    	<FormItem 
+				                            {...formItemLayout}
+				                            label="签单时间" >   
+				                            <DatePicker
+				                              style={{marginTop:"2px"}}
+										      showTime
+										      format="YYYY-MM-DD"
+										      placeholder="选择签单时间"
+										      value={this.state.entryTime}
+										      onChange={(e,time)=>{this.selTime(e,time)}}
+										    />
+			                    		</FormItem>
+			                    	</div>	
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
 			                        <Button className="submitSave" type="primary" htmlType="submit">确定签单</Button>  
 			                        <Button className="submitSave" type="ghost" onClick={this.signBittOk}>返回</Button>

+ 6 - 1
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -31,7 +31,7 @@ const MyService=Form.create()(React.createClass({
 				orderStatus:this.state.orderStatusSearch,
 				orderChannel:this.state.orderChannelSearch,
 				intention:this.state.intentOrder?1:0,
-				formal:this.state.formalOrder?1:0
+				formal:this.state.formalOrder?1:0,
             },
             success: function (data) {
                 let theArr = [];
@@ -57,6 +57,7 @@ const MyService=Form.create()(React.createClass({
 	                         orderChannel:thisdata.orderChannel,
 	                         salesmanName:thisdata.salesmanName,
 	                         active:thisdata.active,
+	                         signTime:thisdata.signTime
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -118,6 +119,10 @@ const MyService=Form.create()(React.createClass({
                     dataIndex: 'createTime',
                     key: 'createTime'
                 },{
+                    title: '签单时间',
+                    dataIndex: 'signTime',
+                    key: 'signTime'
+                },{
                     title: '订单客户',
                     dataIndex: 'buyerName',
                     key: 'buyerName'

+ 6 - 1
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx

@@ -3,7 +3,7 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionChannel ,getTransactionProject } from '../../../../tools.js';
+import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionChannel ,getTransactionProject } from '../../../../tools.js';
 
 //图片组件
 const PicturesWall = React.createClass({
@@ -481,6 +481,11 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 				                            label="立项时间" >  
 				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
+			                    		</FormItem>
 		                    		</div>
 					                <div>
 					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>业务项目</span>

+ 6 - 1
js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx

@@ -3,7 +3,7 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
+import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
 
 const ApproveDetaile = Form.create()(React.createClass({
 	loadData(record) {
@@ -428,6 +428,11 @@ const ApproveDetaile = Form.create()(React.createClass({
 				                            label="立项时间" >  
 				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
+			                    		</FormItem>
 		                    		</div>
 					                <div>
 					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>业务项目</span>

+ 6 - 1
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx

@@ -3,7 +3,7 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
+import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
 
 const MySettlementDetaile = Form.create()(React.createClass({
 	loadData(record) {
@@ -433,6 +433,11 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                            label="立项时间" >  
 				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
+			                    		</FormItem>
 		                    		</div>
 					                <div>
 					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>

+ 6 - 1
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -3,7 +3,7 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
+import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
 
 const ManagementDetaile = Form.create()(React.createClass({
 	loadData(record) {
@@ -428,6 +428,11 @@ const ManagementDetaile = Form.create()(React.createClass({
 				                            label="立项时间" >  
 				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
+			                    		</FormItem>
 		                    		</div>
 					                <div>
 					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>

+ 6 - 1
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx

@@ -3,7 +3,7 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
+import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
 
 const MySettlementDetaile = Form.create()(React.createClass({
 	loadData(record) {
@@ -428,6 +428,11 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                            label="立项时间" >  
 				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目状态" >  
+				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
+			                    		</FormItem>
 		                    		</div>
 					                <div>
 					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>业务项目</span>

+ 9 - 8
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -90,10 +90,12 @@ const Newuser = Form.create()(React.createClass({
         	message.warning('请选择角色状态');
         	return false;
         };
-        if(!this.state.departmentId){
-        	message.warning('请选择组织部门');
-        	return false;
-        };
+        if(window.adminData.isSuperAdmin){
+        	if(!this.state.departmentId){
+	        	message.warning('请选择组织部门');
+	        	return false;
+        	};
+        }
         if(!this.state.theTypes&&!this.state.superiorId){
         	message.warning('请输入正确的上级主管');
         	return false;
@@ -126,7 +128,7 @@ const Newuser = Form.create()(React.createClass({
 	                mobile:this.state.mobile,
 					status:this.state.status,
 					name:this.state.name,
-					departmentId:this.state.departmentId,
+					departmentId:window.adminData.isSuperAdmin?this.state.departmentId:window.adminData.departmentId,
 					duty:this.state.duty,
 					position:this.state.position,//岗位
 					email:this.state.email,
@@ -432,7 +434,7 @@ const Newuser = Form.create()(React.createClass({
 										      onChange={(e,time)=>{this.selTime(e,time)}}
 										    />
 			                    		</FormItem>*/}
-					                    <FormItem className="half-item"
+					                    {window.adminData.isSuperAdmin?<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="组织部门" >   
 				                                    <Select placeholder="选择组织部门"
@@ -446,8 +448,7 @@ const Newuser = Form.create()(React.createClass({
 							                            }
 							                        </Select>
 				                                    <span className="mandatory">*</span>
-					                    </FormItem>
-					                    
+					                    </FormItem>:''}
 					                    <FormItem className="half-item" 
 					                          {...formItemLayout}
 					                           label="职务"

+ 5 - 3
js/component/manageCenter/set/userManagementS/user.jsx

@@ -15,6 +15,8 @@ const User = Form.create()(React.createClass({
 			userDetaile:false,
 			loading: true
 		});
+		var admin=window.adminData.isSuperAdmin||'';
+		var departmentId=window.adminData.departmentId||'';
 		$.ajax({
 			method: "get",
 			dataType: "json",
@@ -24,7 +26,7 @@ const User = Form.create()(React.createClass({
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
 				name: this.state.userNameSearch,
-				departmentId: this.state.organizationSearch,
+				departmentId: admin?this.state.organizationSearch:departmentId,
 				rid: this.state.rolesSearch,
 				duty: this.state.postSearch,
 				position: this.state.stationSearch,
@@ -545,7 +547,7 @@ const User = Form.create()(React.createClass({
 	                    <Input placeholder="用户姓名" style={{width:'150px'}}
 	                        value={this.state.userNameSearch}
 	                        onChange={(e) => { this.setState({ userNameSearch: e.target.value }); }} />
-	                    <Select placeholder="部门"
+	                    {window.adminData.isSuperAdmin?<Select placeholder="部门"
                             style={{ width: 160 }}
                             value={this.state.organizationSearch}
                             onChange={(e) => { this.setState({ organizationSearch: e }) }}>
@@ -554,7 +556,7 @@ const User = Form.create()(React.createClass({
                                         return <Select.Option key={item.id} >{item.name}</Select.Option>
                                 })
                             }
-                        </Select>
+                        </Select>:''}
                         <Select placeholder="角色"
                             style={{ width: 160 }}
                             value={this.state.rolesSearch}