张延森 4 years ago
parent
commit
a780b30a52

+ 2
- 2
src/pages/property/bill/list/index.jsx View File

65
             {
65
             {
66
               getFieldDecorator('isTicket')(
66
               getFieldDecorator('isTicket')(
67
                 <Select style={{minWidth: 100}} allowClear>
67
                 <Select style={{minWidth: 100}} allowClear>
68
-                  <Select.Option value={1}>物业</Select.Option>
69
-                  <Select.Option value={0}>工单</Select.Option>
68
+                  <Select.Option value={0}>物业</Select.Option>
69
+                  <Select.Option value={1}>工单</Select.Option>
70
                 </Select>
70
                 </Select>
71
               )
71
               )
72
             }
72
             }

+ 9
- 6
src/pages/property/bill/order/index.jsx View File

160
   }
160
   }
161
 
161
 
162
   const handlePageChange = (pageNum, pageSize) => {
162
   const handlePageChange = (pageNum, pageSize) => {
163
-    setQueryParams({
164
-      ...queryParams,      
165
-      pageNum,
166
-      pageSize,
167
-    })
163
+    // 此处与 handleTableChange 重复了
164
+    // setQueryParams({
165
+    //   ...queryParams,      
166
+    //   pageNum,
167
+    //   pageSize,
168
+    // })
168
   }
169
   }
169
 
170
 
170
   const handleTableChange = (pagination, filters, sorter) => {
171
   const handleTableChange = (pagination, filters, sorter) => {
171
       console.log(sorter)
172
       console.log(sorter)
172
       setQueryParams({
173
       setQueryParams({
173
-        ...queryParams,      
174
+        ...queryParams,     
175
+        pageNum: pagination.current,
176
+        pageSize: pagination.pageSize, 
174
         sortKey: sorter.columnKey,
177
         sortKey: sorter.columnKey,
175
         sortOrder: sorter.order,
178
         sortOrder: sorter.order,
176
       })
179
       })

+ 2
- 4
src/pages/property/community/index.jsx View File

58
 
58
 
59
   const handleDeleteRow = row => {
59
   const handleDeleteRow = row => {
60
     deleteCommunity({ urlData: {id: row.id} }).then(res => {
60
     deleteCommunity({ urlData: {id: row.id} }).then(res => {
61
+      setQueryParams({...queryParams})
61
       Modal.success({
62
       Modal.success({
62
         content: '删除内容成功',
63
         content: '删除内容成功',
63
-        onOk: () => {
64
-          // 触发数据刷新
65
-          setQueryParams({...queryParams})
66
-        }
64
+        onOk: () => {}
67
       })
65
       })
68
     })
66
     })
69
   }
67
   }

+ 8
- 5
src/pages/property/notice/index.jsx View File

131
     console.log(sorter)
131
     console.log(sorter)
132
     setQueryParams({
132
     setQueryParams({
133
       ...queryParams,      
133
       ...queryParams,      
134
+      pageNum: pagination.current,
135
+      pageSize: pagination.pageSize,
134
       sortKey: sorter.columnKey,
136
       sortKey: sorter.columnKey,
135
       sortOrder: sorter.order,
137
       sortOrder: sorter.order,
136
     })
138
     })
137
 };
139
 };
138
 
140
 
139
   const handlePageChange = (pageNum, pageSize) => {
141
   const handlePageChange = (pageNum, pageSize) => {
140
-    setQueryParams({
141
-      ...queryParams,      
142
-      pageNum,
143
-      pageSize,
144
-    })
142
+    // 此处与 handleTableChange 重复了
143
+    // setQueryParams({
144
+    //   ...queryParams,      
145
+    //   pageNum,
146
+    //   pageSize,
147
+    // })
145
   }
148
   }
146
 
149
 
147
   useEffect(() => {
150
   useEffect(() => {

+ 18
- 14
src/pages/property/proprietor/index.jsx View File

226
   }
226
   }
227
 
227
 
228
   const handlePageChange = (pageNum, pageSize) => {
228
   const handlePageChange = (pageNum, pageSize) => {
229
-    setQueryParams({
230
-      ...queryParams,      
231
-      pageNum,
232
-      pageSize,
233
-    })
229
+    // 此处与 handleTableChange 重复了
230
+    // setQueryParams({
231
+    //   ...queryParams,      
232
+    //   pageNum,
233
+    //   pageSize,
234
+    // })
234
   }
235
   }
235
 
236
 
236
   const handleExport = () => {
237
   const handleExport = () => {
242
   }
243
   }
243
 
244
 
244
   const handleTableChange = (pagination, filters, sorter) => {
245
   const handleTableChange = (pagination, filters, sorter) => {
245
-    console.log(sorter)
246
     setQueryParams({
246
     setQueryParams({
247
-      ...queryParams,      
247
+      ...queryParams,
248
+      pageNum: pagination.current,
249
+      pageSize: pagination.pageSize,
248
       sortKey: sorter.columnKey,
250
       sortKey: sorter.columnKey,
249
       sortOrder: sorter.order,
251
       sortOrder: sorter.order,
250
     })
252
     })
251
 };
253
 };
252
 
254
 
253
   useEffect(() => {
255
   useEffect(() => {
254
-    setLoading(true)
255
-    buildingInfoList({ data: {...queryParams, communityId} }).then(res => {
256
-      const { list, ...pageInfo } = res || {}
257
-      setListData(list)
258
-      setPagination(pageInfo)
259
-      setLoading(false)
260
-    }).catch(() => setLoading(false))
256
+    if (communityId) {
257
+      setLoading(true)
258
+      buildingInfoList({ data: {...queryParams, communityId} }).then(res => {
259
+        const { list, ...pageInfo } = res || {}
260
+        setListData(list)
261
+        setPagination(pageInfo)
262
+        setLoading(false)
263
+      }).catch(() => setLoading(false))
264
+    }
261
   }, [queryParams, communityId])
265
   }, [queryParams, communityId])
262
 
266
 
263
   return (
267
   return (