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/components/Interview/InterviewAdd.vue |   64 +++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue
index 7a47229..145c41f 100644
--- a/PAMapp/components/Interview/InterviewAdd.vue
+++ b/PAMapp/components/Interview/InterviewAdd.vue
@@ -5,18 +5,20 @@
           <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">
@@ -26,12 +28,12 @@
           ></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 +45,7 @@
         </el-input>
       </template>
       <template v-else>
-          <div class="mdTxt lighter mt-20">
+          <div class="fs-20 mt-20">
               {{content}}
           </div>
       </template>
@@ -77,7 +79,7 @@
         @closePopUp="closePopup">
         <div class="text--center mdTxt">{{confirmTxt}}嚗�</div>
         <div class="text--center mdTxt">蝡���赤�嚗�</div>
-        <div class="text--center mt-30">
+        <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 +88,7 @@
       <InterviewMsg
         :isVisible.sync="showInterviewMsgPopup"
         :client="appointmentDetail"
+        :defaultValue="interviewTime"
         @closeDialog="closePopup"
       ></InterviewMsg>
   </div>
@@ -165,24 +168,24 @@
             }
             this.updateRecord(updateInterviewRecord);
         }
-        this.updateAppointmentDetail(+this.appointmentId);
     }
 
     private createdRecord(interviewRecordInfo) {
         appointmentService.createInterviewRecord(interviewRecordInfo).then(res => {
-            this.confirmTxt = '�憓���'
-            this.showPopUp();
+            this.showPopUp('�憓���');
         });
     }
 
     private updateRecord(updateInterviewRecord) {
         appointmentService.updateInterviewRecord(updateInterviewRecord).then(res => {
-            this.confirmTxt = '蝺刻摩����';
-            this.showPopUp();
+            this.showPopUp('蝺刻摩����');
         });
     }
 
-    private showPopUp() {
+    private showPopUp(confirmTxt) {
+        this.confirmTxt = confirmTxt;
+        this.updateAppointmentDetail(+this.appointmentId);
+
         if (new Date(this.interviewTime).getTime() >= new Date().getTime()) {
             this.showFutureDateConfirmPopup = true;
         } else {
@@ -224,7 +227,7 @@
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" >
 .edit-appointment-record {
     padding-left : 10px;
     padding-right: 10px;
@@ -235,15 +238,32 @@
         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;
+    }
+}
+.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