Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/components/DateEdit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
prepend-inner-icon="calendar_month"
:disabled="disabled"
:placeholder="placeholder ?? label"
clearable
@click:clear="editDate = null"
/>
</template>

Expand All @@ -20,7 +22,7 @@
import moment from 'moment'
import {computed, ref, watch} from 'vue'

const value = defineModel<string>()
const value = defineModel<string | null>()

const componentProps = defineProps<{
disabled?: boolean
Expand All @@ -33,7 +35,7 @@ const componentProps = defineProps<{
const editDate = ref<string | null>(value.value == '' ? null : (value.value ?? null))
const menu = ref(false)
const editedDate = computed(() => {
if (editDate.value === null && !componentProps.newDate) return ''
if (editDate.value === null && !componentProps.newDate) return null
return moment(editDate.value).format('YYYY-MM-DD')
})

Expand Down
8 changes: 1 addition & 7 deletions src/components/dialogs/add/OnCallAdd.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,7 @@
</v-col>

<v-col cols="12" class="pb-0">
<g-combobox
v-model="editedItem.repeatMonths"
multiple
show-header
:items="months"
:label="t('EndTime')"
/>
<g-combobox v-model="editedItem.repeatMonths" multiple show-header :items="months" :label="t('Months')" />
</v-col>
</v-row>
</v-card-text>
Expand Down
Loading