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/empower.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index bf8eb75..b0e7e3d 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -60,10 +60,14 @@
<el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="120px"></el-table-column>
<el-table-column prop="memberidCard" label="韬唤璇佸彿鐮�" min-width="130px"></el-table-column>
<el-table-column prop="companyName" label="鎵�灞炲叕鍙�" min-width="150px"></el-table-column>
+ <el-table-column prop="deviceName" label="璁惧鍚嶇О" min-width="150px"></el-table-column>
<el-table-column label="闂ㄧ鏈夋晥鏈�" min-width="170px">
<template slot-scope="{row}">
- <span>璧凤細{{row.startTime}}</span><br />
- <span>姝細{{row.endTime}}</span>
+ <span v-if="!row.startTime || !row.endTime">闀挎湡</span>
+ <div v-else>
+ <span>璧凤細{{row.startTime}}</span><br />
+ <span>姝細{{row.endTime}}</span>
+ </div>
</template>
</el-table-column>
<el-table-column prop="sendDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
--
Gitblit v1.9.3