From e08bc304e5be985bf83d4e668daf8ffa0f256e14 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 18 十一月 2021 11:15:44 +0800
Subject: [PATCH] update: 我的顧問清單/預約清單: 調整需求單樣式

---
 PAMapp/components/Client/ClientCard.vue |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index 038ec5a..6bfcef1 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -1,11 +1,11 @@
 <template>
     <div>
-        <el-row type="flex" class="rowStyle">
+        <el-row type="flex" class="rowStyle" @click.native="openDetail">
             <el-col :xs="5" :sm="3">
                 <el-avatar
                     :size="50"
                     src=""
-                    class="cursor--pointer"
+                    class="cursor--pointer fix-chrome-click--issue"
                 ></el-avatar>
                 <!-- <div class="satisfaction">
                     <i class="icon-star pam-icon icon--yellow satisfaction"></i>
@@ -30,9 +30,8 @@
                 </div>
             </el-col>
             <el-col class="flex-column contactInfo" :xs="5" :sm="6">
-                <div class="smTxt_bold cursor--pointer"
+                <div class="smTxt_bold cursor--pointer fix-chrome-click--issue"
                     :class="client.communicateStatus"
-                    @click="openDetail"
                 >{{isReserved ? '撌脤���' : '撌脰蝯�'}}
                 </div>
                 <div class="date xsTxt text--mid_grey">{{date}}</div>
@@ -43,6 +42,7 @@
         <Ui-Dialog
             :isVisible.sync="isVisibleDialog"
             :width="width"
+            class="pam-myDemand-dialog"
         >
             <h5 class="subTitle text--center mb-30"
             >{{isReserved ? '������' : '撌脰蝯∟���'}}</h5>
@@ -51,22 +51,21 @@
                 <p>憪��{client.name}}</p>
                 <p>�閰梧�{client.phone}}</p>
                 <p>Email嚗{client.email}}</p>
-                <p>�批嚗{client.gender === 'male' ? '���' : '憟單��'}}</p>
+                <p>�批嚗{gender}}</p>
                 <p>撟湧翩嚗{client.age}}</p>
                 <p>�璆哨�{client.job}}</p>
                 <p>��瘙�{client.requirement.replace(',', '��')}}</p>
                 <p v-for="(item, index) in hopeContactTime" :key="index">��蝯⊥�挾{{index + 1 | formatNumber}}嚗{item}}</p>
+                </div>
                 <div class="mt-30 text--center" v-if="isReserved">
                     <el-button @click="markAppointment">璅酉�撌脤��蝯�</el-button>
                 </div>
-
-            </div>
         </Ui-Dialog>
     </div>
 </template>
 
 <script lang="ts">
-import { Vue, Component, Prop } from 'nuxt-property-decorator';
+import { Vue, Component, Prop, Mutation, Action } from 'nuxt-property-decorator';
 import { isMobileDevice } from '~/assets/ts/device';
 import { ClientInfo, markAsContact } from '~/assets/ts/api/appointment';
 
@@ -81,6 +80,8 @@
     }
 })
 export default class ClientList extends Vue {
+    @Action updateMyAppointment!: (data: ClientInfo) => void
+
     @Prop() client!: ClientInfo;
     isVisibleDialog = false;
     width = '';
@@ -89,9 +90,16 @@
         return this.client.requirement.split(',');
     }
 
+    get gender() {
+        if (this.client.gender) {
+            return this.client.gender === 'male' ? '���' : '憟單��';
+        }
+        return ''
+    }
+
     get hopeContactTime() {
-        const contactList = this.client.hopeContactTime.split("'").map(item => item.slice(0, item.length - 1));
-        return contactList.filter(item => !!item)
+        const contactList = this.client.hopeContactTime.split("'").map(item => item.slice(0, item.length));
+        return contactList.filter(item => !!item && item !== ",")
     }
 
     get time() {
@@ -114,7 +122,17 @@
     }
 
     markAppointment() {
-        markAsContact(this.client.id).then(res => this.$router.go(0))
+        markAsContact(this.client.id).then(data => {
+            // TODO: 閬敺����� updated client 鞈�� - Ben 2021/11/16
+
+            const updatedClient = {...this.client};
+            updatedClient.communicateStatus = 'contacted';
+            updatedClient.appointmentDate = new Date();
+
+            this.updateMyAppointment(updatedClient);
+            this.isVisibleDialog = false;
+
+        })
     }
 
 }
@@ -179,8 +197,11 @@
 
     .dialogTxt {
         font-size: 20px;
+        overflow-y:scroll;
+        height:400px;
     }
 
+
     .text-right {
         text-align: right;
     }

--
Gitblit v1.8.0