From f9384d412c6b612264d757b195f82b38a000b6e9 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 17 十一月 2021 11:09:26 +0800
Subject: [PATCH] update: [預約顧問] 在送出預約表單時，如果選擇的聯絡時段是全天、全時段，則存入'不限日期', '不限時間'

---
 PAMapp/components/phoneContactTimePicker.vue |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/PAMapp/components/phoneContactTimePicker.vue b/PAMapp/components/phoneContactTimePicker.vue
index 04578be..fffa621 100644
--- a/PAMapp/components/phoneContactTimePicker.vue
+++ b/PAMapp/components/phoneContactTimePicker.vue
@@ -4,7 +4,7 @@
   <div>
     <div class="mt-10" v-for="(scheduleDto,index) in syncScheduleList" :key="index">
       <div class="mdTxt">{{titleFormatByIndex(index)}}</div>
-      <div class="pam-contact-schedule cursor--pointer" @click="openPopUp(scheduleDto,index)">
+      <div class="pam-contact-schedule cursor--pointer fix-chrome-click--issue" @click="openPopUp(scheduleDto,index)">
         <div class="pam-contact-schedule__text">
           <template v-if="checkFormHasDone(scheduleDto)">
             <p>{{optionsFormat(scheduleDto.selectWeekOptions,weekOptions)}}</p>
@@ -33,7 +33,6 @@
 
     <PopUpFrame class="pam-popUpFrame" 
       :isOpen.sync="isOpenByStep_1"
-      :model="isOpenByStep_1"
       :drawerSize="drawerSize"
       :dialogWidth="dialogWidth">
         <div class="pam-popUp-title">{{popUpTitle}}</div>
@@ -75,16 +74,62 @@
 <script lang="ts">
   import { Component,PropSync,Vue } from "nuxt-property-decorator";
   import * as _ from "lodash";
+import { OptionBtnDto } from "./singleSelectBtn.vue";
   @Component
   export default class PhoneContactTimePicker extends Vue {
     @PropSync('scheduleList',{type:Array,default:()=>[]}) syncScheduleList!:scheduleDto[];
     private weekOptions ={
       selectAll:'瘥予',
-      options:['蝳格��','蝳格���','蝳格���','蝳格���','蝳格���','蝳格�','蝳格�'],
+      options:[
+        {
+          title:'蝳格��',
+          label:'蝳格��'
+        },
+         {
+          title:'蝳格���',
+          label:'蝳格���'
+        },
+         {
+          title:'蝳格���',
+          label:'蝳格���'
+        },
+         {
+          title:'蝳格���',
+          label:'蝳格���'
+        },
+         {
+          title:'蝳格���',
+          label:'蝳格���'
+        }, {
+          title:'蝳格�',
+          label:'蝳格�'
+        },
+         {
+          title:'蝳格�',
+          label:'蝳格�'
+        },
+      ],
     };
     private timesOfDayOptions ={
       selectAll:'�憭�',
-      options:['9:00~12:00','12:00~14:00','14:00~18:00','18:00~21:00'],
+      options:[
+        {
+          title:'9:00~12:00',
+          label:'9:00~12:00',
+        },
+        {
+          title:'12:00~14:00',
+           label:'12:00~14:00',
+        },
+        {
+          title:'14:00~18:00',
+           label:'14:00~18:00',
+        },
+        {
+          title:'18:00~21:00',
+          label:'18:00~21:00',
+        }
+      ],
     };
     private drawerSize="40%";
     private dialogWidth="376px";
@@ -117,8 +162,9 @@
       this.selectedSchedule.selectWeekOptions = this.getOptionsBySort(this.weekOptions.options,this.initPickerControl.selectWeekOptions);
       this.selectedSchedule.selectTimesOptions = this.getOptionsBySort(this.timesOfDayOptions.options,this.initPickerControl.selectTimesOptions);
     }
-    getOptionsBySort(options:string[],selectedOptions:string[]):string[]{
-      return options.filter( o => _.includes(selectedOptions,o));
+    getOptionsBySort(options:OptionBtnDto[],selectedOptions:string[]):string[]{
+      return options.map( o => _.includes(selectedOptions,o.title) ? o.title :'').filter(String);
+      // return 
     }
     addNewSchedule():void{
       const newScheduleDto={
@@ -140,7 +186,7 @@
       const chineseNumber = ['銝�','鈭�','銝�','���','鈭�','�','銝�','�','銋�','���']
       return '��挾'+chineseNumber[index];
     }
-    optionsFormat(options:string[],needToCompareList:OptionDto):string{
+    optionsFormat(options:OptionBtnDto[],needToCompareList:OptionDto):string{
       return _.isEqual(options.length,needToCompareList.options.length) ? needToCompareList.selectAll: _.join(options,',');
     }
   }

--
Gitblit v1.8.0