From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/reportRecord.vue | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index 2fad862..2cba9f7 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -77,7 +77,7 @@
<span v-if="row.status === 4" style="color: gray">鍙栨秷</span>
<span v-if="row.status === 5" style="color: green">涓嬪彂鎴愬姛</span>
<span v-if="row.status === 6" style="color: gray">涓嬪彂澶辫触</span>
- <span v-if="row.status === 7" style="color: green">鎷滆涓�</span>
+ <span v-if="row.status === 7" style="color: green">宸茬櫥璁�</span>
<span v-if="row.status === 8" style="color: red">宸茬绂�</span>
<span v-if="row.status === 9" style="color: gray">宸插け鏁�</span>
</template>
@@ -144,9 +144,10 @@
label: '鍏徃鍚嶇О'
},
{
- filed: 'date',
- type: 'daterange',
- label: '璧峰鏃ユ湡'
+ filed1: 'queryStarttime',
+ filed2: 'queryEndtime',
+ type: 'datetime',
+ label: '鎷滆鏃堕棿'
}
],
online: true
@@ -239,14 +240,6 @@
},
getList (page) {
const { pagination, filters } = this
- console.log(filters)
- if (filters.date && filters.date.length === 2) {
- filters.queryStarttime = filters.date[0]
- filters.queryEndtime = filters.date[1]
- } else {
- filters.queryStarttime = ''
- filters.queryEndtime = ''
- }
pagination.page = page || pagination.page
fetchList({
model: { ...filters },
--
Gitblit v1.9.3