Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/statistical/activity/addRegistNum.jsx

@@ -162,8 +162,7 @@ class SharePersonNum extends React.Component {
       tableData: [],
       userType: 'all',
       activityName:  this.props.location.query.activityName
-    })
-    this.getTableList()
+    },this.getTableList)
   }
 
   goback = () => {

src/pages/statistical/activity/shareNum.jsx

@@ -159,8 +159,7 @@ class SharePersonNum extends React.Component {
       tableData: [],
       userType: 'all',
       activityName:  this.props.location.query.activityName
-    })
-    this.getTableList()
+    },this.getTableList)
   }
 
   goback = () => {

src/pages/statistical/activity/sharePersonNum.jsx

@@ -247,8 +247,7 @@ class SharePersonNum extends React.Component {
       tableData: [],
       userType: 'all',
       activityName:  this.props.location.query.activityName
-    }) 
-    this.getTableList()
+    },this.getTableList) 
   }
 
   goback = () => {

src/pages/statistical/activity/visitNum.jsx

@@ -153,6 +153,37 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    let startDate;
+    let endDate;
+    if (this.props.location.query.queryDate){
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }else{
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
+    }
+    console.log(startDate)
+    this.setState( {
+      formData: {
+        personFrom: '',
+        pageNum:'',
+        pageSize:'',
+        startDate: startDate,
+        endDate: endDate,
+        province:'',
+        realtyConsultant:'',
+        realtyConsultantPhone:'',
+        activityId: this.props.location.query.activityId,
+        activityType:this.props.location.query.activityType,
+        personId: this.props.location.query.personId,
+        buildingId: this.props.location.query.buildingId
+      },
+      personData: [],  
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      activityName:  this.props.location.query.activityName
+    }, this.getTableList)
   }
 
   goback = () => {

src/pages/statistical/activity/visitPersonNum.jsx

@@ -178,8 +178,7 @@ class SharePersonNum extends React.Component {
       tableData: [],
       userType: 'all',
       activityName: this.props.location.query.activityName
-    })
-    this.getTableList()
+    },this.getTableList)
   }
 
   goback = () => {