dengzhiguo 6 years ago
parent
commit
08c45288dc

+ 61 - 0
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -91,6 +91,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				specially: 3,//审核列表
 				name: this.state.customerName,//名称
 				orderNo: this.state.orderNo,//订单编号
+				depId: this.state.departmenttSearch,//订单部门
 				starTime: this.state.releaseDate[0],//开始时间
 				endTime: this.state.releaseDate[1],//结束时间
 			},
@@ -117,6 +118,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                         salesmanName:thisdata.salesmanName,//营销员名称
 	                         financeName:thisdata.financeName,//财务名称
 	                         createDate:thisdata.createDate,//下单时间
+	                         depName:thisdata.depName,//部门名称
 						});
 					};
 				    this.state.pagination.total = data.data.totalCount;
@@ -143,6 +145,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			releaseDate: [],
 			selectedRowKeys: [],
 			orgCodeUrl:[],
+			departmentArr: [],
 			paginations:false,
 			pagination: {
 				defaultCurrent: 1,
@@ -203,6 +206,10 @@ const IntentionCustomer = Form.create()(React.createClass({
                     title: '财务负责人',
                     dataIndex: 'financeName',
                     key: 'financeName'
+                },{
+                    title: '订单部门',
+                    dataIndex: 'depName',
+                    key: 'depName'
                 }
 			],
 			data: [],
@@ -270,6 +277,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	},
 	//页面加载函数
 	componentWillMount() {
+		this.departmentList();
 		this.loadData();
 	},
 	//整行点击
@@ -529,6 +537,7 @@ const IntentionCustomer = Form.create()(React.createClass({
     	})
     	this.state.orderNo='';
     	this.state.customerName='';
+    	this.state.departmenttSearch=undefined;
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
 		this.state.approval= undefined;
@@ -537,6 +546,7 @@ const IntentionCustomer = Form.create()(React.createClass({
     resets(){
     	this.state.orderNo='';
     	this.state.customerName='';
+    	this.state.departmenttSearch=undefined;
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
     },
@@ -556,6 +566,46 @@ const IntentionCustomer = Form.create()(React.createClass({
 		})
 		this.resets();
 	},
+	 //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
 	render() {
 		const formItemLayout = {
 			labelCol: { span: 8 },
@@ -579,6 +629,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				})
 			},
 		};
+		let departmentArr = this.state.departmentArr || [];
 		const hasSelected = this.state.selectedRowKeys.length > 0;
 		return(
 			<div className="user-content">
@@ -592,6 +643,16 @@ const IntentionCustomer = Form.create()(React.createClass({
                     <Input placeholder="订单编号" style={{width:'150px'}}
                         value={this.state.orderNo}
                         onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
+                    <Select placeholder="选择部门"
+                        style={{ width: 150 ,marginRight:'10px'}}
+                        value={this.state.departmenttSearch}
+                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+               		 </Select>
                     <span style={{marginRight:"10px"}}>合同签订时间 :</span>
                     <RangePicker
 	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,

+ 46 - 3
js/component/manageCenter/order/orderNew/billing.jsx

@@ -26,6 +26,7 @@ const MyService=Form.create()(React.createClass({
                 specially:0,
                 name:this.state.customerName,
                 orderNo:this.state.orderNo,
+                depId: this.state.departmenttSearch,
                 starTime: this.state.releaseDate[0],
 				endTime: this.state.releaseDate[1],
             },
@@ -52,6 +53,7 @@ const MyService=Form.create()(React.createClass({
 	                         financeName:thisdata.financeName,//财务名称
 	                         createDate:thisdata.createDate,//下单时间
 	                         orderStatus:thisdata.orderStatus,//订单状态
+	                         depName:thisdata.depName,//部门名称
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -79,6 +81,7 @@ const MyService=Form.create()(React.createClass({
         	datauser:{},
             selectedRowKeys: [],
             releaseDate: [],
+            departmentArr: [],
             signBillState:false,
             signBillVisible:false,
             selectedRows: [],
@@ -284,6 +287,7 @@ const MyService=Form.create()(React.createClass({
     	})
     },
     componentWillMount() {
+    	this.departmentList();
         this.loadData();
         let data=localStorage.getItem('newData');
     	if(data!='{}'&&data){
@@ -362,17 +366,55 @@ const MyService=Form.create()(React.createClass({
     	})
     	this.state.orderNo='';
     	this.state.customerName='';
+    	this.state.departmenttSearch=undefined;
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
 		this.state.projectProgress = undefined;
-		this.state.settlementState = undefined;
-		this.state.orderStatusSearch = undefined;
-		this.state.orderChannelSearch = undefined;
 		this.state.approval= undefined;
 		this.state.formalOrder=true;
 		this.state.intentOrder=true;
         this.loadData();       
     },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
     render() {
     	const FormItem = Form.Item;
     	const formItemLayout = {
@@ -395,6 +437,7 @@ const MyService=Form.create()(React.createClass({
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
+        let departmentArr = this.state.departmentArr || [];
         return (
             <div className="user-content" >
                 <div className="content-title">

+ 69 - 1
js/component/manageCenter/order/orderNew/press.jsx

@@ -90,6 +90,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 				pageSize: this.state.pagination.pageSize,
 				name: this.state.customerName,//名称
 				orderNo: this.state.orderNo,//订单编号
+				depId: this.state.departmenttSearch,//订单部门
+				adminName:this.state.adminName,//责任人名称
 				starTime: this.state.releaseDate[0],//开始时间
 				endTime: this.state.releaseDate[1],//结束时间
 			},
@@ -118,6 +120,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                         salesmanName:thisdata.salesmanName,//营销员名称
 	                         dunSubject:thisdata.dunSubject,//催收科目
 	                         startDate:thisdata.startDate,//催收启动时间
+	                         depName:thisdata.depName,//部门名称
 	                        
 						});
 					};
@@ -186,6 +189,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			releaseDate: [],
 			selectedRowKeys: [],
 			orgCodeUrl:[],
+			departmentArr: [],
 			paginations:false,
 			pagination: {
 				defaultCurrent: 1,
@@ -251,6 +255,10 @@ const IntentionCustomer = Form.create()(React.createClass({
                     dataIndex: 'salesmanName',
                     key: 'salesmanName'
                 },{
+                    title: '订单部门',
+                    dataIndex: 'depName',
+                    key: 'depName'
+                },{
                     title: '催收科目',
                     dataIndex: 'dunSubject',
                     key: 'dunSubject',
@@ -295,6 +303,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	
 	//页面加载函数
 	componentWillMount() {
+		this.departmentList();
 		this.loadData();
 	},
 	//进入新增拜访记录
@@ -369,6 +378,8 @@ const IntentionCustomer = Form.create()(React.createClass({
     	})
     	this.state.orderNo='';
     	this.state.customerName='';
+    	this.state.adminName='';
+    	this.state.departmenttSearch=undefined;
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
         this.loadData();       
@@ -376,6 +387,8 @@ const IntentionCustomer = Form.create()(React.createClass({
     resets(){
     	this.state.orderNo='';
     	this.state.customerName='';
+    	this.state.adminName='';
+    	this.state.departmenttSearch=undefined;
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
     },
@@ -405,7 +418,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 	//导出
     exportExec(){
         var data = {
-            name: this.state.customerName?this.state.customerName:undefined,//订单负责人
+            name: this.state.customerName?this.state.customerName:undefined,//客户名称
+            adminName:this.state.adminName?this.state.adminName:undefined,//订单负责人
             orderNo: this.state.orderNo?this.state.orderNo:undefined,//订单编号
             startTime: this.state.releaseDate[0]?this.state.releaseDate[0]:undefined,
             endTime: this.state.releaseDate[1]?this.state.releaseDate[1]:undefined,
@@ -418,6 +432,46 @@ const IntentionCustomer = Form.create()(React.createClass({
 		})
 		this.resets();
 	},
+	 //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
 	render() {
 		const formItemLayout = {
 			labelCol: { span: 8 },
@@ -441,6 +495,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				})
 			},
 		};
+		let departmentArr = this.state.departmentArr || [];
 		const hasSelected = this.state.selectedRowKeys.length > 0;
 		return(
 			<div className="user-content">
@@ -452,9 +507,22 @@ const IntentionCustomer = Form.create()(React.createClass({
                    <Input placeholder="客户名称" style={{width:'150px',marginBottom:'10px'}}
 	                        value={this.state.customerName}
 	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+                    <Input placeholder="营销员名称" style={{width:'150px',marginBottom:'10px'}}
+	                        value={this.state.adminName}
+	                        onChange={(e) => { this.setState({ adminName: e.target.value }); }} />
                     <Input placeholder="订单编号" style={{width:'150px'}}
                         value={this.state.orderNo}
                         onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
+                    <Select placeholder="选择部门"
+                        style={{ width: 150 ,marginRight:'10px'}}
+                        value={this.state.departmenttSearch}
+                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+               		 </Select>  
                     <span style={{marginRight:"10px"}}>合同签订时间 :</span>
                     <RangePicker
 	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,

+ 63 - 2
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -26,6 +26,7 @@ const PaiDan = React.createClass({
 				specially: 4,//咨询师管理列表
 				distribution:this.state.distribution,//全部列表
 				name: this.state.customerName,//名称
+				depId: this.state.departmenttSearch,//订单部门
 				orderNo: this.state.orderNoSearch,//订单编号
 				starTime: this.state.releaseDate[0],//开始时间
 				endTime: this.state.releaseDate[1],//结束时间
@@ -54,6 +55,7 @@ const PaiDan = React.createClass({
 	                         consultantName:thisdata.consultantName,//项目负责人
 	                         createDate:thisdata.createDate,//下单时间
 	                         settlementAmount:thisdata.settlementAmount,//已交款项
+	                         depName:thisdata.depName,//部门名称
                         });
                     };
                 }
@@ -79,6 +81,7 @@ const PaiDan = React.createClass({
             searchMore: true,
             assignVisible:false,
             releaseDate: [],
+            departmentArr: [],
             boHuivisible:false,
             selectedRowKeys: [],
             selectedRows: [],
@@ -130,6 +133,10 @@ const PaiDan = React.createClass({
                     title: '订单负责人',
                     dataIndex: 'salesmanName',
                     key: 'salesmanName'
+                },{
+                    title: '订单部门',
+                    dataIndex: 'depName',
+                    key: 'depName'
                 },
                 {
                     title: '财务负责人',
@@ -228,6 +235,7 @@ const PaiDan = React.createClass({
     },
    
     componentWillMount() {
+    	this.departmentList();
         this.loadData();
     },
     tableRowClick(record, index) {
@@ -445,7 +453,8 @@ const PaiDan = React.createClass({
         this.state.nameSearch = '';
         this.state.customerName='';
         this.state.releaseDate = [];
-        this.state.orderNoSearch=''
+        this.state.orderNoSearch='';
+        this.state.departmenttSearch=undefined;
         this.state.distribution=undefined;
         this.loadData(this.state.page);
     },
@@ -470,9 +479,50 @@ const PaiDan = React.createClass({
 	resets(){
     	this.state.orderNo='';
     	this.state.customerName='';
+    	 this.state.departmenttSearch=undefined;
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
     },
+     //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
     render() { 
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -490,6 +540,7 @@ const PaiDan = React.createClass({
         const FormItem = Form.Item;
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
+        let departmentArr = this.state.departmentArr || [];
         return ( <div className="user-content">
             <div className="content-title">
                     <span>项目派单管理</span>
@@ -501,7 +552,17 @@ const PaiDan = React.createClass({
                     <Input placeholder="订单编号"
                         value={this.state.orderNoSearch}
                         onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-                    <Select 
+                    <Select placeholder="选择部门"
+                        style={{ width: 150 ,marginRight:'10px'}}
+                        value={this.state.departmenttSearch}
+                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+               		 </Select> 
+                    <Select
                         onChange={(e)=>{this.setState({distribution:e})}} 
                         style={{width:160,marginRight:5}} 
                         placeholder="分派状态"

+ 63 - 2
js/component/manageCenter/project/project/projectQuery.jsx

@@ -26,6 +26,7 @@ const PaiDan = React.createClass({
 				specially: 4,//咨询师管理列表
 				distribution:this.state.distribution,//全部列表
 				name: this.state.customerName,//名称
+				depId: this.state.departmenttSearch,//订单部门
 				orderNo: this.state.orderNoSearch,//订单编号
 				starTime: this.state.releaseDate[0],//开始时间
 				endTime: this.state.releaseDate[1],//结束时间
@@ -53,6 +54,7 @@ const PaiDan = React.createClass({
 	                         financeName:thisdata.financeName,//财务名称
 	                         consultantName:thisdata.consultantName,//项目负责人
 	                         createDate:thisdata.createDate,//下单时间
+	                         depName:thisdata.depName,//部门名称
                         });
                     };
                 }
@@ -141,6 +143,11 @@ const PaiDan = React.createClass({
                     key: 'consultantName'
                 },
                 {
+                    title: '订单部门',
+                    dataIndex: 'depName',
+                    key: 'depName'
+                },
+                {
                     title: '分派状态',
                     dataIndex: 'processStatus',
                     key: 'processStatus',
@@ -203,6 +210,7 @@ const PaiDan = React.createClass({
     },
    
     componentWillMount() {
+    	this.departmentList();
         this.loadData();
     },
     tableRowClick(record, index) {
@@ -331,7 +339,8 @@ const PaiDan = React.createClass({
         this.state.nameSearch = '';
         this.state.customerName='';
         this.state.releaseDate = [];
-        this.state.orderNoSearch=''
+        this.state.orderNoSearch='';
+        this.state.departmenttSearch=undefined;
         this.state.distribution=undefined;
         this.loadData(this.state.page);
     },
@@ -356,9 +365,50 @@ const PaiDan = React.createClass({
 	resets(){
     	this.state.orderNo='';
     	this.state.customerName='';
+    	this.state.departmenttSearch=undefined;
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
     },
+     //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
     render() { 
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -374,6 +424,7 @@ const PaiDan = React.createClass({
 			wrapperCol: { span: 14 },
 		};
         const FormItem = Form.Item;
+        let departmentArr = this.state.departmentArr || [];
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         return ( <div className="user-content">
@@ -387,7 +438,17 @@ const PaiDan = React.createClass({
                     <Input placeholder="订单编号"
                         value={this.state.orderNoSearch}
                         onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-                    <Select 
+                   	<Select placeholder="选择部门"
+                        style={{ width: 150 ,marginRight:'10px'}}
+                        value={this.state.departmenttSearch}
+                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+               		 </Select> 
+                   <Select
                         onChange={(e)=>{this.setState({distribution:e})}} 
                         style={{width:160,marginRight:5}} 
                         placeholder="分派状态"

+ 60 - 0
js/component/manageCenter/project/task/myTask.jsx

@@ -28,6 +28,7 @@ const Task = React.createClass({
                 pageSize: this.state.pagination.pageSize,
                 specially:0,//个人
                 name: this.state.nameSearch,//客户名称
+                depId: this.state.departmenttSearch,//订单部门
                 orderNo:this.state.orderNoSearch,//订单编号
                 taskId:this.state.taskNoSearch, //任务编号
                 taskStatus:this.state.taskStatus,//任务状态
@@ -53,6 +54,7 @@ const Task = React.createClass({
                             taskStatus:thisdata.taskStatus,//任务状态
                             taskDate:thisdata.taskDate,//分配时间
                             userName:thisdata.userName,//用户名
+                        	depName:thisdata.depName,//部门名称
                         });
                     };
                 }
@@ -81,6 +83,7 @@ const Task = React.createClass({
             roleName:'',
             boHuivisible:false,
             selectedRowKeys: [],
+             departmentArr: [],
             selectedRows: [],
             attachmentUrl:[],
             paginations:false,
@@ -137,6 +140,10 @@ const Task = React.createClass({
                     title: '分配时间',
                     dataIndex: 'taskDate',
                     key: 'taskDate'
+                },{
+                    title: '订单部门',
+                    dataIndex: 'depName',
+                    key: 'depName'
                 },
                 {
                     title:'操作',
@@ -218,6 +225,7 @@ const Task = React.createClass({
     },
    
     componentWillMount() {
+    	this.departmentList();
         this.loadData();
     },
     tableRowClick(record, index) {
@@ -523,6 +531,7 @@ const Task = React.createClass({
         this.state.orderNoSearch='';
         this.state.taskNoSearch='';
         this.state.distribution=undefined;
+        this.state.departmenttSearch=undefined;
         this.loadData(this.state.page);
     },
     searchSwitch() {
@@ -530,6 +539,46 @@ const Task = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
     render() { 
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -546,6 +595,7 @@ const Task = React.createClass({
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
+        let departmentArr = this.state.departmentArr || [];
         return ( <div className="user-content">
             <div className="content-title">
                     <span>任务派单管理</span>
@@ -560,6 +610,16 @@ const Task = React.createClass({
                     <Input placeholder="任务编号"
                         value={this.state.taskNoSearch}
                         onChange={(e) => { this.setState({ taskNoSearch: e.target.value }); }} />
+                     <Select placeholder="选择部门"
+                        style={{ width: 150 ,marginRight:'10px'}}
+                        value={this.state.departmenttSearch}
+                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+               		 </Select> 
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     {/* <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>

+ 60 - 0
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -28,6 +28,7 @@ const Task = React.createClass({
                 name: this.state.nameSearch,//客户名称
                 orderNo:this.state.orderNoSearch,//订单编号
                 taskId:this.state.taskId, //任务编号
+                depId: this.state.departmenttSearch,//订单部门
                 taskStatus:this.state.taskStatus,//任务状态
                 adminName:this.state.adminName,//任务受理人
             },
@@ -52,6 +53,7 @@ const Task = React.createClass({
                             taskDate:thisdata.taskDate,//分配时间
                             commodityQuantity:thisdata.commodityQuantity,//数量
                             userName:thisdata.userName,//用户名
+                        	depName:thisdata.depName,//部门名称
                         });
                     };
                 }
@@ -79,6 +81,7 @@ const Task = React.createClass({
             releaseDate: [],
             roleName:'',
             boHuivisible:false,
+            departmentArr: [],
             selectedRowKeys: [],
             selectedRows: [],
             paginations:false,
@@ -134,6 +137,10 @@ const Task = React.createClass({
                     title: '任务数量',
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
+                },{
+                    title: '订单部门',
+                    dataIndex: 'depName',
+                    key: 'depName'
                 },
                 {
                     title:'操作',
@@ -204,6 +211,7 @@ const Task = React.createClass({
     },
    
     componentWillMount() {
+    	this.departmentList();
         this.loadData();
     },
     tableRowClick(record, index) {
@@ -345,6 +353,7 @@ const Task = React.createClass({
         this.state.releaseDate = [];
         this.state.orderNoSearch='';
         this.state.taskNoSearch='';
+        this.state.departmenttSearch=undefined;
         this.state.distribution=undefined;
         this.loadData(this.state.page);
     },
@@ -353,6 +362,46 @@ const Task = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
     render() { 
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -369,6 +418,7 @@ const Task = React.createClass({
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
+        let departmentArr = this.state.departmentArr || [];
         return ( <div className="user-content">
             <div className="content-title">
                     <span>任务派单</span>
@@ -383,6 +433,16 @@ const Task = React.createClass({
                     <Input placeholder="任务编号"
                         value={this.state.taskNoSearch}
                         onChange={(e) => { this.setState({ taskNoSearch: e.target.value }); }} />
+                    <Select placeholder="选择部门"
+                        style={{ width: 150 ,marginRight:'10px'}}
+                        value={this.state.departmenttSearch}
+                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+               		 </Select> 
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     {/* <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>

+ 60 - 1
js/component/manageCenter/project/task/taskQuery.jsx

@@ -27,6 +27,7 @@ const Task = React.createClass({
                 specially:1,//经理
                 name: this.state.nameSearch,//客户名称
                 orderNo:this.state.orderNoSearch,//订单编号
+                depId: this.state.departmenttSearch,//订单部门
                 taskId:this.state.taskId, //任务编号
                 taskStatus:this.state.taskStatus,//任务状态
                 adminName:this.state.adminName,//任务受理人
@@ -52,6 +53,7 @@ const Task = React.createClass({
                             taskDate:thisdata.taskDate,//分配时间
                             commodityQuantity:thisdata.commodityQuantity,//数量
                             userName:thisdata.userName,//用户名
+                            depName:thisdata.depName,//部门名称
                         });
                     };
                 }
@@ -78,6 +80,7 @@ const Task = React.createClass({
             assignVisible:false,
             releaseDate: [],
             roleName:'',
+            departmentArr: [],
             boHuivisible:false,
             selectedRowKeys: [],
             selectedRows: [],
@@ -140,6 +143,10 @@ const Task = React.createClass({
                     title: '任务数量',
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
+                },{
+                    title: '订单部门',
+                    dataIndex: 'depName',
+                    key: 'depName'
                 }
             ],
             dataSource: [],
@@ -199,6 +206,7 @@ const Task = React.createClass({
     },
    
     componentWillMount() {
+    	this.departmentList();
         this.loadData();
     },
     tableRowClick(record, index) {
@@ -340,7 +348,7 @@ const Task = React.createClass({
         this.state.releaseDate = [];
         this.state.orderNoSearch='';
         this.state.taskNoSearch='';
-        this.state.distribution=undefined;
+        this.state.departmenttSearch=undefined;
         this.loadData(this.state.page);
     },
     searchSwitch() {
@@ -348,6 +356,46 @@ const Task = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
     render() { 
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -364,6 +412,7 @@ const Task = React.createClass({
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
+        let departmentArr = this.state.departmentArr || [];
         return ( <div className="user-content">
             <div className="content-title">
                     <span>任务查询</span>
@@ -378,6 +427,16 @@ const Task = React.createClass({
                     <Input placeholder="任务编号"
                         value={this.state.taskNoSearch}
                         onChange={(e) => { this.setState({ taskNoSearch: e.target.value }); }} />
+                    <Select placeholder="选择部门"
+                        style={{ width: 150 ,marginRight:'10px'}}
+                        value={this.state.departmenttSearch}
+                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+                        {
+                            departmentArr.map(function (item) {
+                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+                            })
+                        }
+               		 </Select> 
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     {/* <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>