From ef219472503a542e18678b3a0f82ef973f42d60c Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Fri, 1 Dec 2023 09:11:36 +0700
Subject: [PATCH 1/7] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=94=E0=B8=B6=E0=B8=87?=
 =?UTF-8?q?=20month=20=E0=B9=80=E0=B9=80=E0=B8=A5=E0=B8=B0=20year=20?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B2=E0=B8=88=E0=B8=B2=E0=B8=81=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=99=E0=B8=99=E0=B8=B5=E0=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/09_leave/stores/SpecialTimeStore.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/09_leave/stores/SpecialTimeStore.ts b/src/modules/09_leave/stores/SpecialTimeStore.ts
index ecdd6ffd8..54230e6d7 100644
--- a/src/modules/09_leave/stores/SpecialTimeStore.ts
+++ b/src/modules/09_leave/stores/SpecialTimeStore.ts
@@ -40,8 +40,9 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
   const checkOutStatus = ref<String>("ปกติ");
 
   // paging
-  const year = ref<number>(2023);
-  const month = ref<number>(11);
+  const toDay = ref<Date>(new Date());
+  const month = toDay.value.getMonth();
+  const year = toDay.value.getFullYear();
   const page = ref<number>(1);
   const total = ref<number>(0);
   const pageSize = ref<number>(10);
@@ -56,7 +57,7 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
     await http
       .get(
         config.API.specialTime() +
-          `?year=${year.value}&month=${month.value}&page=${page.value}&pageSize=${pageSize.value}&keyword=${filter.value}`
+          `?year=${year}&month=${month}&page=${page.value}&pageSize=${pageSize.value}&keyword=${filter.value}`
       )
       .then(async (res) => {
         let data = res.data.result.data;

From 97fde66a79e85139b192a0a1a1da004bd2e71536 Mon Sep 17 00:00:00 2001
From: AnandaTon <ananda@frappet.com>
Date: Fri, 1 Dec 2023 09:22:38 +0700
Subject: [PATCH 2/7] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=20Date=20selecter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/09_leave/stores/SpecialTimeStore.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/09_leave/stores/SpecialTimeStore.ts b/src/modules/09_leave/stores/SpecialTimeStore.ts
index 54230e6d7..d2c467879 100644
--- a/src/modules/09_leave/stores/SpecialTimeStore.ts
+++ b/src/modules/09_leave/stores/SpecialTimeStore.ts
@@ -41,8 +41,8 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
 
   // paging
   const toDay = ref<Date>(new Date());
-  const month = toDay.value.getMonth();
-  const year = toDay.value.getFullYear();
+  const month = ref<number>(11);
+  const year = ref<number>(2023);
   const page = ref<number>(1);
   const total = ref<number>(0);
   const pageSize = ref<number>(10);
@@ -57,7 +57,7 @@ export const useSpecialTimeStore = defineStore("LeaveSpecialTime", () => {
     await http
       .get(
         config.API.specialTime() +
-          `?year=${year}&month=${month}&page=${page.value}&pageSize=${pageSize.value}&keyword=${filter.value}`
+          `?year=${year.value}&month=${month.value}&page=${page.value}&pageSize=${pageSize.value}&keyword=${filter.value}`
       )
       .then(async (res) => {
         let data = res.data.result.data;

From 62ad5673c623670a0bf1b9c7cc64dbf2dabe4a70 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 1 Dec 2023 11:44:11 +0700
Subject: [PATCH 3/7] =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=96?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/AddPersonal.vue          | 14 +++++++++++---
 .../components/1_Complaint/Form.vue             |  2 +-
 .../components/2_InvestigateFacts/Form.vue      |  2 +-
 .../interface/response/investigate.ts           | 17 ++++++++++++++++-
 src/modules/11_discipline/store.ts              |  4 ++--
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 412b7a5b5..598b82936 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -46,7 +46,7 @@ const typeOps = ref<typeOp[]>([
 
 /** รับค่ามาจาก หน้าหลัก */
 const props = defineProps({
-  checkId: {
+  mainData: {
     type: Array,
     default: [],
   },
@@ -118,8 +118,9 @@ async function searchInput() {
       .post(config.API.searchPersonal(), body)
       .then((res) => {
         const data = res.data.result;
+        console.log(data)
         const list = data.map((e: ResponsePreson) => ({
-          personId: e.personId,
+          id: e.personId,
           idcard: e.idcard,
           prefix: e.prefix,
           firstName: e.firstName,
@@ -145,10 +146,17 @@ async function searchInput() {
   }
 }
 
+
 /** update เมื่อเปลี่ยน option */
 function updateSelect() {
   search.value = "";
 }
+watch(()=>props.mainData,()=>{
+  if(props.mainData){
+    console.log('mainData',props.mainData)
+    selected.value = props.mainData
+  }
+})
 </script>
 
 <template>
@@ -214,7 +222,7 @@ function updateSelect() {
             ref="table"
             :columns="mainStore.columnsRespondent"
             :rows="rows"
-            row-key="personId"
+            row-key="idcard"
             flat
             bordered
             :paging="true"
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 12313a440..361415cbb 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -984,7 +984,7 @@ onMounted(() => {
   <!-- Popup ผู้ถูกร้องเรียน -->
   <DialogAddPersonal
     title="ผู้ถูกร้องเรียน"
-    :checkId="mainStore.rowsAdd"
+    :mainData="mainStore.rowsAdd"
     :modal="modal"
     btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
     :close="toggleModal"
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 7227edb4f..edf07e8fd 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -1303,7 +1303,7 @@ onMounted(async () => {
 
   <DialogAddPersonal
     title="ผู้ถูกร้องเรียน"
-    :checkId="mainStore.rowsAdd"
+    :mainData="mainStore.rowsAdd"
     :modal="modalPerson"
     btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
     :close="toggleModal"
diff --git a/src/modules/11_discipline/interface/response/investigate.ts b/src/modules/11_discipline/interface/response/investigate.ts
index 0bd7d136e..d9355dea9 100644
--- a/src/modules/11_discipline/interface/response/investigate.ts
+++ b/src/modules/11_discipline/interface/response/investigate.ts
@@ -12,6 +12,20 @@ interface ListData {
 }
 
 interface ArrayPerson {
+  id:string
+  idcard:string
+  name:string
+  prefix:string
+  firstName:string
+  lastName:string
+  posNo:string
+  position:string
+  positionLevel:string
+  salary:number|null
+  organization:string
+}
+
+interface ArrayPersonAdd {
   personId:string
   idcard:string
   name:string
@@ -24,8 +38,9 @@ interface ArrayPerson {
   salary:number|null
   organization:string
 }
+
 interface ocListType{
   organizationId:string
   organizationName:string
 }
-export type { ListData,ArrayPerson,ocListType };
+export type { ListData,ArrayPerson,ocListType,ArrayPersonAdd };
diff --git a/src/modules/11_discipline/store.ts b/src/modules/11_discipline/store.ts
index 589f0e90c..b705596c8 100644
--- a/src/modules/11_discipline/store.ts
+++ b/src/modules/11_discipline/store.ts
@@ -2,7 +2,7 @@ import { defineStore } from "pinia";
 import type { QTableProps } from "quasar";
 import { ref } from "vue";
 import type { DataOption } from "@/modules/11_discipline/interface/index/Main";
-import type { ArrayPerson } from "@/modules/11_discipline/interface/response/investigate";
+import type { ArrayPerson, ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate";
 
 export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
   /** option ผู้ถูกสอบสวน*/
@@ -278,6 +278,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     rowsAdd.value = data;
   }
 
+
   return {
     complainantoptionsMain,
     convertFault,
@@ -292,7 +293,6 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     visibleColumnsDirector,
     rowsAdd,
     fetchData,
-
     statusResultOptions,
     convertStatusResult,
 

From 07fd525952671c32aaf283a42bc1983b2d176dea Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 1 Dec 2023 13:49:34 +0700
Subject: [PATCH 4/7] =?UTF-8?q?fix=20=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=96?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B9=83=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B9=80=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/AddPersonal.vue        | 20 +++++++++----------
 .../components/1_Complaint/EditPage.vue       |  1 +
 .../components/1_Complaint/Form.vue           | 11 +++++-----
 .../components/1_Complaint/MainPage.vue       |  1 -
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 598b82936..7c58fb619 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -21,7 +21,7 @@ interface typeOp {
 }
 
 interface tableType {
-  id: string;
+  personId: string;
   idcard: string;
   prefix: string;
   firstName: string;
@@ -46,10 +46,6 @@ const typeOps = ref<typeOp[]>([
 
 /** รับค่ามาจาก หน้าหลัก */
 const props = defineProps({
-  mainData: {
-    type: Array,
-    default: [],
-  },
   modal: {
     type: Boolean,
     default: false,
@@ -67,6 +63,10 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  selectedData: {
+    type: Array,
+    default: [],
+  },
   close: {
     type: Function,
     default: () => console.log("not function"),
@@ -118,9 +118,8 @@ async function searchInput() {
       .post(config.API.searchPersonal(), body)
       .then((res) => {
         const data = res.data.result;
-        console.log(data)
         const list = data.map((e: ResponsePreson) => ({
-          id: e.personId,
+          personId: e.personId,
           idcard: e.idcard,
           prefix: e.prefix,
           firstName: e.firstName,
@@ -151,10 +150,9 @@ async function searchInput() {
 function updateSelect() {
   search.value = "";
 }
-watch(()=>props.mainData,()=>{
-  if(props.mainData){
-    console.log('mainData',props.mainData)
-    selected.value = props.mainData
+watch(()=>props.selectedData,()=>{
+  if(props.selectedData){
+    selected.value = props.selectedData
   }
 })
 </script>
diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
index fe721f539..d146070de 100644
--- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue
@@ -207,6 +207,7 @@ async function onSubmit(data: any) {
       messageError($q, e);
     })
     .finally(async () => {
+      getData();
       hideLoader();
     });
   // router.push(`/discipline/complaints`);
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 361415cbb..15526f584 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -184,10 +184,9 @@ function onSubmit() {
     $q,
     async () => {
       if (mainStore.rowsAdd) {
-        formData.persons = mainStore.rowsAdd;
-        props.onSubmit(formData);
-      } else props.onSubmit(formData);
-      // props.onSubmit(formData);
+        formData.persons = await mainStore.rowsAdd;
+      } 
+      await props.onSubmit(formData);
       isSave.value = false;
     },
     "ยืนยันการบันทึกข้อมูล",
@@ -321,10 +320,10 @@ function getOc() {
  */
 function deletePerson(id: string) {
   // dialogRemove($q, () => {
-  changeFormData();
   const dataRow = mainStore.rowsAdd;
   const updatedRows = dataRow.filter((item: any) => item.personId !== id);
   mainStore.rowsAdd = updatedRows;
+  changeFormData();
   // });
 }
 
@@ -984,11 +983,11 @@ onMounted(() => {
   <!-- Popup ผู้ถูกร้องเรียน -->
   <DialogAddPersonal
     title="ผู้ถูกร้องเรียน"
-    :mainData="mainStore.rowsAdd"
     :modal="modal"
     btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
     :close="toggleModal"
     :save="addPerson"
+    :selected-data="mainStore.rowsAdd"
     @returnData="handleSave"
   />
 </template>
diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
index fe1cd7ef5..e6887b68b 100644
--- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@@ -9,7 +9,6 @@ import { useComplainstDataStore } from "@/modules/11_discipline/store/Complaints
 import TableComplaint from "@/modules/11_discipline/components/1_Complaint/TableComplaint.vue";
 import config from "@/app.config";
 import http from "@/plugins/http";
-import { max } from "moment";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();

From d47ef4efee762446cf2e965c72a13455d9a2fe71 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 1 Dec 2023 13:50:47 +0700
Subject: [PATCH 5/7] no message

---
 .../components/4_Result/DialogSendToCommand.vue        | 10 +++++++++-
 .../11_discipline/components/4_Result/EditPage.vue     | 10 +---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
index 257ab6d68..e58dbb534 100644
--- a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
+++ b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, computed, watchEffect, onMounted } from "vue";
+import { ref, computed, watchEffect, onMounted, watch } from "vue";
 import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import type { QTableProps } from "quasar";
@@ -119,6 +119,7 @@ const columns2 = ref<QTableProps["columns"]>([
 ]);
 
 const props = defineProps({
+  data:Array,
   Modal: Boolean,
   closeModal: Function,
   getData: Function,
@@ -209,8 +210,15 @@ watchEffect(() => {
   }
 });
 
+watch(()=>props.data,()=>{
+  if(props.data){
+    const data = props.data.persons
+    console.log(data)
+  }
+})
 onMounted(async () => {
   await fecthTypeOption();
+  
 });
 </script>
 <template>
diff --git a/src/modules/11_discipline/components/4_Result/EditPage.vue b/src/modules/11_discipline/components/4_Result/EditPage.vue
index 9dd1a80fc..9d45efa62 100644
--- a/src/modules/11_discipline/components/4_Result/EditPage.vue
+++ b/src/modules/11_discipline/components/4_Result/EditPage.vue
@@ -28,15 +28,6 @@ const route = useRoute();
 const id = ref<string>(route.params.id as string);
 const type = ref<string>("");
 
-/** ข้อมูล v-model ของฟอร์ม */
-const data = reactive<FormData>({
-  detail: "",
-});
-
-/** จำลองข้อมูลจาก api */
-const fetchData = async () => {
-  data.detail = "";
-};
 
 /**
  * บันทึกข้อมูลที่เเก้ไข
@@ -331,6 +322,7 @@ watch(
     v-model:Modal="modal"
     :closeModal="closeModal"
     :rows2="[]"
+    :data="dataResult"
     v-model:filterKeyword2="filterKeyword"
     :getData="getData"
     v-model:type="type"

From 25b92f276803382f315bdd09d0bffcfb9764adae Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 1 Dec 2023 14:29:21 +0700
Subject: [PATCH 6/7] =?UTF-8?q?ui=20=E0=B8=A3=E0=B8=B2=E0=B8=87=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=AA=E0=B8=96=E0=B8=B4=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/2_Leave/DetailLeaveReject.vue  |   8 +-
 .../components/3_Report/DetailReport.vue      | 480 ++++++++++++++++++
 src/modules/09_leave/interface/index/Main.ts  |   6 +-
 src/modules/09_leave/router.ts                |  12 +
 src/modules/09_leave/views/ReportMain.vue     |  63 ++-
 5 files changed, 561 insertions(+), 8 deletions(-)
 create mode 100644 src/modules/09_leave/components/3_Report/DetailReport.vue

diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
index d2d2021e5..ba85e5cf2 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
@@ -61,8 +61,8 @@ const formData = reactive<FremData>({
   leaveLimit: 0, //โควต้าลา(แต่ละประเภท)หน่วยเป็นวัน
   leaveTotal: 0, //ลาป่วยไปแล้ว(แต่ละประเภท)หน่วยเป็นวัน
   leaveRemain: 0, //คงเหลือโควต้า(แต่ละประเภท)หน่วยเป็นวัน
-  leaveStartDate: new Date(), //*วัน เดือน ปีเริ่มต้นลา
-  leaveEndDate: new Date(), //*วัน เดือน ปีสิ้นสุดลา
+  leaveDateStart: new Date(), //*วัน เดือน ปีเริ่มต้นลา
+  leaveDateEnd: new Date(), //*วัน เดือน ปีสิ้นสุดลา
   leaveWrote: "", //เขียนที่
   leaveAddress: "", //สถานที่ติดต่อขณะลา
   leaveNumber: "", //หมายเลขที่ติดต่อขณะลา
@@ -137,8 +137,8 @@ function fetchDetailLeave(paramsId: string) {
     formData.leaveLimit = e.leaveLimit;
     formData.leaveTotal = e.leaveTotal;
     formData.leaveRemain = e.leaveRemain;
-    formData.leaveStartDate = e.leaveStartDate && date2Thai(e.leaveStartDate);
-    formData.leaveEndDate = e.leaveEndDate && date2Thai(e.leaveEndDate);
+    formData.leaveDateStart = e.leaveStartDate && date2Thai(e.leaveStartDate);
+    formData.leaveDateEnd = e.leaveEndDate && date2Thai(e.leaveEndDate);
     formData.status = e.status;
     formData.leaveWrote = e.leaveWrote;
     formData.leaveAddress = e.leaveAddress;
diff --git a/src/modules/09_leave/components/3_Report/DetailReport.vue b/src/modules/09_leave/components/3_Report/DetailReport.vue
new file mode 100644
index 000000000..7762359a6
--- /dev/null
+++ b/src/modules/09_leave/components/3_Report/DetailReport.vue
@@ -0,0 +1,480 @@
+<script setup lang="ts">
+import { ref, computed } from "vue";
+import { useRoute } from "vue-router";
+
+import type {
+  DataDateMonthObject,
+  DataOption,
+} from "@/modules/09_leave/interface/index/Main";
+
+import { useCounterMixin } from "@/stores/mixin";
+const route = useRoute();
+
+const mixin = useCounterMixin();
+const { messageError, showLoader, hideLoader, date2Thai, monthYear2Thai } =
+  mixin;
+
+const typeReport = route.params.type.toString();
+const titleReport = computed(() => {
+  const title =
+    typeReport === "daily"
+      ? "รายงานสรุปบันทึกการลงเวลาปฏิบัติงานเป็นรายวัน"
+      : typeReport === "monthly"
+      ? "รายงานสรุปบันทึกการลงเวลาปฏิบัติงานเป็นรายเดือน"
+      : typeReport === "yearly"
+      ? "รายงานสรุปบันทึกการลงเวลาปฏิบัติงานเป็นรายปี"
+      : typeReport === "leaveday"
+      ? "บัญชีแสดงวันลา"
+      : "";
+  return title;
+});
+
+const date = ref<Date>(new Date());
+const dateMonth = ref<DataDateMonthObject>({
+  month: new Date().getMonth(),
+  year: new Date().getFullYear(),
+});
+const year = ref<number>(new Date().getFullYear());
+const dateStart = ref<Date>(new Date());
+const dateEnd = ref<Date>(new Date());
+const employeeClass = ref<string>("");
+
+function monthYearThai(val: DataDateMonthObject) {
+  if (val == null) return "";
+  else return monthYear2Thai(val.month, val.year);
+}
+
+const employeeClassMain = ref<DataOption[]>([
+  { id: "perm", name: "ลูกจ้างประจำ" },
+  { id: "temp", name: "ลูกจ้างชั่วคราว" },
+]);
+const employeeClassOption = ref<DataOption[]>(employeeClassMain.value);
+
+function filterFnOptions(val: any, update: Function) {
+  update(() => {
+    employeeClassOption.value = employeeClassMain.value.filter(
+      (v: DataOption) => v.name.indexOf(val) > -1
+    );
+  });
+}
+
+const splitterModel = ref(14);
+const numOfPages = ref<number>(0);
+const page = ref<number>(1);
+const pdfSrc = ref<any>();
+const modalFull = ref<boolean>(false);
+/** ไปหน้าต่อไปของรายงาน */
+function nextPage() {
+  if (page.value < numOfPages.value) {
+    page.value++;
+  }
+}
+
+/** กลับหน้าก่อนหน้าของรายงาน */
+function backPage() {
+  if (page.value !== 1) {
+    page.value--;
+  }
+}
+
+/** กลับหน้าหลัก */
+function backHistory() {
+  window.history.back();
+}
+</script>
+<template>
+  <div class="toptitle">
+    <q-btn
+      icon="mdi-arrow-left"
+      unelevated
+      round
+      dense
+      flat
+      color="primary"
+      class="q-mr-sm"
+      @click="backHistory"
+    />
+    {{ titleReport }}
+  </div>
+  <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+    <div class="q-pa-md q-gutter-y-sm">
+      <q-toolbar style="padding: 0">
+        <div class="q-pr-xs" v-if="typeReport === 'daily'">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="date"
+            :locale="'th'"
+            autoApply
+            :enableTimePicker="false"
+            week-start="0"
+          >
+            <template #year="{ year }">{{ year + 543 }}</template>
+            <template #year-overlay-value="{ value }">{{
+              parseInt(value + 543)
+            }}</template>
+            <template #trigger>
+              <q-input
+                class="full-width inputgreen cursor-pointer"
+                outlined
+                dense
+                lazy-rules
+                borderless
+                :model-value="date ? date2Thai(date) : null"
+                :label="`${'วันที่'}`"
+              >
+                <template v-slot:prepend>
+                  <q-icon name="event" class="cursor-pointer" color="primary">
+                  </q-icon>
+                </template>
+              </q-input>
+            </template>
+          </datepicker>
+        </div>
+        <div class="q-pr-xs" v-if="typeReport === 'monthly'">
+          <datepicker
+            v-model="dateMonth"
+            :locale="'th'"
+            autoApply
+            month-picker
+            :enableTimePicker="false"
+          >
+            <template #year="{ year }">{{ year + 543 }}</template>
+            <template #year-overlay-value="{ value }">{{
+              parseInt(value + 543)
+            }}</template>
+            <template #trigger>
+              <q-input
+                class="full-width inputgreen cursor-pointer"
+                outlined
+                dense
+                lazy-rules
+                borderless
+                :label="`${'เดือนที่'}`"
+                :model-value="monthYearThai(dateMonth)"
+              >
+                <template v-slot:prepend>
+                  <q-icon
+                    name="event"
+                    class="cursor-pointer"
+                    color="primary"
+                  ></q-icon>
+                </template>
+              </q-input>
+            </template>
+          </datepicker>
+        </div>
+        <div class="q-pr-xs" v-if="typeReport === 'yearly'">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="year"
+            class="col-2"
+            :locale="'th'"
+            autoApply
+            year-picker
+            :enableTimePicker="false"
+          >
+            <template #year="{ year }">{{ year + 543 }}</template>
+            <template #year-overlay-value="{ value }">{{
+              parseInt(value + 543)
+            }}</template>
+            <template #trigger>
+              <q-input
+                dense
+                lazy-rules
+                outlined
+                :model-value="Number(year) + 543"
+                :label="`${'ปีงบประมาณ'}`"
+              >
+                <template v-slot:prepend>
+                  <q-icon
+                    name="event"
+                    class="cursor-pointer"
+                    style="color: var(--q-primary)"
+                  >
+                  </q-icon>
+                </template>
+              </q-input>
+            </template>
+          </datepicker>
+        </div>
+
+        <div class="q-pl-xs" v-if="typeReport === 'leaveday'">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="dateStart"
+            :locale="'th'"
+            autoApply
+            :enableTimePicker="false"
+            week-start="0"
+          >
+            <template #year="{ year }">{{ year + 543 }}</template>
+            <template #year-overlay-value="{ value }">{{
+              parseInt(value + 543)
+            }}</template>
+            <template #trigger>
+              <q-input
+                class="full-width inputgreen cursor-pointer"
+                outlined
+                dense
+                lazy-rules
+                borderless
+                :model-value="dateStart ? date2Thai(dateStart) : null"
+                :label="`${'ตั้งเเต่วันที่'}`"
+              >
+                <template v-slot:prepend>
+                  <q-icon name="event" class="cursor-pointer" color="primary">
+                  </q-icon>
+                </template>
+              </q-input>
+            </template>
+          </datepicker>
+        </div>
+        <div class="q-pl-xs" v-if="typeReport === 'leaveday'">
+          <datepicker
+            menu-class-name="modalfix"
+            v-model="dateEnd"
+            :locale="'th'"
+            autoApply
+            :enableTimePicker="false"
+            week-start="0"
+          >
+            <template #year="{ year }">{{ year + 543 }}</template>
+            <template #year-overlay-value="{ value }">{{
+              parseInt(value + 543)
+            }}</template>
+            <template #trigger>
+              <q-input
+                class="full-width inputgreen cursor-pointer"
+                outlined
+                dense
+                lazy-rules
+                borderless
+                :model-value="dateEnd ? date2Thai(dateEnd) : null"
+                :label="`${'ถึงวันที่'}`"
+              >
+                <template v-slot:prepend>
+                  <q-icon name="event" class="cursor-pointer" color="primary">
+                  </q-icon>
+                </template>
+              </q-input>
+            </template>
+          </datepicker>
+        </div>
+
+        <q-space />
+        <div class="q-py-xs">
+          <q-btn unelevated color="primary" @click="modalFull = true">
+            <q-icon left size="2em" name="mdi-eye-outline" />
+            <div>แสดงรายงาน</div>
+          </q-btn>
+        </div>
+      </q-toolbar>
+
+      <q-toolbar
+        v-if="typeReport === 'leaveday'"
+        class="q-pa-sm bg-grey-2"
+        style="border-radius: 5px"
+      >
+        <div class="q-pr-xs">
+          <q-select
+            class="bg-white"
+            outlined
+            dense
+            v-model="employeeClass"
+            :options="employeeClassOption"
+            label="สถานภาพ"
+            emit-value
+            map-options
+            option-label="name"
+            option-value="id"
+            use-input
+            style="width: 230px"
+            @filter="(inputValue: any,
+      doneFn: Function) => filterFnOptions(inputValue, doneFn)"
+            ><template v-slot:no-option>
+              <q-item>
+                <q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
+              </q-item>
+            </template>
+          </q-select>
+        </div></q-toolbar
+      >
+      <q-splitter
+        v-model="splitterModel"
+        horizontal
+        style="
+          height: 70vh;
+          border: 1px solid rgb(210, 210, 210);
+          border-radius: 5px;
+        "
+        before-class="overflow-hidden disable"
+        separator-class="bg-white disabled"
+      >
+        <template v-slot:before>
+          <div class="q-px-sm">
+            <div class="row items-start items-center">
+              <div class="col">
+                <q-btn
+                  padding="xs"
+                  icon="mdi-chevron-left"
+                  color="grey-2"
+                  text-color="grey-5"
+                  size="md"
+                  class="my-auto"
+                  @click="backPage"
+                  :disable="page == 1"
+                />
+              </div>
+              <div class="col-12 col-md-auto">
+                <div class="q-pa-md flex">
+                  หน้าที่ {{ page }} จาก {{ numOfPages }}
+                </div>
+              </div>
+              <div class="col text-right">
+                <q-btn
+                  padding="xs"
+                  icon="mdi-chevron-right"
+                  color="grey-2"
+                  text-color="grey-5"
+                  size="md"
+                  @click="nextPage"
+                  :disable="page === numOfPages"
+                />
+              </div>
+            </div>
+          </div>
+        </template>
+        <template v-slot:after>
+          <div class="q-pa-md">
+            <VuePDF ref="vuePDFRef" :pdf="pdfSrc" :page="page" fit-parent />
+          </div>
+        </template>
+        <template v-slot:default>
+          <div class="q-pa-md">
+            <div class="row items-start items-center">
+              <div class="col">
+                <q-btn
+                  padding="xs"
+                  icon="mdi-chevron-left"
+                  color="grey-2"
+                  text-color="grey-5"
+                  size="md"
+                  class="my-auto"
+                  @click="backPage"
+                  :disable="page == 1"
+                />
+              </div>
+
+              <div class="col-12 col-md-auto">
+                <div class="q-pa-md flex">
+                  หน้าที่ {{ page }} จาก {{ numOfPages }}
+                </div>
+              </div>
+              <div class="col text-right">
+                <q-btn
+                  padding="xs"
+                  icon="mdi-chevron-right"
+                  color="grey-2"
+                  text-color="grey-5"
+                  size="md"
+                  @click="nextPage"
+                  :disable="page === numOfPages"
+                />
+              </div>
+            </div>
+          </div>
+        </template>
+      </q-splitter>
+    </div>
+  </q-card>
+
+  <!-- Dialog Full Screen -->
+  <q-dialog
+    v-model="modalFull"
+    persistent
+    :maximized="true"
+    transition-show="slide-up"
+    transition-hide="slide-down"
+  >
+    <q-card class="bg-white">
+      <div class="flex justify-end items-center align-center q-mr-md q-mt-sm">
+        <q-btn
+          icon="close"
+          unelevated
+          round
+          dense
+          style="color: #ff8080; background-color: #ffdede"
+          size="12px"
+          v-close-popup
+        />
+      </div>
+      <div class="q-pa-md">
+        <div class="row items-start items-center">
+          <div class="col">
+            <q-btn
+              padding="xs"
+              icon="mdi-chevron-left"
+              color="grey-2"
+              text-color="grey-5"
+              size="md"
+              class="my-auto"
+              @click="backPage"
+              :disable="page == 1"
+            />
+          </div>
+          <div class="col-12 col-md-auto">
+            <div class="q-pa-md flex">
+              หน้าที่ {{ page }} จาก {{ numOfPages }}
+            </div>
+          </div>
+          <div class="col text-right">
+            <q-btn
+              padding="xs"
+              icon="mdi-chevron-right"
+              color="grey-2"
+              text-color="grey-5"
+              size="md"
+              @click="nextPage"
+              :disable="page === numOfPages"
+            />
+          </div>
+        </div>
+        <div class="row items- items-center">
+          <VuePDF ref="vuePDFRef" :pdf="pdfSrc" :page="page" fit-parent />
+        </div>
+        <div class="row items- items-end">
+          <div class="col">
+            <q-btn
+              padding="xs"
+              icon="mdi-chevron-left"
+              color="grey-2"
+              text-color="grey-5"
+              size="md"
+              class="my-auto"
+              @click="backPage"
+              :disable="page == 1"
+            />
+          </div>
+          <div class="col-12 col-md-auto">
+            <div class="q-pa-md flex">
+              หน้าที่ {{ page }} จาก {{ numOfPages }}
+            </div>
+          </div>
+          <div class="col text-right">
+            <q-btn
+              padding="xs"
+              icon="mdi-chevron-right"
+              color="grey-2"
+              text-color="grey-5"
+              size="md"
+              @click="nextPage"
+              :disable="page === numOfPages"
+            />
+          </div>
+        </div>
+      </div>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/09_leave/interface/index/Main.ts b/src/modules/09_leave/interface/index/Main.ts
index e76abc1f2..58ada0de4 100644
--- a/src/modules/09_leave/interface/index/Main.ts
+++ b/src/modules/09_leave/interface/index/Main.ts
@@ -6,4 +6,8 @@ interface DataOption2 {
   id: number;
   name: string;
 }
-export type { DataOption, DataOption2 };
+interface DataDateMonthObject {
+  month: number;
+  year: number;
+}
+export type { DataOption, DataOption2, DataDateMonthObject };
diff --git a/src/modules/09_leave/router.ts b/src/modules/09_leave/router.ts
index 9724f3d98..57d06f504 100644
--- a/src/modules/09_leave/router.ts
+++ b/src/modules/09_leave/router.ts
@@ -1,6 +1,8 @@
 const workMain = () => import("@/modules/09_leave/views/WorkingMain.vue");
 const leaveMain = () => import("@/modules/09_leave/views/LeaveListMain.vue");
 const reportMain = () => import("@/modules/09_leave/views/ReportMain.vue");
+const reportDetail = () =>
+  import("@/modules/09_leave/components/3_Report/DetailReport.vue");
 const leaveDetail = () =>
   import("@/modules/09_leave/components/2_Leave/DetailLeave.vue");
 const leaveDetailReject = () =>
@@ -102,4 +104,14 @@ export default [
       Role: "coin",
     },
   },
+  {
+    path: "/statistics-report/:type",
+    name: "/statistics-report-detail",
+    component: reportDetail,
+    meta: {
+      Auth: true,
+      Key: [9],
+      Role: "coin",
+    },
+  },
 ];
diff --git a/src/modules/09_leave/views/ReportMain.vue b/src/modules/09_leave/views/ReportMain.vue
index d57fa0695..4892317d7 100644
--- a/src/modules/09_leave/views/ReportMain.vue
+++ b/src/modules/09_leave/views/ReportMain.vue
@@ -1,9 +1,66 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { useRouter } from "vue-router";
+
+const router = useRouter();
+
+function nextPage(type: string,) {
+  router.push(`/statistics-report/${type}`);
+}
+</script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">รายงานสถิติ</div>
   <div>
-    <q-card flat bordered class="col-12 q-mt-sm"> </q-card>
+    <q-card flat bordered class="col-12 q-mt-sm">
+      <div class="q-pa-md">
+        <q-item clickable dense class="hover-green" @click="nextPage('daily')">
+          <q-item-section avatar>
+            <q-icon color="primary" name="mdi-file" size="xs" />
+          </q-item-section>
+          <q-item-section class="text-dark">
+            รายงานสรุปบันทึกการลงเวลาปฏิบัติงานเป็นรายวัน
+          </q-item-section>
+        </q-item>
+
+        <q-item
+          clickable
+          dense
+          class="hover-green"
+          @click="nextPage('monthly')"
+        >
+          <q-item-section avatar>
+            <q-icon color="primary" name="mdi-file" size="xs" />
+          </q-item-section>
+          <q-item-section class="text-dark">
+            รายงานสรุปบันทึกการลงเวลาปฏิบัติงานเป็นรายเดือน
+          </q-item-section>
+        </q-item>
+
+        <q-item clickable dense class="hover-green" @click="nextPage('yearly')">
+          <q-item-section avatar>
+            <q-icon color="primary" name="mdi-file" size="xs" />
+          </q-item-section>
+          <q-item-section class="text-dark">
+            รายงานสรุปบันทึกการลงเวลาปฏิบัติงานเป็นรายปี
+          </q-item-section>
+        </q-item>
+
+        <q-item clickable dense class="hover-green" @click="nextPage('leaveday')">
+          <q-item-section avatar>
+            <q-icon color="primary" name="mdi-file" size="xs" />
+          </q-item-section>
+          <q-item-section class="text-dark"> บัญชีแสดงวันลา </q-item-section>
+        </q-item>
+      </div>
+    </q-card>
   </div>
 </template>
 
-<style scoped></style>
+<style lang="scss" scoped>
+.q-item.hover-green:hover {
+  background-color: #d5f1ee57;
+  border-radius: 2px;
+}
+.q-item.hover-green {
+  padding: 10px;
+}
+</style>

From 8974c6874de6a07deed5e6a879dab8a076610cc2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 1 Dec 2023 14:34:49 +0700
Subject: [PATCH 7/7] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20form?=
 =?UTF-8?q?Data=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/2_Leave/DetailLeaveReject.vue  | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
index ba85e5cf2..4122b9b6b 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
@@ -53,27 +53,38 @@ function upLoadFile() {
 /** Form รายละเอียดข้อมูล*/
 const formData = reactive<FremData>({
   id: "", //Id การยื่นขอลา
+  reasonCommander: "", //เหตุผลผู้บังคับบัญชา
+  reasonOligarch: "", //เหตุผลผู้มีอำนาจ
+  positionName: "", //ตำแหน่งผู้ยื่นขอ
+  positionLevelName: "", //ระดับผู้ยื่นขอ
+  organizationName: "", //สังกัดผู้ยื่นขอ
   leaveTypeName: "", // Name ประเภทการลา
   leaveTypeId: "", //Id ประเภทการลา
   fullname: "", //คำนำหน้า ชื่อ นามสกุล คนขอลา
   dateSendLeave: new Date(), // วันที่ยืนใบลา
+  leaveDateStart: new Date(), //วันเริ่มการลา
+  leaveDateEnd: new Date(), //วันสิ้นสุดการลา
+  leaveCount: 0, //จำนวนวันลา
   status: "", //สถานะการของลา
   leaveLimit: 0, //โควต้าลา(แต่ละประเภท)หน่วยเป็นวัน
-  leaveTotal: 0, //ลาป่วยไปแล้ว(แต่ละประเภท)หน่วยเป็นวัน
+  leaveSummary: 0, //ลาป่วยไปแล้ว(แต่ละประเภท)หน่วยเป็นวัน
   leaveRemain: 0, //คงเหลือโควต้า(แต่ละประเภท)หน่วยเป็นวัน
-  leaveDateStart: new Date(), //*วัน เดือน ปีเริ่มต้นลา
-  leaveDateEnd: new Date(), //*วัน เดือน ปีสิ้นสุดลา
+  // leaveStartDate: new Date(), //*วัน เดือน ปีเริ่มต้นลา
+  // leaveEndDate: new Date(), //*วัน เดือน ปีสิ้นสุดลา
   leaveWrote: "", //เขียนที่
   leaveAddress: "", //สถานที่ติดต่อขณะลา
   leaveNumber: "", //หมายเลขที่ติดต่อขณะลา
   leaveDetail: "", //รายละเอียดการลา
   leaveDocument: "", //อัปโหลดเอกสารประกอบรายละเอียด
-  leaveLast: new Date(), //ลาครั้งสุดท้ายในประเภทนั้น ๆ เมื่อวันที่(ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว)(Auto)
-  leaveDateTotal: 0, //จำนวนวันที่ลา(Auto)
+  leaveDraftDocument: "", //อัปโหลดแบบฟอร์มการลา
+  leaveLastStart: new Date(), //ลาครั้งสุดท้ายในประเภทนั้น ๆ เริ่มเมื่อวันที่(ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว)(Auto)
+  leaveLastEnd: new Date(), //ลาครั้งสุดท้ายในประเภทนั้น ๆ สิ้นสุดเมื่อวันที่(ลาป่วย ลาคลอดบุตร และลากิจส่วนตัว)(Auto)
+  leaveTotal: 0, //จำนวนวันที่ลา(Auto)
   leavebirthDate: new Date(), //วันเดือนปีเกิด(Auto)
   leavegovernmentDate: new Date(), //วันที่เข้ารับราชการ(Auto)
   leaveSalary: 0, //เงินเดือนปัจจุบัน(Auto)
   leaveSalaryText: "", //เงินเดือนปัจจุบัน(เขียนเป็นคำอ่าน)
+  leaveTypeDay: "", //ประเภทการลาในวันนั้นเช่น
   wifeDayName: "", //ชื่อภรรยา(ลาไปช่วยเหลือภริยาที่คลอดบุตร)
   wifeDayDateBorn: new Date(), //วันที่คลอด(ลาไปช่วยเหลือภริยาที่คลอดบุตร)
   restDayOldTotal: 0, //จำนวนวันลาพักผ่อนสะสม จากปีที่ผ่านมา(ลาพักผ่อน)(Auto)
@@ -127,31 +138,40 @@ function fetchDetailLeave(paramsId: string) {
   console.log(data);
   data.map((e: any) => {
     formData.id = e.id;
+    formData.reasonCommander = e.reasonCommander;
+    formData.reasonOligarch = e.reasonOligarch;
+    formData.positionName = e.positionName;
+    formData.positionLevelName = e.positionLevelName;
+    formData.organizationName = e.organizationName;
     formData.leaveTypeName = e.leaveTypeName
       ? e.leaveTypeName
       : stores.convertLeave(e.leaveTypeId);
     formData.leaveTypeId = e.leaveTypeId;
     formData.fullname = e.fullname;
     formData.dateSendLeave = e.dateSendLeave && date2Thai(e.dateSendLeave);
+    formData.leaveDateStart = e.leaveDateStart && date2Thai(e.leaveDateStart);
+    formData.leaveDateEnd = e.leaveDateEnd && date2Thai(e.leaveDateEnd);
+    formData.leaveCount = e.leaveCount;
     formData.status = e.status && e.status;
     formData.leaveLimit = e.leaveLimit;
-    formData.leaveTotal = e.leaveTotal;
+    formData.leaveSummary = e.leaveSummary;
     formData.leaveRemain = e.leaveRemain;
-    formData.leaveDateStart = e.leaveStartDate && date2Thai(e.leaveStartDate);
-    formData.leaveDateEnd = e.leaveEndDate && date2Thai(e.leaveEndDate);
-    formData.status = e.status;
     formData.leaveWrote = e.leaveWrote;
     formData.leaveAddress = e.leaveAddress;
     formData.leaveNumber = e.leaveNumber;
     formData.leaveDetail = e.leaveDetail;
     formData.leaveDocument = e.leaveDocument;
-    formData.leaveLast = e.leaveLast && date2Thai(e.leaveLast);
-    formData.leaveDateTotal = e.leaveDateTotal;
+    formData.leaveDraftDocument = e.leaveDraftDocument;
+    formData.leaveLastStart = e.leaveLastStart && date2Thai(e.leaveLastStart);
+    formData.leaveLastEnd = e.leaveLastStart && date2Thai(e.leaveLastEnd);
+    formData.leaveTotal = e.leaveTotal;
     formData.leavebirthDate = e.leavebirthDate && date2Thai(e.leavebirthDate);
     formData.leavegovernmentDate =
       e.leavegovernmentDate && date2Thai(e.leavegovernmentDate);
     formData.leaveSalary = e.leaveSalary;
     formData.leaveSalaryText = e.leaveSalaryText;
+    formData.leaveTypeDay =
+      e.leaveTypeDay && stores.convertLeaveDaytype(e.leaveTypeDay);
     formData.wifeDayName = e.wifeDayName;
     formData.wifeDayDateBorn =
       e.wifeDayDateBorn && date2Thai(e.wifeDayDateBorn);