From 5ca8f6e6e554696cb8add0fc91396b2d905b0d7a Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 30 十一月 2021 13:53:24 +0800
Subject: [PATCH] add: age.filter

---
 PAMapp/components/Client/ClientCard.vue |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index ec0d0b2..ef481b3 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -42,6 +42,7 @@
         <Ui-Dialog
             :isVisible.sync="isVisibleDialog"
             :width="width"
+            class="pam-myDemand-dialog"
         >
             <h5 class="subTitle text--center mb-30"
             >{{isReserved ? '������' : '撌脰蝯∟���'}}</h5>
@@ -51,10 +52,10 @@
                 <p>�閰梧�{client.phone}}</p>
                 <p>Email嚗{client.email}}</p>
                 <p>�批嚗{gender}}</p>
-                <p>撟湧翩嚗{client.age}}</p>
+                <p>撟湧翩嚗{client.age | toAgeLabel }}</p>
                 <p>�璆哨�{client.job}}</p>
-                <p>��瘙�{client.requirement.replace(',', '��')}}</p>
-                <p v-for="(item, index) in hopeContactTime" :key="index">��蝯⊥�挾{{index + 1 | formatNumber}}嚗{item}}</p>
+                <p>��瘙�{client.requirement.split(',').join('��')}}</p>
+                <p v-for="(item, index) in hopeContactTime" :key="index">��蝯⊥�挾{{index + 1 | formatNumber}}嚗{ item | formatHopeContactTime}}</p>
                 </div>
                 <div class="mt-30 text--center" v-if="isReserved">
                     <el-button @click="markAppointment">璅酉�撌脤��蝯�</el-button>
@@ -75,6 +76,15 @@
                 const upperNumber = ['�', '銝�', '鈭�', '銝�', '���', '鈭�', '�', '銝�', '�', '銋�', '���']
                 return upperNumber[index];
             }
+        },
+        formatHopeContactTime(item: string): string {
+          if (item) {
+            const [hopeDay, hopeTime] = item.split('��');
+            const day = hopeDay.split(',').length > 6 ? '銝����' : hopeDay;
+            const time = hopeTime.split(',').length > 3 ? '銝����' : hopeTime;
+            return `${day}��${time}`;
+          }
+          return '';
         }
     }
 })
@@ -98,7 +108,7 @@
 
     get hopeContactTime() {
         const contactList = this.client.hopeContactTime.split("'").map(item => item.slice(0, item.length));
-        return contactList.filter(item => !!item)
+        return contactList.filter(item => !!item && item !== ",")
     }
 
     get time() {
@@ -196,12 +206,12 @@
 
     .dialogTxt {
         font-size: 20px;
-        overflow:scroll;
+        overflow-y:scroll;
         height:400px;
     }
-    
+
 
     .text-right {
         text-align: right;
     }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.8.0