แก้ฟอร์มลา
This commit is contained in:
parent
d706f92616
commit
ebfae7437e
17 changed files with 64 additions and 92 deletions
|
|
@ -8,12 +8,12 @@ import config from "@/app.config"
|
||||||
import type { FremDetail, FormDelete, FormDeleteRef, FromCancelDetail } from "@/modules/05_leave/interface/response/leave"
|
import type { FremDetail, FormDelete, FormDeleteRef, FromCancelDetail } from "@/modules/05_leave/interface/response/leave"
|
||||||
|
|
||||||
/** import componest*/
|
/** import componest*/
|
||||||
import FormLeave from "@/modules/05_leave/components/formDetail/formLeave.vue"
|
import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue"
|
||||||
import FormChildbirth from "@/modules/05_leave/components/formDetail/formChildbirth.vue"
|
import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue"
|
||||||
import FormHoliday from "@/modules/05_leave/components/formDetail/formHoliday.vue"
|
import FormHoliday from "@/modules/05_leave/components/formDetail/05_VacationForm.vue"
|
||||||
import FormUpasom from "@/modules/05_leave/components/formDetail/formUpasom.vue"
|
import FormUpasom from "@/modules/05_leave/components/formDetail/06_OrdinationForm.vue"
|
||||||
import FormHajj from "@/modules/05_leave/components/formDetail/formHajj.vue"
|
import FormHajj from "@/modules/05_leave/components/formDetail/07_HajjForm.vue"
|
||||||
import FormCheckSelect from "@/modules/05_leave/components/formDetail/formCheckSelect.vue"
|
import FormCheckSelect from "@/modules/05_leave/components/formDetail/08_MilitaryForm.vue"
|
||||||
import FormStudy from "@/modules/05_leave/components/formDetail/formStudy.vue"
|
import FormStudy from "@/modules/05_leave/components/formDetail/formStudy.vue"
|
||||||
import FormLeaveToTraining from "@/modules/05_leave/components/formDetail/formLeaveToTraining.vue"
|
import FormLeaveToTraining from "@/modules/05_leave/components/formDetail/formLeaveToTraining.vue"
|
||||||
import FormLeaveToWorkInternational from "@/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue"
|
import FormLeaveToWorkInternational from "@/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue"
|
||||||
|
|
@ -125,6 +125,7 @@ const formData = reactive<FremDetail>({
|
||||||
coupleDaySumTotalHistory: "", //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส)
|
coupleDaySumTotalHistory: "", //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส)
|
||||||
approveStep: "",
|
approveStep: "",
|
||||||
dear: "",
|
dear: "",
|
||||||
|
leaveRange: ""
|
||||||
})
|
})
|
||||||
/** Form รายละเอียดข้อมูล*/
|
/** Form รายละเอียดข้อมูล*/
|
||||||
const formDataCancle = reactive<FromCancelDetail>({
|
const formDataCancle = reactive<FromCancelDetail>({
|
||||||
|
|
@ -184,7 +185,8 @@ async function fetchDataDetail(id: string) {
|
||||||
formData.leaveNumber = data.leaveNumber ?? "-"
|
formData.leaveNumber = data.leaveNumber ?? "-"
|
||||||
formData.leaveDetail = data.leaveDetail ?? "-"
|
formData.leaveDetail = data.leaveDetail ?? "-"
|
||||||
formData.leaveDocument = data.leaveDocument
|
formData.leaveDocument = data.leaveDocument
|
||||||
formData.leaveDraftDocument = data.leaveDraftDocument
|
formData.leaveDocument = data.leaveDocument
|
||||||
|
formData.leaveRange = data.leaveRange
|
||||||
formData.leaveLastStart = data.leaveLastStart && date2Thai(data.leaveLastStart)
|
formData.leaveLastStart = data.leaveLastStart && date2Thai(data.leaveLastStart)
|
||||||
formData.leaveLastEnd = data.leaveLastStart && date2Thai(data.leaveLastEnd)
|
formData.leaveLastEnd = data.leaveLastStart && date2Thai(data.leaveLastEnd)
|
||||||
// formData.leaveTotal = calculateDurationYmd(data.leaveStartDate, data.leaveEndDate)
|
// formData.leaveTotal = calculateDurationYmd(data.leaveStartDate, data.leaveEndDate)
|
||||||
|
|
|
||||||
|
|
@ -196,6 +196,7 @@ onMounted(() => {
|
||||||
formDataSick.leaveTotal = props.data.leaveTotal;
|
formDataSick.leaveTotal = props.data.leaveTotal;
|
||||||
formDataSick.leaveNumber = props.data.leaveNumber;
|
formDataSick.leaveNumber = props.data.leaveNumber;
|
||||||
formDataSick.leaveDetail = props.data.leaveDetail;
|
formDataSick.leaveDetail = props.data.leaveDetail;
|
||||||
|
formDataSick.leaveRange = props.data.leaveRange;
|
||||||
leaveDocumentList.value = props.data.leaveDocument;
|
leaveDocumentList.value = props.data.leaveDocument;
|
||||||
formDataSick.leaveAddress = props.data.leaveAddress;
|
formDataSick.leaveAddress = props.data.leaveAddress;
|
||||||
statusCheck.value = props.data.status;
|
statusCheck.value = props.data.status;
|
||||||
|
|
|
||||||
|
|
@ -413,7 +413,6 @@ onMounted(() => {
|
||||||
{{ "เอกสารแนบที่ " + (index + 1) }}
|
{{ "เอกสารแนบที่ " + (index + 1) }}
|
||||||
</div>
|
</div>
|
||||||
<q-btn
|
<q-btn
|
||||||
class="col-6"
|
|
||||||
:href="document"
|
:href="document"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
outline
|
outline
|
||||||
|
|
|
||||||
|
|
@ -114,9 +114,12 @@ function onValidate() {
|
||||||
formData.append("type", formDataHelpWife.type);
|
formData.append("type", formDataHelpWife.type);
|
||||||
formData.append(
|
formData.append(
|
||||||
"leaveStartDate",
|
"leaveStartDate",
|
||||||
dateToISO(formDataHelpWife.leaveStartDate)
|
dateToISO(new Date(formDataHelpWife.leaveStartDate))
|
||||||
|
);
|
||||||
|
formData.append(
|
||||||
|
"leaveEndDate",
|
||||||
|
dateToISO(new Date(formDataHelpWife.leaveEndDate))
|
||||||
);
|
);
|
||||||
formData.append("leaveEndDate", dateToISO(formDataHelpWife.leaveEndDate));
|
|
||||||
formData.append("leaveWrote", formDataHelpWife.leaveWrote);
|
formData.append("leaveWrote", formDataHelpWife.leaveWrote);
|
||||||
formData.append("leaveAddress", formDataHelpWife.leaveAddress);
|
formData.append("leaveAddress", formDataHelpWife.leaveAddress);
|
||||||
formData.append("leaveNumber", formDataHelpWife.leaveNumber);
|
formData.append("leaveNumber", formDataHelpWife.leaveNumber);
|
||||||
|
|
@ -483,7 +486,6 @@ onMounted(() => {
|
||||||
{{ "เอกสารแนบที่ " + (index + 1) }}
|
{{ "เอกสารแนบที่ " + (index + 1) }}
|
||||||
</div>
|
</div>
|
||||||
<q-btn
|
<q-btn
|
||||||
class="col-6"
|
|
||||||
:href="document"
|
:href="document"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
outline
|
outline
|
||||||
|
|
|
||||||
|
|
@ -111,9 +111,9 @@ function onValidate() {
|
||||||
formData.append("leaveRange", formDataVacation.leaveRange);
|
formData.append("leaveRange", formDataVacation.leaveRange);
|
||||||
formData.append(
|
formData.append(
|
||||||
"leaveStartDate",
|
"leaveStartDate",
|
||||||
dateToISO(formDataVacation.leaveStartDate)
|
dateToISO(new Date(formDataVacation.leaveStartDate))
|
||||||
);
|
);
|
||||||
formData.append("leaveEndDate", dateToISO(formDataVacation.leaveEndDate));
|
formData.append("leaveEndDate", dateToISO(new Date(formDataVacation.leaveEndDate)));
|
||||||
formData.append("leaveWrote", formDataVacation.leaveWrote);
|
formData.append("leaveWrote", formDataVacation.leaveWrote);
|
||||||
formData.append("leaveAddress", formDataVacation.leaveAddress);
|
formData.append("leaveAddress", formDataVacation.leaveAddress);
|
||||||
formData.append("leaveNumber", formDataVacation.leaveNumber);
|
formData.append("leaveNumber", formDataVacation.leaveNumber);
|
||||||
|
|
@ -194,6 +194,7 @@ onMounted(() => {
|
||||||
formDataVacation.leaveDetail = props.data.leaveDetail;
|
formDataVacation.leaveDetail = props.data.leaveDetail;
|
||||||
leaveDocumentList.value = props.data.leaveDocument;
|
leaveDocumentList.value = props.data.leaveDocument;
|
||||||
statusCheck.value = props.data.status;
|
statusCheck.value = props.data.status;
|
||||||
|
formDataVacation.leaveRange = props.data.leaveRange;
|
||||||
// formDataVacation.leaveDocument = props.data.leaveDocument;
|
// formDataVacation.leaveDocument = props.data.leaveDocument;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -481,7 +482,6 @@ onMounted(() => {
|
||||||
{{ "เอกสารแนบที่ " + (index + 1) }}
|
{{ "เอกสารแนบที่ " + (index + 1) }}
|
||||||
</div>
|
</div>
|
||||||
<q-btn
|
<q-btn
|
||||||
class="col-6"
|
|
||||||
:href="document"
|
:href="document"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
outline
|
outline
|
||||||
|
|
|
||||||
|
|
@ -71,8 +71,9 @@ const formDataOrdination = reactive<any>({
|
||||||
ordainDayLocationAddress: "",
|
ordainDayLocationAddress: "",
|
||||||
ordainDayBuddhistLentName: "",
|
ordainDayBuddhistLentName: "",
|
||||||
ordainDayBuddhistLentAddress: "",
|
ordainDayBuddhistLentAddress: "",
|
||||||
ordainDayStatus: "true",
|
ordainDayStatus: true,
|
||||||
leaveDocument: null,
|
leaveDocument: [],
|
||||||
|
leaveDetail: ""
|
||||||
});
|
});
|
||||||
|
|
||||||
/** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
|
/** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
|
||||||
|
|
@ -113,21 +114,28 @@ function onValidate() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hasError.every((result) => result === true)) {
|
if (hasError.every((result) => result === true)) {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formDataOrdination.leaveDocument.forEach((file: File) => {
|
|
||||||
formData.append("leaveDocument", file);
|
if (formDataOrdination.leaveDocument) {
|
||||||
});
|
formDataOrdination.leaveDocument.forEach((file: File) => {
|
||||||
|
formData.append("leaveDocument", file);
|
||||||
|
});
|
||||||
|
}
|
||||||
// formData.append("leaveDocument", formDataOrdination.leaveDocument);
|
// formData.append("leaveDocument", formDataOrdination.leaveDocument);
|
||||||
formData.append("type", formDataOrdination.type);
|
formData.append("type", formDataOrdination.type);
|
||||||
formData.append(
|
formData.append(
|
||||||
"leaveStartDate",
|
"leaveStartDate",
|
||||||
dateToISO(formDataOrdination.leaveStartDate)
|
dateToISO(new Date(formDataOrdination.leaveStartDate))
|
||||||
|
);
|
||||||
|
formData.append(
|
||||||
|
"leaveEndDate",
|
||||||
|
dateToISO(new Date(formDataOrdination.leaveEndDate))
|
||||||
);
|
);
|
||||||
formData.append("leaveEndDate", dateToISO(formDataOrdination.leaveEndDate));
|
|
||||||
formData.append(
|
formData.append(
|
||||||
"ordainDayOrdination",
|
"ordainDayOrdination",
|
||||||
dateToISO(formDataOrdination.ordainDayOrdination)
|
dateToISO(new Date(formDataOrdination.ordainDayOrdination))
|
||||||
);
|
);
|
||||||
formData.append(
|
formData.append(
|
||||||
"ordainDayLocationName",
|
"ordainDayLocationName",
|
||||||
|
|
@ -611,7 +619,7 @@ onMounted(() => {
|
||||||
label="รายละเอียด"
|
label="รายละเอียด"
|
||||||
:readonly="!edit || statusCheck === 'NEW'"
|
:readonly="!edit || statusCheck === 'NEW'"
|
||||||
/>
|
/>
|
||||||
<div class="full-width col-12" v-if="statusCheck != 'NEW'">
|
<div class="full-width" v-if="statusCheck != 'NEW'">
|
||||||
<div class="q-col-gutter-sm row">
|
<div class="q-col-gutter-sm row">
|
||||||
<!-- multiple -->
|
<!-- multiple -->
|
||||||
<q-file
|
<q-file
|
||||||
|
|
@ -624,6 +632,7 @@ onMounted(() => {
|
||||||
outlined
|
outlined
|
||||||
bg-color="white"
|
bg-color="white"
|
||||||
use-chips
|
use-chips
|
||||||
|
class="col-12 q-pl-sm col-12"
|
||||||
>
|
>
|
||||||
<template v-slot:prepend>
|
<template v-slot:prepend>
|
||||||
<q-icon name="attach_file" color="primary" />
|
<q-icon name="attach_file" color="primary" />
|
||||||
|
|
@ -652,10 +661,9 @@ onMounted(() => {
|
||||||
<q-item-section>
|
<q-item-section>
|
||||||
<q-item-label class="row items-baseline">
|
<q-item-label class="row items-baseline">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
{{ "เอกสารแนบที่ " + (index + 1) }}
|
{{ "เอกสารแนบฉบับที่ " + (index + 1) }}
|
||||||
</div>
|
</div>
|
||||||
<q-btn
|
<q-btn
|
||||||
class="col-6"
|
|
||||||
:href="document"
|
:href="document"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
outline
|
outline
|
||||||
|
|
@ -677,30 +685,6 @@ onMounted(() => {
|
||||||
</q-card>
|
</q-card>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-12 col-sm-6 row" v-if="!edit">
|
|
||||||
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
|
|
||||||
<div class="q-pl-sm text-weight-bold text-dark">
|
|
||||||
เอกสารเพิ่มเติม
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<q-card bordered flat class="full-width">
|
|
||||||
<q-list separator>
|
|
||||||
<q-item
|
|
||||||
v-for="(file, index) in leaveDocumentList"
|
|
||||||
:key="index"
|
|
||||||
class="q-my-xs"
|
|
||||||
>
|
|
||||||
<q-item-section>
|
|
||||||
<q-item-label class="full-width ellipsis">
|
|
||||||
{{ file.name }}
|
|
||||||
</q-item-label>
|
|
||||||
<q-item-label caption> </q-item-label>
|
|
||||||
</q-item-section>
|
|
||||||
</q-item>
|
|
||||||
</q-list>
|
|
||||||
</q-card>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</q-card>
|
</q-card>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,9 +55,10 @@ const formDataHaji = reactive<any>({
|
||||||
leavegovernmentDate: null,
|
leavegovernmentDate: null,
|
||||||
leaveStartDate: null,
|
leaveStartDate: null,
|
||||||
leaveEndDate: null,
|
leaveEndDate: null,
|
||||||
totalLeave: null,
|
totalLeave: 0,
|
||||||
hajjDayStatus: "true",
|
hajjDayStatus: "true",
|
||||||
leaveDocument: null,
|
leaveDocument: [],
|
||||||
|
leaveDetail: "",
|
||||||
});
|
});
|
||||||
|
|
||||||
/** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
|
/** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
|
||||||
|
|
@ -97,8 +98,14 @@ function onValidate() {
|
||||||
});
|
});
|
||||||
// formData.append("leaveDocument", formDataHaji.leaveDocument);
|
// formData.append("leaveDocument", formDataHaji.leaveDocument);
|
||||||
formData.append("type", formDataHaji.type);
|
formData.append("type", formDataHaji.type);
|
||||||
formData.append("leaveStartDate", dateToISO(formDataHaji.leaveStartDate));
|
formData.append(
|
||||||
formData.append("leaveEndDate", dateToISO(formDataHaji.leaveEndDate));
|
"leaveStartDate",
|
||||||
|
dateToISO(new Date(formDataHaji.leaveStartDate))
|
||||||
|
);
|
||||||
|
formData.append(
|
||||||
|
"leaveEndDate",
|
||||||
|
dateToISO(new Date(formDataHaji.leaveEndDate))
|
||||||
|
);
|
||||||
formData.append("hajjDayStatus", formDataHaji.hajjDayStatus);
|
formData.append("hajjDayStatus", formDataHaji.hajjDayStatus);
|
||||||
formData.append("leaveWrote", formDataHaji.leaveWrote);
|
formData.append("leaveWrote", formDataHaji.leaveWrote);
|
||||||
formData.append("leaveDetail", formDataHaji.leaveDetail);
|
formData.append("leaveDetail", formDataHaji.leaveDetail);
|
||||||
|
|
@ -397,6 +404,7 @@ onMounted(() => {
|
||||||
dense
|
dense
|
||||||
outlined
|
outlined
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
|
class="col-12 q-pl-sm col-12"
|
||||||
>
|
>
|
||||||
<template v-slot:prepend>
|
<template v-slot:prepend>
|
||||||
<q-icon name="attach_file" color="primary" />
|
<q-icon name="attach_file" color="primary" />
|
||||||
|
|
@ -428,7 +436,6 @@ onMounted(() => {
|
||||||
{{ "เอกสารแนบที่ " + (index + 1) }}
|
{{ "เอกสารแนบที่ " + (index + 1) }}
|
||||||
</div>
|
</div>
|
||||||
<q-btn
|
<q-btn
|
||||||
class="col-6"
|
|
||||||
:href="document"
|
:href="document"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
outline
|
outline
|
||||||
|
|
@ -451,30 +458,6 @@ onMounted(() => {
|
||||||
</q-card>
|
</q-card>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-12 col-sm-6 row" v-if="!edit">
|
|
||||||
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
|
|
||||||
<div class="q-pl-sm text-weight-bold text-dark">
|
|
||||||
เอกสารเพิ่มเติม
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<q-card bordered flat class="full-width">
|
|
||||||
<q-list separator>
|
|
||||||
<q-item
|
|
||||||
v-for="(file, index) in leaveDocumentList"
|
|
||||||
:key="index"
|
|
||||||
class="q-my-xs"
|
|
||||||
>
|
|
||||||
<q-item-section>
|
|
||||||
<q-item-label class="full-width ellipsis">
|
|
||||||
{{ file.name }}
|
|
||||||
</q-item-label>
|
|
||||||
<q-item-label caption> </q-item-label>
|
|
||||||
</q-item-section>
|
|
||||||
</q-item>
|
|
||||||
</q-list>
|
|
||||||
</q-card>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</q-card>
|
</q-card>
|
||||||
<q-separator class="q-mt-sm" />
|
<q-separator class="q-mt-sm" />
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ const formDataMilitary = reactive<any>({
|
||||||
leaveStartDate: null,
|
leaveStartDate: null,
|
||||||
leaveEndDate: null,
|
leaveEndDate: null,
|
||||||
leaveTotal: 0,
|
leaveTotal: 0,
|
||||||
leaveDocument: null,
|
leaveDocument: [],
|
||||||
leaveWrote: "",
|
leaveWrote: "",
|
||||||
absentDaySummon: "",
|
absentDaySummon: "",
|
||||||
absentDayLocation: "",
|
absentDayLocation: "",
|
||||||
|
|
@ -111,14 +111,14 @@ function onValidate() {
|
||||||
formData.append("type", formDataMilitary.type);
|
formData.append("type", formDataMilitary.type);
|
||||||
formData.append(
|
formData.append(
|
||||||
"leaveStartDate",
|
"leaveStartDate",
|
||||||
dateToISO(formDataMilitary.leaveStartDate)
|
dateToISO(new Date(formDataMilitary.leaveStartDate))
|
||||||
);
|
);
|
||||||
formData.append("leaveEndDate", dateToISO(formDataMilitary.leaveEndDate));
|
formData.append("leaveEndDate", dateToISO(new Date(formDataMilitary.leaveEndDate)));
|
||||||
formData.append("absentDaySummon", formDataMilitary.absentDaySummon);
|
formData.append("absentDaySummon", formDataMilitary.absentDaySummon);
|
||||||
formData.append("absentDayLocation", formDataMilitary.absentDayLocation);
|
formData.append("absentDayLocation", formDataMilitary.absentDayLocation);
|
||||||
formData.append(
|
formData.append(
|
||||||
"absentDayRegistorDate",
|
"absentDayRegistorDate",
|
||||||
dateToISO(formDataMilitary.absentDayRegistorDate)
|
dateToISO(new Date(formDataMilitary.absentDayRegistorDate))
|
||||||
);
|
);
|
||||||
formData.append("absentDayGetIn", formDataMilitary.absentDayGetIn);
|
formData.append("absentDayGetIn", formDataMilitary.absentDayGetIn);
|
||||||
formData.append("absentDayAt", formDataMilitary.absentDayAt);
|
formData.append("absentDayAt", formDataMilitary.absentDayAt);
|
||||||
|
|
@ -485,7 +485,6 @@ onMounted(() => {
|
||||||
{{ "เอกสารแนบที่ " + (index + 1) }}
|
{{ "เอกสารแนบที่ " + (index + 1) }}
|
||||||
</div>
|
</div>
|
||||||
<q-btn
|
<q-btn
|
||||||
class="col-6"
|
|
||||||
:href="document"
|
:href="document"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
outline
|
outline
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ const props = defineProps({
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col text-grey-8">จำนวนวันที่ลา</div>
|
<div class="col text-grey-8">จำนวนวันที่ลา</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
{{ props.data.leaveTotal ? props.data.leaveTotal : "-" }}
|
{{ props.data.leaveRange == 'ALL' ? props.data.leaveTotal + ' วัน' : props.data.leaveRange == 'MORNING' ? 'ลาครึ่งวันเช้า (0.5)': 'ลาครึ่งวันบ่าย (0.5)' }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
@ -32,7 +32,7 @@ const props = defineProps({
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col text-grey-8">จำนวนวันที่ลา</div>
|
<div class="col text-grey-8">จำนวนวันที่ลา</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
{{ props.data.leaveCount ? props.data.leaveCount : "-" }}
|
{{ props.data.leaveTotal ? props.data.leaveTotal + " วัน" : "-" }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
@ -41,7 +41,7 @@ const props = defineProps({
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col text-grey-8">จำนวนวันที่ลา</div>
|
<div class="col text-grey-8">จำนวนวันที่ลา</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
{{ props.data.leaveCount ? props.data.leaveCount : "-" }}
|
{{ props.data.leaveRange == 'ALL' ? props.data.leaveTotal + ' วัน' : props.data.leaveRange == 'MORNING' ? 'ลาครึ่งวันเช้า (0.5)': 'ลาครึ่งวันบ่าย (0.5)' }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
@ -79,6 +79,7 @@ interface FremDetail {
|
||||||
coupleDaySumTotalHistory: string //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส)
|
coupleDaySumTotalHistory: string //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส)
|
||||||
approveStep: string
|
approveStep: string
|
||||||
dear: string
|
dear: string
|
||||||
|
leaveRange: string
|
||||||
}
|
}
|
||||||
|
|
||||||
interface FromCancelDetail {
|
interface FromCancelDetail {
|
||||||
|
|
|
||||||
|
|
@ -102,6 +102,7 @@ const formData = reactive<any>({
|
||||||
approveStep: "",
|
approveStep: "",
|
||||||
dear: "",
|
dear: "",
|
||||||
leaveLast: "",
|
leaveLast: "",
|
||||||
|
leaveRange: "",
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -156,8 +157,7 @@ async function fetchDataDetail(id: string) {
|
||||||
formData.ordainDayLocationName = data.ordainDayLocationName ?? "-";
|
formData.ordainDayLocationName = data.ordainDayLocationName ?? "-";
|
||||||
formData.ordainDayLocationAddress = data.ordainDayLocationAddress ?? "-";
|
formData.ordainDayLocationAddress = data.ordainDayLocationAddress ?? "-";
|
||||||
formData.ordainDayLocationNumber = data.ordainDayLocationNumber ?? "-";
|
formData.ordainDayLocationNumber = data.ordainDayLocationNumber ?? "-";
|
||||||
formData.ordainDayOrdination =
|
formData.ordainDayOrdination = data.ordainDayOrdination;
|
||||||
data.ordainDayOrdination && date2Thai(data.ordainDayOrdination);
|
|
||||||
formData.ordainDayBuddhistLentName =
|
formData.ordainDayBuddhistLentName =
|
||||||
data.ordainDayBuddhistLentName ?? "-";
|
data.ordainDayBuddhistLentName ?? "-";
|
||||||
formData.ordainDayBuddhistLentAddress =
|
formData.ordainDayBuddhistLentAddress =
|
||||||
|
|
@ -165,8 +165,7 @@ async function fetchDataDetail(id: string) {
|
||||||
formData.hajjDayStatus = data.hajjDayStatus;
|
formData.hajjDayStatus = data.hajjDayStatus;
|
||||||
formData.absentDaySummon = data.absentDaySummon ?? "-";
|
formData.absentDaySummon = data.absentDaySummon ?? "-";
|
||||||
formData.absentDayLocation = data.absentDayLocation ?? "-";
|
formData.absentDayLocation = data.absentDayLocation ?? "-";
|
||||||
formData.absentDayRegistorDate =
|
formData.absentDayRegistorDate = data.absentDayRegistorDate;
|
||||||
data.absentDayRegistorDate && date2Thai(data.absentDayRegistorDate);
|
|
||||||
formData.absentDayGetIn = data.absentDayGetIn ?? "-";
|
formData.absentDayGetIn = data.absentDayGetIn ?? "-";
|
||||||
formData.absentDayAt = data.absentDayAt ?? "-";
|
formData.absentDayAt = data.absentDayAt ?? "-";
|
||||||
formData.studyDaySubject = data.studyDaySubject ?? "-";
|
formData.studyDaySubject = data.studyDaySubject ?? "-";
|
||||||
|
|
@ -189,6 +188,8 @@ async function fetchDataDetail(id: string) {
|
||||||
formData.approveStep = data.approveStep ?? "-";
|
formData.approveStep = data.approveStep ?? "-";
|
||||||
formData.dear = data.dear ?? "-";
|
formData.dear = data.dear ?? "-";
|
||||||
formData.leaveLast = data.leaveLast ?? "-";
|
formData.leaveLast = data.leaveLast ?? "-";
|
||||||
|
formData.leaveRange = data.leaveRange;
|
||||||
|
|
||||||
// checkLeaveType(formData.leaveTypeId, formData.leaveTypeName)
|
// checkLeaveType(formData.leaveTypeId, formData.leaveTypeName)
|
||||||
|
|
||||||
dataStore.fetchProfileOld(data);
|
dataStore.fetchProfileOld(data);
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ async function getReport(fileName: string) {
|
||||||
.get(config.API.appealByPrintReport(id.value))
|
.get(config.API.appealByPrintReport(id.value))
|
||||||
.then(async (res) => {
|
.then(async (res) => {
|
||||||
console.log(res.data.result.data);
|
console.log(res.data.result.data);
|
||||||
const data = res.data.result
|
const data = res.data.result;
|
||||||
await genReport(data, fileName);
|
await genReport(data, fileName);
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
|
|
@ -114,7 +114,7 @@ onMounted(() => {
|
||||||
flat
|
flat
|
||||||
color="primary"
|
color="primary"
|
||||||
class="q-mr-sm"
|
class="q-mr-sm"
|
||||||
@click="router.go(-1)"
|
@click="router.push('/appeal-complain')"
|
||||||
/>
|
/>
|
||||||
แก้ไขอุทธรณ์/ร้องทุกข์
|
แก้ไขอุทธรณ์/ร้องทุกข์
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue