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 | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/admin/src/views/business/bikeRetakeRecord.vue b/admin/src/views/business/bikeRetakeRecord.vue
index c74cbc3..471f844 100644
--- a/admin/src/views/business/bikeRetakeRecord.vue
+++ b/admin/src/views/business/bikeRetakeRecord.vue
@@ -3,28 +3,31 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鐢ㄦ埛" prop="memberId">
- <el-input v-model="searchForm.memberId" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鐢ㄦ埛" prop="openid">
+ <el-input v-model="searchForm.openid" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="杞﹁締缂栫爜" prop="bikeCode">
<el-input v-model="searchForm.bikeCode" placeholder="璇疯緭鍏ヨ溅杈嗙紪鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鏄惁褰掕繕" prop="closeStatus">
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
+ <el-form-item label="鏄惁褰掕繕" prop="hasBack">
+ <el-select v-model="searchForm.hasBack" placeholder="璇烽�夋嫨">
<el-option
label="鏈綊杩�"
- :value="1">
+ :value="false">
</el-option>
<el-option
label="宸插綊杩�"
- :value="1">
+ :value="true">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="绉熷�熸椂闂�" prop="rentDate">
+ <el-form-item label="鍊熷嚭鏃堕棿" prop="rentDate">
<el-date-picker
v-model="value1"
type="daterange"
+ @change="selectDate"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -33,28 +36,32 @@
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:memberrides:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+ <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:memberrides:exportExcel']" @click="exportExcel">瀵煎嚭</el-button> -->
<el-button @click="reset">閲嶇疆</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+ <ul class="toolbar">
+ <li ><el-button type="primary" :loading="isWorking.export" v-permissions="['business:memberrides:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+ </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
stripe
border
+
>
- <el-table-column prop="memberId" 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="paramId" label="杞﹁締绫诲瀷" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="paramId" label="鍊熷嚭绔欑偣" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="paramId" 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="paramId" label="褰掕繕绔欑偣" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="paramId" 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="duration" label="鍊熷嚭鏃堕暱(鍒�)" 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>
@@ -99,6 +106,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import dayjs from 'dayjs'
export default {
name: 'MemberRides',
extends: BaseTable,
@@ -109,12 +117,12 @@
searchForm: {
id: '',
createDate: '',
- creator: '',
+ hasBack: '',
editDate: '',
editor: '',
isdeleted: '',
info: '',
- memberId: '',
+ openid: '',
bikeCode: '',
balance: '',
paramId: '',
@@ -143,19 +151,70 @@
backType: '',
backReason: '',
backInfo: '',
+ startDate: '',
+ endDate: '',
backUserid: ''
},
- value1: []
+ value1: [new Date(), new Date()]
}
},
created () {
this.config({
module: '鐢ㄦ埛楠戣璁板綍琛�',
- api: '/business/memberRides',
+ api: '/business/bikeRetakeRecord',
'field.id': 'id',
'field.main': 'id'
})
+ 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 = ''
+ this.searchForm.endDate = ''
+ this.$refs.searchForm.resetFields()
+ this.search()
+ },
+ selectDate(v) {
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ if (v) {
+ this.searchForm.startDate = v[0]
+ this.searchForm.endDate = v[1]
+ }
+ this.search()
+ },
+ },
}
</script>
--
Gitblit v1.9.3