From 771d43f1f81238e9f6fb86d90c11b2f7b949d143 Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期一, 17 一月 2022 09:02:37 +0800 Subject: [PATCH] fixed: 調整 constactStatus enum 對應的值 --- PAMapp/components/Client/ClientCard.vue | 86 ++++++++++++++++++++++++++++--------------- 1 files changed, 56 insertions(+), 30 deletions(-) diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue index c140e28..8d3d7fd 100644 --- a/PAMapp/components/Client/ClientCard.vue +++ b/PAMapp/components/Client/ClientCard.vue @@ -6,7 +6,7 @@ class="rowStyle cursor--pointer" justify="space-between" :class="{'new': newAppointment }" - @click.native="openDetail" + @click.native="viewDetail" > <div class="test"> <div class="unread" v-if="isReserved"> @@ -29,13 +29,9 @@ >(摰X�����瘙�)</span> </template> </div> - <div class="unread" style="display:flex"> - <div class="circle"></div> - <div class="line"></div> - <div class="circle"></div> - <div class="line"></div> - <div class="circle"></div> - </div> + <AppointmentProgress + :currentStep="client.communicateStatus" + ></AppointmentProgress> </div> </div> <!-- <el-col :xs="5" :sm="3" align="middle"> @@ -53,15 +49,28 @@ </template> </div> </el-col> --> - + <div 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> --> - <div class="invite-msg smTxt_bold"> - ���赤� + + <div + class="invite-msg smTxt_bold" + @click.stop="makeInterview" + v-if="client.communicateStatus === contactStatus.RESERVED"> + ���赤� </div> + <div + class="invite-msg smTxt_bold" + @click.stop="closeAppointment" + v-else-if="client.communicateStatus === contactStatus.CONTACTED"> + 蝯�� + </div> + <div + class="invite-msg smTxt_bold" + @click.stop="inviteReview" + v-else> + ��遛��漲 + </div> + <div class="date xsTxt text--black" >{{ date }}</div> @@ -132,6 +141,8 @@ <el-button @click="markAppointment">璅酉�撌脤��蝯�</el-button> </div> </Ui-Dialog> + + <InterviewMsg :isVisible.sync="isMsgDialog"></InterviewMsg> </div> </template> @@ -141,9 +152,10 @@ import appointmentService from '~/shared/services/appointment.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 } from '~/shared/models/appointment.model'; +import { ContactStatus } from '~/shared/models/enum/contact-status'; const localStorage = namespace('localStorage'); @Component({ @@ -167,17 +179,21 @@ }) 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; + isMsgDialog = false; dialogWidth = ''; hideReviews = hideReviews; + + contactStatus = ContactStatus; + // currentAppointmentStatus = this.contactStatus.RESERVED; isEdit = false; memoInfo: AppointmentMemoInfo = { @@ -204,6 +220,24 @@ ? 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}`); + } + + makeInterview(): void { + this.isMsgDialog = true; + } + + closeAppointment(): void { + this.$router.push(`/appointment/${this.client.id}/close`); + } + + makeAppointment(): void { + alert('MAKE AN APPOINTMENT!'); } get newAppointment(): boolean { @@ -353,7 +387,7 @@ margin-bottom: 10px; display: flex; justify-content: space-between; - + transition: background-color 0.5s; &.new { border-left: solid 4px $YELLOW; @@ -367,7 +401,7 @@ .circle { width: 10px; height: 10px; - border-radius: 50px; + border-radius: 50%; background-color: $PRIMARY_RED; margin: auto; } @@ -387,7 +421,6 @@ text-overflow: ellipsis; .professionalsTxt { font-size: 12px; - font-weight: bold; margin-right: 5px; } .noProfessionalsTxt { @@ -437,14 +470,7 @@ display: flex; } .invite-msg{ - color: #ED1B2E; - border-bottom: 1px solid #ED1B2E; - width: 97px; - } - .line{ - height: 4px; - width: 10px; - background-color: $PRUDENTIAL_GREY; - + color: $PRIMARY_RED; + @extend .text--underline; } </style> -- Gitblit v1.8.0