diff --git a/src/modules/07_insignia/views/03_ResultMain.vue b/src/modules/07_insignia/views/03_ResultMain.vue
index e600bc9df..6d42aa4e7 100644
--- a/src/modules/07_insignia/views/03_ResultMain.vue
+++ b/src/modules/07_insignia/views/03_ResultMain.vue
@@ -85,6 +85,7 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+
   {
     name: "citizenId",
     align: "left",
@@ -103,6 +104,15 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    field: "position",
+    sortable: true,
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "employeeType",
     align: "left",
@@ -219,6 +229,7 @@ const visibleColumns = ref<String[]>([
   "status",
   "citizenId",
   "name",
+  "position",
   "type",
   "dateReceive",
   "date",
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index bdb15c37e..6d7d0cc28 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -167,8 +167,7 @@ async function fetchDetailLeave(paramsId: string) {
       formData.leaveDraftDocument = data.leaveDraftDocument;
       formData.leaveLastStart =
         data.leaveLastStart && date2Thai(data.leaveLastStart);
-      formData.leaveLastEnd =
-        data.leaveLastStart && date2Thai(data.leaveLastEnd);
+      formData.leaveLastEnd = data.leaveLastEnd && date2Thai(data.leaveLastEnd);
       formData.leaveTotal = data.leaveTotal ? data.leaveTotal : "0";
       formData.leavebirthDate =
         data.leaveBirthDate && date2Thai(data.leaveBirthDate);
@@ -263,7 +262,7 @@ async function fetchDetailLeave(paramsId: string) {
       formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory
         ? data.coupleDaySumTotalHistory
         : "-";
-      formData.approveStep = data.approveStep;
+      formData.approveStep = data.approveStep ? data.approveStep : "-";
       formData.dear = data.dear ? data.dear : "-";
 
       /** ส่งประเภทของการลาไป Function เช็คประเภทการลา*/
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue b/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue
index c38db2a18..8559b57b8 100644
--- a/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue
+++ b/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue
@@ -36,7 +36,13 @@ const props = defineProps({
       </div>
       <div class="row">
         <div class="col text-grey-8">ลงวันที่</div>
-        <div class="col">{{ props.data.absentDayRegistorDate }}</div>
+        <div class="col">
+          {{
+            props.data.absentDayRegistorDate
+              ? props.data.absentDayRegistorDate
+              : "-"
+          }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">ให้เข้ารับการ</div>
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue b/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue
index 9b46c2309..9127575c1 100644
--- a/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue
+++ b/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue
@@ -31,7 +31,9 @@ const props = defineProps({
       </div>
       <div class="row">
         <div class="col text-grey-8">วันที่คลอด</div>
-        <div class="col">{{ props.data.wifeDayDateBorn }}</div>
+        <div class="col">
+          {{ props.data.wifeDayDateBorn ? props.data.wifeDayDateBorn : "-" }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">หมายเลขที่ติดต่อขณะลา</div>
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue b/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue
index 65bc14d48..316010402 100644
--- a/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue
@@ -42,7 +42,9 @@ const props = defineProps({
         <div class="col text-grey-8">
           ลาครั้งสุดท้ายในประเภทนั้น ๆ เมื่อวันที่
         </div>
-        <div class="col">{{ props.data.leaveLastStart }}</div>
+        <div class="col">
+          {{ props.data.leaveLastStart ? props.data.leaveLastStart : "-" }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">หมายเลขที่ติดต่อขณะลา</div>
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue b/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue
index 3f8a44d5d..28179b58c 100644
--- a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue
+++ b/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue
@@ -71,7 +71,13 @@ function convertDateToEng(dataThia: string) {
       </div>
       <div class="row">
         <div class="col text-grey-8">วันที่เข้ารับราชการ</div>
-        <div class="col">{{ props.data.leavegovernmentDate }}</div>
+        <div class="col">
+          {{
+            props.data.leavegovernmentDate
+              ? props.data.leavegovernmentDate
+              : "-"
+          }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">เงินเดือนปัจจุบัน</div>
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue b/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue
index e3ce29314..e6c4c9154 100644
--- a/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue
+++ b/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue
@@ -67,11 +67,19 @@ function convertDateToEng(dataThia: string) {
       </div>
       <div class="row">
         <div class="col text-grey-8">วันเดือนปีเกิด</div>
-        <div class="col">{{ props.data.leavebirthDate }}</div>
+        <div class="col">
+          {{ props.data.leavebirthDate ? props.data.leavebirthDate : "-" }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">วันที่เข้ารับราชการ</div>
-        <div class="col">{{ props.data.leavegovernmentDate }}</div>
+        <div class="col">
+          {{
+            props.data.leavegovernmentDate
+              ? props.data.leavegovernmentDate
+              : "-"
+          }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">เงินเดือนปัจจุบัน</div>
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue b/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue
index e340333cf..d009f26b4 100644
--- a/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue
+++ b/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue
@@ -16,11 +16,11 @@ const props = defineProps({
       </div>
       <div class="row">
         <div class="col text-grey-8">ลาตั้งแต่วันที่</div>
-        <div class="col">{{ props.data.leaveLastStart }}</div>
+        <div class="col">{{ props.data.leaveDateStart }}</div>
       </div>
       <div class="row">
         <div class="col text-grey-8">ลาถึงวันที่</div>
-        <div class="col">{{ props.data.leaveLastEnd }}</div>
+        <div class="col">{{ props.data.leaveDateEnd }}</div>
       </div>
       <div class="row">
         <div class="col text-grey-8">จำนวนวันที่ลา</div>
@@ -28,11 +28,19 @@ const props = defineProps({
       </div>
       <div class="row">
         <div class="col text-grey-8">วันเดือนปีเกิด</div>
-        <div class="col">{{ props.data.leavebirthDate }}</div>
+        <div class="col">
+          {{ props.data.leavebirthDate ? props.data.leavebirthDate : "-" }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">วันที่เข้ารับราชการ</div>
-        <div class="col">{{ props.data.leavegovernmentDate }}</div>
+        <div class="col">
+          {{
+            props.data.leavegovernmentDate
+              ? props.data.leavegovernmentDate
+              : "-"
+          }}
+        </div>
       </div>
       <div class="row">
         <div class="col text-grey-8">เคย/ไม่เคยบวช</div>