From 5841a771d4455d25adb185b8a0637c9ba498aab2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/carEvent.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index 6e1515d..12a2af9 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -47,7 +47,6 @@
</section>
</el-form>
</div>
-
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:carevent:exportExcel']">
@@ -60,7 +59,7 @@
@click="exportExcel">瀵煎嚭</el-button>
</li>
</ul>
- <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
<el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="personCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
@@ -81,7 +80,7 @@
<span v-if="row.inoutType === 1">绂诲洯</span>
</template>
</el-table-column>
-<!-- <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
+ <!-- <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
<template slot-scope="{ row }">
<div v-if="row.platePicUrl != null">
<el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
@@ -129,7 +128,7 @@
companyName: '',
startTime: '',
endTime: '',
- radio: '0'
+ radio: ''
},
time: []
}
@@ -152,8 +151,16 @@
methods: {
reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = ''
- // this.changeRadio('0')
+ this.searchForm = {
+ eventType: '',
+ keyWords: '',
+ plateNos: '',
+ memberType: '',
+ companyName: '',
+ startTime: '',
+ endTime: '',
+ radio: ''
+ }
this.time = []
this.search()
},
--
Gitblit v1.9.3