|
@@ -1,6 +1,6 @@
|
|
|
import React,{Component} from 'react';
|
|
|
import {
|
|
|
- Button,
|
|
|
+ Button, DatePicker,
|
|
|
Input,
|
|
|
message,
|
|
|
Select,
|
|
@@ -10,13 +10,17 @@ import {
|
|
|
import './index.less';
|
|
|
import $ from "jquery/src/ajax";
|
|
|
import CustomerDetails from './customerDetails';
|
|
|
+import moment from "moment";
|
|
|
+
|
|
|
+const { RangePicker } = DatePicker;
|
|
|
|
|
|
class DepartmentStatistics extends Component{
|
|
|
constructor(props) {
|
|
|
super(props);
|
|
|
this.state={
|
|
|
- superId:'',
|
|
|
+ superId:undefined,
|
|
|
nameSearch: '',
|
|
|
+ releaseDate: [],
|
|
|
|
|
|
columns: [
|
|
|
{
|
|
@@ -176,6 +180,12 @@ class DepartmentStatistics extends Component{
|
|
|
if(this.state.nameSearch){
|
|
|
data.aName = this.state.nameSearch;
|
|
|
}
|
|
|
+ if(this.state.releaseDate[0]){
|
|
|
+ data.startTime = this.state.releaseDate[0]
|
|
|
+ }
|
|
|
+ if(this.state.releaseDate[1]){
|
|
|
+ data.endTime = this.state.releaseDate[1]
|
|
|
+ }
|
|
|
$.ajax({
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
@@ -238,8 +248,9 @@ class DepartmentStatistics extends Component{
|
|
|
|
|
|
reset(){
|
|
|
this.setState({
|
|
|
- superId:'',
|
|
|
+ superId:undefined,
|
|
|
nameSearch: '',
|
|
|
+ releaseDate: [],
|
|
|
},()=>{
|
|
|
this.loadData();
|
|
|
});
|
|
@@ -296,10 +307,12 @@ class DepartmentStatistics extends Component{
|
|
|
</div>
|
|
|
<div className="user-search" style={{display:'flex',alignItems:'center'}}>
|
|
|
<div>
|
|
|
- <Select placeholder="请选择部门"
|
|
|
- style={{ width:200,marginLeft:10}}
|
|
|
- value={this.state.superId}
|
|
|
- onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
|
|
|
+ <Select
|
|
|
+ placeholder="请选择部门"
|
|
|
+ style={{ width:200,marginLeft:10}}
|
|
|
+ value={this.state.superId}
|
|
|
+ onChange={(e) => { this.setState({ superId: e }) }}
|
|
|
+ notFoundContent="未获取到上级组织列表">
|
|
|
{this.state.contactsOption}
|
|
|
</Select>
|
|
|
</div>
|
|
@@ -311,6 +324,23 @@ class DepartmentStatistics extends Component{
|
|
|
this.setState({ nameSearch: e.target.value });
|
|
|
}}
|
|
|
/>
|
|
|
+ <div style={{
|
|
|
+ marginTop: '10px',
|
|
|
+ }}>
|
|
|
+ <RangePicker
|
|
|
+ value={[
|
|
|
+ this.state.releaseDate[0]
|
|
|
+ ? moment(this.state.releaseDate[0])
|
|
|
+ : null,
|
|
|
+ this.state.releaseDate[1]
|
|
|
+ ? moment(this.state.releaseDate[1])
|
|
|
+ : null,
|
|
|
+ ]}
|
|
|
+ onChange={(data, dataString) => {
|
|
|
+ this.setState({ releaseDate: dataString });
|
|
|
+ }}
|
|
|
+ />
|
|
|
+ </div>
|
|
|
<Button
|
|
|
type="primary"
|
|
|
style={{ marginLeft: "10px", marginRight: 10 }}
|
|
@@ -334,6 +364,8 @@ class DepartmentStatistics extends Component{
|
|
|
{this.state.customerVisible ? <CustomerDetails
|
|
|
aid={this.state.aid}
|
|
|
type={this.state.type}
|
|
|
+ startTime={this.state.releaseDate[0]}
|
|
|
+ endTime={this.state.releaseDate[1]}
|
|
|
visible={this.state.customerVisible}
|
|
|
onCancel={()=>{
|
|
|
this.setState({
|