From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007

---
 admin/src/views/business/retention.vue |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 2818825..b0d72f8 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -12,14 +12,19 @@
         <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
           <el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
             <el-option label="璁垮" value="0"></el-option>
-            <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
+            <el-option label="鐩搁暱鏈熷叧鏂�" value="1"></el-option>
             <el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
+            <el-option label="璐ц繍鍙告満" value="5"></el-option>
           </el-select>
         </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>
@@ -41,7 +46,8 @@
             @click="exportExcel">瀵煎嚭</el-button>
         </li>
       </ul>
-      <el-table :max-height="tableHeight" 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="name" label="濮撳悕" min-width="100px"></el-table-column>
         <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
@@ -50,7 +56,7 @@
           <template slot-scope="{ row }">
             <span v-if="row.type === 2 || row.type === 0">{{
               row.companyName
-            }}</span>
+              }}</span>
             <span v-else>{{ row.visitCompanyName }}</span>
           </template>
         </el-table-column>
@@ -67,7 +73,7 @@
             <span>{{ row.deviceName || '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="eventDate" label="杩涘満鏃堕棿" min-width="140px"></el-table-column>
+        <el-table-column prop="eventDate" label="鏈�鍚庤繘鍦烘椂闂�" min-width="140px"></el-table-column>
         <el-table-column label="浜鸿劯鐓х墖" min-width="100px">
           <template slot-scope="{ row }">
             <el-image v-if="row.faceImgFull != null" style="width: 80px; height: 80px" :src="row.faceImgFull"
@@ -130,15 +136,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