From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/carEvent.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index 0b5cd5d..ed79f61 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]">
@@ -97,7 +96,7 @@
</el-image>
</div>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="140px"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
--
Gitblit v1.9.3