From 34b08e1c461f5e08675fcff95525956d7c4bef11 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:38:48 +0800
Subject: [PATCH] Merge branch 'Phase3' into pollex-dev
---
PAMapp/pages/myAppointmentList.vue | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/PAMapp/pages/myAppointmentList.vue b/PAMapp/pages/myAppointmentList.vue
index c013cd9..646cede 100644
--- a/PAMapp/pages/myAppointmentList.vue
+++ b/PAMapp/pages/myAppointmentList.vue
@@ -32,26 +32,41 @@
<!-- DIALOG -->
<PopUpFrame
- :isOpen.sync="showNewAppointmentHint"
+ :isOpen.sync="isShowNewAppointmentHint"
>
<div class="text--center mdTxt">
<p class="mb-50">���� <span class="text--primary">{{ newAppointmentSum }}</span> �������</p>
<div class="text--center">
<el-button
type="primary"
- @click="showNewAppointmentHint = false"
+ @click="isShowNewAppointmentHint = false"
>������</el-button>
</div>
</div>
</PopUpFrame>
+
+ <PopUpFrame
+ :isOpen.sync="isShowRemindAppointmentDialog"
+ >
+ <div class="text--center mdTxt">
+ <p class="mb-50">���� <span class="text--primary">{{ pendingAppointmentSum }}</span> ������脰�蝜恬������</p>
+ <div class="text--center">
+ <el-button
+ type="primary"
+ @click="isShowRemindAppointmentDialog = false"
+ >������</el-button>
+ </div>
+ </div>
+ </PopUpFrame>
</div>
</template>
<script lang="ts">
-import { Vue, Component, State, Action, Watch, namespace } from 'nuxt-property-decorator';
+import { Vue, Component, Watch, namespace } from 'nuxt-property-decorator';
import * as _ from 'lodash';
+import appointmentService from '~/shared/services/appointment.service';
import { Appointment } from '~/shared/models/appointment.model';
import { ContactStatus } from '~/shared/models/enum/contact-status';
@@ -88,14 +103,23 @@
@localStorage.Getter
currentAppointmentIdFromMsg!: string;
- activeTabName : string = 'appointmentList';
contactStatus = ContactStatus;
- showNewAppointmentHint: boolean = false;
+
+ activeTabName = 'appointmentList';
+ isShowNewAppointmentHint = false;
+ isShowRemindAppointmentDialog = false;
+ pendingAppointmentSum = 0;
//////////////////////////////////////////////////////////////////////
mounted() {
this.getMyAppointmentList();
+ appointmentService.getPendingAppointmentSum().then((pendingAppointmentSum) => {
+ this.pendingAppointmentSum = pendingAppointmentSum;
+ if (this.pendingAppointmentSum) {
+ this.isShowRemindAppointmentDialog = true;
+ }
+ });
}
destroyed() {
@@ -134,7 +158,7 @@
@Watch('newAppointmentSum')
newAppointmentSumChange(): void {
- this.showNewAppointmentHint = this.newAppointmentSum > 0;
+ this.isShowNewAppointmentHint = this.newAppointmentSum > 0;
}
@Watch('$route', {immediate: true})
--
Gitblit v1.8.0