diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue b/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue
index 68e66a89a..23b33dfab 100644
--- a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue
+++ b/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToWorkInternational.vue
@@ -25,22 +25,7 @@ const props = defineProps({
         <div class="col text-grey-8">รายละเอียด</div>
         <div class="col">{{ props.data.leaveDetail }}</div>
       </div>
-      <div class="row">
-        <div class="col text-grey-8">เอกสารประกอบ</div>
-        <div class="col" v-if="props.data.leaveDocument">
-          <q-btn
-            :href="props.data.leaveDocument"
-            target="_blank"
-            outline
-            color="blue"
-            label="ดาวน์โหลด"
-            size="12px"
-          >
-            <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip></q-btn
-          >
-        </div>
-        <div class="col" v-else>-</div>
-      </div>
+
       <div class="row">
         <div class="col text-grey-8">เอกสารแบบฟอร์ม</div>
         <div class="col" v-if="props.data.leaveDraftDocument">
@@ -57,6 +42,31 @@ const props = defineProps({
         </div>
         <div class="col" v-else>-</div>
       </div>
+
+      <div class="row">
+        <div class="col text-grey-8">เอกสารประกอบ</div>
+        <div class="col" v-if="props.data.leaveDocument">
+          <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 class="col" v-else>-</div>
+      </div>
     </div>
   </q-card-section>
 </template>
diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 97d253ce1..7738bbbc1 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -137,8 +137,8 @@ function fetchData() {
 
       expanded.value = arrayExpanded.filter((e) => e !== null).slice(0, -1);
       expanded2.value = arrayExpanded2.filter((e) => e !== null).slice(0, -1);
-      reasonPlanned.value = data.reasonPlanned;
-      reasonActual.value = data.reasonActual;
+      reasonPlanned.value = data.reasonPlanned ? data.reasonPlanned:'';
+      reasonActual.value = data.reasonActual ? data.reasonActual :'';
     })
     .catch((err) => {
       messageError($q, err);