From 943b8dfc3fd82d76d46cde1834972270d4aa868a Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 12 一月 2022 16:06:40 +0800
Subject: [PATCH] update: 串接預約單流程(新增採訪紀錄, 結案頁面, 預約單列表細節)

---
 PAMapp/components/careerSelect.vue |   93 ++++++++++++++++++++++++++--------------------
 1 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/PAMapp/components/careerSelect.vue b/PAMapp/components/careerSelect.vue
index 0dc24dc..3a0f848 100644
--- a/PAMapp/components/careerSelect.vue
+++ b/PAMapp/components/careerSelect.vue
@@ -29,14 +29,13 @@
           </div>
           <el-button type="primary"
             class="pam-career__confirm"
-            :disabled="isCareerVerifyFailed"
+            :disabled="!isCareerValid"
             @click="patchCareer">
               蝣箏��
           </el-button>
         </div>
       </PopUpFrame>
   </div>
-
 
 </template>
 
@@ -46,11 +45,15 @@
 
   @Component
   export default class CareerSelect extends Vue {
-    @PropSync('careerSelect',{ type: String, default :''}) syncCareerSelect! :string;
+
+    @PropSync('careerSelect',{ type: String, default :''})
+    syncCareerSelect! :string;
+
     showJobDrawer = false;
-    career='';
-    career_Other='';
-    options= [
+    career        = '';
+    career_Other  = '';
+
+    options = [
       {
         title:'憭',
         label:'憭'
@@ -64,21 +67,21 @@
         label:'�隞�'
       }
     ];
-    get isCareerVerifyFailed():boolean{
-      return !this.career || (_.isEqual(this.career,'�隞�')&&!this.career_Other) ;
-    }
-    handleChange(event:any):void{
+
+    //////////////////////////////////////////////////////////////////////
+
+    handleChange(event:any): void{
       if(event !== '�隞�'){
-        this.career_Other='';
+        this.career_Other = '';
       }
     }
 
-    openPopUp():void{
+    openPopUp(): void{
       this.showJobDrawer = true;
       this.patchInitValue();
     }
 
-    patchInitValue():void{
+    patchInitValue(): void{
       if(this.syncCareerSelect){
         if(_.includes(['憭','��'],this.syncCareerSelect)){
           this.career = this.syncCareerSelect;
@@ -89,44 +92,51 @@
       }
     }
 
-    patchCareer():boolean {
+    patchCareer(): void {
       this.showJobDrawer = false;
-      this.syncCareerSelect = this.career === '�隞�' ? _.cloneDeep(this.career_Other):_.cloneDeep(this.career);
-      return true;
+      this.syncCareerSelect = this.career === '�隞�'
+                          ? _.cloneDeep(this.career_Other)
+                          : _.cloneDeep(this.career);
+    }
+
+    get isCareerValid(): boolean {
+      return !!(this.career === '�隞�'
+            ? this.career_Other
+            : this.career);
     }
   }
 </script>
 
 <style lang="scss" scoped>
   .pam-career{
-    display: flex;
+    display       : flex;
     flex-direction: column;
-    align-items: center;
+    align-items   : center;
   }
   .ques-career__select{
-    position: relative;
-    height: 50px;
+    position          : relative;
+    height            : 50px;
     -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    padding: 15px;
-    border-radius:10px;
-    border:1px solid #D0D0CE ;
-    background-color: $PRIMARY_WHITE;
+    -moz-box-sizing   : border-box;
+    box-sizing        : border-box;
+    padding           : 15px;
+    border-radius     : 10px;
+    border            : 1px solid #D0D0CE ;
+    background-color  : $PRIMARY_WHITE;
     .ques-career__select-input{
       width: 90%;
     }
     .ques-career__select--icon{
       position: absolute;
-      top: 0px;
-      right: 15px;
+      top     : 0px;
+      right   : 15px;
       .down-icon{
-        color:#ED1B2E;
-        font-size: 25px;
-        display: flex;
+        color          : #ED1B2E;
+        font-size      : 25px;
+        display        : flex;
         justify-content: flex-end;
-        padding-top: 11px;
-        margin-left: -20px;
+        padding-top    : 11px;
+        margin-left    : -20px;
       }
     }
   }
@@ -136,13 +146,14 @@
   .pam-career__other {
     width: 100%;
     .pam-career__other-input {
-      height: 50px;
-      border: 1px #CCCCCC solid;
-      width: 100%;
-      padding-left: 15px;
+      height            : 50px;
+      border            : 1px #CCCCCC solid;
+      width             : 100%;
+      padding-left      : 15px;
       -webkit-box-sizing: border-box;
-      -moz-box-sizing: border-box;
-      box-sizing: border-box;
+      -moz-box-sizing   : border-box;
+      box-sizing        : border-box;
+      border-radius     : 10px;
       &.warning{
         border: 1px $PRIMARY_RED solid;
       }
@@ -150,8 +161,8 @@
 
   }
   .pam-career__confirm{
-    width: 120px;
-    height: 50px;
+    width     : 120px;
+    height    : 50px;
     margin-top: 20px;
   }
 

--
Gitblit v1.8.0