李志伟 3 years ago
parent
commit
fa18854773

+ 25
- 10
src/pages/applicationList/index.jsx View File

1
-import React, { useRef } from 'react'
1
+import React, { useRef,useState } from 'react'
2
 import moment from 'moment';
2
 import moment from 'moment';
3
 import { DatePicker, Button } from 'antd';
3
 import { DatePicker, Button } from 'antd';
4
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
4
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
14
 };
14
 };
15
 
15
 
16
 export default (props) => {
16
 export default (props) => {
17
-  const actionRef = useRef();
17
+  const actionRef = useRef();  
18
+  const [applyStart, setStart] = useState()
19
+  const [applyEnd, setEnd] = useState()
18
   const goDetail = (id) => {
20
   const goDetail = (id) => {
19
     history.push(`applicationList/detail.jsx?id=${id}`);
21
     history.push(`applicationList/detail.jsx?id=${id}`);
20
   }
22
   }
23
+
24
+  const handelChange = (date, dateStrings) => {
25
+    setStart(dateStrings[0])
26
+    setEnd(dateStrings[1])
27
+  }
28
+
29
+  const handleReset = () => {
30
+    setStart()
31
+    setEnd()
32
+  }
21
   const columns = [
33
   const columns = [
22
     {
34
     {
23
       title: '犬主',
35
       title: '犬主',
25
       key: 'personName',
37
       key: 'personName',
26
       search: true,
38
       search: true,
27
     },
39
     },
40
+    {
41
+      title: '手机号',
42
+      dataIndex: 'phone',
43
+      key: 'phone',
44
+      search: true,
45
+    },
28
     {
46
     {
29
       title: '犬名',
47
       title: '犬名',
30
       dataIndex: 'petName',
48
       dataIndex: 'petName',
31
       key: 'petName',
49
       key: 'petName',
32
-      search: true,
50
+      search: false,
33
     },
51
     },
34
     {
52
     {
35
       title: '申请时间',
53
       title: '申请时间',
36
       dataIndex: 'createDate',
54
       dataIndex: 'createDate',
37
       key: 'createDate',
55
       key: 'createDate',
38
       render: (t) => formatterTime(t),
56
       render: (t) => formatterTime(t),
39
-      renderFormItem: (_, record) => <RangePicker format='YYYY-MM-DD' />
57
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelChange} />
40
     },
58
     },
41
     {
59
     {
42
       title: '申请类型',
60
       title: '申请类型',
104
       title: '制证状态',
122
       title: '制证状态',
105
       dataIndex: 'makeStatus',
123
       dataIndex: 'makeStatus',
106
       key: 'makeStatus',
124
       key: 'makeStatus',
107
-      search: true,// 
125
+      search: false, 
108
       render: (_, record) => {
126
       render: (_, record) => {
109
         return record.makeStatus === 0
127
         return record.makeStatus === 0
110
           ? '待发放'
128
           ? '待发放'
111
           : record.makeStatus === 1
129
           : record.makeStatus === 1
112
             ? '已发放' : ''
130
             ? '已发放' : ''
113
       },
131
       },
114
-      valueType: 'select',
115
-      valueEnum: {
116
-        0: { text: '待发放' },
117
-        1: { text: '已发放' },
118
-      },
119
     },
132
     },
120
     {
133
     {
121
       title: '操作',
134
       title: '操作',
136
       <PageTable
149
       <PageTable
137
         actionRef={actionRef}
150
         actionRef={actionRef}
138
         columns={columns}
151
         columns={columns}
152
+        params={{ applyStart, applyEnd }}
139
         request={getApplicationList}
153
         request={getApplicationList}
140
         options={false}
154
         options={false}
155
+        onReset={handleReset}
141
         rowKey="applyId"
156
         rowKey="applyId"
142
       />
157
       />
143
     </PageHeaderWrapper>
158
     </PageHeaderWrapper>

+ 1
- 1
src/pages/cardList/index.jsx View File

27
       title: '犬名',
27
       title: '犬名',
28
       dataIndex: 'petName',
28
       dataIndex: 'petName',
29
       key: 'petName',
29
       key: 'petName',
30
-      search: true,
30
+      search: false,
31
     },
31
     },
32
     {
32
     {
33
       title: '有效期',
33
       title: '有效期',

+ 1
- 1
src/pages/cardNoList/index.jsx View File

50
       key: 'qrImage',
50
       key: 'qrImage',
51
       dataIndex: 'qrImage',
51
       dataIndex: 'qrImage',
52
       render: (t) => <Image width={110} src={t} alt="" />,
52
       render: (t) => <Image width={110} src={t} alt="" />,
53
-      search:false
54
     },    
53
     },    
55
     {
54
     {
56
       title: '创建时间',
55
       title: '创建时间',
67
         request={getCardNoList}
66
         request={getCardNoList}
68
         rowKey="qrId"
67
         rowKey="qrId"
69
         options={false}
68
         options={false}
69
+        search={false}
70
         toolBarRender={actions}
70
         toolBarRender={actions}
71
         actionRef={actionRef}
71
         actionRef={actionRef}
72
       />
72
       />

+ 26
- 11
src/pages/certificateIssuance/index.jsx View File

1
-import React, { useRef } from 'react'
1
+import React, { useRef,useState } from 'react'
2
 import moment from 'moment';
2
 import moment from 'moment';
3
 import { history } from 'umi';
3
 import { history } from 'umi';
4
 import { DatePicker, Button } from 'antd';
4
 import { DatePicker, Button } from 'antd';
14
 
14
 
15
 export default (props) => {
15
 export default (props) => {
16
   const actionRef = useRef();
16
   const actionRef = useRef();
17
+  const [applyStart, setStart] = useState()
18
+  const [applyEnd, setEnd] = useState()
19
+  const [makeStart, setMakeStart] = useState()
20
+  const [makeEnd, setMakeEnd] = useState()
17
   const goDetail = (id) => {
21
   const goDetail = (id) => {
18
     history.push(`certificateIssuance/issuance.jsx?id=${id}`);
22
     history.push(`certificateIssuance/issuance.jsx?id=${id}`);
19
   }
23
   }
24
+  const handelApplyDateChange = (date, dateStrings) => {
25
+    setStart(dateStrings[0])
26
+    setEnd(dateStrings[1])
27
+  }
28
+  const handelMakeDateChange = (date, dateStrings) => {
29
+    setMakeStart(dateStrings[0])
30
+    setMakeEnd(dateStrings[1])
31
+  }
32
+  const handleReset = () => {
33
+    setStart()
34
+    setEnd()
35
+    setMakeStart()
36
+    setMakeEnd()
37
+  }
20
   const columns = [
38
   const columns = [
21
     {
39
     {
22
       title: '证件号',
40
       title: '证件号',
34
       title: '犬名',
52
       title: '犬名',
35
       dataIndex: 'petName',
53
       dataIndex: 'petName',
36
       key: 'petName',
54
       key: 'petName',
37
-      search: true,
55
+      search: false,
38
     },
56
     },
39
     {
57
     {
40
       title: '申领方式',
58
       title: '申领方式',
58
       dataIndex: 'createDate',
76
       dataIndex: 'createDate',
59
       key: 'createDate',
77
       key: 'createDate',
60
       render: (t) => formatterTime(t),
78
       render: (t) => formatterTime(t),
61
-      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
79
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD'onChange={handelApplyDateChange} />
62
     },
80
     },
63
     {
81
     {
64
       title: '制证状态',
82
       title: '制证状态',
65
       dataIndex: 'makeStatus',
83
       dataIndex: 'makeStatus',
66
       key: 'makeStatus',
84
       key: 'makeStatus',
67
-      search: true,// 
85
+      search: false, 
68
       render: (_, record) => {
86
       render: (_, record) => {
69
         return record.makeStatus === 0
87
         return record.makeStatus === 0
70
           ? '待发放'
88
           ? '待发放'
71
           : record.makeStatus === 1
89
           : record.makeStatus === 1
72
             ? '已发放' : ''
90
             ? '已发放' : ''
73
       },
91
       },
74
-      valueType: 'select',
75
-      valueEnum: {
76
-        0: { text: '待发放' },
77
-        1: { text: '已发放' },
78
-      },
79
     },
92
     },
80
     {
93
     {
81
       title: '发放人',
94
       title: '发放人',
82
       dataIndex: 'makeUserName',
95
       dataIndex: 'makeUserName',
83
       key: 'makeUserName',
96
       key: 'makeUserName',
84
-      search: true,
97
+      search: false,
85
     },
98
     },
86
     {
99
     {
87
       title: '发放时间',
100
       title: '发放时间',
88
       dataIndex: 'makeDate',
101
       dataIndex: 'makeDate',
89
       key: 'makeDate',
102
       key: 'makeDate',
90
       render: (t) => t != '-' ? formatterTime(t) : '-',
103
       render: (t) => t != '-' ? formatterTime(t) : '-',
91
-      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
104
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD'onChange={handelMakeDateChange} />
92
     },
105
     },
93
     {
106
     {
94
       title: '操作',
107
       title: '操作',
111
         actionRef={actionRef}
124
         actionRef={actionRef}
112
         columns={columns}
125
         columns={columns}
113
         request={getMakeList}
126
         request={getMakeList}
127
+        params={{ applyStart, applyEnd, makeStart, makeEnd }}
114
         options={false}
128
         options={false}
129
+        onReset={handleReset}
115
         rowKey="applyId"
130
         rowKey="applyId"
116
       />
131
       />
117
     </PageHeaderWrapper>
132
     </PageHeaderWrapper>

+ 26
- 12
src/pages/examine/index.jsx View File

1
-import React, { useRef } from 'react'
1
+import React, { useRef, useState } from 'react'
2
 import moment from 'moment';
2
 import moment from 'moment';
3
 import { history } from 'umi';
3
 import { history } from 'umi';
4
 import { DatePicker, Button } from 'antd';
4
 import { DatePicker, Button } from 'antd';
15
 
15
 
16
 export default (props) => {
16
 export default (props) => {
17
   const actionRef = useRef();
17
   const actionRef = useRef();
18
+  const [applyStart, setStart] = useState()
19
+  const [applyEnd, setEnd] = useState()
20
+  const [auditStart, setAuditStart] = useState()
21
+  const [auditEnd, setAuditEnd] = useState()
18
   const goDetail = (id) => {
22
   const goDetail = (id) => {
19
     history.push(`examine/detail.jsx?id=${id}`);
23
     history.push(`examine/detail.jsx?id=${id}`);
20
   }
24
   }
25
+  const handelApplyDateChange = (date, dateStrings) => {
26
+    setStart(dateStrings[0])
27
+    setEnd(dateStrings[1])
28
+  }
29
+  const handelVerifyDateChange = (date, dateStrings) => {
30
+    setAuditStart(dateStrings[0])
31
+    setAuditEnd(dateStrings[1])
32
+  }
33
+  const handleReset = () => {
34
+    setStart()
35
+    setEnd()
36
+    setAuditStart()
37
+    setAuditEnd()
38
+  }
21
   const columns = [
39
   const columns = [
22
     {
40
     {
23
       title: '犬主',
41
       title: '犬主',
29
       title: '犬名',
47
       title: '犬名',
30
       dataIndex: 'petName',
48
       dataIndex: 'petName',
31
       key: 'petName',
49
       key: 'petName',
32
-      search: true,
50
+      search: false,
33
     },
51
     },
34
     {
52
     {
35
       title: '申请时间',
53
       title: '申请时间',
36
       dataIndex: 'createDate',
54
       dataIndex: 'createDate',
37
       key: 'createDate',
55
       key: 'createDate',
38
       render: (t) => formatterTime(t),
56
       render: (t) => formatterTime(t),
39
-      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
57
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelApplyDateChange} />
40
     },
58
     },
41
     {
59
     {
42
       title: '支付状态',
60
       title: '支付状态',
43
       dataIndex: 'payStatus',
61
       dataIndex: 'payStatus',
44
       key: 'payStatus',
62
       key: 'payStatus',
45
-      search: true,//已支付 待支付
63
+      search: false,
46
       render: (_, record) => {
64
       render: (_, record) => {
47
         return record.payStatus === 0
65
         return record.payStatus === 0
48
           ? '待支付'
66
           ? '待支付'
53
               : record.payStatus === 3
71
               : record.payStatus === 3
54
                 ? '已退款' : ''
72
                 ? '已退款' : ''
55
       },
73
       },
56
-      valueType: 'select',
57
-      valueEnum: {
58
-        0: { text: '待支付' },
59
-        2: { text: '已支付' },
60
-        3: { text: '已退款' },
61
-      },
62
     },
74
     },
63
     {
75
     {
64
       title: '审核状态',
76
       title: '审核状态',
84
       title: '审核人',
96
       title: '审核人',
85
       dataIndex: 'verifyUserName',
97
       dataIndex: 'verifyUserName',
86
       key: 'verifyUserName',
98
       key: 'verifyUserName',
87
-      search: true,
99
+      search: false,
88
     },
100
     },
89
     {
101
     {
90
       title: '审核时间',
102
       title: '审核时间',
91
       dataIndex: 'verifyDate',
103
       dataIndex: 'verifyDate',
92
       key: 'verifyDate',
104
       key: 'verifyDate',
93
       render: (t) => t != '-' ? formatterTime(t) : '-',
105
       render: (t) => t != '-' ? formatterTime(t) : '-',
94
-      renderFormItem: (_, record) => <RangePicker format='YYYY-MM-DD' />
106
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' onChange={handelVerifyDateChange} />
95
     },
107
     },
96
     {
108
     {
97
       title: '操作',
109
       title: '操作',
114
         actionRef={actionRef}
126
         actionRef={actionRef}
115
         columns={columns}
127
         columns={columns}
116
         request={getAuditList}
128
         request={getAuditList}
129
+        params={{ applyStart, applyEnd, auditStart, auditEnd }}
117
         options={false}
130
         options={false}
131
+        onReset={handleReset}
118
         rowKey="applyId"
132
         rowKey="applyId"
119
       />
133
       />
120
     </PageHeaderWrapper>
134
     </PageHeaderWrapper>

+ 1
- 3
src/pages/userList/index.jsx View File

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