From e422239791b35a7c466372eda8c99d2775a6bae1 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期六, 22 一月 2022 14:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
PAMapp/components/Interview/InterviewAdd.vue | 248 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 217 insertions(+), 31 deletions(-)
diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue
index 6cac922..5106383 100644
--- a/PAMapp/components/Interview/InterviewAdd.vue
+++ b/PAMapp/components/Interview/InterviewAdd.vue
@@ -1,48 +1,231 @@
<template>
<div class="edit-appointment-record">
- <div class="edit-appointment-record-date">
- <span>隞予 11:00 撱箇��</span>
- <span>隞予 11:00 ��</span>
+ <div class="edit-appointment-record-date" v-if="interviewId && interviewRecord">
+ <span>{{interviewRecord.createdDate | formatDate}} 撱箇��</span>
+ <span>{{interviewRecord.lastModifiedDate | formatDate}} ��</span>
+ </div>
+ <el-row class="mdTxt mb-10">
+ <el-col :xs="16" :sm="20">蝝赤����</el-col>
+ <el-col :xs="8" :sm="4" class="text--right" v-if="interviewId">
+ <span
+ v-if="!isEdit"
+ class="mr-10 text--primary text--underline cursor--pointer"
+ @click="showCancelPopUp = true"
+ >��</span>
+ <span
+ v-if="!isEdit"
+ class="text--primary text--underline cursor--pointer"
+ @click="isEdit = !isEdit"
+ >蝺刻摩</span>
+ </el-col>
+ </el-row>
+ <template v-if="!interviewId || isEdit">
+ <DateTimePicker
+ @changeDateTime="interviewTime = $event"
+ :defaultValue="defaultValue"
+ ></DateTimePicker>
+ </template>
+ <template v-else>
+ <div class="mdTxt lighter mt-20">
+ {{formatInterviewDate}}
+ </div>
+ </template>
+
+ <div class="mdTxt mb-10 mt-30">蝝赤蝝����</div>
+ <template v-if="!interviewId || isEdit">
+ <el-input
+ type="textarea"
+ :rows="5"
+ placeholder="隢撓�蝝赤蝝����"
+ resize="none"
+ v-model="content"
+ >
+ </el-input>
+ </template>
+ <template v-else>
+ <div class="mdTxt lighter mt-20">
+ {{content}}
+ </div>
+ </template>
+ <div class="edit-appointment-record-btn" v-if="!interviewId || isEdit">
+ <el-button @click="cancel">����</el-button>
+ <el-button
+ :disabled="!interviewTime || !content"
+ @click="saveInterviewRecord"
+ >蝣箏��</el-button>
</div>
- <div class="mdTxt mb-10">蝝赤����</div>
- <DateTimePicker
- @changeDateTime="interviewTime = $event"
- ></DateTimePicker>
+ <PopUpFrame :isOpen.sync="showCancelPopUp"
+ @closePopUp="showCancelPopUp = false"
+ >
+ <div class="text--center mdTxt">����甇斤��赤閮���</div>
+ <div class="text--center mt-30">
+ <el-button @click="showCancelPopUp = false">�</el-button>
+ <el-button @click="deleteInterviewRecord" type="primary">�</el-button>
+ </div>
+ </PopUpFrame>
- <div class="mdTxt mb-10 mt-10">蝝赤蝝����</div>
- <el-input type="textarea" :rows="5" placeholder="蝝赤�" resize="none">
- </el-input>
+ <PopUpFrame :isOpen.sync="showConfirmPopup"
+ @closePopUp="closePopup">
+ <div class="text--center mdTxt">{{confirmTxt}}嚗�</div>
+ <div class="text--center mt-30">
+ <el-button @click="closePopup" type="primary">蝣箏��</el-button>
+ </div>
+ </PopUpFrame>
- <div class="edit-appointment-record-btn">
- <el-button>����</el-button>
- <el-button :disabled="!interviewTime">蝣箏��</el-button>
- </div>
+ <PopUpFrame :isOpen.sync="showFutureDateConfirmPopup"
+ @closePopUp="closePopup">
+ <div class="text--center mdTxt">{{confirmTxt}}嚗�</div>
+ <div class="text--center mdTxt">蝡���赤�嚗�</div>
+ <div class="text--center mt-30" style="display:flex">
+ <el-button @click="closePopup">�����</el-button>
+ <el-button @click="showInterviewMsgPopup = true" type="primary">���赤�</el-button>
+ </div>
+ </PopUpFrame>
+
+ <InterviewMsg
+ :isVisible.sync="showInterviewMsgPopup"
+ :client="appointmentDetail"
+ :defaultValue="interviewTime"
+ @closeDialog="closePopup"
+ ></InterviewMsg>
</div>
</template>
<script lang="ts">
-import { AppointmentLog } from '~/shared/models/appointment.model';
-import { Vue, Component, Prop } from 'nuxt-property-decorator';
-import authService from '~/shared/services/auth.service';
+import { Appointment, InterviewRecord, InterviewRecordInfo } from '~/shared/models/appointment.model';
+import { Vue, Component, Watch, namespace } from 'nuxt-property-decorator';
+import appointmentService from '~/shared/services/appointment.service';
+
+const appointmentStore = namespace('appointment.store');
@Component
export default class InterviewAdd extends Vue {
+
+ @appointmentStore.State
+ appointmentDetail!: Appointment;
+
+ @appointmentStore.Action
+ updateAppointmentDetail!: (id: number) => Appointment;
+
interviewTime = '';
+ content = '';
- // @Prop()
- // myAppointmentReviewLogList!: AppointmentLog[];
+ interviewId = '';
+ appointmentId = '';
+ confirmTxt: '�憓���' | '蝺刻摩����' | '������' = '�憓���';
- // isUserLogin = false;
+ isEdit = false;
- //////////////////////////////////////////////////////////////////////
- // mounted() {
- // this.isUserLogin = authService.isUserLogin();
- // }
+ showConfirmPopup = false;
+ showCancelPopUp = false;
+ showInterviewMsgPopup = false;
+ showFutureDateConfirmPopup = false;
+
+ defaultValue = '';
+
+ interviewRecord!: InterviewRecord;
+
+ ////////////////////////////////////////////////////////////////////
+
+ mounted() {
+ this.interviewId = this.$route.params.interviewId;
+ this.appointmentId = this.$route.params.appointmentId;
+
+ this.onAppointmentDetailChange();
+ }
+
+ ////////////////////////////////////////////////////////////////////
+
+ @Watch('appointmentDetail', {immediate: true})
+ onAppointmentDetailChange() {
+ if (this.appointmentDetail && this.appointmentDetail.id === +this.appointmentId) {
+ this.interviewRecord = this.appointmentDetail.interviewRecordDTOs
+ .filter(item => item.id === +this.interviewId)[0];
+
+ if (this.interviewRecord && this.interviewId) {
+ this.content = this.interviewRecord.content;
+ this.defaultValue = this.interviewRecord.interviewDate;
+ }
+ }
+ }
+
+ ////////////////////////////////////////////////////////////////////
+
+ saveInterviewRecord() {
+ const interviewRecordInfo: InterviewRecordInfo = {
+ content: this.content,
+ interviewDate: this.interviewTime,
+ appointmentId: +this.appointmentId
+ };
+ if (!this.interviewId) {
+ this.createdRecord(interviewRecordInfo);
+ } else {
+ const updateInterviewRecord = {
+ ...interviewRecordInfo,
+ id: +this.interviewId
+ }
+ this.updateRecord(updateInterviewRecord);
+ }
+ }
+
+ private createdRecord(interviewRecordInfo) {
+ appointmentService.createInterviewRecord(interviewRecordInfo).then(res => {
+ this.showPopUp('�憓���');
+ });
+ }
+
+ private updateRecord(updateInterviewRecord) {
+ appointmentService.updateInterviewRecord(updateInterviewRecord).then(res => {
+ this.showPopUp('蝺刻摩����');
+ });
+ }
+
+ private showPopUp(confirmTxt) {
+ this.confirmTxt = confirmTxt;
+ this.updateAppointmentDetail(+this.appointmentId);
+
+ if (new Date(this.interviewTime).getTime() >= new Date().getTime()) {
+ this.showFutureDateConfirmPopup = true;
+ } else {
+ this.showConfirmPopup = true;
+ }
+ }
+
+ deleteInterviewRecord() {
+ appointmentService.deleteInterviewRecord(this.interviewId).then(res => {
+ this.confirmTxt = '������';
+ this.showConfirmPopup = true;
+ this.updateAppointmentDetail(+this.appointmentId);
+ });
+ }
+
+ cancel() {
+ if (this.interviewId) {
+ this.content = this.interviewRecord.content;
+ this.defaultValue = this.interviewRecord.interviewDate;
+ this.isEdit = false;
+ } else {
+ this.$router.go(-1);
+ }
+ }
+
+ closePopup() {
+ this.$router.go(-1);
+ }
+
+ ////////////////////////////////////////////////////////////////////
+
+ get formatInterviewDate() {
+ const interviewDate = new Date(this.interviewRecord.interviewDate);
+ const hours = interviewDate.getHours();
+ const minutes = interviewDate.getMinutes();
+ return `${interviewDate.getFullYear()}/${interviewDate.getMonth() + 1}/${interviewDate.getDate()} ${hours < 10 ? '0' + hours : hours}:${minutes < 10 ? '0' + minutes : minutes}`;
+ }
}
</script>
-<style lang="scss" scoped>
+<style lang="scss" >
.edit-appointment-record {
padding-left : 10px;
padding-right: 10px;
@@ -53,15 +236,18 @@
margin-bottom : 26px;
}
}
-.icon {
- color : $PRIMARY_RED;
- display : flex;
- flex : 1;
- justify-content: flex-end;
-}
.edit-appointment-record-btn{
margin-top: 30px;
display: flex;
justify-content: center;
}
+.el-textarea__inner {
+ border: 1px solid #707070;
+ padding: 10px 20px;
+ font-size: 20px;
+ &::placeholder {
+ font-size: 20px;
+ }
+}
+
</style>
--
Gitblit v1.8.0