From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 18 三月 2025 11:17:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- admin/src/views/business/memberRides.vue | 54 +++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 41 insertions(+), 13 deletions(-) diff --git a/admin/src/views/business/memberRides.vue b/admin/src/views/business/memberRides.vue index 5446f02..b79b5cd 100644 --- a/admin/src/views/business/memberRides.vue +++ b/admin/src/views/business/memberRides.vue @@ -3,17 +3,17 @@ <!-- 鎼滅储琛ㄥ崟 --> <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-select v-model="searchForm.closeStatus" placeholder="璇烽�夋嫨"> <el-option label="鏈粨绠�" - :value="1"> + :value="0"> </el-option> <el-option label="宸茬粨绠�" @@ -25,6 +25,9 @@ <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,24 +36,26 @@ <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 @click="reset">閲嶇疆</el-button> </section> </el-form> <!-- 琛ㄦ牸鍜屽垎椤� --> <template v-slot:table-wrap> + <ul class="toolbar" v-permissions="['business:member:create']"> + <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="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="paramId" label="杞﹁締绫诲瀷缂栫爜" min-width="100px" align="center"></el-table-column> - <el-table-column prop="rentDate" label="绉熻溅鏃堕棿" min-width="100px" align="center"></el-table-column> - <el-table-column prop="duration" label="楠戣璁¤垂鏃堕暱" min-width="100px" align="center"></el-table-column> - <el-table-column prop="createDate" 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="rideTime" label="鍊熷嚭鏃堕暱(鍒�)" min-width="100px" align="center"></el-table-column> + <el-table-column prop="duration" label="璁¤垂鏃堕暱(鍒�)" min-width="100px" align="center"></el-table-column> + <el-table-column prop="rentDate" label="鍊熷嚭鏃堕棿" min-width="100px" align="center"></el-table-column> <el-table-column prop="backDate" label="杩樿溅鏃堕棿" min-width="100px" align="center"></el-table-column> <el-table-column prop="closeStatus" label="缁撶畻鐘舵��" min-width="100px" align="center"> <!-- 0鏈粨绠� 1宸茬粨鏉� --> @@ -103,6 +108,7 @@ import BaseTable from '@/components/base/BaseTable' import TableLayout from '@/layouts/TableLayout' import Pagination from '@/components/common/Pagination' +import { formatDateTime } from '@/utils/util' export default { name: 'MemberRides', extends: BaseTable, @@ -118,7 +124,7 @@ editor: '', isdeleted: '', info: '', - memberId: '', + openid: '', bikeCode: '', balance: '', paramId: '', @@ -147,9 +153,11 @@ backType: '', backReason: '', backInfo: '', + startDate: '', + endDate: '', backUserid: '' }, - value1: [] + value1: [new Date(), new Date()] } }, created () { @@ -159,7 +167,27 @@ '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.search() - } + }, + methods: { + 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