From 54e81529b5644b10ebe9aa56c811c27e27bba59e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 十二月 2025 13:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 admin/src/views/business/retention.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 724e319..68d0979 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -14,7 +14,7 @@
             <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-option label="璐ц繍鍙告満" value="5"></el-option>-->
           </el-select>
         </el-form-item>
         <el-form-item label="璧锋鏃堕棿" prop="startTime">
@@ -54,7 +54,7 @@
         <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>
@@ -65,7 +65,7 @@
             <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-if="row.type ==5">璐ц繍鍙告満</span>-->
             <span  v-else ></span>
           </template>
         </el-table-column>

--
Gitblit v1.9.3