From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
admin/src/views/business/bikeRetakeRecord.vue | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/business/bikeRetakeRecord.vue b/admin/src/views/business/bikeRetakeRecord.vue
index bcee59b..471f844 100644
--- a/admin/src/views/business/bikeRetakeRecord.vue
+++ b/admin/src/views/business/bikeRetakeRecord.vue
@@ -50,17 +50,18 @@
:data="tableData.list"
stripe
border
+
>
- <el-table-column prop="openid" label="鐢ㄦ埛" min-width="180px" align="center"></el-table-column>
- <el-table-column prop="bikeCode" label="杞﹁締缂栫爜" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="bikeType" label="杞﹁締绫诲瀷" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="rentSiteId" label="鍊熷嚭绔欑偣" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="rentLockId" label="鍊熷嚭閿佸叿鍙�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="rentDate" label="鍊熷嚭鏃堕棿" min-width="140px" align="center"></el-table-column>
- <el-table-column prop="backSiteId" label="褰掕繕绔欑偣" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="backLockId" label="褰掕繕閿佸叿鍙�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="backDate" label="褰掕繕鏃堕棿" min-width="140px" align="center"></el-table-column>
- <el-table-column prop="rideTime" label="鍊熷嚭鏃堕暱(鍒�)" fixed="right" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="openid" sortable label="鐢ㄦ埛" min-width="180px" align="center"></el-table-column>
+ <el-table-column prop="bikeCode" sortable label="杞﹁締缂栫爜" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="bikeType" :sort-method="(a,b)=>{ return a.paramId-b.paramId}" sortable label="杞﹁締绫诲瀷" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="rentSiteId" :sort-method="(a,b)=>{ return a.rentSiteId-b.rentSiteId}" sortable label="鍊熷嚭绔欑偣" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="rentLockId" :sort-method="(a,b)=>{ return a.rentLockId-b.rentLockId}" sortable label="鍊熷嚭閿佸叿鍙�" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="rentDate" sortable label="鍊熷嚭鏃堕棿" min-width="140px" align="center"></el-table-column>
+ <el-table-column prop="backSiteId" :sort-method="(a,b)=>{ return a.backSiteId-b.backSiteId}" sortable label="褰掕繕绔欑偣" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="backLockId" :sort-method="(a,b)=>{ return a.backLockId-b.backLockId}" sortable label="褰掕繕閿佸叿鍙�" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="backDate" sortable label="褰掕繕鏃堕棿" min-width="140px" align="center"></el-table-column>
+ <el-table-column prop="rideTime" sortable label="鍊熷嚭鏃堕暱(鍒�)" fixed="right" min-width="100px" align="center"></el-table-column>
<!-- <el-table-column prop="creator" label="鍒涘缓浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="缂栬緫鏃堕棿" min-width="100px"></el-table-column>
@@ -105,7 +106,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
export default {
name: 'MemberRides',
extends: BaseTable,
@@ -164,11 +165,40 @@
'field.id': 'id',
'field.main': 'id'
})
- this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
- this.searchForm.endDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 23:59:59'
+ this.searchForm.startDate = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
+ this.searchForm.endDate = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
this.search()
},
methods: {
+ handleSort(e) {
+ // console.log(111, e)
+ if (e.order == 'descending') {
+ // console.log(111, '闄嶅簭')
+ this.tableData.list = this.tableData.list.sort((a,b) => this.sortMethod(a, b,e.prop))
+ } else if (e.order == 'ascending') {
+ // console.log(111, '鍗囧簭')
+ this.tableData.list = this.tableData.list.sort((a,b) => this.sortMethod(b, a,e.prop))
+ }
+ },
+ sortMethod1(a,b){
+ console.log( (a) +"==========" + (b))
+ console.log( a-b)
+ },
+ sortMethod(a,b,key){
+ console.log( parseInt(a[key]) +"==========" + parseInt(b[key]))
+ console.log( parseInt(a[key])-parseInt(b[key]))
+ let temp =parseInt(a[key])-parseInt(b[key]);
+ if(temp>0){
+ console.log(1)
+ return 1;
+ }
+ if(temp == 0){
+ console.log(0)
+ return 0;
+ }
+ console.log(-1)
+ return -1;
+ },
reset() {
this.value1 = []
this.searchForm.startDate = ''
--
Gitblit v1.9.3