Merge branch 'master' of http://git.ycjcjy.com/estateagents/pc-channel

src/pages/sample/h5/components/SelectContact.jsx

@@ -60,7 +60,7 @@ const SelectContact = props => {
   }
 
   const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10 })
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
   const removeSelected = (val) => {

src/pages/sample/h5/index.jsx

@@ -51,7 +51,16 @@ function header(props) {
   }
 
   const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 12 })
+    let {createDate, ...submitValue} = props.form.getFieldsValue()
+    if(null != createDate && createDate.length > 0){
+      const [startCreateDate, endCreateDate] = createDate
+      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+    }else{
+      submitValue.startCreateDate = null
+      submitValue.endCreateDate = null
+    }
+    getList({ pageNum: pageNumber, pageSize: 12, ...submitValue })
   }