From 3401ccf43ad521054cf9b13b2e63660cf6153fa6 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Sat, 29 Jun 2024 16:04:16 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=20fixing=20layout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_leave/components/DialogDetail.vue      |   6 +-
 .../components/formDetail/01_SickForm.vue     | 174 +++++++++---------
 .../formDetail/04_HelpWifeBirthForm.vue       |   6 +-
 .../components/formDetail/05_VacationForm.vue |   2 +-
 .../formDetail/06_OrdinationForm.vue          |   2 +-
 .../components/formDetail/07_HajjForm.vue     |   2 +-
 .../components/formDetail/08_MilitaryForm.vue |   2 +-
 .../components/formDetail/09_StudyForm.vue    |   2 +-
 .../components/formDetail/10_TrainForm.vue    |  14 +-
 .../formDetail/11_WorkInternationalForm.vue   |   2 +-
 .../formDetail/12_FollowSpouseForm.vue        |   2 +-
 .../formDetail/13_RehabilitationForm.vue      |   2 +-
 12 files changed, 109 insertions(+), 107 deletions(-)

diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index d74bd9b..350e67a 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -297,10 +297,6 @@ function checkLeaveType(
   ordainDayLocationName: string,
   studyDayTrainingSubject: string
 ) {
-  console.log(leaveTypeName);
-  console.log(leaveTypeId);
-  console.log(ordainDayLocationName);
-
   if (props.leaveType) {
     const filtertype = props.leaveType.find((e: any) => e.id === leaveTypeId);
     const type = filtertype.code;
@@ -504,7 +500,7 @@ watch(
 
         <div
           flat
-          class="col-xs-12 col-sm-6 q-pa-sm"
+          class="col-xs-12 col-sm-6 q-pa-sm q-gutter-sm"
           v-if="props.leaveStatus === 'CANCEL'"
         >
           <q-input
diff --git a/src/modules/05_leave/components/formDetail/01_SickForm.vue b/src/modules/05_leave/components/formDetail/01_SickForm.vue
index d88d761..cf8a51a 100644
--- a/src/modules/05_leave/components/formDetail/01_SickForm.vue
+++ b/src/modules/05_leave/components/formDetail/01_SickForm.vue
@@ -11,96 +11,94 @@ const props = defineProps({
 </script>
 
 <template>
-  
-    <div class="q-gutter-md q-pa-sm">
-      <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.dateSendLeave }}</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.leaveTypeName }}</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.leaveWrote }}</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.leaveDateStart }}</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 }}</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.leaveRange == "ALL"
-              ? props.data.leaveTotal + " วัน"
-              : props.data.leaveRange == "MORNING"
-              ? "ลาครึ่งวันเช้า (0.5)"
-              : "ลาครึ่งวันบ่าย (0.5)"
-          }}
-        </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.leaveTypeDay }}</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.leaveLastStart }}</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.leaveNumber }}</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.leaveAddress }}</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.leaveDetail ? props.data.leaveDetail : "-" }}
-        </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">
-          <div
-            v-if="
-              props.data.leaveDocument && props.data.leaveDocument.length > 0
-            "
-          >
-            <div
-              v-for="(document, index) in props.data.leaveDocument"
-              :key="index"
-              :style="{ marginBottom: '10px' }"
-            >
-              <div>
-                <q-btn
-                  :href="document"
-                  target="_blank"
-                  outline
-                  color="blue"
-                  :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
-                  size="12px"
-                >
-                  <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
-                </q-btn>
-              </div>
-            </div>
-          </div>
-          <div v-else>-</div>
-        </div>
+  <div class="q-gutter-md q-pa-sm">
+    <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.dateSendLeave }}</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.leaveTypeName }}</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.leaveWrote }}</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.leaveDateStart }}</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 }}</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.leaveRange == "ALL"
+            ? props.data.leaveTotal + " วัน"
+            : props.data.leaveRange == "MORNING"
+            ? "ลาครึ่งวันเช้า (0.5)"
+            : "ลาครึ่งวันบ่าย (0.5)"
+        }}
       </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.leaveTypeDay }}</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.leaveLastStart }}</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.leaveNumber }}</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.leaveAddress }}</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.leaveDetail ? props.data.leaveDetail : "-" }}
+      </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">
+        <div
+          v-if="props.data.leaveDocument && props.data.leaveDocument.length > 0"
+        >
+          <div
+            v-for="(document, index) in props.data.leaveDocument"
+            :key="index"
+            :style="{ marginBottom: '10px' }"
+          >
+            <div>
+              <q-btn
+                :href="document.path"
+                target="_blank"
+                outline
+                color="blue"
+                :label="`ดาวน์โหลดเอกสารแนบที่ ${index + 1}`"
+                size="12px"
+              >
+                <q-tooltip>ดาวน์โหลดเอกสารแนบที่ {{ index + 1 }}</q-tooltip>
+              </q-btn>
+            </div>
+          </div>
+        </div>
+        <div v-else>-</div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
index e7771b7..6c3a70c 100644
--- a/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
+++ b/src/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue
@@ -50,7 +50,9 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6">{{ props.data.leaveNumber }}</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 text-grey-8">
+        ที่อยู่ที่ติดต่อได้ระหว่างลา
+      </div>
       <div class="col-xs-12 col-md-6">{{ props.data.leaveAddress }}</div>
     </div>
     <div class="row">
@@ -72,7 +74,7 @@ const props = defineProps({
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"
diff --git a/src/modules/05_leave/components/formDetail/05_VacationForm.vue b/src/modules/05_leave/components/formDetail/05_VacationForm.vue
index ce76b84..0f5f6f4 100644
--- a/src/modules/05_leave/components/formDetail/05_VacationForm.vue
+++ b/src/modules/05_leave/components/formDetail/05_VacationForm.vue
@@ -89,7 +89,7 @@ const props = defineProps({
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"
diff --git a/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue b/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
index 2581ea3..1e6b714 100644
--- a/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
+++ b/src/modules/05_leave/components/formDetail/06_OrdinationForm.vue
@@ -90,7 +90,7 @@ const props = defineProps({
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"
diff --git a/src/modules/05_leave/components/formDetail/07_HajjForm.vue b/src/modules/05_leave/components/formDetail/07_HajjForm.vue
index 32f6c31..60cf162 100644
--- a/src/modules/05_leave/components/formDetail/07_HajjForm.vue
+++ b/src/modules/05_leave/components/formDetail/07_HajjForm.vue
@@ -69,7 +69,7 @@ const props = defineProps({
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"
diff --git a/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue b/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue
index 1e77d64..97c0f08 100644
--- a/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue
+++ b/src/modules/05_leave/components/formDetail/08_MilitaryForm.vue
@@ -80,7 +80,7 @@ console.log(props);
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"
diff --git a/src/modules/05_leave/components/formDetail/09_StudyForm.vue b/src/modules/05_leave/components/formDetail/09_StudyForm.vue
index b5fc281..1b177a0 100644
--- a/src/modules/05_leave/components/formDetail/09_StudyForm.vue
+++ b/src/modules/05_leave/components/formDetail/09_StudyForm.vue
@@ -103,7 +103,7 @@ const props = defineProps({
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"
diff --git a/src/modules/05_leave/components/formDetail/10_TrainForm.vue b/src/modules/05_leave/components/formDetail/10_TrainForm.vue
index d9ecc6c..c84bf2f 100644
--- a/src/modules/05_leave/components/formDetail/10_TrainForm.vue
+++ b/src/modules/05_leave/components/formDetail/10_TrainForm.vue
@@ -54,11 +54,15 @@ const props = defineProps({
 
     <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.studyDayTrainingSubject }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.studyDayTrainingSubject }}
+      </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.studyDayTrainingName }}</div>
+      <div class="col-xs-12 col-md-6">
+        {{ props.data.studyDayTrainingName }}
+      </div>
     </div>
 
     <div class="row">
@@ -74,7 +78,9 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6">{{ props.data.leaveNumber }}</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 text-grey-8">
+        ที่อยู่ที่ติดต่อได้ระหว่างลา
+      </div>
       <div class="col-xs-12 col-md-6">{{ props.data.leaveAddress }}</div>
     </div>
     <div class="row">
@@ -96,7 +102,7 @@ const props = defineProps({
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"
diff --git a/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue b/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue
index 6aa6e8e..8cd324c 100644
--- a/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue
+++ b/src/modules/05_leave/components/formDetail/11_WorkInternationalForm.vue
@@ -72,7 +72,7 @@ const props = defineProps({
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"
diff --git a/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue b/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue
index 2087a4d..30d0056 100644
--- a/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue
+++ b/src/modules/05_leave/components/formDetail/12_FollowSpouseForm.vue
@@ -107,7 +107,7 @@ const props = defineProps({
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"
diff --git a/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue b/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue
index 0c94915..c5413cf 100644
--- a/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue
+++ b/src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue
@@ -66,7 +66,7 @@ const props = defineProps({
           >
             <div>
               <q-btn
-                :href="document"
+                :href="document.path"
                 target="_blank"
                 outline
                 color="blue"