From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 21 五月 2025 09:14:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/views/business/retention.vue | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 3d4f9d6..a7b8a3c 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -54,26 +54,36 @@
<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 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 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"
@@ -81,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>
--
Gitblit v1.9.3