From 9493c2dfcf2016fcb2359338366d72f7453b02c1 Mon Sep 17 00:00:00 2001 From: HelenHuang <LinHuang@pollex.com.tw> Date: 星期一, 17 一月 2022 14:53:04 +0800 Subject: [PATCH] update: 顧問_預約單細節 - 結案明細 --- PAMapp/components/Client/ClientCard.vue | 167 ++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 127 insertions(+), 40 deletions(-) diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue index 25c5423..90eec39 100644 --- a/PAMapp/components/Client/ClientCard.vue +++ b/PAMapp/components/Client/ClientCard.vue @@ -6,12 +6,47 @@ class="rowStyle cursor--pointer" justify="space-between" :class="{'new': newAppointment }" - @click.native="openDetail" + @click.native="viewDetail" > - <el-col :xs="1" :sm="1" class="unread" align="middle" v-if="isReserved"> + <div class="test"> + <div class="unread" v-if="isReserved"> <div class="circle" v-if="!isRead"></div> - </el-col> - <el-col :xs="5" :sm="3" align="middle"> + </div> + + <div class="pl-10"> + <div class="smTxt_bold name">{{ client.name }}</div> + <div v-if="client.communicateStatus === contactStatus.RESERVED" class="my-10 xsTxt">������</div> + <div + class="xsTxt mb-10 mt-10" + v-else-if="client.communicateStatus === contactStatus.CONTACTED"> + 蝝赤蝝���� + </div> + <div + class="xsTxt mb-10 mt-10" + v-else> + 皛踵�漲 + <span v-if="client.satisfactionScore" class="xsTxt">{{ client.satisfactionScore }}</span> + <span v-else class="xsTxt text--mid_grey">�憛�</span> + </div> + <div class="professionals" v-if="client.communicateStatus === contactStatus.RESERVED"> + <template v-if="client.requirement"> + <span + v-for="(item, index) in requirements" + :key="index" + class="professionalsTxt" + >#{{item}}</span> + </template> + <template v-else> + <span class="professionalsTxt noProfessionalsTxt" + >(摰X�����瘙�)</span> + </template> + </div> + <AppointmentProgress + :currentStep="client.communicateStatus" + ></AppointmentProgress> + </div> + </div> + <!-- <el-col :xs="5" :sm="3" align="middle"> <el-avatar :size="50" ></el-avatar> @@ -25,36 +60,36 @@ <div class="unfilled">�憛急遛��漲</div> </template> </div> - </el-col> - <el-col :xs="14" :sm="14" class="pl-10"> - <div class="smTxt_bold name">{{ client.name }}</div> - <div class="my-10">������</div> - <div class="professionals"> - <template v-if="client.requirement"> - <span - v-for="(item, index) in requirements" - :key="index" - class="professionalsTxt" - >#{{item}}</span> - </template> - <template v-else> - <span class="professionalsTxt noProfessionalsTxt" - >(摰X�����瘙�)</span> - </template> + </el-col> --> + + <div class="flex-column contactInfo" :xs="4" :sm="6"> + + <div + class="invite-msg smTxt_bold" + @click.stop="showAddInterviewDialog" + v-if="client.communicateStatus === contactStatus.RESERVED"> + ���赤� </div> - </el-col> - <el-col class="flex-column contactInfo" :xs="4" :sm="6"> <div - class="smTxt_bold fix-chrome-click--issue" - :class="{'unread-txt': reservedTxt === '�霈�', 'read-txt': reservedTxt !== '�霈�'}" - >{{ reservedTxt }}</div> + class="invite-msg smTxt_bold" + @click.stop="navigateToCloseAppointment" + v-else-if="client.communicateStatus === contactStatus.CONTACTED"> + 蝯�� + </div> <div - class="date xsTxt text--mid_grey" + class="invite-msg smTxt_bold" + @click.stop="inviteReview" + v-else> + ��遛��漲 + </div> + + <div + class="date xsTxt text--black" >{{ date }}</div> <div class="xsTxt text--mid_grey" >{{ time }}</div> - </el-col> + </div> </el-row> <Ui-Dialog @@ -118,6 +153,17 @@ <el-button @click="markAppointment">璅酉�撌脤��蝯�</el-button> </div> </Ui-Dialog> + + <InterviewMsg + :client="client" + :isVisible.sync="isShowAddInterviewDialog"> + </InterviewMsg> + <PopUpFrame :isOpen.sync="showInviteReview"> + <div class="text--middle invite-review"> + <div class="mb-30 mt-10">撌脩�遛��漲</div> + <div class="text--primary text--middle cursor--pointer text--underline" @click="showInviteReview = false" :size="'250px'">������</div> + </div> + </PopUpFrame> </div> </template> @@ -125,11 +171,12 @@ import { Vue, Component, Prop, Action, namespace, Watch } from 'nuxt-property-decorator'; import appointmentService from '~/shared/services/appointment.service'; +import myConsultantService from '~/shared/services/my-consultant.service'; import UtilsService from '~/shared/services/utils.service'; import { hideReviews } from '~/shared/const/hide-reviews'; -import { AppointmentMemoInfo, ClientInfo } from '~/shared/models/client.model'; -import myConsultantService from '~/shared/services/my-consultant.service'; import { ElRow } from 'element-ui/types/row'; +import { Appointment, AppointmentMemoInfo, ToInformAppointment } from '~/shared/models/appointment.model'; +import { ContactStatus } from '~/shared/models/enum/contact-status'; const localStorage = namespace('localStorage'); @Component({ @@ -153,25 +200,31 @@ }) export default class ClientList extends Vue { @Action - updateMyAppointment!: (data: ClientInfo) => void; + updateMyAppointment!: (data: Appointment) => void; @Prop() - client!: ClientInfo; + client!: Appointment; @localStorage.Mutation storageClearAppointmentIdFromMsg!: () => void; - isVisibleDialog = false; - dialogWidth = ''; - hideReviews = hideReviews; + contactStatus = ContactStatus; + dialogWidth = ''; + hideReviews = hideReviews; + isEdit = false; + isShowAddInterviewDialog = false; + isVisibleDialog = false; + memo = ''; + showInviteReview = false; - isEdit = false; + + // currentAppointmentStatus = this.contactStatus.RESERVED; + memoInfo: AppointmentMemoInfo = { appointmentId: 0, - content: '', - id: 0 + content : '', + id : 0 } - memo = ''; ////////////////////////////////////////////////////////////////////// @@ -190,6 +243,28 @@ ? JSON.parse(JSON.stringify(this.client.appointmentMemoList[0])) : {appointmentId: 0, content: '', id: 0}; this.memo = this.memoInfo.content; + } + + ////////////////////////////////////////////////////////////////////// + + viewDetail(): void { + this.$router.push(`/appointment/${this.client.id}`); + } + + showAddInterviewDialog(): void { + this.isShowAddInterviewDialog = true; + } + + navigateToCloseAppointment(): void { + this.$router.push(`/appointment/${this.client.id}/close`); + } + + makeAppointment(): void { + alert('MAKE AN APPOINTMENT!'); + } + + inviteReview(): void { + this.showInviteReview = true ; } get newAppointment(): boolean { @@ -339,6 +414,7 @@ margin-bottom: 10px; display: flex; justify-content: space-between; + transition: background-color 0.5s; &.new { border-left: solid 4px $YELLOW; @@ -352,7 +428,7 @@ .circle { width: 10px; height: 10px; - border-radius: 50px; + border-radius: 50%; background-color: $PRIMARY_RED; margin: auto; } @@ -372,7 +448,6 @@ text-overflow: ellipsis; .professionalsTxt { font-size: 12px; - font-weight: bold; margin-right: 5px; } .noProfessionalsTxt { @@ -418,4 +493,16 @@ .fixed-Height { height: 16px; } + .test{ + display: flex; + } + .invite-msg{ + color: $PRIMARY_RED; + @extend .text--underline; + } + .invite-review{ + display: flex; + flex-direction: column; + align-items: center; + } </style> -- Gitblit v1.8.0