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/retention.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index d9fa1da..054b175 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -40,6 +40,9 @@
</ul>
<el-table 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">{{
@@ -55,13 +58,10 @@
<span v-else>璁垮</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 prop="idcardDecode" label="韬唤璇佸彿" min-width="130px"></el-table-column>
<el-table-column label="杩涘満闂ㄧ" min-width="100px">
<template slot-scope="{ row }">
- <span v-if="row.type === 1">-</span>
- <span v-else>{{ row.deviceName }}</span>
+ <!-- <span v-if="row.type === 1">-</span> -->
+ <span>{{ row.deviceName || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="eventDate" label="杩涘満鏃堕棿" min-width="100px"></el-table-column>
@@ -137,7 +137,7 @@
reset() {
this.$refs.searchForm.resetFields()
this.searchForm.startTime = ''
- this.searchForm.radio = '0'
+ this.searchForm.radio = ''
this.searchForm.endTime = ''
this.time = []
this.search()
--
Gitblit v1.9.3