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/retention.vue |   50 ++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 2818825..a7b8a3c 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -10,16 +10,21 @@
           <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
         </el-form-item>
         <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-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+            <el-option label="璁垮" value="1"></el-option>
+            <el-option label="鐩搁暱鏈熷叧鏂�" value="4"></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,33 +46,44 @@
             @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>
         <el-table-column prop="idcardDecode" label="韬唤璇佸彿" min-width="130px"></el-table-column>
         <el-table-column prop="companyName" label="缁勭粐" min-width="100px">
           <template slot-scope="{ row }">
-            <span v-if="row.type === 2 || row.type === 0">{{
+            <span v-if="row.type === 2 || row.type === 4 || row.type === 0">{{
               row.companyName
-            }}</span>
+              }}</span>
             <span v-else>{{ row.visitCompanyName }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="type" label="浜哄憳绫诲瀷" min-width="100px">
+          <template slot-scope="{row}">
+            <span  v-if="row.type ==1">璁垮</span>
+            <span  v-else-if="row.type ==2">鍐呴儴浜哄憳</span>
+            <span  v-else-if="row.type ==4">鐩稿叧鏂逛汉鍛�</span>
+            <span  v-else-if="row.type ==5">璐ц繍鍙告満</span>
+            <span  v-else ></span>
+          </template>
+        </el-table-column>
+<!--        <el-table-column prop="type" label="浜哄憳绫诲瀷" min-width="100px">
           <template slot-scope="{ row }">
             <span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
             <span v-else-if="row.companyType == 1">鍐呴儴鍛樺伐</span>
             <span v-else>璁垮</span>
           </template>
-        </el-table-column>
-        <el-table-column label="杩涘満闂ㄧ" min-width="100px">
+        </el-table-column>-->
+        <el-table-column label="杩涘満闂ㄧ" min-width="150px">
           <template slot-scope="{ row }">
             <!-- <span v-if="row.type === 1">-</span> -->
             <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="澶囨敞" prop="remark"  min-width="100px"></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"
@@ -75,12 +91,14 @@
             </el-image>
           </template>
         </el-table-column>
+
         <el-table-column label="鎿嶄綔" min-width="120" fixed="right">
           <template slot-scope="{ row }">
             <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
               v-permissions="['business:retention:delete']">鏍囪绂诲満</el-button>
           </template>
         </el-table-column>
+
       </el-table>
       <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
       </pagination>
@@ -130,15 +148,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