傅行帆 4 年之前
父節點
當前提交
f1b1a0d175
共有 3 個檔案被更改,包括 43 行新增12 行删除
  1. 18
    7
      src/pages/property/bill/order/index.jsx
  2. 14
    4
      src/pages/property/notice/index.jsx
  3. 11
    1
      src/pages/property/proprietor/index.jsx

+ 18
- 7
src/pages/property/bill/order/index.jsx 查看文件

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
   const exportExcel = () => {
179
   const exportExcel = () => {
171
     exportStatementExcel().then(res => {
180
     exportStatementExcel().then(res => {
172
       const link = document.createElement('a')
181
       const link = document.createElement('a')
192
       {/* <div style={{ margin: '24px 0' }}>
201
       {/* <div style={{ margin: '24px 0' }}>
193
         <Button type="link" onClick={exportExcel}><Icon type="download"/>导出数据</Button>
202
         <Button type="link" onClick={exportExcel}><Icon type="download"/>导出数据</Button>
194
       </div> */}
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
         <Table.Column
207
         <Table.Column
197
           title="订单号"
208
           title="订单号"
198
           dataIndex="id"
209
           dataIndex="id"
231
         <Table.Column
242
         <Table.Column
232
           title="订单状态"
243
           title="订单状态"
233
           dataIndex="orderStatus"
244
           dataIndex="orderStatus"
234
-          key="orderStatus"
245
+          key="order_status"
235
           render={(_, row) => StatusDict[row.orderStatus]}
246
           render={(_, row) => StatusDict[row.orderStatus]}
236
-          sorter={(a, b) => a.orderStatus - b.orderStatus}
247
+          sorter={true}
237
         />
248
         />
238
         <Table.Column title="缴费人手机号" dataIndex="payPhone" key="payPhone" />
249
         <Table.Column title="缴费人手机号" dataIndex="payPhone" key="payPhone" />
239
         <Table.Column title="缴费备注" dataIndex="payRemark" key="payRemark" />
250
         <Table.Column title="缴费备注" dataIndex="payRemark" key="payRemark" />
240
         <Table.Column title="缴费方式" dataIndex="payType" key="payType" render={payType => PayTypeDict[payType]}/>
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
       </List>
256
       </List>
246
 
257
 
247
     </div>
258
     </div>

+ 14
- 4
src/pages/property/notice/index.jsx 查看文件

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
   const handlePageChange = (pageNum, pageSize) => {
139
   const handlePageChange = (pageNum, pageSize) => {
132
     setQueryParams({
140
     setQueryParams({
154
           <Button type="primary">添加</Button>
162
           <Button type="primary">添加</Button>
155
         </NavLink>
163
         </NavLink>
156
       </div>
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
         {/* <Table.Column title="编号" dataIndex="id" key="id" /> */}
168
         {/* <Table.Column title="编号" dataIndex="id" key="id" /> */}
159
         <Table.Column title="类型" dataIndex="annType" key="annType" render={t => t === 'notice' ? '提醒' : null} />
169
         <Table.Column title="类型" dataIndex="annType" key="annType" render={t => t === 'notice' ? '提醒' : null} />
160
         <Table.Column
170
         <Table.Column
175
           dataIndex="status"
185
           dataIndex="status"
176
           key="status"
186
           key="status"
177
           render={(_, row) => StatusDict[row.status]}
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
         {/* <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
192
         {/* <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
183
         <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
193
         <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
184
         <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" /> */}
194
         <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" /> */}

+ 11
- 1
src/pages/property/proprietor/index.jsx 查看文件

240
     }).catch(() => setLoading(false))
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
   useEffect(() => {
252
   useEffect(() => {
244
     setLoading(true)
253
     setLoading(true)
245
     buildingInfoList({ data: {...queryParams, communityId} }).then(res => {
254
     buildingInfoList({ data: {...queryParams, communityId} }).then(res => {
280
         pagination={pagination}
289
         pagination={pagination}
281
         rowSelection={rowSelection} 
290
         rowSelection={rowSelection} 
282
         onPageChange={handlePageChange}
291
         onPageChange={handlePageChange}
292
+        onChange={handleTableChange}
283
         rowKey="id"
293
         rowKey="id"
284
       >
294
       >
285
         <Table.Column
295
         <Table.Column
321
               </span>
331
               </span>
322
             )
332
             )
323
           }}
333
           }}
324
-          sorter={(a, b) => a.verifyStatus - b.verifyStatus}
334
+          sorter={true}
325
         />
335
         />
326
         <Table.Column title="审核人" dataIndex="updateName" key="updateName" />
336
         <Table.Column title="审核人" dataIndex="updateName" key="updateName" />
327
         <Table.Column title="编辑时间" dataIndex="createDate" key="createDate" />
337
         <Table.Column title="编辑时间" dataIndex="createDate" key="createDate" />