feats

src/pages/property/bill/list/index.jsx

@@ -65,8 +65,8 @@ const Condition = props => {
             {
               getFieldDecorator('isTicket')(
                 <Select style={{minWidth: 100}} allowClear>
-                  <Select.Option value={1}>物业</Select.Option>
-                  <Select.Option value={0}>工单</Select.Option>
+                  <Select.Option value={0}>物业</Select.Option>
+                  <Select.Option value={1}>工单</Select.Option>
                 </Select>
               )
             }

src/pages/property/bill/order/index.jsx

@@ -160,17 +160,20 @@ export default props => {
   }
 
   const handlePageChange = (pageNum, pageSize) => {
-    setQueryParams({
-      ...queryParams,      
-      pageNum,
-      pageSize,
-    })
+    // 此处与 handleTableChange 重复了
+    // setQueryParams({
+    //   ...queryParams,      
+    //   pageNum,
+    //   pageSize,
+    // })
   }
 
   const handleTableChange = (pagination, filters, sorter) => {
       console.log(sorter)
       setQueryParams({
-        ...queryParams,      
+        ...queryParams,     
+        pageNum: pagination.current,
+        pageSize: pagination.pageSize, 
         sortKey: sorter.columnKey,
         sortOrder: sorter.order,
       })

src/pages/property/community/index.jsx

@@ -58,12 +58,10 @@ export default props => {
 
   const handleDeleteRow = row => {
     deleteCommunity({ urlData: {id: row.id} }).then(res => {
+      setQueryParams({...queryParams})
       Modal.success({
         content: '删除内容成功',
-        onOk: () => {
-          // 触发数据刷新
-          setQueryParams({...queryParams})
-        }
+        onOk: () => {}
       })
     })
   }

src/pages/property/notice/index.jsx

@@ -131,17 +131,20 @@ export default props => {
     console.log(sorter)
     setQueryParams({
       ...queryParams,      
+      pageNum: pagination.current,
+      pageSize: pagination.pageSize,
       sortKey: sorter.columnKey,
       sortOrder: sorter.order,
     })
 };
 
   const handlePageChange = (pageNum, pageSize) => {
-    setQueryParams({
-      ...queryParams,      
-      pageNum,
-      pageSize,
-    })
+    // 此处与 handleTableChange 重复了
+    // setQueryParams({
+    //   ...queryParams,      
+    //   pageNum,
+    //   pageSize,
+    // })
   }
 
   useEffect(() => {

src/pages/property/proprietor/index.jsx

@@ -226,11 +226,12 @@ export default props => {
   }
 
   const handlePageChange = (pageNum, pageSize) => {
-    setQueryParams({
-      ...queryParams,      
-      pageNum,
-      pageSize,
-    })
+    // 此处与 handleTableChange 重复了
+    // setQueryParams({
+    //   ...queryParams,      
+    //   pageNum,
+    //   pageSize,
+    // })
   }
 
   const handleExport = () => {
@@ -242,22 +243,25 @@ export default props => {
   }
 
   const handleTableChange = (pagination, filters, sorter) => {
-    console.log(sorter)
     setQueryParams({
-      ...queryParams,      
+      ...queryParams,
+      pageNum: pagination.current,
+      pageSize: pagination.pageSize,
       sortKey: sorter.columnKey,
       sortOrder: sorter.order,
     })
 };
 
   useEffect(() => {
-    setLoading(true)
-    buildingInfoList({ data: {...queryParams, communityId} }).then(res => {
-      const { list, ...pageInfo } = res || {}
-      setListData(list)
-      setPagination(pageInfo)
-      setLoading(false)
-    }).catch(() => setLoading(false))
+    if (communityId) {
+      setLoading(true)
+      buildingInfoList({ data: {...queryParams, communityId} }).then(res => {
+        const { list, ...pageInfo } = res || {}
+        setListData(list)
+        setPagination(pageInfo)
+        setLoading(false)
+      }).catch(() => setLoading(false))
+    }
   }, [queryParams, communityId])
 
   return (