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

fix bug calendar

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-04-30 10:59:11 +07:00
parent 2737810c6c
commit 6f5f1f90c9
111 changed files with 2002 additions and 1866 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/08_registryEmployee/components/AddEmployee/Main.vue
View file

@ -447,7 +447,6 @@ const clickBack = () => {
hide-bottom-space
outlined
dense
lazy-rules
:model-value="
informaData.birthDate == null
? null

22
src/modules/08_registryEmployee/components/EditEmployee/Assessment.vue
View file

@ -35,8 +35,15 @@ const store = useProfileDataStore();
const { profileData, changeProfileColumns } = store;
const mixin = useCounterMixin();
const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
mixin;
const {
date2Thai,
success,
dateToISO,
messageError,
showLoader,
hideLoader,
dialogConfirm,
} = mixin;
const route = useRoute();
const id = ref<string>("");
const name = ref<string>();
@ -395,9 +402,9 @@ const clickAdd = async () => {
/**
* กดบันทึกใน dialog
*/
const clickSave = () =>{
dialogConfirm($q,()=>SaveData())
}
const clickSave = () => {
dialogConfirm($q, () => SaveData());
};
const SaveData = async () => {
await myForm.value.validate().then(async (result: boolean) => {
if (result) {
@ -735,9 +742,7 @@ const textPoint = (val: number | undefined) => {
/>
<q-separator />
<q-card-section class="q-p-sm">
<div
class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
>
<div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
<div class="col-xs-12 col-sm-12 col-md-12">
<datepicker
menu-class-name="modalfix"
@ -758,7 +763,6 @@ const textPoint = (val: number | undefined) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่ได้รับ'}`]"

21
src/modules/08_registryEmployee/components/EditEmployee/Discipline.vue
View file

@ -34,8 +34,15 @@ const store = useProfileDataStore();
const { profileData, changeProfileColumns } = store;
const mixin = useCounterMixin();
const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader, dialogConfirm } =
mixin;
const {
date2Thai,
success,
dateToISO,
messageError,
showLoader,
hideLoader,
dialogConfirm,
} = mixin;
const route = useRoute();
const id = ref<string>("");
const level = ref<string>();
@ -415,8 +422,8 @@ const clickAdd = async () => {
* กดบันทึกใน dialog
*/
const clickSave = () => {
dialogConfirm($q,()=>SaveData())
}
dialogConfirm($q, () => SaveData());
};
const SaveData = async () => {
await myForm.value.validate().then(async (result: boolean) => {
if (result) {
@ -723,9 +730,7 @@ const resetFilter = () => {};
<DialogHeader tittle="วินัย" :close="clickClose" />
<q-separator />
<q-card-section class="q-p-sm">
<div
class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
>
<div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
<div class="col-xs-6 col-sm-6 col-md-6">
<datepicker
menu-class-name="modalfix"
@ -746,7 +751,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[(val:string) => !!val || `${'กรุณาเลือกวัน เดือน ปี'}`]"
@ -866,7 +870,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
refCommandDate == null ? null : date2Thai(refCommandDate)

24
src/modules/08_registryEmployee/components/EditEmployee/Education.vue
View file

@ -32,8 +32,15 @@ const store = useProfileDataStore();
const { profileData, changeProfileColumns } = store;
const mixin = useCounterMixin();
const { success, dateToISO, date2Thai, messageError, showLoader, hideLoader,dialogConfirm } =
mixin;
const {
success,
dateToISO,
date2Thai,
messageError,
showLoader,
hideLoader,
dialogConfirm,
} = mixin;
const route = useRoute();
const id = ref<string>("");
const levelId = ref<string>();
@ -657,8 +664,8 @@ const clickAdd = async () => {
* กดบันทึกใน dialog
*/
const clickSave = () => {
dialogConfirm($q,() => SaveData() )
}
dialogConfirm($q, () => SaveData());
};
const SaveData = async () => {
await myForm.value.validate().then(async (result: boolean) => {
if (result) {
@ -1054,9 +1061,7 @@ const getClass = (val: boolean) => {
<DialogHeader tittle="ประวัติการศึกษา" :close="clickClose" />
<q-separator />
<q-card-section class="q-p-sm">
<div
class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
>
<div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
<div class="col-xs-6 col-sm-6 col-md-6">
<selector
:class="getClass(edit)"
@ -1142,7 +1147,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="startDate + 543"
:rules="[
@ -1187,7 +1191,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(startDate2)"
:rules="[
@ -1237,7 +1240,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="endDate + 543"
:rules="[
@ -1281,7 +1283,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(endDate2)"
:rules="[
@ -1331,7 +1332,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(finishDate)"
:rules="[

211
src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
View file

@ -311,29 +311,71 @@ const paginationHis = ref({
<q-card flat bordered class="col-12 q-px-lg q-py-md">
<div class="flex items-center">
<div class="flex items-center">
<q-icon name="mdi-clipboard" size="1.5em" color="grey-5" class="q-mr-md" />
<q-icon
name="mdi-clipboard"
size="1.5em"
color="grey-5"
class="q-mr-md"
/>
<div class="text-bold text-subtitle2 col-12 row items-center">
ข้อมูลการจ้าง
</div>
</div>
<div class="q-gutter-sm q-mx-sm">
<q-btn size="12px" flat round color="primary" @click="onClickAdd" icon="mdi-plus">
<q-btn
size="12px"
flat
round
color="primary"
@click="onClickAdd"
icon="mdi-plus"
>
<q-tooltip>เพิ่มข้อมูลการจ้าง</q-tooltip>
</q-btn>
</div>
<q-space />
<div class="q-gutter-sm" style="display: flex">
<q-input outlined dense v-model="filter" label="ค้นหา" style="min-width: 150px" />
<q-input
outlined
dense
v-model="filter"
label="ค้นหา"
style="min-width: 150px"
/>
<q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px" />
<q-select
v-model="visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
option-value="name"
options-cover
style="min-width: 150px"
/>
</div>
</div>
<div class="q-mt-sm">
<d-table flat bordered id="table" ref="table" :columns="columns" :rows="rows" :filter="filter"
row-key="dateEmployment" :paging="true" dense :visible-columns="visibleColumns" v-model:pagination="pagination">
<d-table
flat
bordered
id="table"
ref="table"
:columns="columns"
:rows="rows"
:filter="filter"
row-key="dateEmployment"
:paging="true"
dense
:visible-columns="visibleColumns"
v-model:pagination="pagination"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props">
@ -352,16 +394,38 @@ const paginationHis = ref({
</div>
</q-td>
<q-td>
<q-btn dense flat round color="primary" icon="mdi-pencil" @click="clickEdit(props.row, 'edit')">
<q-btn
dense
flat
round
color="primary"
icon="mdi-pencil"
@click="clickEdit(props.row, 'edit')"
>
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn>
</q-td>
<q-td>
<q-btn dense flat round color="red" icon="mdi-delete" @click="cilckDelete(props.row.id)">
<q-tooltip>ลบข้อมูล</q-tooltip></q-btn>
<q-btn
dense
flat
round
color="red"
icon="mdi-delete"
@click="cilckDelete(props.row.id)"
>
<q-tooltip>ลบข้อมูล</q-tooltip></q-btn
>
</q-td>
<q-td>
<q-btn dense flat round color="info" @click="openPopupHistory(props.row.id)" icon="mdi-history">
<q-btn
dense
flat
round
color="info"
@click="openPopupHistory(props.row.id)"
icon="mdi-history"
>
<q-tooltip>ประวัติข้อมูลการจ้าง </q-tooltip>
</q-btn>
</q-td>
@ -380,17 +444,33 @@ const paginationHis = ref({
</span>
<span style="margin-right: 0" v-else> เพิ่มข้อมูลการจ้าง </span>
</q-toolbar-title>
<q-btn for="closeDialog" icon="close" unelevated round dense style="color: #eb0505; background-color: #ffdede"
@click="colsePopup" />
<q-btn
for="closeDialog"
icon="close"
unelevated
round
dense
style="color: #eb0505; background-color: #ffdede"
@click="colsePopup"
/>
</q-toolbar>
<q-separator />
<form @submit.prevent="validateForm">
<q-card-section class="q-pt-none">
<div class="col-12 row q-pa-md">
<div class="col-xs-12 col-sm-12 row q-col-gutter-x-md q-col-gutter-y-xs">
<div
class="col-xs-12 col-sm-12 row q-col-gutter-x-md q-col-gutter-y-xs"
>
<div class="col-xs-12 col-sm-6">
<datepicker menu-class-name="modalfix" v-model="formData.dateEmployment" :locale="'th'" autoApply
borderless :enableTimePicker="false" week-start="0">
<datepicker
menu-class-name="modalfix"
v-model="formData.dateEmployment"
:locale="'th'"
autoApply
borderless
:enableTimePicker="false"
week-start="0"
>
<template #year="{ year }">
{{ year + 543 }}
</template>
@ -398,13 +478,26 @@ const paginationHis = ref({
{{ parseInt(value + 543) }}
</template>
<template #trigger>
<q-input for="inputdateEmployment" ref="dateEmploymentRef" outlined dense
class="full-width datepicker" :model-value="formData.dateEmployment != null
<q-input
for="inputdateEmployment"
ref="dateEmploymentRef"
outlined
dense
class="full-width datepicker"
:model-value="
formData.dateEmployment != null
? date2Thai(formData.dateEmployment)
: null
" label="วันที่จ้าง" :rules="[(val) => !!val || `${'กรุณาเลือกวันที่จ้าง'}`]" lazy-rules>
"
label="วันที่จ้าง"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่จ้าง'}`]"
>
<template v-slot:prepend>
<q-icon name="event" class="cursor-pointer" style="color: var(--q-primary)">
<q-icon
name="event"
class="cursor-pointer"
style="color: var(--q-primary)"
>
</q-icon>
</template>
</q-input>
@ -413,9 +506,16 @@ const paginationHis = ref({
</div>
<div class="col-xs-12 col-sm-6">
<q-input for="inputOrderEmployment" ref="orderEmploymentRef" dense outlined
v-model="formData.orderEmployment" label="คำสั่งจ้าง"
:rules="[(val) => !!val || `${'กรุณากรอกคำสั่งจ้าง'}`]" lazy-rules />
<q-input
for="inputOrderEmployment"
ref="orderEmploymentRef"
dense
outlined
v-model="formData.orderEmployment"
label="คำสั่งจ้าง"
:rules="[(val) => !!val || `${'กรุณากรอกคำสั่งจ้าง'}`]"
lazy-rules
/>
</div>
</div>
</div>
@ -425,8 +525,16 @@ const paginationHis = ref({
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white text-teal">
<q-btn for="ButtonOnSubmit" id="onSubmit" flat round color="secondary" icon="mdi-content-save-outline"
type="submit"><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn>
<q-btn
for="ButtonOnSubmit"
id="onSubmit"
flat
round
color="secondary"
icon="mdi-content-save-outline"
type="submit"
><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
>
</q-card-actions>
</form>
</q-card>
@ -438,8 +546,15 @@ const paginationHis = ref({
<q-toolbar-title class="text-subtitle1 text-weight-bold">
<span style="margin-right: 0"> ประวัติข้อมูลการจ้าง </span>
</q-toolbar-title>
<q-btn for="closeDialog" icon="close" unelevated round dense style="color: #eb0505; background-color: #ffdede"
@click="colsePopup" />
<q-btn
for="closeDialog"
icon="close"
unelevated
round
dense
style="color: #eb0505; background-color: #ffdede"
@click="colsePopup"
/>
</q-toolbar>
<q-separator />
@ -447,16 +562,44 @@ const paginationHis = ref({
<q-toolbar class="q-pa-none">
<q-space />
<div class="q-gutter-sm" style="display: flex">
<q-input outlined dense v-model="filterHis" label="ค้นหา" style="min-width: 150px" />
<q-input
outlined
dense
v-model="filterHis"
label="ค้นหา"
style="min-width: 150px"
/>
<q-select v-model="visibleColumnsHis" multiple outlined dense options-dense
:display-value="$q.lang.table.columns" emit-value map-options :options="columnsHis" option-value="name"
options-cover style="min-width: 150px" />
<q-select
v-model="visibleColumnsHis"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columnsHis"
option-value="name"
options-cover
style="min-width: 150px"
/>
</div>
</q-toolbar>
<d-table flat bordered id="table" ref="table" :columns="columnsHis" :rows="rowsHis" :filter="filterHis"
row-key="dateEmployment" :paging="true" dense :visible-columns="visibleColumnsHis"
v-model:pagination="paginationHis">
<d-table
flat
bordered
id="table"
ref="table"
:columns="columnsHis"
:rows="rowsHis"
:filter="filterHis"
row-key="dateEmployment"
:paging="true"
dense
:visible-columns="visibleColumnsHis"
v-model:pagination="paginationHis"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props">

23
src/modules/08_registryEmployee/components/EditEmployee/Information/Certicate.vue
View file

@ -34,8 +34,15 @@ const store = useProfileDataStore();
const { profileData, changeProfileColumns } = store;
const mixin = useCounterMixin();
const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader ,dialogConfirm} =
mixin;
const {
date2Thai,
success,
dateToISO,
messageError,
showLoader,
hideLoader,
dialogConfirm,
} = mixin;
const route = useRoute();
const id = ref<string>("");
const certificateNo = ref<string>();
@ -326,10 +333,10 @@ const clickAdd = async () => {
* กดบันทึกใน dialog
*/
const clickSave = () => {
dialogConfirm($q,() => SaveData())
}
dialogConfirm($q, () => SaveData());
};
const SaveData = async () => {
await myForm.value?.validate().then(async (result: boolean) => {
await myForm.value?.validate().then(async (result: boolean) => {
if (result) {
if (modalEdit.value) {
await editData();
@ -638,9 +645,7 @@ const getClass = (val: boolean) => {
/>
<q-separator />
<q-card-section class="q-p-sm">
<div
class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
>
<div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
<div class="col-xs-6 col-sm-6 col-md-6">
<q-input
:class="getClass(edit)"
@ -708,7 +713,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(issueDate)"
:rules="[
@ -754,7 +758,6 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(expireDate)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่หมดอายุ'}`]"

4
src/modules/08_registryEmployee/components/EditEmployee/Information/Government.vue
View file

@ -580,7 +580,6 @@ const getClass = (val: boolean) => {
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="date2Thai(new Date(govermentData.containDate))"
@ -633,7 +632,6 @@ const getClass = (val: boolean) => {
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="date2Thai(new Date(govermentData.workDate))"
@ -761,4 +759,4 @@ const getClass = (val: boolean) => {
</q-tr>
</template>
</HistoryTable>
</template>
</template>

1
src/modules/08_registryEmployee/components/EditEmployee/Information/Information.vue
View file

@ -861,7 +861,6 @@ const getClass = (val: boolean) => {
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="

2
src/modules/08_registryEmployee/components/EditEmployee/Leave.vue
View file

@ -1059,7 +1059,7 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="dateThaiRange(dateRange)"
:rules="[(val:string) => !!val || `${'กรุณาเลือกวัน เดือน ปีที่ลา'}`]"

2
src/modules/08_registryEmployee/components/EditEmployee/Other.vue
View file

@ -536,7 +536,7 @@ const getClass = (val: boolean) => {
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่'}`]"

2
src/modules/08_registryEmployee/components/EditEmployee/Record.vue
View file

@ -650,7 +650,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[(val) => !!val || `${'กรุณาเลือกวัน เดือน ปี'}`]"
@ -747,7 +746,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
refCommandDate == null ? null : date2Thai(refCommandDate)

38
src/modules/08_registryEmployee/components/EditEmployee/Salary.vue
View file

@ -1535,22 +1535,41 @@ const resetFilter = () => {};
>
<template #columns="props">
<q-tr :props="props">
<q-td v-for="col in props.cols" :key="col.name" :props="props" @click="selectData(props)"
class="cursor-pointer">
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
@click="selectData(props)"
class="cursor-pointer"
>
<div v-if="col.name == 'date'" class="table_ellipsis">
{{ date2Thai(col.value) }}
</div>
<div v-else-if="props.row.salaryStatus !== 'DEATH' && (
col.name == 'positionSalaryAmount' ||
col.name == 'mouthSalaryAmount' ||
col.name == 'amount')
" class="table_ellipsis">
<div
v-else-if="
props.row.salaryStatus !== 'DEATH' &&
(col.name == 'positionSalaryAmount' ||
col.name == 'mouthSalaryAmount' ||
col.name == 'amount')
"
class="table_ellipsis"
>
{{ col.value == null ? "" : col.value.toLocaleString("en-US") }}
</div>
<div v-else-if="props.row.salaryStatus === 'DEATH' && col.name == 'position'" class="table_ellipsis">
<div
v-else-if="
props.row.salaryStatus === 'DEATH' && col.name == 'position'
"
class="table_ellipsis"
>
ถึงแก่กรรม
</div>
<div v-else-if="props.row.salaryStatus === 'DEATH' && col.name !== 'salaryRef'" class="table_ellipsis">
<div
v-else-if="
props.row.salaryStatus === 'DEATH' && col.name !== 'salaryRef'
"
class="table_ellipsis"
>
-
</div>
<div v-else class="table_ellipsis">
@ -1660,7 +1679,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[

1
src/modules/08_registryEmployee/components/EditEmployee/SalaryEmployee.vue
View file

@ -1618,7 +1618,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[

22
src/modules/08_registryEmployee/components/EditEmployee/Train.vue
View file

@ -30,8 +30,15 @@ const store = useProfileDataStore();
const { profileData, changeProfileColumns } = store;
const mixin = useCounterMixin();
const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
mixin;
const {
date2Thai,
success,
dateToISO,
messageError,
showLoader,
hideLoader,
dialogConfirm,
} = mixin;
const route = useRoute();
const id = ref<string>("");
const name = ref<string>();
@ -476,8 +483,8 @@ const SaveData = async () => {
* บันทึกเพิ่มข้อมูล
*/
const clickSave = () => {
dialogConfirm($q,() => SaveData())
}
dialogConfirm($q, () => SaveData());
};
const saveData = async () => {
if (profileId.value) {
showLoader();
@ -792,9 +799,7 @@ const getClass = (val: boolean) => {
<DialogHeader tittle="การฝึกอบรม/ดูงาน" :close="clickClose" />
<q-separator />
<q-card-section class="q-p-sm">
<div
class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
>
<div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
<div class="col-xs-6 col-sm-6 col-md-6">
<q-input
:class="getClass(edit)"
@ -851,7 +856,6 @@ const getClass = (val: boolean) => {
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(startDate)"
:rules="[
@ -944,7 +948,6 @@ const getClass = (val: boolean) => {
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="yearly + 543"
:rules="[(val) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`]"
@ -1047,7 +1050,6 @@ const getClass = (val: boolean) => {
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(dateOrder)"
:label="`${'คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`"

26
src/modules/08_registryEmployee/components/EditEmployee/Work.vue
View file

@ -30,8 +30,15 @@ const store = useProfileDataStore();
const { profileData, changeProfileColumns } = store;
const mixin = useCounterMixin();
const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader,dialogConfirm } =
mixin;
const {
date2Thai,
success,
dateToISO,
messageError,
showLoader,
hideLoader,
dialogConfirm,
} = mixin;
const route = useRoute();
const id = ref<string>("");
const dateStart = ref<Date>(new Date());
@ -353,11 +360,11 @@ const clickAdd = async () => {
/**
* กดบันทึกใน dialog
*/
const clickSave = () => {
dialogConfirm($q,() => SaveData())
}
const clickSave = () => {
dialogConfirm($q, () => SaveData());
};
const SaveData = async () => {
await myForm.value.validate().then(async (result: boolean) => {
await myForm.value.validate().then(async (result: boolean) => {
if (result) {
if (modalEdit.value) {
await editData();
@ -666,9 +673,7 @@ const resetFilter = () => {};
<DialogHeader tittle="ปฏิบัติราชการพิเศษ" :close="clickClose" />
<q-separator />
<q-card-section class="q-p-sm">
<div
class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
>
<div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
<div class="col-xs-6 col-sm-6 col-md-6">
<datepicker
menu-class-name="modalfix"
@ -689,7 +694,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(dateStart)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่เริ่มต้น'}`]"
@ -733,7 +737,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(dateEnd)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`]"
@ -830,7 +833,6 @@ const resetFilter = () => {};
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
refCommandDate == null ? null : date2Thai(refCommandDate)

2
src/modules/08_registryEmployee/views/EditDetail.vue
View file

@ -759,7 +759,6 @@ const Retire = async () => {
class="full-width inputgreen cursor-pointer"
outlined
dense
lazy-rules
:model-value="date2Thai(leaveDate)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่พ้นราชการ'}`]"
hide-bottom-space
@ -824,7 +823,6 @@ const Retire = async () => {
class="full-width inputgreen cursor-pointer"
outlined
dense
lazy-rules
:model-value="date2Thai(leaveDateOrder)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่ออกคำสั่ง'}`]"
hide-bottom-space