From 0aac56d220f5764313b333ca1e3adcf7475195e3 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 01 八月 2023 11:52:09 +0800
Subject: [PATCH] Merge branch '2023_CR2' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into 2023_CR2
---
PAMapp/components/Client/ClientCard.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index 7235847..051bc23 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -48,7 +48,7 @@
></AppointmentProgress>
</div>
</div>
- <el-col :xs="5" :sm="3" align="middle">
+ <!-- <el-col :xs="5" :sm="3" align="middle">
<el-avatar
:size="50"
></el-avatar>
@@ -61,7 +61,7 @@
<div class="unfilled">�憛急遛��漲</div>
</template>
</div>
- </el-col>
+ </el-col> -->
<div class="flex-column contactInfo" :xs="4" :sm="6">
@@ -77,12 +77,12 @@
v-else-if="client.communicateStatus === contactStatus.CONTACTED">
蝯��
</div>
- <div
+ <!-- <div
class="invite-msg smTxt_bold"
@click.stop="inviteReview"
v-else-if="!client.satisfactionScore">
��遛��漲
- </div>
+ </div> -->
<div
class="date xsTxt text--black"
@@ -118,7 +118,8 @@
<p>�批嚗�<span>{{gender}}</span></p>
<p>撟湧翩嚗�<span>{{client.age | toAgeLabel }}</span></p>
<p>�璆哨��<span>{{client.job}}</span></p>
- <p>��瘙��<span>{{client.requirement.split(',').join('��')}}</span></p>
+ <p>隢株岷�撘��<span>{{client.consultationMethod | toConsultationMethod }}</span></p>
+ <p>��瘙��<span>{{ client.requirement ? client.requirement.split(',').join('��') : '--' }}</span></p>
<p v-for="(item, index) in hopeContactTime"
:key="index"
>��蝯⊥�挾{{index + 1 | formatNumber}}嚗�<span>{{ item | formatHopeContactTime}}</span></p>
@@ -382,7 +383,7 @@
}
get requirements() {
- return this.client.requirement.split(',');
+ return this.client.requirement ? this.client.requirement.split(',') : [];
}
get gender() {
--
Gitblit v1.8.0