From a2feefbe2565234b5755573326bdb7c0781b2562 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期二, 18 一月 2022 15:34:56 +0800
Subject: [PATCH] update: 刪除重複的 interface: appointmentDeatil => appointment

---
 PAMapp/shared/services/appointment.service.ts     |    4 ++--
 PAMapp/components/Client/ClientCard.vue           |    2 +-
 PAMapp/shared/models/appointment.model.ts         |   35 ++++++++++-------------------------
 PAMapp/pages/appointment/_appointmentId/index.vue |    6 +++---
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index 2f04309..2d417e0 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -177,7 +177,7 @@
 import UtilsService from '~/shared/services/utils.service';
 import { hideReviews } from '~/shared/const/hide-reviews';
 import { ElRow } from 'element-ui/types/row';
-import { Appointment, AppointmentMemoInfo, ToInformAppointment } from '~/shared/models/appointment.model';
+import { Appointment, AppointmentMemoInfo } from '~/shared/models/appointment.model';
 import { ContactStatus } from '~/shared/models/enum/contact-status';
 
 const localStorage = namespace('localStorage');
diff --git a/PAMapp/pages/appointment/_appointmentId/index.vue b/PAMapp/pages/appointment/_appointmentId/index.vue
index 2957175..c507db4 100644
--- a/PAMapp/pages/appointment/_appointmentId/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/index.vue
@@ -84,7 +84,7 @@
     </section>
 
     <section class="mt-30">
-      <AppointmentRecordList />
+      <AppointmentRecordList :noticeLogs="appointmentDetail.appointmentNoticeLogs" />
     </section>
 
   </div>
@@ -96,13 +96,13 @@
 import { Vue, Component } from 'vue-property-decorator';
 
 import appointmentService from '~/shared/services/appointment.service';
-import { AppointmentDetail } from '~/shared/models/appointment.model';
+import { Appointment } from '~/shared/models/appointment.model';
 import { ContactStatus } from '~/shared/models/enum/contact-status';
 
 @Component
 export default class AppointmentDetailComponent extends Vue {
 
-  appointmentDetail!: AppointmentDetail;
+  appointmentDetail!: Appointment;
   isVisibleDialog = false;
   interviewTxt = "";
   contactStatus = ContactStatus;
diff --git a/PAMapp/shared/models/appointment.model.ts b/PAMapp/shared/models/appointment.model.ts
index 172112d..57c52ee 100644
--- a/PAMapp/shared/models/appointment.model.ts
+++ b/PAMapp/shared/models/appointment.model.ts
@@ -34,6 +34,7 @@
   phone              : string;
   requirement        : string;
   satisfactionScore  : number;
+  appointmentNoticeLogs: NoticeLogs[];
 };
 
 export interface AppointmentMemoInfo {
@@ -51,37 +52,21 @@
   lastModifiedBy  : string;
   lastModifiedDate: string;
 }
+
+export interface NoticeLogs {
+  id: number,
+  phone: string,
+  email: string,
+  appointmentId: number,
+  content: string,
+  createdDate: string
+}
 export interface AppointmentWithConsultantInfo extends Appointment {
   consultantAvatar    : string;
   consultantExpertList: string[];
   consultantName      : string;
   contactStatus       : string;
   updateTime          : string;
-}
-
-export interface AppointmentDetail {
-  age                 : string;
-  agentNo             : string;
-  appointmentDate     : string;
-  appointmentMemoList?: string[];
-  communicateStatus   : string;
-  consultantReadTime  : string;
-  consultantViewTime  : string;
-  contactTime         : string;
-  contactType         : string;
-  customerId          : number;
-  email               : string;
-  gender              : string;
-  hopeContactTime     : string;
-  id                  : number;
-  interviewRecordDTOs : InterviewRecord[];
-  job                 : string;
-  lastModifiedDate    : string;
-  name                : string;
-  otherRequirement    : string;
-  phone               : string;
-  requirement         : string;
-  satisfactionScore?  : number;
 }
 export interface AppointmentParams {
   age            : string;
diff --git a/PAMapp/shared/services/appointment.service.ts b/PAMapp/shared/services/appointment.service.ts
index a15e298..dcba492 100644
--- a/PAMapp/shared/services/appointment.service.ts
+++ b/PAMapp/shared/services/appointment.service.ts
@@ -1,6 +1,6 @@
 import { http } from "./httpClient";
 
-import { Appointment, AppointmentDetail, AppointmentMemoInfo, createdMemoInfo, EditAppointmentParams,  InterviewRecordInfo, ToCloseAppointment, ToDoneAppointment, ToInformAppointment, updatedMemoInfo, UpdateInterviewRecordInfo } from "~/shared/models/appointment.model";
+import { Appointment, AppointmentMemoInfo, createdMemoInfo, EditAppointmentParams,  InterviewRecordInfo, ToCloseAppointment, ToDoneAppointment, ToInformAppointment, updatedMemoInfo, UpdateInterviewRecordInfo } from "~/shared/models/appointment.model";
 
 class AppointmentService {
 
@@ -26,7 +26,7 @@
   }
 
   // �����蝝啁�
-  async getAppointmentDetail(appointmentId: number):Promise<AppointmentDetail> {
+  async getAppointmentDetail(appointmentId: number):Promise<Appointment> {
     return http.get(`/appointment/getDetail/${appointmentId}`).then((res) => res.data);
   }
 

--
Gitblit v1.8.0