From 4e2e52b766d87fc528d02bdebc1757c3dda8c596 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 二月 2025 09:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/retentionCars.vue |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/src/views/business/retentionCars.vue b/admin/src/views/business/retentionCars.vue
index 227f7f0..e4756e2 100644
--- a/admin/src/views/business/retentionCars.vue
+++ b/admin/src/views/business/retentionCars.vue
@@ -19,6 +19,7 @@
           <el-option label="鍐呰繍鐗╂祦杞�" value="3"></el-option>
           <el-option label="澶栧崗杞﹁締" value="4"></el-option>
           <el-option label="甯傚叕鍙稿嵏璐ц溅" value="5"></el-option>
+          <el-option label="鏈櫥璁拌溅杈�" value="6"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="璧锋鏃堕棿" prop="startTime">
@@ -50,7 +51,7 @@
         <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>
+            <span>{{ row.companyName || row.visitCompanyName || '' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="carType" label="杞﹁締绫诲瀷" min-width="100px">
@@ -61,11 +62,12 @@
             <span v-else-if="row.carType == 3">鍐呰繍鐗╂祦杞�</span>
             <span v-else-if="row.carType == 4">澶栧崗杞﹁締</span>
             <span v-else-if="row.carType == 5">甯傚叕鍙稿嵏璐ц溅</span>
+            <span v-else-if="row.carType == 6">鏈櫥璁拌溅杈�</span>
           </template>
         </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">
+        <!--        <el-table-column label="杩涘満闂ㄧ" min-width="100px">
           <template slot-scope="{ row }">
             &lt;!&ndash; <span v-if="row.type === 1">-</span> &ndash;&gt;
             <span>{{ row.deviceName || '-' }}</span>
@@ -136,13 +138,13 @@
     reset() {
       this.$refs.searchForm.resetFields()
       this.searchForm.startTime = ''
-      this.searchForm.radio = '0'
+      this.searchForm.radio = ''
       this.searchForm.endTime = ''
       this.time = []
       this.search()
     },
     seleTime(e) {
-      if(e && e.length >2){
+      if (e && e.length > 2) {
         this.searchForm.startTime = e[0]
         this.searchForm.endTime = e[1]
         this.searchForm.radio = null

--
Gitblit v1.9.3