แก้ type

2025-04-30 17:57:47 +07:00 · 2025-04-30 17:57:47 +07:00 · 9af702f459
commit 9af702f459
parent 677c6b7bc7
13 changed files with 60 additions and 33 deletions
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@ -310,12 +310,13 @@ function checkLeaveType(leaveTypeId: string) {
      checkForm.value = "FormCheckSelect";
    } else if (
      type === "LV-008" &&
-      formData.leaveSubTypeName === "ลาไปศึกษาต่อ"
+      formData.leaveSubTypeName === "ศึกษาต่อ"
    ) {
      checkForm.value = "FormStudy";
    } else if (
-      type === "LV-008" &&
-      formData.leaveSubTypeName === "ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน"
+      (type === "LV-008" && formData.leaveSubTypeName === "ฝึกอบรม") ||
+      (type === "LV-008" && formData.leaveSubTypeName === "ปฎิบัติการวิจัย") ||
+      (type === "LV-008" && formData.leaveSubTypeName === "ดูงาน")
    ) {
      checkForm.value = "FormLeaveToTraining";
    } else if (type === "LV-009") {
--- a/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
+++ b/src/modules/05_leave/components/FormLeave/07_HajjForm.vue
@ -161,8 +161,8 @@ async function fetchCheck() {
      isLeave.value = data.isLeave;
      formDataHaji.leaveTotal = data.totalDate;
      leaveText.value = calculateDurationYmd(
-        formDataHaji.leaveStartDate,
-        formDataHaji.leaveEndDate
+        convertDateToAPI(formDataHaji.leaveStartDate),
+        convertDateToAPI(formDataHaji.leaveEndDate)
      );
      reasonLeave.value = data.message
        ? data.message
--- a/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/FormLeave/08_MilitaryForm.vue
@ -184,8 +184,8 @@ async function fetchCheck() {
      isLeave.value = data.isLeave;
      formDataMilitary.leaveTotal = data.totalDate;
      leaveText.value = calculateDurationYmd(
-        formDataMilitary.leaveStartDate,
-        formDataMilitary.leaveEndDate
+        convertDateToAPI(formDataMilitary.leaveStartDate),
+        convertDateToAPI(formDataMilitary.leaveEndDate)
      );
      reasonLeave.value = data.message
        ? data.message
--- a/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
+++ b/src/modules/05_leave/components/FormLeave/09_StudyForm.vue
@ -199,8 +199,8 @@ async function fetchCheck() {
      isLeave.value = data.isLeave;
      formDataStudy.leaveTotal = data.totalDate;
      leaveText.value = calculateDurationYmd(
-        formDataStudy.leaveStartDate,
-        formDataStudy.leaveEndDate
+        convertDateToAPI(formDataStudy.leaveStartDate),
+        convertDateToAPI(formDataStudy.leaveEndDate)
      );
      reasonLeave.value = data.message
        ? data.message
--- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
+++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue
@ -184,8 +184,8 @@ async function fetchCheck() {
      isLeave.value = data.isLeave;
      formDataTrain.leaveTotal = data.totalDate;
      leaveText.value = calculateDurationYmd(
-        formDataTrain.leaveStartDate,
-        formDataTrain.leaveEndDate
+        convertDateToAPI(formDataTrain.leaveStartDate),
+        convertDateToAPI(formDataTrain.leaveEndDate)
      );
      reasonLeave.value = data.message
        ? data.message
--- a/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/FormLeave/11_WorkInternationalForm.vue
@ -190,8 +190,8 @@ async function fetchCheck() {
      formDataWorkInternational.leaveTotal = data.totalDate;

      leaveText.value = calculateDurationYmd(
-        formDataWorkInternational.leaveStartDate,
-        formDataWorkInternational.leaveEndDate
+        convertDateToAPI(formDataWorkInternational.leaveStartDate),
+        convertDateToAPI(formDataWorkInternational.leaveEndDate)
      );
      reasonLeave.value = data.message
        ? data.message
--- a/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue
@ -220,10 +220,10 @@ async function fetchCheck() {
    .then((res: any) => {
      const data = res.data.result;
      isLeave.value = data.isLeave;
-      formDataFollowSpouse.leaveTotalDay = data.totalDate;
+      formDataFollowSpouse.leaveTotal = data.totalDate;
      leaveText.value = calculateDurationYmd(
-        formDataFollowSpouse.leaveStartDate,
-        formDataFollowSpouse.leaveEndDate
+        convertDateToAPI(formDataFollowSpouse.leaveStartDate),
+        convertDateToAPI(formDataFollowSpouse.leaveEndDate)
      );
      reasonLeave.value = data.message
        ? data.message
--- a/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/FormLeave/13_RehabilitationForm.vue
@ -148,8 +148,8 @@ async function fetchCheck() {
      isLeave.value = data.isLeave;
      formDataRehabilitation.leaveTotal = data.totalDate;
      leaveText.value = calculateDurationYmd(
-        formDataRehabilitation.leaveStartDate,
-        formDataRehabilitation.leaveEndDate
+        convertDateToAPI(formDataRehabilitation.leaveStartDate),
+        convertDateToAPI(formDataRehabilitation.leaveEndDate)
      );

      reasonLeave.value = data.message
--- a/src/modules/05_leave/components/formDetail/09_StudyForm.vue
+++ b/src/modules/05_leave/components/formDetail/09_StudyForm.vue
@ -22,7 +22,7 @@ const props = defineProps({
    </div>
    <div class="row">
      <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
-      <div class="col-xs-12 col-md-6">ลาไปศึกษาต่อ</div>
+      <div class="col-xs-12 col-md-6">ศึกษาต่อ</div>
    </div>
    <div class="row">
      <div class="col-xs-12 col-md-6 text-grey-8">เขียนที่</div>
--- a/src/modules/05_leave/components/formDetail/10_TrainForm.vue
+++ b/src/modules/05_leave/components/formDetail/10_TrainForm.vue
@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { useLeaveStore } from '@/modules/05_leave/store'
+import { useLeaveStore } from "@/modules/05_leave/store";

-const store = useLeaveStore()
-const { converstType } = store
+const store = useLeaveStore();
+const { converstType } = store;
 /**
 * รับ prop จาก component
 */
@ -21,7 +21,7 @@ const props = defineProps({
    </div>
    <div class="row">
      <div class="col-xs-12 col-md-6 text-grey-8">เรื่อง</div>
-      <div class="col-xs-12 col-md-6">ลาฝึกอบรม/ปฎิบัติการวิจัย/ดูงาน</div>
+      <div class="col-xs-12 col-md-6">{{ props.data.leaveSubTypeName }}</div>
    </div>
    <div class="row">
      <div class="col-xs-12 col-md-6 text-grey-8">เขียนที่</div>
@ -29,11 +29,33 @@ const props = defineProps({
    </div>
    <div class="row">
      <div class="col-xs-12 col-md-6 text-grey-8">ลาตั้งแต่วันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateStart }} {{ `${props.data.leaveRange && props.data.leaveRange !== 'ALL' ? `(${converstType(props.data.leaveRange)})`:''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateStart }}
+        {{
+          `${
+            props.data.leaveRange && props.data.leaveRange !== "ALL"
+              ? `(${converstType(props.data.leaveRange)})`
+              : ""
+          }`
+        }}
+      </div>
    </div>
    <div class="row">
      <div class="col-xs-12 col-md-6 text-grey-8">ลาถึงวันที่</div>
-<div class="col-xs-12 col-md-6">{{ props.data.leaveDateEnd }} {{ `${props.data.leaveDateStart !== props.data.leaveDateEnd ?  `${props.data.leaveRangeEnd && props.data.leaveRangeEnd !== 'ALL' ? `(${converstType(props.data.leaveRangeEnd)})`:''}` :''}` }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.leaveDateEnd }}
+        {{
+          `${
+            props.data.leaveDateStart !== props.data.leaveDateEnd
+              ? `${
+                  props.data.leaveRangeEnd && props.data.leaveRangeEnd !== "ALL"
+                    ? `(${converstType(props.data.leaveRangeEnd)})`
+                    : ""
+                }`
+              : ""
+          }`
+        }}
+      </div>
    </div>
    <div class="row">
      <div class="col-xs-12 col-md-6 text-grey-8">จำนวนวันที่ลา</div>