แก้ใช้ จาก mixin
This commit is contained in:
parent
920ca8e13b
commit
cbee41e212
12 changed files with 81 additions and 102 deletions
|
|
@ -1,7 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, reactive, watch, computed, onMounted } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -16,7 +15,7 @@ const typeForm = defineModel<string>("type", { required: true });
|
|||
const $q = useQuasar();
|
||||
const dataStore = useLeaveStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, dateToISO, messageError } = mixin;
|
||||
const { date2Thai, dateToISO, messageError, convertDateToAPI } = mixin;
|
||||
const edit = ref<boolean>(true);
|
||||
const leaveDocumentRef = ref<any>(null);
|
||||
|
||||
|
|
@ -126,11 +125,11 @@ function onValidate() {
|
|||
formData.append("leaveRange", formDataSick.leaveRange);
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataSick.leaveStartDate))
|
||||
convertDateToAPI(formDataSick.leaveStartDate) ?? ""
|
||||
);
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataSick.leaveEndDate))
|
||||
convertDateToAPI(formDataSick.leaveEndDate) ?? ""
|
||||
);
|
||||
formData.append("leaveWrote", formDataSick.leaveWrote);
|
||||
formData.append("leaveAddress", formDataSick.leaveAddress);
|
||||
|
|
@ -151,16 +150,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate:
|
||||
format(
|
||||
utcToZonedTime(formDataSick.leaveStartDate, "Asia/Bangkok"),
|
||||
"yyyy-MM-dd"
|
||||
) ?? null,
|
||||
EndLeaveDate:
|
||||
format(
|
||||
utcToZonedTime(formDataSick.leaveEndDate, "Asia/Bangkok"),
|
||||
"yyyy-MM-dd"
|
||||
) ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataSick.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataSick.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, reactive, onMounted, computed, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -14,7 +13,7 @@ import type { FormRef } from "@/modules/05_leave/interface/request/BirthForm";
|
|||
const $q = useQuasar();
|
||||
const dataStore = useLeaveStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, dateToISO, messageError } = mixin;
|
||||
const { date2Thai, dateToISO, messageError, convertDateToAPI } = mixin;
|
||||
|
||||
const edit = ref<boolean>(true);
|
||||
const leaveId = ref<string>("");
|
||||
|
|
@ -107,11 +106,11 @@ function onValidate() {
|
|||
formData.append("type", formDataBirth.type);
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataBirth.leaveStartDate))
|
||||
convertDateToAPI(formDataBirth.leaveStartDate) ?? ""
|
||||
);
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataBirth.leaveEndDate))
|
||||
convertDateToAPI(formDataBirth.leaveEndDate) ?? ""
|
||||
);
|
||||
formData.append("leaveWrote", formDataBirth.leaveWrote);
|
||||
formData.append("leaveAddress", formDataBirth.leaveAddress);
|
||||
|
|
@ -133,8 +132,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate: format(utcToZonedTime(formDataBirth.leaveStartDate , "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
EndLeaveDate: format(utcToZonedTime(formDataBirth.leaveEndDate , "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataBirth.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataBirth.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import { ref, reactive, onMounted, computed, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { useRouter } from "vue-router";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -15,7 +14,7 @@ import type { FormRef } from "@/modules/05_leave/interface/request/HelpWifeForm"
|
|||
const $q = useQuasar();
|
||||
const dataStore = useLeaveStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, calculateDurationYmd, dateToISO, messageError } = mixin;
|
||||
const { date2Thai, calculateDurationYmd, dateToISO, messageError,convertDateToAPI } = mixin;
|
||||
|
||||
const edit = ref<boolean>(true);
|
||||
const leaveId = ref<string>("");
|
||||
|
|
@ -118,11 +117,11 @@ function onValidate() {
|
|||
formData.append("type", formDataHelpWife.type);
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataHelpWife.leaveStartDate))
|
||||
convertDateToAPI(formDataHelpWife.leaveStartDate)??''
|
||||
);
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataHelpWife.leaveEndDate))
|
||||
convertDateToAPI(formDataHelpWife.leaveEndDate)??''
|
||||
);
|
||||
formData.append("leaveWrote", formDataHelpWife.leaveWrote);
|
||||
formData.append("leaveAddress", formDataHelpWife.leaveAddress);
|
||||
|
|
@ -131,7 +130,7 @@ function onValidate() {
|
|||
formData.append("wifeDayName", formDataHelpWife.wifeDayName);
|
||||
formData.append(
|
||||
"wifeDayDateBorn",
|
||||
dateToISO(new Date(formDataHelpWife.wifeDayDateBorn))
|
||||
convertDateToAPI(formDataHelpWife.wifeDayDateBorn)??''
|
||||
);
|
||||
formData.append("leaveTotal", formDataHelpWife.leaveTotal);
|
||||
|
||||
|
|
@ -160,8 +159,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate: format(utcToZonedTime( formDataHelpWife.leaveStartDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
EndLeaveDate: format(utcToZonedTime( formDataHelpWife.leaveEndDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataHelpWife.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataHelpWife.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import { ref, reactive, onMounted, computed, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { useRouter } from "vue-router";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -15,7 +14,7 @@ import type { FormRef } from "@/modules/05_leave/interface/request/VacationForm"
|
|||
const $q = useQuasar();
|
||||
const dataStore = useLeaveStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, dateToISO, messageError } = mixin;
|
||||
const { date2Thai, dateToISO, messageError,convertDateToAPI } = mixin;
|
||||
|
||||
const edit = ref<boolean>(true);
|
||||
const leaveId = ref<string>("");
|
||||
|
|
@ -139,11 +138,11 @@ function onValidate() {
|
|||
formData.append("leaveRange", formDataVacation.leaveRange);
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataVacation.leaveStartDate))
|
||||
convertDateToAPI(formDataVacation.leaveStartDate)??''
|
||||
);
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataVacation.leaveEndDate))
|
||||
convertDateToAPI(formDataVacation.leaveEndDate)??''
|
||||
);
|
||||
formData.append("leaveWrote", formDataVacation.leaveWrote);
|
||||
formData.append("leaveAddress", formDataVacation.leaveAddress);
|
||||
|
|
@ -165,16 +164,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate:
|
||||
format(
|
||||
utcToZonedTime(formDataVacation.leaveStartDate, "Asia/Bangkok"),
|
||||
"yyyy-MM-dd"
|
||||
) ?? null,
|
||||
EndLeaveDate:
|
||||
format(
|
||||
utcToZonedTime(formDataVacation.leaveEndDate, "Asia/Bangkok"),
|
||||
"yyyy-MM-dd"
|
||||
) ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataVacation.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataVacation.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
@ -359,6 +350,7 @@ onMounted(() => {
|
|||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
|
||||
<datepicker
|
||||
class="col-12 col-md-3 col-sm-6 cursor-pointer inputgreen"
|
||||
menu-class-name="modalfix"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { reactive, ref, onMounted, computed, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -14,7 +13,7 @@ import type { OrdinationForm } from "@/modules/05_leave/interface/request/AddAbs
|
|||
const $q = useQuasar();
|
||||
const dataStore = useLeaveStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, calculateDurationYmd, dateToISO, messageError } = mixin;
|
||||
const { date2Thai, calculateDurationYmd, dateToISO, messageError,convertDateToAPI } = mixin;
|
||||
const edit = ref<boolean>(true);
|
||||
const leaveId = ref<string>("");
|
||||
|
||||
|
|
@ -123,15 +122,15 @@ function onValidate() {
|
|||
formData.append("type", formDataOrdination.type);
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataOrdination.leaveStartDate))
|
||||
convertDateToAPI(formDataOrdination.leaveStartDate)??''
|
||||
);
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataOrdination.leaveEndDate))
|
||||
convertDateToAPI(formDataOrdination.leaveEndDate)??''
|
||||
);
|
||||
formData.append(
|
||||
"ordainDayOrdination",
|
||||
dateToISO(new Date(formDataOrdination.ordainDayOrdination))
|
||||
convertDateToAPI(formDataOrdination.ordainDayOrdination)??''
|
||||
);
|
||||
formData.append(
|
||||
"ordainDayLocationName",
|
||||
|
|
@ -171,8 +170,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate: format(utcToZonedTime( formDataOrdination.leaveStartDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
EndLeaveDate: format(utcToZonedTime( formDataOrdination.leaveEndDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataOrdination.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataOrdination.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import { reactive, ref, onMounted, computed, watch } from "vue";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useQuasar } from "quasar";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -14,7 +13,7 @@ import type { HajiForm } from "@/modules/05_leave/interface/request/AddAbsence";
|
|||
const dataStore = useLeaveStore();
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, calculateDurationYmd, messageError, dateToISO } = mixin;
|
||||
const { date2Thai, calculateDurationYmd, messageError, dateToISO,convertDateToAPI } = mixin;
|
||||
|
||||
const edit = ref<boolean>(true);
|
||||
const leaveId = ref<any>("");
|
||||
|
|
@ -100,11 +99,11 @@ function onValidate() {
|
|||
formData.append("type", formDataHaji.type);
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataHaji.leaveStartDate))
|
||||
convertDateToAPI(formDataHaji.leaveStartDate)??''
|
||||
);
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataHaji.leaveEndDate))
|
||||
convertDateToAPI(formDataHaji.leaveEndDate)??''
|
||||
);
|
||||
formData.append("hajjDayStatus", formDataHaji.hajjDayStatus);
|
||||
formData.append("leaveWrote", formDataHaji.leaveWrote);
|
||||
|
|
@ -124,8 +123,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate: format(utcToZonedTime( formDataHaji.leaveStartDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
EndLeaveDate: format(utcToZonedTime( formDataHaji.leaveEndDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataHaji.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataHaji.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { reactive, ref, onMounted, computed, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -14,7 +13,7 @@ import type { MilitaryForm } from "@/modules/05_leave/interface/request/AddAbsen
|
|||
const dataStore = useLeaveStore();
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, calculateDurationYmd, dateToISO, messageError } = mixin;
|
||||
const { date2Thai, calculateDurationYmd, dateToISO, messageError,convertDateToAPI } = mixin;
|
||||
const edit = ref<boolean>(true);
|
||||
const leaveId = ref<string>("");
|
||||
|
||||
|
|
@ -118,17 +117,17 @@ function onValidate() {
|
|||
formData.append("type", formDataMilitary.type);
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataMilitary.leaveStartDate))
|
||||
convertDateToAPI(formDataMilitary.leaveStartDate)??''
|
||||
);
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataMilitary.leaveEndDate))
|
||||
convertDateToAPI(formDataMilitary.leaveEndDate)??''
|
||||
);
|
||||
formData.append("absentDaySummon", formDataMilitary.absentDaySummon);
|
||||
formData.append("absentDayLocation", formDataMilitary.absentDayLocation);
|
||||
formData.append(
|
||||
"absentDayRegistorDate",
|
||||
dateToISO(new Date(formDataMilitary.absentDayRegistorDate))
|
||||
convertDateToAPI(formDataMilitary.absentDayRegistorDate)??''
|
||||
);
|
||||
formData.append("absentDayGetIn", formDataMilitary.absentDayGetIn);
|
||||
formData.append("absentDayAt", formDataMilitary.absentDayAt);
|
||||
|
|
@ -148,8 +147,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate: format(utcToZonedTime(formDataMilitary.leaveStartDate , "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
EndLeaveDate: format(utcToZonedTime(formDataMilitary.leaveEndDate , "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataMilitary.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataMilitary.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { reactive, ref, computed, onMounted, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -20,6 +19,7 @@ const {
|
|||
dateToISO,
|
||||
messageError,
|
||||
arabicNumberToText,
|
||||
convertDateToAPI
|
||||
} = mixin;
|
||||
|
||||
const edit = ref<boolean>(true);
|
||||
|
|
@ -135,17 +135,17 @@ function onValidate() {
|
|||
formData.append("type", formDataStudy.type); //
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataStudy.leaveStartDate))
|
||||
convertDateToAPI(formDataStudy.leaveStartDate)??''
|
||||
);
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataStudy.leaveEndDate))
|
||||
convertDateToAPI(formDataStudy.leaveEndDate)??''
|
||||
);
|
||||
formData.append("studyDaySubject", formDataStudy.studyDaySubject);
|
||||
formData.append("studyDayDegreeLevel", formDataStudy.studyDayDegreeLevel);
|
||||
// formData.append(
|
||||
// "leavegovernmentDate",
|
||||
// dateToISO(new Date(formDataStudy.leavegovernmentDate))
|
||||
// convertDateToAPI(formDataStudy.leavegovernmentDate)??''
|
||||
// );
|
||||
formData.append(
|
||||
"studyDayUniversityName",
|
||||
|
|
@ -168,8 +168,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate: format(utcToZonedTime( formDataStudy.leaveStartDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
EndLeaveDate: format(utcToZonedTime( formDataStudy.leaveEndDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataStudy.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataStudy.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { reactive, ref, computed, onMounted, watch } from "vue";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -20,6 +19,7 @@ const {
|
|||
calculateDurationYmd,
|
||||
dateToISO,
|
||||
messageError,
|
||||
convertDateToAPI
|
||||
} = mixin;
|
||||
|
||||
const edit = ref<boolean>(true);
|
||||
|
|
@ -125,11 +125,11 @@ function onValidate() {
|
|||
formData.append("type", formDataTrain.type); //
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataTrain.leaveStartDate))
|
||||
convertDateToAPI(formDataTrain.leaveStartDate)??''
|
||||
); //
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataTrain.leaveEndDate))
|
||||
convertDateToAPI(formDataTrain.leaveEndDate)??''
|
||||
); //
|
||||
formData.append("studyDayCountry", formDataTrain.studyDayCountry);
|
||||
formData.append("studyDayTrainingName", formDataTrain.studyDayTrainingName);
|
||||
|
|
@ -155,8 +155,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate: format(utcToZonedTime( formDataTrain.leaveStartDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
EndLeaveDate: format(utcToZonedTime( formDataTrain.leaveEndDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataTrain.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataTrain.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import { ref, reactive, watch, onMounted, computed } from "vue";
|
||||
import { useRouter } from "vue-router";
|
||||
import { useQuasar } from "quasar";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -16,7 +15,7 @@ import type { FormRef } from "@/modules/05_leave/interface/request/WorkInternati
|
|||
const $q = useQuasar();
|
||||
const dataStore = useLeaveStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, dateToISO, messageError, showLoader, hideLoader } = mixin;
|
||||
const { date2Thai, dateToISO, messageError, showLoader, hideLoader,convertDateToAPI } = mixin;
|
||||
|
||||
const edit = ref<boolean>(true);
|
||||
const isSave = ref<boolean>(false);
|
||||
|
|
@ -110,11 +109,11 @@ async function onValidate() {
|
|||
formData.append("type", formDataWorkInternational.type); //
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(formDataWorkInternational.leaveStartDate)
|
||||
convertDateToAPI(formDataWorkInternational.leaveStartDate)??''
|
||||
); //
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(formDataWorkInternational.leaveEndDate)
|
||||
convertDateToAPI(formDataWorkInternational.leaveEndDate)??''
|
||||
); //
|
||||
formData.append("leaveWrote", formDataWorkInternational.leaveWrote); //
|
||||
formData.append("leaveDetail", formDataWorkInternational.leaveDetail);
|
||||
|
|
@ -151,8 +150,8 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate: format(utcToZonedTime( formDataWorkInternational.leaveStartDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
EndLeaveDate: format(utcToZonedTime( formDataWorkInternational.leaveEndDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
StartLeaveDate: convertDateToAPI(formDataWorkInternational.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataWorkInternational.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, reactive, computed, onMounted, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
|
@ -16,7 +15,13 @@ const dataStore = useLeaveStore();
|
|||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
|
||||
const { date2Thai, calculateDurationYmd, dateToISO, messageError } = mixin;
|
||||
const {
|
||||
date2Thai,
|
||||
calculateDurationYmd,
|
||||
dateToISO,
|
||||
messageError,
|
||||
convertDateToAPI,
|
||||
} = mixin;
|
||||
const edit = ref<boolean>(true);
|
||||
const leaveId = ref<string>("");
|
||||
|
||||
|
|
@ -132,23 +137,19 @@ function onValidate() {
|
|||
formData.append("type", formDataFollowSpouse.type); //
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataFollowSpouse.leaveStartDate))
|
||||
convertDateToAPI(formDataFollowSpouse.leaveStartDate) ?? ""
|
||||
); //
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataFollowSpouse.leaveEndDate))
|
||||
convertDateToAPI(formDataFollowSpouse.leaveEndDate) ?? ""
|
||||
); //
|
||||
formData.append(
|
||||
"coupleDayStartDateHistory",
|
||||
formDataFollowSpouse.coupleDayStartDateHistory
|
||||
? dateToISO(new Date(formDataFollowSpouse.coupleDayStartDateHistory))
|
||||
: ""
|
||||
convertDateToAPI(formDataFollowSpouse.coupleDayStartDateHistory) ?? ""
|
||||
); //
|
||||
formData.append(
|
||||
"coupleDayEndDateHistory",
|
||||
formDataFollowSpouse.coupleDayEndDateHistory
|
||||
? dateToISO(new Date(formDataFollowSpouse.coupleDayEndDateHistory))
|
||||
: ""
|
||||
convertDateToAPI(formDataFollowSpouse.coupleDayEndDateHistory) ?? ""
|
||||
); //
|
||||
formData.append("leaveWrote", formDataFollowSpouse.leaveWrote); //
|
||||
formData.append("leaveDetail", formDataFollowSpouse.leaveDetail); //
|
||||
|
|
@ -188,8 +189,9 @@ async function fetchCheck() {
|
|||
await http
|
||||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate: format(utcToZonedTime( formDataFollowSpouse.leaveStartDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
EndLeaveDate: format(utcToZonedTime( formDataFollowSpouse.leaveEndDate, "Asia/Bangkok"),"yyyy-MM-dd") ?? null,
|
||||
StartLeaveDate:
|
||||
convertDateToAPI(formDataFollowSpouse.leaveStartDate) ?? null,
|
||||
EndLeaveDate: convertDateToAPI(formDataFollowSpouse.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
import { reactive, ref, onMounted, computed, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { format, utcToZonedTime } from "date-fns-tz";
|
||||
|
||||
import type { RehabilitationForm } from "@/modules/05_leave/interface/request/AddAbsence";
|
||||
import { useLeaveStore } from "@/modules/05_leave/store";
|
||||
|
|
@ -13,7 +12,14 @@ import genReport from "@/plugins/genreport";
|
|||
const $q = useQuasar();
|
||||
const dataStore = useLeaveStore();
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, dateToISO, messageError, showLoader, hideLoader } = mixin;
|
||||
const {
|
||||
date2Thai,
|
||||
dateToISO,
|
||||
messageError,
|
||||
showLoader,
|
||||
hideLoader,
|
||||
convertDateToAPI,
|
||||
} = mixin;
|
||||
|
||||
const edit = ref<boolean>(true);
|
||||
const isSave = ref<boolean>(false);
|
||||
|
|
@ -79,11 +85,11 @@ async function onValidate() {
|
|||
formData.append("type", formDataRehabilitation.type); //
|
||||
formData.append(
|
||||
"leaveStartDate",
|
||||
dateToISO(new Date(formDataRehabilitation.leaveStartDate))
|
||||
convertDateToAPI(formDataRehabilitation.leaveStartDate) ?? ""
|
||||
);
|
||||
formData.append(
|
||||
"leaveEndDate",
|
||||
dateToISO(new Date(formDataRehabilitation.leaveEndDate))
|
||||
convertDateToAPI(formDataRehabilitation.leaveEndDate) ?? ""
|
||||
);
|
||||
formData.append("leaveWrote", formDataRehabilitation.leaveWrote); //
|
||||
formData.append("leaveDetail", formDataRehabilitation.leaveDetail); //
|
||||
|
|
@ -112,15 +118,9 @@ async function FetchCheck() {
|
|||
.post(config.API.leaveCheck(), {
|
||||
type: dataStore.typeId ?? null,
|
||||
StartLeaveDate:
|
||||
format(
|
||||
utcToZonedTime(formDataRehabilitation.leaveStartDate, "Asia/Bangkok"),
|
||||
"yyyy-MM-dd"
|
||||
) ?? null,
|
||||
convertDateToAPI(formDataRehabilitation.leaveStartDate) ?? null,
|
||||
EndLeaveDate:
|
||||
format(
|
||||
utcToZonedTime(formDataRehabilitation.leaveEndDate, "Asia/Bangkok"),
|
||||
"yyyy-MM-dd"
|
||||
) ?? null,
|
||||
convertDateToAPI(formDataRehabilitation.leaveEndDate) ?? null,
|
||||
})
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue