From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/visitorManagement.vue |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/admin/src/views/business/visitorManagement.vue b/admin/src/views/business/visitorManagement.vue
index 9ae6170..fe0cd12 100644
--- a/admin/src/views/business/visitorManagement.vue
+++ b/admin/src/views/business/visitorManagement.vue
@@ -34,7 +34,18 @@
                 <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="phone" label="鎬у埆" min-width="100px"></el-table-column>
+                <el-table-column prop="phone" label="鎬у埆" min-width="100px">
+                    <template slot-scope="{row}">
+                        <span v-if="row.sex === 1">鐢�</span>
+                        <span v-if="row.sex === 2">濂�</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="status" label="鐘舵��" min-width="100px">
+                    <template slot-scope="{row}">
+                        <span v-if="(row.status || 0) === 0" style="color: green">姝e父</span>
+                        <span v-else style="color: red">寮傚父</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="璇佷欢绫诲瀷" min-width="100px">
                     <template slot-scope="{row}">
                         <span v-if="row.idcardType === 0">韬唤璇�</span>
@@ -42,8 +53,8 @@
                         <span v-if="row.idcardType === 2">鎶ょ収</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="idcardNo" label="韬唤璇佸彿" min-width="100px"></el-table-column>
-                <el-table-column prop="companyName" label="鍏徃" min-width="100px"></el-table-column>
+                <el-table-column prop="idcardDecode" label="韬唤璇佸彿" width="150px"></el-table-column>
+                <el-table-column prop="visitCompanyName" label="鍏徃" min-width="100px"></el-table-column>
                 <el-table-column prop="visitTimes" label="鎷滆娆℃暟" min-width="100px"></el-table-column>
                 <el-table-column prop="lastVisitDate" label="鏈�鍚庢嫓璁挎椂闂�" min-width="100px"></el-table-column>
             </el-table>

--
Gitblit v1.9.3