รายการให้ออกจากราชการ (ลูกจ้าง

src/modules/06_retirement/views/06_dismissOrder.vue

@@ -154,7 +154,7 @@ function openModalOrder() {
 async function getData() {
   showLoader();
   await http
-    .get(config.API.retirementOut)
+    .get(config.API.retirementOut+`/officer`)
     .then((res: any) => {
       const data = res.data.result;
       rows.value = data;

src/modules/06_retirement/views/08_dismissOrderEmp.vue

@@ -154,19 +154,19 @@ function openModalOrder() {
 async function getData() {
   showLoader();
   await http
-    .get(config.API.retirementOut)
+    .get(config.API.retirementOut + `/employee`)
     .then((res: any) => {
       const data = res.data.result;
       rows.value = data;
       rowsData.value = data;
       filters.value = data;
+      hideLoader();
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
       hideLoader();
-    });
+    })
+    .finally(() => {});
 }
 
 async function clickDelete(id: string) {
@@ -209,7 +209,9 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="toptitle text-dark col-12 row items-center">รายการให้ออก (ลูกจ้าง)</div>
+  <div class="toptitle text-dark col-12 row items-center">
+    รายการให้ออก (ลูกจ้าง)
+  </div>
   <q-card flat bordered class="col-12 q-mt-sm">
     <q-separator />
     <div class="row q-pa-md">
@@ -287,7 +289,7 @@ onMounted(async () => {
                     icon="mdi-eye"
                     @click="
                       router.push(
-                        `/retirement/dismiss-order-detail/${props.row.id}`
+                        `/retirementEmployee/dismiss-order-detail/${props.row.id}`
                       )
                     "
                   >
@@ -304,7 +306,7 @@ onMounted(async () => {
                     color="edit"
                     icon="edit"
                     @click="
-                      router.push(`/retirement/dismiss-order/${props.row.id}`)
+                      router.push(`/retirementEmployee/dismiss-order/${props.row.id}`)
                     "
                   >
                     <q-tooltip>แก้ไขข้อมูล</q-tooltip>