fix class nodalfix ==> 05_leave

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-06-06 10:38:41 +07:00
parent 7081399c2f
commit ecc0a27ec7
16 changed files with 317 additions and 321 deletions

View file

@ -15,14 +15,8 @@ const typeForm = defineModel<string>("type", { required: true });
const $q = useQuasar(); const $q = useQuasar();
const dataStore = useLeaveStore(); const dataStore = useLeaveStore();
const mixin = useCounterMixin(); const mixin = useCounterMixin();
const { const { date2Thai, messageError, convertDateToAPI, showLoader, hideLoader } =
date2Thai, mixin;
dateToISO,
messageError,
convertDateToAPI,
showLoader,
hideLoader,
} = mixin;
const edit = ref<boolean>(true); const edit = ref<boolean>(true);
const leaveDocumentRef = ref<any>(null); const leaveDocumentRef = ref<any>(null);
@ -200,7 +194,9 @@ const dateEndInputStyle = computed(() => {
const leaveId = ref<any>(""); const leaveId = ref<any>("");
/** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */ /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
const statusCheck = ref<any>(""); const statusCheck = ref<any>("");
watch(props.data, () => { watch(
() => props.data,
() => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataSick.leaveWrote = props.data.leaveWrote; formDataSick.leaveWrote = props.data.leaveWrote;
@ -215,7 +211,8 @@ watch(props.data, () => {
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
formDataSick.leaveDocument = []; formDataSick.leaveDocument = [];
} }
}); }
);
/** Hook */ /** Hook */
onMounted(() => { onMounted(() => {
@ -264,7 +261,6 @@ onMounted(() => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataSick.leaveStartDate" v-model="formDataSick.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -342,7 +338,6 @@ onMounted(() => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataSick.leaveEndDate" v-model="formDataSick.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -205,7 +205,9 @@ const dateEndInputStyle = computed(() => {
/** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */ /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
const leaveDocumentList = ref<any>(); const leaveDocumentList = ref<any>();
const statusCheck = ref<any>(""); const statusCheck = ref<any>("");
watch(props.data, () => { watch(
() => props.data,
() => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataBirth.leaveWrote = props.data.leaveWrote; formDataBirth.leaveWrote = props.data.leaveWrote;
@ -218,7 +220,8 @@ watch(props.data, () => {
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
formDataBirth.leaveDocument = []; formDataBirth.leaveDocument = [];
} }
}); }
);
/** Hook */ /** Hook */
onMounted(() => { onMounted(() => {
@ -266,7 +269,6 @@ onMounted(() => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataBirth.leaveStartDate" v-model="formDataBirth.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -344,7 +346,6 @@ onMounted(() => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataBirth.leaveEndDate" v-model="formDataBirth.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -205,7 +205,9 @@ async function fetchCheck() {
/** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */ /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
watch(props.data, async () => { watch(
() => props.data,
async () => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataHelpWife.leaveWrote = props.data.leaveWrote; formDataHelpWife.leaveWrote = props.data.leaveWrote;
@ -221,7 +223,8 @@ watch(props.data, async () => {
leaveDocumentList.value = props.data.leaveDocument; leaveDocumentList.value = props.data.leaveDocument;
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
} }
}); }
);
/**Hook */ /**Hook */
onMounted(async () => { onMounted(async () => {
@ -270,7 +273,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataHelpWife.leaveStartDate" v-model="formDataHelpWife.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -348,7 +350,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataHelpWife.leaveEndDate" v-model="formDataHelpWife.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -466,7 +467,6 @@ onMounted(async () => {
<div class="col-12 col-md-4 col-sm-12 inputgreen"> <div class="col-12 col-md-4 col-sm-12 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataHelpWife.wifeDayDateBorn" v-model="formDataHelpWife.wifeDayDateBorn"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -203,7 +203,9 @@ async function fetchCheck() {
} }
} }
watch(props.data, () => { watch(
() => props.data,
() => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataVacation.leaveWrote = props.data.leaveWrote; formDataVacation.leaveWrote = props.data.leaveWrote;
@ -220,7 +222,8 @@ watch(props.data, () => {
formDataVacation.leaveRange = props.data.leaveRange; formDataVacation.leaveRange = props.data.leaveRange;
formDataVacation.leaveDocument = []; formDataVacation.leaveDocument = [];
} }
}); }
);
/**Hook */ /**Hook */
onMounted(() => { onMounted(() => {
@ -270,7 +273,6 @@ onMounted(() => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataVacation.leaveStartDate" v-model="formDataVacation.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -347,7 +349,6 @@ onMounted(() => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataVacation.leaveEndDate" v-model="formDataVacation.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -229,7 +229,9 @@ const dateEndInputStyle = computed(() => {
const leaveDocumentList = ref<any>(); const leaveDocumentList = ref<any>();
const statusCheck = ref<string>(""); const statusCheck = ref<string>("");
watch(props.data, async () => { watch(
() => props.data,
async () => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataOrdination.leaveWrote = props.data.leaveWrote; formDataOrdination.leaveWrote = props.data.leaveWrote;
@ -237,7 +239,8 @@ watch(props.data, async () => {
formDataOrdination.leaveEndDate = props.data.leaveEndDate; formDataOrdination.leaveEndDate = props.data.leaveEndDate;
formDataOrdination.leaveTotal = props.data.leaveTotal; formDataOrdination.leaveTotal = props.data.leaveTotal;
formDataOrdination.ordainDayOrdination = props.data.ordainDayOrdination; formDataOrdination.ordainDayOrdination = props.data.ordainDayOrdination;
formDataOrdination.ordainDayLocationName = props.data.ordainDayLocationName; formDataOrdination.ordainDayLocationName =
props.data.ordainDayLocationName;
formDataOrdination.ordainDayLocationAddress = formDataOrdination.ordainDayLocationAddress =
props.data.ordainDayLocationAddress; props.data.ordainDayLocationAddress;
formDataOrdination.ordainDayBuddhistLentName = formDataOrdination.ordainDayBuddhistLentName =
@ -254,7 +257,8 @@ watch(props.data, async () => {
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
formDataOrdination.leaveDocument = []; formDataOrdination.leaveDocument = [];
} }
}); }
);
/** Hook */ /** Hook */
onMounted(async () => { onMounted(async () => {
@ -320,7 +324,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataOrdination.leaveStartDate" v-model="formDataOrdination.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -398,7 +401,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataOrdination.leaveEndDate" v-model="formDataOrdination.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -497,7 +499,6 @@ onMounted(async () => {
<div class="col-12 col-md-3 col-sm-6"> <div class="col-12 col-md-3 col-sm-6">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataOrdination.leavegovernmentDate" v-model="formDataOrdination.leavegovernmentDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -543,7 +544,6 @@ onMounted(async () => {
<div class="col-12 col-md-3 col-sm-6"> <div class="col-12 col-md-3 col-sm-6">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataOrdination.leavebirthDate" v-model="formDataOrdination.leavebirthDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -614,7 +614,6 @@ onMounted(async () => {
<div class="text-weight-bold text-dark col-12">สถานทบวช</div> <div class="text-weight-bold text-dark col-12">สถานทบวช</div>
<div class="col-12 col-md-4 col-sm-6 inputgreen"> <div class="col-12 col-md-4 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataOrdination.ordainDayOrdination" v-model="formDataOrdination.ordainDayOrdination"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -122,7 +122,7 @@ function onValidate() {
formData.append("leaveTotal", formDataHaji.leaveTotal); formData.append("leaveTotal", formDataHaji.leaveTotal);
formData.append("leaveRange", formDataHaji.leaveRange); formData.append("leaveRange", formDataHaji.leaveRange);
formData.append("leaveRangeEnd", formDataHaji.leaveRangeEnd); formData.append("leaveRangeEnd", formDataHaji.leaveRangeEnd);
formData.append("hajj", 'true'); formData.append("hajj", "true");
props.onSubmit(formData, isLeave.value); props.onSubmit(formData, isLeave.value);
} }
} }
@ -193,7 +193,9 @@ const dateEndInputStyle = computed(() => {
/** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */ /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
const leaveDocumentList = ref<any>(); const leaveDocumentList = ref<any>();
const statusCheck = ref<any>(""); const statusCheck = ref<any>("");
watch(props.data, async () => { watch(
() => props.data,
async () => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataHaji.leaveWrote = props.data.leaveWrote; formDataHaji.leaveWrote = props.data.leaveWrote;
@ -208,7 +210,8 @@ watch(props.data, async () => {
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
formDataHaji.leaveDocument = []; formDataHaji.leaveDocument = [];
} }
}); }
);
/**Hook */ /**Hook */
onMounted(async () => { onMounted(async () => {
@ -255,7 +258,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<datepicker <datepicker
class="col-12 col-md-3 col-sm-6 inputgreen" class="col-12 col-md-3 col-sm-6 inputgreen"
menu-class-name="modalfix"
v-model="formDataHaji.leaveStartDate" v-model="formDataHaji.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -329,7 +331,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<datepicker <datepicker
class="col-12 col-md-3 col-sm-6 inputgreen" class="col-12 col-md-3 col-sm-6 inputgreen"
menu-class-name="modalfix"
v-model="formDataHaji.leaveEndDate" v-model="formDataHaji.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -425,7 +426,6 @@ onMounted(async () => {
<datepicker <datepicker
class="col-12 col-md-3 col-sm-6" class="col-12 col-md-3 col-sm-6"
menu-class-name="modalfix"
autoApply autoApply
borderless borderless
readonly readonly

View file

@ -215,7 +215,9 @@ async function fetchCheck() {
// formDataMilitary.leaveTotal = newLeaveTotal; // formDataMilitary.leaveTotal = newLeaveTotal;
// } // }
watch(props.data, async () => { watch(
() => props.data,
async () => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataMilitary.leaveWrote = props.data.leaveWrote; formDataMilitary.leaveWrote = props.data.leaveWrote;
@ -239,7 +241,8 @@ watch(props.data, async () => {
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
formDataMilitary.leaveDocument = []; formDataMilitary.leaveDocument = [];
} }
}); }
);
/**Hook */ /**Hook */
onMounted(async () => { onMounted(async () => {
@ -296,7 +299,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataMilitary.leaveStartDate" v-model="formDataMilitary.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -374,7 +376,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> --> <div class="row q-col-gutter-sm"> -->
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataMilitary.leaveEndDate" v-model="formDataMilitary.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -509,7 +510,6 @@ onMounted(async () => {
<div class="q-col-gutter-sm row"> <div class="q-col-gutter-sm row">
<datepicker <datepicker
class="col-12 col-md-4 col-sm-6 inputgreen" class="col-12 col-md-4 col-sm-6 inputgreen"
menu-class-name="modalfix"
v-model="formDataMilitary.absentDayRegistorDate" v-model="formDataMilitary.absentDayRegistorDate"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -230,7 +230,9 @@ async function fetchCheck() {
// } // }
/** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */ /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
watch(props.data, async () => { watch(
() => props.data,
async () => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataStudy.leaveWrote = props.data.leaveWrote; formDataStudy.leaveWrote = props.data.leaveWrote;
@ -259,7 +261,8 @@ watch(props.data, async () => {
leaveText.value = leaveTotal; leaveText.value = leaveTotal;
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
} }
}); }
);
/**Hook */ /**Hook */
onMounted(async () => { onMounted(async () => {
@ -323,7 +326,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataStudy.leaveStartDate" v-model="formDataStudy.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -401,7 +403,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> --> <div class="row q-col-gutter-sm"> -->
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataStudy.leaveEndDate" v-model="formDataStudy.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -504,7 +505,6 @@ onMounted(async () => {
<div class="q-col-gutter-sm row"> <div class="q-col-gutter-sm row">
<div class="col-12 col-md-3 col-sm-6"> <div class="col-12 col-md-3 col-sm-6">
<datepicker <datepicker
menu-class-name="modalfix"
autoApply autoApply
borderless borderless
week-start="0" week-start="0"
@ -552,7 +552,6 @@ onMounted(async () => {
<div class="col-12 col-md-3 col-sm-6"> <div class="col-12 col-md-3 col-sm-6">
<datepicker <datepicker
menu-class-name="modalfix"
autoApply autoApply
borderless borderless
readonly readonly

View file

@ -214,7 +214,9 @@ function updateLeaveTotal() {
formDataTrain.leaveTotal = newLeaveTotal; formDataTrain.leaveTotal = newLeaveTotal;
} }
watch(props.data, async () => { watch(
() => props.data,
async () => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataTrain.leaveWrote = props.data.leaveWrote; formDataTrain.leaveWrote = props.data.leaveWrote;
@ -227,7 +229,8 @@ watch(props.data, async () => {
formDataTrain.leaveSalaryText = props.data.leaveSalaryText; formDataTrain.leaveSalaryText = props.data.leaveSalaryText;
formDataTrain.studyDayScholarship = props.data.studyDayScholarship; formDataTrain.studyDayScholarship = props.data.studyDayScholarship;
formDataTrain.studyDayCountry = props.data.studyDayCountry; formDataTrain.studyDayCountry = props.data.studyDayCountry;
formDataTrain.studyDayTrainingSubject = props.data.studyDayTrainingSubject; formDataTrain.studyDayTrainingSubject =
props.data.studyDayTrainingSubject;
formDataTrain.studyDayTrainingName = props.data.studyDayTrainingName; formDataTrain.studyDayTrainingName = props.data.studyDayTrainingName;
formDataTrain.leaveDetail = props.data.leaveDetail; formDataTrain.leaveDetail = props.data.leaveDetail;
formDataTrain.leaveRange = props.data.leaveRange; formDataTrain.leaveRange = props.data.leaveRange;
@ -241,7 +244,8 @@ watch(props.data, async () => {
leaveDocumentList.value = props.data.leaveDocument; leaveDocumentList.value = props.data.leaveDocument;
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
} }
}); }
);
/**Hook */ /**Hook */
onMounted(async () => { onMounted(async () => {
@ -303,7 +307,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataTrain.leaveStartDate" v-model="formDataTrain.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -380,7 +383,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> --> <div class="row q-col-gutter-sm"> -->
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataTrain.leaveEndDate" v-model="formDataTrain.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -484,7 +486,6 @@ onMounted(async () => {
<div class="col-12 col-sm-3"> <div class="col-12 col-sm-3">
<datepicker <datepicker
v-model="formDataTrain.leavegovernmentDate" v-model="formDataTrain.leavegovernmentDate"
menu-class-name="modalfix"
autoApply autoApply
borderless borderless
week-start="0" week-start="0"
@ -533,7 +534,6 @@ onMounted(async () => {
<div class="col-12 col-sm-3"> <div class="col-12 col-sm-3">
<datepicker <datepicker
v-model="formDataTrain.leavebirthDate" v-model="formDataTrain.leavebirthDate"
menu-class-name="modalfix"
autoApply autoApply
borderless borderless
readonly readonly

View file

@ -219,14 +219,18 @@ const leaveDocumentList = ref<any>();
const leaveDraftDocument = ref<string>(); const leaveDraftDocument = ref<string>();
const statusCheck = ref<string>(""); const statusCheck = ref<string>("");
watch(props, async () => { watch(
() => props,
async () => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataWorkInternational.leaveWrote = props.data.leaveWrote; formDataWorkInternational.leaveWrote = props.data.leaveWrote;
formDataWorkInternational.leaveStartDate = new Date( formDataWorkInternational.leaveStartDate = new Date(
props.data.leaveStartDate props.data.leaveStartDate
); );
formDataWorkInternational.leaveEndDate = new Date(props.data.leaveEndDate); formDataWorkInternational.leaveEndDate = new Date(
props.data.leaveEndDate
);
formDataWorkInternational.leaveDetail = props.data.leaveDetail; formDataWorkInternational.leaveDetail = props.data.leaveDetail;
leaveDraftDocument.value = props.data.leaveDraftDocument; leaveDraftDocument.value = props.data.leaveDraftDocument;
formDataWorkInternational.leaveRange = props.data.leaveRange; formDataWorkInternational.leaveRange = props.data.leaveRange;
@ -242,7 +246,8 @@ watch(props, async () => {
); );
leaveText.value = leaveTotal; leaveText.value = leaveTotal;
} }
}); }
);
watch( watch(
() => formDataWorkInternational.leaveEndDate, () => formDataWorkInternational.leaveEndDate,
@ -311,7 +316,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataWorkInternational.leaveStartDate" v-model="formDataWorkInternational.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -388,7 +392,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> --> <div class="row q-col-gutter-sm"> -->
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataWorkInternational.leaveEndDate" v-model="formDataWorkInternational.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -285,7 +285,9 @@ const dateEndInputStyle = computed(() => {
/** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */ /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */
const leaveDocumentList = ref<any>(); const leaveDocumentList = ref<any>();
const statusCheck = ref<any>(""); const statusCheck = ref<any>("");
watch(props.data, async () => { watch(
() => props.data,
async () => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataFollowSpouse.leaveWrote = props.data.leaveWrote; formDataFollowSpouse.leaveWrote = props.data.leaveWrote;
@ -328,7 +330,8 @@ watch(props.data, async () => {
statusCheck.value = props.data.status; statusCheck.value = props.data.status;
formDataFollowSpouse.leaveDocument = []; formDataFollowSpouse.leaveDocument = [];
} }
}); }
);
/**Hook */ /**Hook */
onMounted(async () => { onMounted(async () => {
@ -405,7 +408,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataFollowSpouse.leaveStartDate" v-model="formDataFollowSpouse.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -483,7 +485,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> --> <div class="row q-col-gutter-sm"> -->
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataFollowSpouse.leaveEndDate" v-model="formDataFollowSpouse.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -673,7 +674,6 @@ onMounted(async () => {
<datepicker <datepicker
class="col-12 col-md-3 col-sm-12 inputgreen" class="col-12 col-md-3 col-sm-12 inputgreen"
menu-class-name="modalfix"
v-model="formDataFollowSpouse.coupleDayStartDateHistory" v-model="formDataFollowSpouse.coupleDayStartDateHistory"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -720,7 +720,6 @@ onMounted(async () => {
</datepicker> </datepicker>
<datepicker <datepicker
class="col-12 col-md-3 col-sm-12 inputgreen" class="col-12 col-md-3 col-sm-12 inputgreen"
menu-class-name="modalfix"
v-model="formDataFollowSpouse.coupleDayEndDateHistory" v-model="formDataFollowSpouse.coupleDayEndDateHistory"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -198,11 +198,15 @@ const dateEndInputStyle = computed(() => {
const leaveDocumentList = ref<any>(); const leaveDocumentList = ref<any>();
const leaveDraftDocument = ref<string>(); const leaveDraftDocument = ref<string>();
const statusCheck = ref<string>(""); const statusCheck = ref<string>("");
watch(props.data, async () => { watch(
() => props.data,
async () => {
if (props.data) { if (props.data) {
// totalCheck.value = null; // totalCheck.value = null;
formDataRehabilitation.leaveWrote = props.data.leaveWrote; formDataRehabilitation.leaveWrote = props.data.leaveWrote;
formDataRehabilitation.leaveStartDate = new Date(props.data.leaveStartDate); formDataRehabilitation.leaveStartDate = new Date(
props.data.leaveStartDate
);
formDataRehabilitation.leaveEndDate = new Date(props.data.leaveEndDate); formDataRehabilitation.leaveEndDate = new Date(props.data.leaveEndDate);
formDataRehabilitation.leaveDetail = props.data.leaveDetail; formDataRehabilitation.leaveDetail = props.data.leaveDetail;
leaveDraftDocument.value = props.data.leaveDraftDocument; leaveDraftDocument.value = props.data.leaveDraftDocument;
@ -218,7 +222,8 @@ watch(props.data, async () => {
); );
leaveText.value = leaveTotal; leaveText.value = leaveTotal;
} }
}); }
);
/**Hook */ /**Hook */
onMounted(async () => { onMounted(async () => {
@ -274,7 +279,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataRehabilitation.leaveStartDate" v-model="formDataRehabilitation.leaveStartDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -351,7 +355,6 @@ onMounted(async () => {
<div class="row q-col-gutter-sm"> --> <div class="row q-col-gutter-sm"> -->
<div class="col-12 col-md-3 col-sm-6 inputgreen"> <div class="col-12 col-md-3 col-sm-6 inputgreen">
<datepicker <datepicker
menu-class-name="modalfix"
v-model="formDataRehabilitation.leaveEndDate" v-model="formDataRehabilitation.leaveEndDate"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -101,7 +101,10 @@ async function getCommander() {
page: pagination.value.page, page: pagination.value.page,
pageSize: pagination.value.rowsPerPage, pageSize: pagination.value.rowsPerPage,
keycloakId: storeData.formData.keycloakId, keycloakId: storeData.formData.keycloakId,
type:storeData.officerType.toLocaleUpperCase() == 'OFFICER' ? 'officer':'employee' type:
storeData.officerType.toLocaleUpperCase() == "OFFICER"
? "officer"
: "employee",
}) })
.then((res) => { .then((res) => {
rows.value = res.data.result.data; rows.value = res.data.result.data;
@ -170,7 +173,6 @@ onMounted(() => {
<div class="col-12 row q-pa-sm q-col-gutter-sm"> <div class="col-12 row q-pa-sm q-col-gutter-sm">
<datepicker <datepicker
class="col-12 col-sm-6" class="col-12 col-sm-6"
menu-class-name="modalfix"
v-model="dataStore.dateSendLeave" v-model="dataStore.dateSendLeave"
:locale="'th'" :locale="'th'"
autoApply autoApply

View file

@ -101,7 +101,6 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
<div class="items-center col-12 row q-col-gutter-sm"> <div class="items-center col-12 row q-col-gutter-sm">
<datepicker <datepicker
v-if="leaveStore.tabValue === 'list'" v-if="leaveStore.tabValue === 'list'"
menu-class-name="modalfix"
v-model="year" v-model="year"
class="col-xs-12 col-sm-auto" class="col-xs-12 col-sm-auto"
:locale="'th'" :locale="'th'"

View file

@ -1,6 +1,5 @@
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import { ref } from "vue"; import { ref } from "vue";
import { useQuasar } from "quasar";
import http from "@/plugins/http"; import http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
@ -19,7 +18,6 @@ import type { DataOption } from "../14_IDP/interface/Main";
const mixin = useCounterMixin(); const mixin = useCounterMixin();
const { date2Thai, messageError, showLoader, hideLoader } = mixin; const { date2Thai, messageError, showLoader, hideLoader } = mixin;
const $q = useQuasar();
const type = ref<string>("00000000-0000-0000-0000-000000000000"); const type = ref<string>("00000000-0000-0000-0000-000000000000");
const status = ref<string>("ALL"); const status = ref<string>("ALL");
export const useLeaveStore = defineStore("Leave", () => { export const useLeaveStore = defineStore("Leave", () => {
@ -344,7 +342,7 @@ export const useLeaveStore = defineStore("Leave", () => {
Number(data.leaveLimit) - Number(data.restDayTotalOld); Number(data.leaveLimit) - Number(data.restDayTotalOld);
}) })
.catch((e: any) => { .catch((e: any) => {
messageError($q, e); console.log(e);
}) })
.finally(() => { .finally(() => {
hideLoader(); hideLoader();
@ -368,7 +366,7 @@ export const useLeaveStore = defineStore("Leave", () => {
Number(data.leaveLimit) - Number(data.restDayTotalOld); Number(data.leaveLimit) - Number(data.restDayTotalOld);
}) })
.catch((e: any) => { .catch((e: any) => {
messageError($q, e); console.log(e);
}); });
dateSendLeave.value = data.dateSendLeave; dateSendLeave.value = data.dateSendLeave;

View file

@ -1,13 +1,10 @@
import axios from "axios"; import axios from "axios";
import config from "@/app.config"; import config from "@/app.config";
import { useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin"; import { useCounterMixin } from "@/stores/mixin";
const $q = useQuasar();
const mixin = useCounterMixin(); const mixin = useCounterMixin();
const { showLoader, hideLoader, messageError } = mixin; const { showLoader, hideLoader } = mixin;
async function genReport(data: any, fileName: string, type: string = "docx") { async function genReport(data: any, fileName: string, type: string = "docx") {
showLoader(); showLoader();
@ -49,7 +46,7 @@ async function genReport(data: any, fileName: string, type: string = "docx") {
} }
}) })
.catch((err) => { .catch((err) => {
messageError($q, err); console.log(err);
}) })
.finally(() => { .finally(() => {
hideLoader(); hideLoader();