From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/carEvent.vue |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index ca1c76e..12a2af9 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -28,9 +28,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="璧峰鏃堕棿" prop="eventType">
-          <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+          <!-- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
             value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
-          </el-date-picker>
+          </el-date-picker> -->
+          <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+          <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
         </el-form-item>
         <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
           <el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -43,7 +47,6 @@
         </section>
       </el-form>
     </div>
-
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
       <ul class="toolbar" v-permissions="['business:carevent:exportExcel']">
@@ -56,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>
@@ -77,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]">
@@ -93,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">
@@ -125,7 +128,7 @@
         companyName: '',
         startTime: '',
         endTime: '',
-        radio: '0'
+        radio: ''
       },
       time: []
     }
@@ -148,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()
     },
@@ -157,15 +168,19 @@
       if (e === '0') {
         this.searchForm.startTime = timeForMat(0)[0]
         this.searchForm.endTime = timeForMat(0)[1]
-        this.time = timeForMat(0)
       } else if (e === '1') {
         this.searchForm.startTime = timeForMat(6)[0]
         this.searchForm.endTime = timeForMat(6)[1]
-        this.time = timeForMat(6)
       } else if (e === '2') {
         this.searchForm.startTime = timeForMat(29)[0]
         this.searchForm.endTime = timeForMat(29)[1]
-        this.time = timeForMat(29)
+      } else {
+        this.searchForm.radio = ''
+      }
+      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
+        this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+        this.searchForm.startTime = ''
+        return
       }
       this.search()
     },

--
Gitblit v1.9.3