From e3df43421b830b4993f9af4d59837a78ea233fda Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 29 Apr 2026 11:00:15 +0700 Subject: [PATCH] refactor(leave): display dateSendLeave when status is not DRAFT Co-authored-by: Copilot --- .../05_leave/components/DialogDetail.vue | 9 ++-- src/modules/05_leave/components/ListView.vue | 13 ++++-- .../components/formDetail/01_SickForm.vue | 36 +++++++++++++--- .../formDetail/04_HelpWifeBirthForm.vue | 42 +++++++++++++++---- .../components/formDetail/05_VacationForm.vue | 36 +++++++++++++--- .../formDetail/06_OrdinationForm.vue | 8 ++-- .../components/formDetail/07_HajjForm.vue | 8 ++-- .../components/formDetail/08_MilitaryForm.vue | 42 +++++++++++++++---- .../components/formDetail/09_StudyForm.vue | 42 +++++++++++++++---- .../components/formDetail/10_TrainForm.vue | 6 +-- .../formDetail/11_WorkInternationalForm.vue | 6 +-- .../formDetail/12_FollowSpouseForm.vue | 6 +-- .../formDetail/13_RehabilitationForm.vue | 6 +-- 13 files changed, 199 insertions(+), 61 deletions(-) diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue index 2c05ebd..3333374 100644 --- a/src/modules/05_leave/components/DialogDetail.vue +++ b/src/modules/05_leave/components/DialogDetail.vue @@ -206,7 +206,7 @@ async function fetchDataDetail(id: string) { formData.leaveDateEnd = data.leaveEndDate && date2Thai(data.leaveEndDate); formData.leaveCount = calculateDurationYmd( data.leaveStartDate, - data.leaveEndDate + data.leaveEndDate, ); formData.leaveWrote = data.leaveWrote ?? "-"; formData.leaveAddress = data.leaveAddress ?? "-"; @@ -255,8 +255,7 @@ async function fetchDataDetail(id: string) { formData.studyDaySubject = data.studyDaySubject ?? "-"; formData.studyDayDegreeLevel = data.studyDayDegreeLevel ?? "-"; formData.studyDayUniversityName = data.studyDayUniversityName ?? "-"; - formData.studyDayTrainingSubject = - data.studyDayTrainingSubject ?? "-" ?? "-"; + formData.studyDayTrainingSubject = data.studyDayTrainingSubject ?? "-"; formData.studyDayTrainingName = data.studyDayTrainingName ?? "-"; formData.studyDayCountry = data.studyDayCountry ?? "-"; formData.studyDayScholarship = data.studyDayScholarship ?? "-"; @@ -383,7 +382,7 @@ async function onClickSave() { onSubmit(); }, "ยืนยันการบันทึกข้อมูล", - "ต้องการยินยันการบันทึกข้อมูลนี้หรือไม่ ?" + "ต้องการยินยันการบันทึกข้อมูลนี้หรือไม่ ?", ); } else { } @@ -425,7 +424,7 @@ watch( ? props.leaveId && fetchDataCancelDetail(props.leaveId) : props.leaveId && fetchDataDetail(props.leaveId); } - } + }, ); diff --git a/src/modules/05_leave/components/ListView.vue b/src/modules/05_leave/components/ListView.vue index 37aea58..294c302 100644 --- a/src/modules/05_leave/components/ListView.vue +++ b/src/modules/05_leave/components/ListView.vue @@ -163,7 +163,7 @@ async function updatePagination(p: number, ps: number, s: string, d: boolean) { function convert(val: any) { if (leaveType.value) { const filtertype = leaveType.value.find( - (e: any) => e.id === val.leaveTypeId + (e: any) => e.id === val.leaveTypeId, ); const type = filtertype?.code; if (type == "LV-006" && val.hajjDayStatus == false) { @@ -242,7 +242,7 @@ onMounted(async () => { :props="props" @click="onClickView(props.row.id, props.row.status)" > - {{ props.row.dateSendLeave }} + {{ props.row.status === "DRAFT" ? "-" : props.row.dateSendLeave }} @@ -419,7 +419,7 @@ onMounted(async () => { {{ (page - 1) * pageSize + props.rowIndex + 1 }} - + { {{ props.row.statusConvert }} - {{ col.value }} + + {{ + props.row.status === "DRAFT" ? "-" : props.row.dateSendLeave + }} + + {{ col.value }} diff --git a/src/modules/05_leave/components/formDetail/01_SickForm.vue b/src/modules/05_leave/components/formDetail/01_SickForm.vue index d186c94..43530d7 100644 --- a/src/modules/05_leave/components/formDetail/01_SickForm.vue +++ b/src/modules/05_leave/components/formDetail/01_SickForm.vue @@ -18,7 +18,9 @@ const props = defineProps({
วันที่ยื่นใบลา
-
{{ props.data.dateSendLeave }}
+
+ {{ props.data.status === "DRAFT" ? "-" : props.data.dateSendLeave }} +
เรื่อง
@@ -30,11 +32,33 @@ const props = defineProps({
ลาตั้งแต่วันที่
-
{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}
+
+ {{ props.data.leaveDateStart }} + {{ + `${ + props.data.leaveRange && props.data.leaveRange !== "ALL" + ? `(${converstType(props.data.leaveRange)})` + : "" + }` + }} +
ลาถึงวันที่
-
{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ? `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}
+
+ {{ props.data.leaveDateEnd }} + {{ + `${ + props.data.leaveDateStart !== props.data.leaveDateEnd + ? `${ + props.data.leaveRangeEnd && props.data.leaveRangeEnd !== "ALL" + ? `(${converstType(props.data.leaveRangeEnd)})` + : "" + }` + : "" + }` + }} +
จำนวนวันที่ลา
@@ -87,10 +111,12 @@ const props = defineProps({ target="_blank" outline color="blue" - :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`" + :label="`ดาวน์โหลดเอกสารแนบที่ ${Number(index) + 1}`" size="12px" > - ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }} + ดาวน์โหลดเอกสารแนบที่ {{ Number(index) + 1 }}
diff --git a/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue index 80ec85d..52d358c 100644 --- a/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue +++ b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue @@ -1,8 +1,8 @@