傅行帆 4 år sedan
förälder
incheckning
f1b1a0d175

+ 18
- 7
src/pages/property/bill/order/index.jsx Visa fil

@@ -167,6 +167,15 @@ export default props => {
167 167
     })
168 168
   }
169 169
 
170
+  const handleTableChange = (pagination, filters, sorter) => {
171
+      console.log(sorter)
172
+      setQueryParams({
173
+        ...queryParams,      
174
+        sortKey: sorter.columnKey,
175
+        sortOrder: sorter.order,
176
+      })
177
+  };
178
+
170 179
   const exportExcel = () => {
171 180
     exportStatementExcel().then(res => {
172 181
       const link = document.createElement('a')
@@ -192,7 +201,9 @@ export default props => {
192 201
       {/* <div style={{ margin: '24px 0' }}>
193 202
         <Button type="link" onClick={exportExcel}><Icon type="download"/>导出数据</Button>
194 203
       </div> */}
195
-      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
204
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} 
205
+        onChange={handleTableChange}
206
+      rowKey="id">
196 207
         <Table.Column
197 208
           title="订单号"
198 209
           dataIndex="id"
@@ -231,17 +242,17 @@ export default props => {
231 242
         <Table.Column
232 243
           title="订单状态"
233 244
           dataIndex="orderStatus"
234
-          key="orderStatus"
245
+          key="order_status"
235 246
           render={(_, row) => StatusDict[row.orderStatus]}
236
-          sorter={(a, b) => a.orderStatus - b.orderStatus}
247
+          sorter={true}
237 248
         />
238 249
         <Table.Column title="缴费人手机号" dataIndex="payPhone" key="payPhone" />
239 250
         <Table.Column title="缴费备注" dataIndex="payRemark" key="payRemark" />
240 251
         <Table.Column title="缴费方式" dataIndex="payType" key="payType" render={payType => PayTypeDict[payType]}/>
241
-        <Table.Column title="订单生成时间" dataIndex="createDate" key="createDate" 
242
-          sorter={(a, b) => new Date(a.createDate).getTime() - new Date(b.createDate).getTime()}/>
243
-        <Table.Column title="缴费完成时间" dataIndex="createTime" key="createTime" 
244
-          sorter={(a, b) => new Date(a.createTime).getTime() - new Date(b.createTime).getTime()}/>
252
+        <Table.Column title="订单生成时间" dataIndex="createDate" key="create_date" 
253
+          sorter={true}/>
254
+        <Table.Column title="缴费完成时间" dataIndex="createTime" key="create_time" 
255
+          sorter={true}/>
245 256
       </List>
246 257
 
247 258
     </div>

+ 14
- 4
src/pages/property/notice/index.jsx Visa fil

@@ -127,6 +127,14 @@ export default props => {
127 127
       })
128 128
     }
129 129
   }
130
+  const handleTableChange = (pagination, filters, sorter) => {
131
+    console.log(sorter)
132
+    setQueryParams({
133
+      ...queryParams,      
134
+      sortKey: sorter.columnKey,
135
+      sortOrder: sorter.order,
136
+    })
137
+};
130 138
 
131 139
   const handlePageChange = (pageNum, pageSize) => {
132 140
     setQueryParams({
@@ -154,7 +162,9 @@ export default props => {
154 162
           <Button type="primary">添加</Button>
155 163
         </NavLink>
156 164
       </div>
157
-      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
165
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} 
166
+      onChange={handleTableChange}
167
+      rowKey="id">
158 168
         {/* <Table.Column title="编号" dataIndex="id" key="id" /> */}
159 169
         <Table.Column title="类型" dataIndex="annType" key="annType" render={t => t === 'notice' ? '提醒' : null} />
160 170
         <Table.Column
@@ -175,10 +185,10 @@ export default props => {
175 185
           dataIndex="status"
176 186
           key="status"
177 187
           render={(_, row) => StatusDict[row.status]}
178
-          sorter={(a, b) => a.status - b.status}
188
+          sorter={true}
179 189
         />
180
-        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" 
181
-        sorter={(a, b) => new Date(a.createDate).getTime() - new Date(b.createDate).getTime()}/>
190
+        <Table.Column title="创建时间" dataIndex="createDate" key="create_date" 
191
+        sorter={true}/>
182 192
         {/* <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
183 193
         <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
184 194
         <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" /> */}

+ 11
- 1
src/pages/property/proprietor/index.jsx Visa fil

@@ -240,6 +240,15 @@ export default props => {
240 240
     }).catch(() => setLoading(false))
241 241
   }
242 242
 
243
+  const handleTableChange = (pagination, filters, sorter) => {
244
+    console.log(sorter)
245
+    setQueryParams({
246
+      ...queryParams,      
247
+      sortKey: sorter.columnKey,
248
+      sortOrder: sorter.order,
249
+    })
250
+};
251
+
243 252
   useEffect(() => {
244 253
     setLoading(true)
245 254
     buildingInfoList({ data: {...queryParams, communityId} }).then(res => {
@@ -280,6 +289,7 @@ export default props => {
280 289
         pagination={pagination}
281 290
         rowSelection={rowSelection} 
282 291
         onPageChange={handlePageChange}
292
+        onChange={handleTableChange}
283 293
         rowKey="id"
284 294
       >
285 295
         <Table.Column
@@ -321,7 +331,7 @@ export default props => {
321 331
               </span>
322 332
             )
323 333
           }}
324
-          sorter={(a, b) => a.verifyStatus - b.verifyStatus}
334
+          sorter={true}
325 335
         />
326 336
         <Table.Column title="审核人" dataIndex="updateName" key="updateName" />
327 337
         <Table.Column title="编辑时间" dataIndex="createDate" key="createDate" />