hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into NiceDev

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-01-05 13:22:41 +07:00
commit 36ea205624
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/05_leave/components/Calendar.vue
View file

@ -23,6 +23,7 @@ import DialogDetail from "@/modules/05_leave/components/DialogDetail.vue"
/** import stort*/ /** import stort*/
import { useCounterMixin } from "@/stores/mixin" import { useCounterMixin } from "@/stores/mixin"
import { aR } from "@fullcalendar/core/internal-common"
const mixin = useCounterMixin() const mixin = useCounterMixin()
const { showLoader, hideLoader, messageError, date2Thai, monthYear2Thai, dateToISO } = mixin const { showLoader, hideLoader, messageError, date2Thai, monthYear2Thai, dateToISO } = mixin
@ -289,11 +290,16 @@ onMounted(async () => {
<div class="main-content"> <div class="main-content">
<FullCalendar ref="fullCalendar" class="demo-app-calendar" :options="calendarOptions"> <FullCalendar ref="fullCalendar" class="demo-app-calendar" :options="calendarOptions">
<template v-slot:eventContent="arg"> <template v-slot:eventContent="arg">
<div class="row col-12 items-center no-wrap" :style="`background: + ${arg.event.color}`"> <div v-if="arg.event.textColor == 'black'" class="row col-12 items-center no-wrap" :style="`background: + ${arg.event.color}`">
<div class="textHover col-10" @click="onCilckview(arg.event.id)"> <div class="textHover col-10" @click="onCilckview(arg.event.id)">
{{ arg.event.title }} {{ arg.event.title }}
</div> </div>
</div> </div>
<div v-else class="row col-12 items-center no-wrap" :style="`background: + ${arg.event.color}`">
<div class="textHover col-10">
{{ arg.event.title }}
</div>
</div>
</template> </template>
</FullCalendar> </FullCalendar>
</div> </div>

4
src/modules/06_evaluate/components/DialogMain.vue
View file

@ -86,8 +86,8 @@ watch(props, () => {
<q-separator /> <q-separator />
<q-carousel <q-carousel
v-model="slide" v-model="slide"
transition-prev="scale" transition-prev="slide-right"
transition-next="scale" transition-next="slide-left"
swipeable swipeable
animated animated
control-type="regular" control-type="regular"