.

src/pages/applicationList/index.jsx

@@ -1,4 +1,4 @@
-import React, { useRef } from 'react'
+import React, { useRef,useState } from 'react'
 import moment from 'moment';
 import { DatePicker, Button } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
@@ -14,10 +14,22 @@ const formatterTime = (val) => {
 };
 
 export default (props) => {
-  const actionRef = useRef();
+  const actionRef = useRef();  
+  const [applyStart, setStart] = useState()
+  const [applyEnd, setEnd] = useState()
   const goDetail = (id) => {
     history.push(`applicationList/detail.jsx?id=${id}`);
   }
+
+  const handelChange = (date, dateStrings) => {
+    setStart(dateStrings[0])
+    setEnd(dateStrings[1])
+  }
+
+  const handleReset = () => {
+    setStart()
+    setEnd()
+  }
   const columns = [
     {
       title: '犬主',
@@ -25,18 +37,24 @@ export default (props) => {
       key: 'personName',
       search: true,
     },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      search: true,
+    },
     {
       title: '犬名',
       dataIndex: 'petName',
       key: 'petName',
-      search: true,
+      search: false,
     },
     {
       title: '申请时间',
       dataIndex: 'createDate',
       key: 'createDate',
       render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelChange} />
     },
     {
       title: '申请类型',
@@ -104,18 +122,13 @@ export default (props) => {
       title: '制证状态',
       dataIndex: 'makeStatus',
       key: 'makeStatus',
-      search: true,// 
+      search: false, 
       render: (_, record) => {
         return record.makeStatus === 0
           ? '待发放'
           : record.makeStatus === 1
             ? '已发放' : ''
       },
-      valueType: 'select',
-      valueEnum: {
-        0: { text: '待发放' },
-        1: { text: '已发放' },
-      },
     },
     {
       title: '操作',
@@ -136,8 +149,10 @@ export default (props) => {
       <PageTable
         actionRef={actionRef}
         columns={columns}
+        params={{ applyStart, applyEnd }}
         request={getApplicationList}
         options={false}
+        onReset={handleReset}
         rowKey="applyId"
       />
     </PageHeaderWrapper>

src/pages/cardList/index.jsx

@@ -27,7 +27,7 @@ export default (props) => {
       title: '犬名',
       dataIndex: 'petName',
       key: 'petName',
-      search: true,
+      search: false,
     },
     {
       title: '有效期',

src/pages/cardNoList/index.jsx

@@ -50,7 +50,6 @@ export default (props) => {
       key: 'qrImage',
       dataIndex: 'qrImage',
       render: (t) => <Image width={110} src={t} alt="" />,
-      search:false
     },    
     {
       title: '创建时间',
@@ -67,6 +66,7 @@ export default (props) => {
         request={getCardNoList}
         rowKey="qrId"
         options={false}
+        search={false}
         toolBarRender={actions}
         actionRef={actionRef}
       />

src/pages/certificateIssuance/index.jsx

@@ -1,4 +1,4 @@
-import React, { useRef } from 'react'
+import React, { useRef,useState } from 'react'
 import moment from 'moment';
 import { history } from 'umi';
 import { DatePicker, Button } from 'antd';
@@ -14,9 +14,27 @@ const formatterTime = (val) => {
 
 export default (props) => {
   const actionRef = useRef();
+  const [applyStart, setStart] = useState()
+  const [applyEnd, setEnd] = useState()
+  const [makeStart, setMakeStart] = useState()
+  const [makeEnd, setMakeEnd] = useState()
   const goDetail = (id) => {
     history.push(`certificateIssuance/issuance.jsx?id=${id}`);
   }
+  const handelApplyDateChange = (date, dateStrings) => {
+    setStart(dateStrings[0])
+    setEnd(dateStrings[1])
+  }
+  const handelMakeDateChange = (date, dateStrings) => {
+    setMakeStart(dateStrings[0])
+    setMakeEnd(dateStrings[1])
+  }
+  const handleReset = () => {
+    setStart()
+    setEnd()
+    setMakeStart()
+    setMakeEnd()
+  }
   const columns = [
     {
       title: '证件号',
@@ -34,7 +52,7 @@ export default (props) => {
       title: '犬名',
       dataIndex: 'petName',
       key: 'petName',
-      search: true,
+      search: false,
     },
     {
       title: '申领方式',
@@ -58,37 +76,32 @@ export default (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD'onChange={handelApplyDateChange} />
     },
     {
       title: '制证状态',
       dataIndex: 'makeStatus',
       key: 'makeStatus',
-      search: true,// 
+      search: false, 
       render: (_, record) => {
         return record.makeStatus === 0
           ? '待发放'
           : record.makeStatus === 1
             ? '已发放' : ''
       },
-      valueType: 'select',
-      valueEnum: {
-        0: { text: '待发放' },
-        1: { text: '已发放' },
-      },
     },
     {
       title: '发放人',
       dataIndex: 'makeUserName',
       key: 'makeUserName',
-      search: true,
+      search: false,
     },
     {
       title: '发放时间',
       dataIndex: 'makeDate',
       key: 'makeDate',
       render: (t) => t != '-' ? formatterTime(t) : '-',
-      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD'onChange={handelMakeDateChange} />
     },
     {
       title: '操作',
@@ -111,7 +124,9 @@ export default (props) => {
         actionRef={actionRef}
         columns={columns}
         request={getMakeList}
+        params={{ applyStart, applyEnd, makeStart, makeEnd }}
         options={false}
+        onReset={handleReset}
         rowKey="applyId"
       />
     </PageHeaderWrapper>

src/pages/examine/index.jsx

@@ -1,4 +1,4 @@
-import React, { useRef } from 'react'
+import React, { useRef, useState } from 'react'
 import moment from 'moment';
 import { history } from 'umi';
 import { DatePicker, Button } from 'antd';
@@ -15,9 +15,27 @@ const formatterTime = (val) => {
 
 export default (props) => {
   const actionRef = useRef();
+  const [applyStart, setStart] = useState()
+  const [applyEnd, setEnd] = useState()
+  const [auditStart, setAuditStart] = useState()
+  const [auditEnd, setAuditEnd] = useState()
   const goDetail = (id) => {
     history.push(`examine/detail.jsx?id=${id}`);
   }
+  const handelApplyDateChange = (date, dateStrings) => {
+    setStart(dateStrings[0])
+    setEnd(dateStrings[1])
+  }
+  const handelVerifyDateChange = (date, dateStrings) => {
+    setAuditStart(dateStrings[0])
+    setAuditEnd(dateStrings[1])
+  }
+  const handleReset = () => {
+    setStart()
+    setEnd()
+    setAuditStart()
+    setAuditEnd()
+  }
   const columns = [
     {
       title: '犬主',
@@ -29,20 +47,20 @@ export default (props) => {
       title: '犬名',
       dataIndex: 'petName',
       key: 'petName',
-      search: true,
+      search: false,
     },
     {
       title: '申请时间',
       dataIndex: 'createDate',
       key: 'createDate',
       render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelApplyDateChange} />
     },
     {
       title: '支付状态',
       dataIndex: 'payStatus',
       key: 'payStatus',
-      search: true,//已支付 待支付
+      search: false,
       render: (_, record) => {
         return record.payStatus === 0
           ? '待支付'
@@ -53,12 +71,6 @@ export default (props) => {
               : record.payStatus === 3
                 ? '已退款' : ''
       },
-      valueType: 'select',
-      valueEnum: {
-        0: { text: '待支付' },
-        2: { text: '已支付' },
-        3: { text: '已退款' },
-      },
     },
     {
       title: '审核状态',
@@ -84,14 +96,14 @@ export default (props) => {
       title: '审核人',
       dataIndex: 'verifyUserName',
       key: 'verifyUserName',
-      search: true,
+      search: false,
     },
     {
       title: '审核时间',
       dataIndex: 'verifyDate',
       key: 'verifyDate',
       render: (t) => t != '-' ? formatterTime(t) : '-',
-      renderFormItem: (_, record) => <RangePicker format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelVerifyDateChange} />
     },
     {
       title: '操作',
@@ -114,7 +126,9 @@ export default (props) => {
         actionRef={actionRef}
         columns={columns}
         request={getAuditList}
+        params={{ applyStart, applyEnd, auditStart, auditEnd }}
         options={false}
+        onReset={handleReset}
         rowKey="applyId"
       />
     </PageHeaderWrapper>

src/pages/userList/index.jsx

@@ -1,11 +1,9 @@
 import React, { useRef } from 'react'
 import moment from 'moment';
-import { DatePicker } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
 import { getPersonList } from '@/services/person'
 
-const { RangePicker } = DatePicker;
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
@@ -32,7 +30,7 @@ export default (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      search:false,
     },
   ]