From 078a5c4ced367fdbd5a16c27c8bada6e44e632d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 09 十月 2025 16:00:33 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/retentionCars.vue |   45 +++++++++++++++++++--------------------------
 1 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/admin/src/views/business/retentionCars.vue b/admin/src/views/business/retentionCars.vue
index ab65e02..0cdb7e7 100644
--- a/admin/src/views/business/retentionCars.vue
+++ b/admin/src/views/business/retentionCars.vue
@@ -11,20 +11,17 @@
       <el-form-item label="缁勭粐" prop="companyName">
         <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
       </el-form-item>
-      <el-form-item label="杞﹁締绫诲瀷" prop="carType">
-        <el-select v-model="searchForm.carType" placeholder="璇烽�夋嫨">
-          <el-option label="鍐呴儴杞﹁締" value="0"></el-option>
-          <el-option label="鐩稿叧鏂硅溅杈�" value="1"></el-option>
-          <el-option label="璁垮杞﹁締" value="2"></el-option>
-          <el-option label="鍐呰繍鐗╂祦杞�" value="3"></el-option>
-          <el-option label="澶栧崗杞﹁締" value="4"></el-option>
-          <el-option label="甯傚叕鍙稿嵏璐ц溅" value="5"></el-option>
-        </el-select>
+      <el-form-item label="杞﹁締鍒嗙被" prop="categoryName">
+        <el-input v-model="searchForm.categoryName" placeholder="璇疯緭鍏ヨ溅杈嗗垎绫�" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="璧锋鏃堕棿" prop="startTime">
-        <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>
@@ -44,25 +41,16 @@
             @click="exportExcel">瀵煎嚭</el-button>
         </li>
       </ul>
-      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="createDate" label="杩涘満鏃堕棿" min-width="150px"></el-table-column>
+        <el-table-column prop="createDate" label="鏈�鍚庤繘鍦烘椂闂�" min-width="150px"></el-table-column>
         <el-table-column prop="carNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
         <el-table-column prop="companyName" label="缁勭粐" min-width="250px">
           <template slot-scope="{ row }">
             <span>{{ row.companyName || row.visitCompanyName || '' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="carType" label="杞﹁締绫诲瀷" min-width="100px">
-          <template slot-scope="{ row }">
-            <span v-if="row.carType == 0">鍐呴儴杞﹁締</span>
-            <span v-else-if="row.carType == 1">鐩稿叧鏂硅溅杈�</span>
-            <span v-else-if="row.carType == 2">璁垮杞﹁締</span>
-            <span v-else-if="row.carType == 3">鍐呰繍鐗╂祦杞�</span>
-            <span v-else-if="row.carType == 4">澶栧崗杞﹁締</span>
-            <span v-else-if="row.carType == 5">甯傚叕鍙稿嵏璐ц溅</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="categoryName" label="杞﹁締鍒嗙被" min-width="100px"></el-table-column>
         <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
         <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
         <!--        <el-table-column label="杩涘満闂ㄧ" min-width="100px">
@@ -102,6 +90,7 @@
         keyWords: '',
         startTime: '',
         endTime: '',
+        categoryName: '',
         radio: 0
       },
       time: []
@@ -121,15 +110,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