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

แก้ฟอร์มลา

Browse source
This commit is contained in:
Warunee Tamkoo 2024-01-11 18:03:47 +07:00
parent d706f92616
commit ebfae7437e
17 changed files with 64 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/05_leave/components/DialogDetail.vue
View file

@ -8,12 +8,12 @@ import config from "@/app.config"
import type { FremDetail, FormDelete, FormDeleteRef, FromCancelDetail } from "@/modules/05_leave/interface/response/leave"
/** import componest*/
import FormLeave from "@/modules/05_leave/components/formDetail/formLeave.vue"
import FormChildbirth from "@/modules/05_leave/components/formDetail/formChildbirth.vue"
import FormHoliday from "@/modules/05_leave/components/formDetail/formHoliday.vue"
import FormUpasom from "@/modules/05_leave/components/formDetail/formUpasom.vue"
import FormHajj from "@/modules/05_leave/components/formDetail/formHajj.vue"
import FormCheckSelect from "@/modules/05_leave/components/formDetail/formCheckSelect.vue"
import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue"
import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue"
import FormHoliday from "@/modules/05_leave/components/formDetail/05_VacationForm.vue"
import FormUpasom from "@/modules/05_leave/components/formDetail/06_OrdinationForm.vue"
import FormHajj from "@/modules/05_leave/components/formDetail/07_HajjForm.vue"
import FormCheckSelect from "@/modules/05_leave/components/formDetail/08_MilitaryForm.vue"
import FormStudy from "@/modules/05_leave/components/formDetail/formStudy.vue"
import FormLeaveToTraining from "@/modules/05_leave/components/formDetail/formLeaveToTraining.vue"
import FormLeaveToWorkInternational from "@/modules/05_leave/components/formDetail/formLeaveToWorkInternational.vue"
@ -125,6 +125,7 @@ const formData = reactive<FremDetail>({
coupleDaySumTotalHistory: "", //ประวัติ ในกรณีลาติดต่อกับครั้งก่อน รวมทั้งนี้ด้วย เป็นเวลา กี่ปี กี่เดือน กี่วัน (ลาติดตามคู่สมรส)
approveStep: "",
dear: "",
leaveRange: ""
})
/** Form รายละเอียดข้อมูล*/
const formDataCancle = reactive<FromCancelDetail>({
@ -184,7 +185,8 @@ async function fetchDataDetail(id: string) {
formData.leaveNumber = data.leaveNumber ?? "-"
formData.leaveDetail = data.leaveDetail ?? "-"
formData.leaveDocument = data.leaveDocument
formData.leaveDraftDocument = data.leaveDraftDocument
formData.leaveDocument = data.leaveDocument
formData.leaveRange = data.leaveRange
formData.leaveLastStart = data.leaveLastStart && date2Thai(data.leaveLastStart)
formData.leaveLastEnd = data.leaveLastStart && date2Thai(data.leaveLastEnd)
// formData.leaveTotal = calculateDurationYmd(data.leaveStartDate, data.leaveEndDate)

1
src/modules/05_leave/components/FormLeave/01_SickForm.vue
View file

@ -196,6 +196,7 @@ onMounted(() => {
formDataSick.leaveTotal = props.data.leaveTotal;
formDataSick.leaveNumber = props.data.leaveNumber;
formDataSick.leaveDetail = props.data.leaveDetail;
formDataSick.leaveRange = props.data.leaveRange;
leaveDocumentList.value = props.data.leaveDocument;
formDataSick.leaveAddress = props.data.leaveAddress;
statusCheck.value = props.data.status;

1
src/modules/05_leave/components/FormLeave/03_Birth.vue
View file

@ -413,7 +413,6 @@ onMounted(() => {
{{ "เอกสารแนบที่ " + (index + 1) }}
</div>
<q-btn
class="col-6"
:href="document"
target="_blank"
outline

8
src/modules/05_leave/components/FormLeave/04_HelpWifeBirthForm.vue
View file

@ -114,9 +114,12 @@ function onValidate() {
formData.append("type", formDataHelpWife.type);
formData.append(
"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("leaveAddress", formDataHelpWife.leaveAddress);
formData.append("leaveNumber", formDataHelpWife.leaveNumber);
@ -483,7 +486,6 @@ onMounted(() => {
{{ "เอกสารแนบที่ " + (index + 1) }}
</div>
<q-btn
class="col-6"
:href="document"
target="_blank"
outline

6
src/modules/05_leave/components/FormLeave/05_VacationForm.vue
View file

@ -111,9 +111,9 @@ function onValidate() {
formData.append("leaveRange", formDataVacation.leaveRange);
formData.append(
"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("leaveAddress", formDataVacation.leaveAddress);
formData.append("leaveNumber", formDataVacation.leaveNumber);
@ -194,6 +194,7 @@ onMounted(() => {
formDataVacation.leaveDetail = props.data.leaveDetail;
leaveDocumentList.value = props.data.leaveDocument;
statusCheck.value = props.data.status;
formDataVacation.leaveRange = props.data.leaveRange;
// formDataVacation.leaveDocument = props.data.leaveDocument;
}
});
@ -481,7 +482,6 @@ onMounted(() => {
{{ "เอกสารแนบที่ " + (index + 1) }}
</div>
<q-btn
class="col-6"
:href="document"
target="_blank"
outline

54
src/modules/05_leave/components/FormLeave/06_OrdinationForm.vue
View file

@ -71,8 +71,9 @@ const formDataOrdination = reactive<any>({
ordainDayLocationAddress: "",
ordainDayBuddhistLentName: "",
ordainDayBuddhistLentAddress: "",
ordainDayStatus: "true",
leaveDocument: null,
ordainDayStatus: true,
leaveDocument: [],
leaveDetail: ""
});
/** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
@ -113,21 +114,28 @@ function onValidate() {
}
}
}
if (hasError.every((result) => result === true)) {
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("type", formDataOrdination.type);
formData.append(
"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(
"ordainDayOrdination",
dateToISO(formDataOrdination.ordainDayOrdination)
dateToISO(new Date(formDataOrdination.ordainDayOrdination))
);
formData.append(
"ordainDayLocationName",
@ -611,7 +619,7 @@ onMounted(() => {
label="รายละเอียด"
: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">
<!-- multiple -->
<q-file
@ -624,6 +632,7 @@ onMounted(() => {
outlined
bg-color="white"
use-chips
class="col-12 q-pl-sm col-12"
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
@ -652,10 +661,9 @@ onMounted(() => {
<q-item-section>
<q-item-label class="row items-baseline">
<div class="col">
{{ "เอกสารแนบที่ " + (index + 1) }}
{{ "เอกสารแนบฉบับที่ " + (index + 1) }}
</div>
<q-btn
class="col-6"
:href="document"
target="_blank"
outline
@ -677,30 +685,6 @@ onMounted(() => {
</q-card>
</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>
</q-card>

41
src/modules/05_leave/components/FormLeave/07_HajjForm.vue
View file

@ -55,9 +55,10 @@ const formDataHaji = reactive<any>({
leavegovernmentDate: null,
leaveStartDate: null,
leaveEndDate: null,
totalLeave: null,
totalLeave: 0,
hajjDayStatus: "true",
leaveDocument: null,
leaveDocument: [],
leaveDetail: "",
});
/** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
@ -97,8 +98,14 @@ function onValidate() {
});
// formData.append("leaveDocument", formDataHaji.leaveDocument);
formData.append("type", formDataHaji.type);
formData.append("leaveStartDate", dateToISO(formDataHaji.leaveStartDate));
formData.append("leaveEndDate", dateToISO(formDataHaji.leaveEndDate));
formData.append(
"leaveStartDate",
dateToISO(new Date(formDataHaji.leaveStartDate))
);
formData.append(
"leaveEndDate",
dateToISO(new Date(formDataHaji.leaveEndDate))
);
formData.append("hajjDayStatus", formDataHaji.hajjDayStatus);
formData.append("leaveWrote", formDataHaji.leaveWrote);
formData.append("leaveDetail", formDataHaji.leaveDetail);
@ -397,6 +404,7 @@ onMounted(() => {
dense
outlined
hide-bottom-space
class="col-12 q-pl-sm col-12"
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
@ -428,7 +436,6 @@ onMounted(() => {
{{ "เอกสารแนบที่ " + (index + 1) }}
</div>
<q-btn
class="col-6"
:href="document"
target="_blank"
outline
@ -451,30 +458,6 @@ onMounted(() => {
</q-card>
</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>
</q-card>
<q-separator class="q-mt-sm" />

9
src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
View file

@ -58,7 +58,7 @@ const formDataMilitary = reactive<any>({
leaveStartDate: null,
leaveEndDate: null,
leaveTotal: 0,
leaveDocument: null,
leaveDocument: [],
leaveWrote: "",
absentDaySummon: "",
absentDayLocation: "",
@ -111,14 +111,14 @@ function onValidate() {
formData.append("type", formDataMilitary.type);
formData.append(
"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("absentDayLocation", formDataMilitary.absentDayLocation);
formData.append(
"absentDayRegistorDate",
dateToISO(formDataMilitary.absentDayRegistorDate)
dateToISO(new Date(formDataMilitary.absentDayRegistorDate))
);
formData.append("absentDayGetIn", formDataMilitary.absentDayGetIn);
formData.append("absentDayAt", formDataMilitary.absentDayAt);
@ -485,7 +485,6 @@ onMounted(() => {
{{ "เอกสารแนบที่ " + (index + 1) }}
</div>
<q-btn
class="col-6"
:href="document"
target="_blank"
outline

2
src/modules/05_leave/components/formDetail/formLeave.vue → src/modules/05_leave/components/formDetail/01_SickForm.vue
View file

@ -33,7 +33,7 @@ const props = defineProps({
<div class="row">
<div class="col text-grey-8">จำนวนวันที่ลา</div>
<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 class="row">

2
src/modules/05_leave/components/formDetail/formChildbirth.vue → src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
View file

@ -32,7 +32,7 @@ const props = defineProps({
<div class="row">
<div class="col text-grey-8">จำนวนวันที่ลา</div>
<div class="col">
{{ props.data.leaveCount ? props.data.leaveCount : "-" }}
{{ props.data.leaveTotal ? props.data.leaveTotal + " วัน" : "-" }}
</div>
</div>
<div class="row">

2
src/modules/05_leave/components/formDetail/formHoliday.vue → src/modules/05_leave/components/formDetail/05_VacationForm.vue
View file

@ -41,7 +41,7 @@ const props = defineProps({
<div class="row">
<div class="col text-grey-8">จำนวนวันที่ลา</div>
<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 class="row">

0
src/modules/05_leave/components/formDetail/formUpasom.vue → src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
View file

0
src/modules/05_leave/components/formDetail/formHajj.vue → src/modules/05_leave/components/formDetail/07_HajjForm.vue
View file

0
src/modules/05_leave/components/formDetail/formCheckSelect.vue → src/modules/05_leave/components/formDetail/08_MilitaryForm.vue
View file