Merge branch 'pollex-dev' into sit

wayne

2022-02-17 4394e4248455637ab7836756058ac872fdf4af10

 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})