From b4d6944076f1df6eedaae35c4c2a7072fe988e8a Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期二, 30 四月 2024 15:34:02 +0800 Subject: [PATCH] update: package-lock.json --- PAMapp/components/Interview/InterviewAdd.vue | 56 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue index cb0f122..8107e6b 100644 --- a/PAMapp/components/Interview/InterviewAdd.vue +++ b/PAMapp/components/Interview/InterviewAdd.vue @@ -5,33 +5,37 @@ <span>{{interviewRecord.lastModifiedDate | formatDate}} ��</span> </div> <el-row class="mdTxt mb-10"> - <el-col :xs="16" :sm="20">蝝赤����</el-col> + <el-col :xs="16" :sm="20"> + <span :class="{'required': !interviewId || isEdit}">蝝赤����</span> + </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" + class="mr-10 text--primary cursor--pointer" @click="showCancelPopUp = true" - >��</span> + ><i class="icon-delet"></i></span> <span v-if="!isEdit" - class="text--primary text--underline cursor--pointer" + class="text--primary cursor--pointer" @click="isEdit = !isEdit" - >蝺刻摩</span> + ><i class="icon-edit"></i></span> </el-col> </el-row> + <template v-if="!interviewId || isEdit"> <DateTimePicker + :disabledBeforeSpecificDate="appointmentDetail.appointmentDate" @changeDateTime="interviewTime = $event" :defaultValue="defaultValue" ></DateTimePicker> </template> <template v-else> - <div class="mdTxt lighter mt-20"> + <div class="fs-20 mt-20"> {{formatInterviewDate}} </div> </template> - <div class="mdTxt mb-10 mt-30">蝝赤蝝����</div> + <div class="mdTxt mb-10 mt-30" :class="{'required': !interviewId || isEdit}">蝝赤蝝����</div> <template v-if="!interviewId || isEdit"> <el-input type="textarea" @@ -43,7 +47,7 @@ </el-input> </template> <template v-else> - <div class="mdTxt lighter mt-20"> + <div class="fs-20 mt-20 text--break-all line-height"> {{content}} </div> </template> @@ -77,7 +81,7 @@ @closePopUp="closePopup"> <div class="text--center mdTxt">{{confirmTxt}}嚗�</div> <div class="text--center mdTxt">蝡���赤�嚗�</div> - <div class="text--center mt-30" style="display:flex"> + <div class="text--center mt-30 confirm-btn"> <el-button @click="closePopup">�����</el-button> <el-button @click="showInterviewMsgPopup = true" type="primary">���赤�</el-button> </div> @@ -86,6 +90,7 @@ <InterviewMsg :isVisible.sync="showInterviewMsgPopup" :client="appointmentDetail" + :defaultValue="interviewTime" @closeDialog="closePopup" ></InterviewMsg> </div> @@ -173,17 +178,25 @@ }); } - private updateRecord(updateInterviewRecord) { - appointmentService.updateInterviewRecord(updateInterviewRecord).then(res => { - this.showPopUp('蝺刻摩����'); - }); + private async updateRecord(updateInterviewRecord) { + try { + const response = await appointmentService.updateInterviewRecord(updateInterviewRecord); + if (response !== null) { + this.showPopUp('蝺刻摩����'); + } else { + throw new Error('appointmentService.updateInterviewRecord returned null-like value.'); + } + } catch (error) { + console.error('An error occurred while updating interview record:', error); + throw error; } + } private showPopUp(confirmTxt) { this.confirmTxt = confirmTxt; this.updateAppointmentDetail(+this.appointmentId); - if (new Date(this.interviewTime).getTime() >= new Date().getTime()) { + if (new Date(this.interviewTime).getTime() >= new Date().getTime() && (!this.appointmentDetail.appointmentClosedInfo)) { this.showFutureDateConfirmPopup = true; } else { this.showConfirmPopup = true; @@ -248,4 +261,19 @@ font-size: 20px; } } +.required { + position: relative; + + &::before { + content: '*'; + position: absolute; + color: #FF0000; + transform: translate(-12px, 0); + z-index: 5; + } + } +.confirm-btn{ + display: flex; + justify-content: center; +} </style> -- Gitblit v1.8.0