From b81b27ce3e7e9e7cda18bb6a621c34e84e7e2311 Mon Sep 17 00:00:00 2001 From: 劉鈞霖 <benson@gmail.com> Date: 星期一, 27 十二月 2021 12:27:55 +0800 Subject: [PATCH] [ Ref ] : refactor page : quickFilter , recommendConsultant , userReviews , userReviewsRecord and some related component --- PAMapp/components/phoneContactTimePicker.vue | 72 +++++++++++++++++------------------ 1 files changed, 35 insertions(+), 37 deletions(-) diff --git a/PAMapp/components/phoneContactTimePicker.vue b/PAMapp/components/phoneContactTimePicker.vue index 32a2991..9382daa 100644 --- a/PAMapp/components/phoneContactTimePicker.vue +++ b/PAMapp/components/phoneContactTimePicker.vue @@ -11,12 +11,12 @@ <p>{{optionsFormat(scheduleDto.selectTimesOptions,timesOfDayOptions)}}</p> </template> <template v-else> - 隢��� + 隢��� </template> </div> <div class="pam-contact-schedule__icon"> - <i v-if="checkFormHasDone(scheduleDto)" - class="icon-delet" + <i v-if="checkFormHasDone(scheduleDto)" + class="icon-delet" :class="{'disable':syncScheduleList.length===1}" @click.stop="deleteScheduleItem(index)"> </i> @@ -25,44 +25,42 @@ </div> </div> <div class="pam-add-schedule cursor--pointer" - :class="{'disable':!checkFormHasDone(syncScheduleList[syncScheduleList.length-1])|| syncScheduleList.length ===7}" + :class="{'disable':!checkFormHasDone(syncScheduleList[syncScheduleList && syncScheduleList.length && syncScheduleList.length - 1])|| syncScheduleList.length ===7}" @click="addNewSchedule"> <i class="icon-add"></i> �憓�挾 </div> - <PopUpFrame class="pam-popUpFrame" + <PopUpFrame class="pam-popUpFrame" :isOpen.sync="isOpenByStep_1" - :drawerSize="drawerSize" :dialogWidth="dialogWidth"> <div class="pam-popUp-title">{{popUpTitle}}</div> - <MultiSelectBtn class="mt-30" - :mutiSelect.sync="initPickerControl.selectWeekOptions" - :options="weekOptions.options" + <MultiSelectBtn class="mt-30" + :mutiSelect.sync="initPickerControl.selectWeekOptions" + :options="weekOptions.options" :nameOfSelectAll="weekOptions.selectAll"> </MultiSelectBtn> - <div class="pam-popUp-confirm-bolck pam-paragraph"> - <button class="pam-select-confirm" - :class="[initPickerControl.selectWeekOptions.length?'el-button--primary' :'is-disabled']" + <div class="pam-popUp-confirm-bolck mt-30"> + <button class="pam-select-confirm" + :class="[initPickerControl.selectWeekOptions.length?'el-button--primary' :'is-disabled']" @click="confirmByStep_1"> 蝣箏�� </button> </div> </PopUpFrame> - <PopUpFrame class="pam-popUpFrame" + <PopUpFrame class="pam-popUpFrame" :isOpen.sync="isOpenByStep_2" - :drawerSize="drawerSize" :dialogWidth="dialogWidth"> <div class="pam-popUp-title">{{popUpTitle}}</div> - <MultiSelectBtn class="mt-30" - :mutiSelect.sync="initPickerControl.selectTimesOptions" - :options="timesOfDayOptions.options" + <MultiSelectBtn class="mt-30" + :mutiSelect.sync="initPickerControl.selectTimesOptions" + :options="timesOfDayOptions.options" :nameOfSelectAll="timesOfDayOptions.selectAll"> </MultiSelectBtn> - <div class="pam-popUp-confirm-bolck pam-paragraph"> - <button class="pam-select-confirm" - :class="[initPickerControl.selectTimesOptions.length ?'el-button--primary' :'is-disabled']" + <div class="pam-popUp-confirm-bolck mt-30"> + <button class="pam-select-confirm" + :class="[initPickerControl.selectTimesOptions.length ?'el-button--primary' :'is-disabled']" @click="confirmByStep_2"> 蝣箏�� </button> @@ -82,31 +80,31 @@ selectAll:'瘥予', options:[ { - title:'蝳格��', - label:'蝳格��' + title:'����', + label:'����' }, { - title:'蝳格���', - label:'蝳格���' + title:'�����', + label:'�����' }, { - title:'蝳格���', - label:'蝳格���' + title:'�����', + label:'�����' }, { - title:'蝳格���', - label:'蝳格���' + title:'�����', + label:'�����' }, { - title:'蝳格���', - label:'蝳格���' + title:'�����', + label:'�����' }, { - title:'蝳格�', - label:'蝳格�' + title:'���', + label:'���' }, { - title:'蝳格�', - label:'蝳格�' + title:'���', + label:'���' }, ], }; @@ -131,7 +129,6 @@ } ], }; - private drawerSize="'50%'"; private dialogWidth="376px"; private selectedSchedule!:scheduleDto; @@ -163,7 +160,7 @@ } getOptionsBySort(options:OptionBtnDto[],selectedOptions:string[]):string[]{ return options.map( o => _.includes(selectedOptions,o.title) ? o.title :'').filter(String); - // return + // return } addNewSchedule():void{ const newScheduleDto={ @@ -178,7 +175,8 @@ } checkFormHasDone(item:scheduleDto):boolean{ - return item.selectWeekOptions.length>0 && item.selectTimesOptions.length>0; + if (!item) return false; + return item.selectWeekOptions?.length>0 && item.selectTimesOptions?.length>0; } titleFormatByIndex(index:number):string{ -- Gitblit v1.8.0