合并

src/pages/activity/drainage/Detail.jsx

@@ -142,6 +142,8 @@ const header = (props) => {
   function handleReset (e) {
     console.log(e)
     props.form.resetFields();
+    setEndDate('')
+    setStartDate('')
   }
 
   const handleSubmit = (e, props) => {

src/pages/activity/drainage/DrainageList.jsx

@@ -264,6 +264,7 @@ const header = (props) => {
   //重置搜索
   function handleReset () {
     props.form.resetFields();
+    gettaDrainage({ pageNum: 1, pageSize: 10 })
   }
 
 

src/pages/customer/customerlist/customerDetail.jsx

@@ -16,6 +16,7 @@ function header(props) {
    */
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState([{ visitRecords: [] }])
+  const [dataConsultant, setDataonsultant] = useState({})
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -31,6 +32,7 @@ function header(props) {
 
     request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params } }).then(res => {
       setData(res)
+      setDataonsultant(res.consultant)
     })
   }
 
@@ -59,6 +61,7 @@ function header(props) {
   return (
     <>
       <div className={styles.cardBox}>
+     {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
         <div className={styles.leftBox}>
           <p className={styles.tit}>置业顾问信息</p>
           <img className={styles.touxiang} src={ data.consultant && data.consultant.picture } />
@@ -88,9 +91,9 @@ function header(props) {
           <p className={styles.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
           <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p>
           <div className={styles.rightInfo}>
-            <p className={styles.rightItem}>国家：{ data.country }</p>
-            <p className={styles.rightItem}>省份：{ data.province }</p>
-            <p className={styles.rightItem}>城市：{data.city }</p>
+            <p className={styles.rightItem}>国家：{ dataConsultant.country }</p>
+            <p className={styles.rightItem}>省份：{ dataConsultant.province }</p>
+            <p className={styles.rightItem}>城市：{dataConsultant.city }</p>
             <p className={styles.rightItem}>详细信息：</p>
             <p className={styles.rightItem}>意向项目：{data.intention }</p>
             <p className={styles.rightItem}>价格区间：{data.priceRange }</p>

src/pages/customer/report/index.jsx

@@ -75,10 +75,11 @@ function body(props) {
     */
   function handleReset() {
     props.form.resetFields();
+    getList({ pageNumber: 1, pageSize: 9 })
   }
 
   function exportReport() {
-    request({ ...apis.customer.customerRecommendReportExport, responseType: 'blob' })
+    request({ ...apis.customer.customerRecommendReportExport, params: { ...props.form.getFieldsValue() }, responseType: 'blob' })
       .then(response => {
         download(response)
       })