From 2f0789c087589a053f6c80e3bfb17b0a4c2c4514 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期三, 01 十二月 2021 17:54:30 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
PAMapp/components/phoneContactTimePicker.vue | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/PAMapp/components/phoneContactTimePicker.vue b/PAMapp/components/phoneContactTimePicker.vue
index 32a2991..973eacb 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,44 @@
</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']"
+ <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']"
+ <button class="pam-select-confirm"
+ :class="[initPickerControl.selectTimesOptions.length ?'el-button--primary' :'is-disabled']"
@click="confirmByStep_2">
蝣箏��
</button>
@@ -163,7 +163,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 +178,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