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 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/business/memberRides.vue b/admin/src/views/business/memberRides.vue
index b29a13a..b79b5cd 100644
--- a/admin/src/views/business/memberRides.vue
+++ b/admin/src/views/business/memberRides.vue
@@ -13,7 +13,7 @@
<el-select v-model="searchForm.closeStatus" placeholder="璇烽�夋嫨">
<el-option
label="鏈粨绠�"
- :value="1">
+ :value="0">
</el-option>
<el-option
label="宸茬粨绠�"
@@ -36,12 +36,14 @@
<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"
@@ -166,6 +168,7 @@
'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: {
--
Gitblit v1.9.3