From be5afdf49938b5830313740b12c25c6851847e3f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 08 三月 2024 15:42:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/visits.vue | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index 34e4ca2..2c4ea45 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -49,12 +49,21 @@
<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">
<template slot-scope="{row}">
<span>{{row.memberNum || '-'}}</span>
--
Gitblit v1.9.3