From 1f013658d7b3835625aacdb17f42cac0cb7671ce Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 25 二月 2025 18:19:48 +0800
Subject: [PATCH] l l
---
admin/src/views/business/onlinePayStatistics.vue | 5 +-
admin/src/views/business/memberRides.vue | 4 +
admin/src/views/business/bikeRetakeRecord.vue | 6 +-
admin/src/views/combo/components/SaleDetail.vue | 15 ++++---
admin/src/components/base/BasePageTemp.vue | 8 ++-
admin/src/views/business/bikeRepair.vue | 5 +-
admin/src/views/business/goodsorder.vue | 5 +-
admin/src/views/combo/order.vue | 9 +++-
admin/src/components/common/Paginations.vue | 40 ++++++++++++++++++++
admin/src/views/combo/components/ComboDetail.vue | 10 ++--
10 files changed, 79 insertions(+), 28 deletions(-)
diff --git a/admin/src/components/base/BasePageTemp.vue b/admin/src/components/base/BasePageTemp.vue
index af01469..85784ce 100644
--- a/admin/src/components/base/BasePageTemp.vue
+++ b/admin/src/components/base/BasePageTemp.vue
@@ -1,5 +1,5 @@
<script>
-import Pagination from '@/components/common/Pagination'
+import Pagination from '@/components/common/Paginations'
import QueryForm from '@/components/common/QueryForm'
export default {
name: 'BasePageTemp',
@@ -7,7 +7,7 @@
Pagination,
QueryForm,
},
- data () {
+ data() {
return {
loading: false,
pagination: {
@@ -21,11 +21,13 @@
}
},
methods: {
- getList(){},
+ getList() { },
clear() {
this.filters = {}
this.pagination.pageSize = 10
this.pagination.page = 1
+ console.log('-----');
+
this.getList()
},
handleSizeChange(capacity) {
diff --git a/admin/src/components/common/Paginations.vue b/admin/src/components/common/Paginations.vue
new file mode 100644
index 0000000..384d728
--- /dev/null
+++ b/admin/src/components/common/Paginations.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="table-pagination">
+ <el-pagination
+ :current-page="pagination.page"
+ :page-sizes="pagination.pageSizes||[10, 20, 30, 40]"
+ :page-size="pagination.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="pagination.total"
+ @size-change="sizeChange"
+ @current-change="currentChange"
+ background>
+ </el-pagination>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'Pagination',
+ props: {
+ pagination: {
+ type: Object,
+ default: function () {
+ return {}
+ }
+ }
+ },
+ data () {
+ return {
+ }
+ },
+ methods: {
+ sizeChange (value) {
+ this.$emit('size-change', value)
+ },
+ currentChange (value) {
+ this.$emit('current-change', value)
+ }
+ }
+}
+</script>
diff --git a/admin/src/views/business/bikeRepair.vue b/admin/src/views/business/bikeRepair.vue
index 251ce4a..35fc3dd 100644
--- a/admin/src/views/business/bikeRepair.vue
+++ b/admin/src/views/business/bikeRepair.vue
@@ -107,7 +107,7 @@
import Pagination from '@/components/common/Pagination'
import OperaRepairDealWindow from '@/components/business/OperaRepairDealWindow'
import RepairDetailWindow from '@/components/business/RepairDetailWindow'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
import { getFileList } from '@/api/business/bikeRepair'
export default {
name: 'BikeRepair',
@@ -150,7 +150,8 @@
'field.id': 'id',
'field.main': 'id'
})
- // this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+ 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: {
diff --git a/admin/src/views/business/bikeRetakeRecord.vue b/admin/src/views/business/bikeRetakeRecord.vue
index babeb93..471f844 100644
--- a/admin/src/views/business/bikeRetakeRecord.vue
+++ b/admin/src/views/business/bikeRetakeRecord.vue
@@ -106,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,
@@ -165,8 +165,8 @@
'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: {
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index 275e639..41d831a 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -116,7 +116,7 @@
import GoodsOrderDetail from '@/components/business/goodsOrderDetail'
import BackGoodsorderWindow from '@/components/business/backGoodsorderWindow'
import { getDetail, getGoodsorderCanBanlanceDTO, closerGoodsorder } from '@/api/business/goodsorder'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
export default {
name: 'Goodsorder',
extends: BaseTable,
@@ -159,7 +159,8 @@
'field.id': 'id',
'field.main': 'id'
})
- // this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+ 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: {
diff --git a/admin/src/views/business/memberRides.vue b/admin/src/views/business/memberRides.vue
index e9d0139..09a12c2 100644
--- a/admin/src/views/business/memberRides.vue
+++ b/admin/src/views/business/memberRides.vue
@@ -108,7 +108,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,
@@ -167,6 +167,8 @@
'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.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()
diff --git a/admin/src/views/business/onlinePayStatistics.vue b/admin/src/views/business/onlinePayStatistics.vue
index 55f7ca8..5178a32 100644
--- a/admin/src/views/business/onlinePayStatistics.vue
+++ b/admin/src/views/business/onlinePayStatistics.vue
@@ -55,7 +55,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import { fetchList } from '@/api/business/onlinePayStatistics'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
export default {
name: 'PricingParam',
extends: BaseTable,
@@ -71,7 +71,8 @@
}
},
created () {
- // this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+ 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: {
diff --git a/admin/src/views/combo/components/ComboDetail.vue b/admin/src/views/combo/components/ComboDetail.vue
index d2af7fb..98e1ede 100644
--- a/admin/src/views/combo/components/ComboDetail.vue
+++ b/admin/src/views/combo/components/ComboDetail.vue
@@ -10,13 +10,13 @@
<span class="title">{{ detail.name }}</span>
<span class="status">{{ detail.status == '0' ? '宸插惎鐢�' : '绂佺敤' }}</span>
</div>
- <div class="placeholder9 mt10">姣忔棩閿�鍞檺閲忥細{{ detail.saleDayLimit }}</div>
+ <div class="placeholder9 mt10">姣忔棩閿�鍞檺閲忥細{{ detail.saleDayLimit || '涓嶉檺棰�' }}</div>
</div>
</div>
<div class="right">
<div class="item">
<div class="key">鎬诲彂鏀炬暟閲�</div>
- <div class="value">{{ detail.saleLimit || '涓嶉檺棰�' }}</div>
+ <div class="value">{{ detail.saleLimit || '-' }}</div>
</div>
<div class="item">
<div class="key">宸查攢鍞暟閲�</div>
@@ -25,14 +25,14 @@
<div class="item">
<div class="key">鍓╀綑鏁伴噺</div>
<div v-if="detail.saleLimit" class="value">{{ detail.saleLimit - detail.saleNum }}</div>
- <div v-else class="value">涓嶉檺棰�</div>
+ <div v-else class="value">-</div>
</div>
</div>
</div>
<div class="createTime_wrap">
<span class="item">鍒涘缓鏃堕棿锛歿{ detail.createDate }}</span>
<span class="item">鍒涘缓浜猴細{{ detail.creatorName }}</span>
- <span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.endDate }}</span>
+ <span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.editDate }}</span>
<span class="item">鏇存柊浜猴細{{ detail.editorName }}</span>
</div>
</div>
@@ -81,7 +81,7 @@
</div>
<div class="line">
<div class="key">鎬婚檺棰濓細</div>
- <div class="value">{{ detail.saleLimit || '涓嶉檺鍒�' }}</div>
+ <div class="value">{{ detail.saleLimit || '涓嶉檺棰�' }}</div>
</div>
<div class="line">
<div class="key">姣忔棩闄愰锛�</div>
diff --git a/admin/src/views/combo/components/SaleDetail.vue b/admin/src/views/combo/components/SaleDetail.vue
index 7d1dd41..4ad54e5 100644
--- a/admin/src/views/combo/components/SaleDetail.vue
+++ b/admin/src/views/combo/components/SaleDetail.vue
@@ -16,8 +16,8 @@
<div style="border-bottom: 2px solid #e5e7ec; margin-top: 1px;">{{ activeTab == 0 ? '浣跨敤鎯呭喌' : '鎿嶄綔鎯呭喌' }}锛歿{ pagination.total }}娆�</div>
</div>
<el-table v-if="activeTab == 0" v-loading="loading" :data="list" stripe border>
- <el-table-column prop="createDate" align="center" label="浣跨敤鏃堕棿" min-width="100" show-overflow-tooltip />
- <el-table-column prop="discountMemberId" align="center" label="鍏宠仈璁㈠崟" min-width="120" show-overflow-tooltip />
+ <el-table-column prop="createDate" align="center" label="浣跨敤鏃堕棿" min-width="120" show-overflow-tooltip />
+ <el-table-column prop="discountMemberId" align="center" label="鍏宠仈璁㈠崟" min-width="140" show-overflow-tooltip />
<el-table-column prop="" align="center" label="楠戣溅鏃堕暱" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
{{ row.rideTime }}鍒嗛挓
@@ -26,16 +26,16 @@
<el-table-column prop="ridePrice" align="center" label="鎶垫墸閲戦" min-width="100" show-overflow-tooltip />
</el-table>
<el-table v-if="activeTab == 2" v-loading="loading" :data="list" stripe border>
- <el-table-column prop="createDate" align="center" label="鎿嶄綔鏃堕棿" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createDate" align="center" label="鎿嶄綔鏃堕棿" min-width="120" show-overflow-tooltip />
<el-table-column prop="info" align="center" label="鎿嶄綔绫诲瀷" min-width="100" show-overflow-tooltip>
<template v-slot="{ row }">
<span v-if="row.type == 0">鐢ㄦ埛楠戣浣跨敤</span>
- <span v-if="row.type == 1">骞冲彴浣滃簾</span>
- <span v-if="row.type == 2">骞冲彴璋冩暣</span>
+ <span v-if="row.type == 1">濂楅浣滃簾</span>
+ <span v-if="row.type == 2">濂楅璋冩暣</span>
</template>
</el-table-column>
- <el-table-column prop="editInfo" align="center" label="鎿嶄綔澶囨敞" min-width="100" show-overflow-tooltip />
- <el-table-column prop="creatorName" align="center" label="鎿嶄綔浜�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="editInfo" align="center" label="鎿嶄綔澶囨敞" min-width="200" show-overflow-tooltip />
+ <el-table-column prop="creatorName" align="center" label="鎿嶄綔浜�" min-width="80" show-overflow-tooltip />
</el-table>
<div class="table_btns">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
@@ -75,6 +75,7 @@
getDetail(row) {
comboSalerDetailPost(row.id).then(res => {
this.detail = res
+ this.activeTab = '0'
this.getList()
}, () => {
diff --git a/admin/src/views/combo/order.vue b/admin/src/views/combo/order.vue
index ddd8d1b..bee9272 100644
--- a/admin/src/views/combo/order.vue
+++ b/admin/src/views/combo/order.vue
@@ -35,7 +35,7 @@
</el-table-column>
<el-table-column prop="refundUserName" align="center" label="鎿嶄綔浜�" min-width="80" show-overflow-tooltip />
<el-table-column prop="createDate" align="center" label="鍒涘缓鏃堕棿" min-width="160" show-overflow-tooltip />
- <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="80" show-overflow-tooltip>
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="120" show-overflow-tooltip>
<template v-slot="{ row }">
<span @click="handleDetail(row.id)" class="primaryColor pointer">鏌ョ湅璇︽儏</span>
<span v-if="row.status == 1 && (row.refundMoney < row.money)" @click="handRefund(row.id)"
@@ -121,7 +121,7 @@
},
created() {
let date = dayjs().format('YYYY-MM-DD')
- this.$set(this.filters, 'selDate', [date,date])
+ this.$set(this.filters, 'selDate', [date, date])
this.getList()
// this.initData()
},
@@ -156,7 +156,10 @@
comboListOrderEx({
page: 1,
capacity: 1000000,
- model: filters
+ model: {
+ ...filters,
+ type: 1
+ },
})
.then(response => {
this.download(response)
--
Gitblit v1.9.3