From b1740c80205d9584738b1150f4122784c70bbe57 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 14:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/visits.vue |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 2282edb..1b59993 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -50,19 +50,10 @@
         <el-table-column prop="companyName" label="璁垮鍗曚綅" min-width="100px"></el-table-column>
         <el-table-column prop="receptMemberName" label="琚浜�" min-width="100px"></el-table-column>
         <el-table-column prop="reason" label="鎷滆浜嬬敱" min-width="100px"></el-table-column>
-        <el-table-column label="棰勭害鏃堕棿" min-width="170px">
+        <el-table-column label="鎷滆鏃堕棿" min-width="170px">
           <template slot-scope="{row}">
             <span>璧凤細{{ row.starttime }}</span><br />
             <span>姝細{{ row.endtime }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="绛惧埌鏃堕棿" min-width="170px">
-          <template slot-scope="{row}">
-            <div v-if="row.inDate && row.outDate">
-              <span>璧凤細{{ row.inDate }}</span><br />
-              <span>姝細{{ row.outDate }}</span>
-            </div>
-            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column label="鏂藉伐浜哄憳" min-width="100px">
@@ -91,6 +82,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="remark" label="涓嬪彂澶囨敞" min-width="100px"></el-table-column>
+        <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="170px"></el-table-column>
         <el-table-column   label="鎿嶄綔"
           min-width="200" fixed="right">
           <template slot-scope="{row}">

--
Gitblit v1.9.3