From e28e9bc3aade192d749a926d3134f0e105b3b599 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 1 Sep 2025 11:25:56 +0700
Subject: [PATCH] fix bug ==> loading

---
 .../05_leave/components/FormLeave/Form.vue     |  6 +-----
 src/modules/05_leave/components/ListView.vue   |  2 +-
 src/modules/05_leave/components/Table.vue      |  1 -
 src/modules/07_appealComplain/views/Main.vue   |  6 +-----
 src/modules/09_scholarship/views/main.vue      | 18 ++++++++----------
 src/modules/14_IDP/views/main.vue              |  6 +-----
 6 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/src/modules/05_leave/components/FormLeave/Form.vue b/src/modules/05_leave/components/FormLeave/Form.vue
index b366057..db9bd7b 100644
--- a/src/modules/05_leave/components/FormLeave/Form.vue
+++ b/src/modules/05_leave/components/FormLeave/Form.vue
@@ -404,11 +404,7 @@ function getSearch() {
                       :props="props"
                     >
                       <div v-if="col.name == 'no'">
-                        {{
-                          (pagination.page - 1) * pagination.rowsPerPage +
-                          props.rowIndex +
-                          1
-                        }}
+                        {{ props.rowIndex + 1 }}
                       </div>
                       <div v-else>
                         {{ col.value ? col.value : "-" }}
diff --git a/src/modules/05_leave/components/ListView.vue b/src/modules/05_leave/components/ListView.vue
index 3dbefca..3f4235a 100644
--- a/src/modules/05_leave/components/ListView.vue
+++ b/src/modules/05_leave/components/ListView.vue
@@ -197,7 +197,7 @@ onMounted(async () => {
           :props="props"
           @click="onClickView(props.row.id, props.row.status)"
         >
-          {{ (page - 1) * pageSize + props.rowIndex + 1 }}
+          {{ props.rowIndex + 1 }}
         </q-td>
         <q-td
           key="leaveTypeName"
diff --git a/src/modules/05_leave/components/Table.vue b/src/modules/05_leave/components/Table.vue
index 1c9f499..4a11409 100644
--- a/src/modules/05_leave/components/Table.vue
+++ b/src/modules/05_leave/components/Table.vue
@@ -261,7 +261,6 @@ function onTableRequest(requestProps: PropsTable.RequestProps) {
       :virtual-scroll-sticky-size-start="48"
       dense
       :rows-per-page-options="[10, 25, 50, 100]"
-      D
       v-model:pagination="pagination"
       @request="onTableRequest"
       :grid="$q.screen.gt.xs ? false : true"
diff --git a/src/modules/07_appealComplain/views/Main.vue b/src/modules/07_appealComplain/views/Main.vue
index 8acf2e3..c9163c1 100644
--- a/src/modules/07_appealComplain/views/Main.vue
+++ b/src/modules/07_appealComplain/views/Main.vue
@@ -398,11 +398,7 @@ onMounted(async () => {
                       @click.stop.prevent="editPage(props.row.id)"
                     >
                       <div v-if="col.name == 'no'">
-                        {{
-                          (pagination.page - 1) * pagination.rowsPerPage +
-                          props.rowIndex +
-                          1
-                        }}
+                        {{ props.rowIndex + 1 }}
                       </div>
 
                       <div v-else>
diff --git a/src/modules/09_scholarship/views/main.vue b/src/modules/09_scholarship/views/main.vue
index e9d3036..0d873c6 100644
--- a/src/modules/09_scholarship/views/main.vue
+++ b/src/modules/09_scholarship/views/main.vue
@@ -109,19 +109,17 @@ function onEdit(id: string) {
 
 async function getProfileId() {
   isLoad.value = true;
-  if (dataStore.profileId) {
-    profilId.value = dataStore.profileId;
-  } else {
-    try {
+  try {
+    if (!dataStore.profileId) {
       const res = await http.get(config.API.profilePosition());
       dataStore.profileId = res.data.result.profileId;
-      profilId.value = dataStore.profileId;
-      await getData();
-    } catch (e) {
-      messageError($q, e);
-    } finally {
-      isLoad.value = false;
     }
+    profilId.value = dataStore.profileId;
+    await getData();
+  } catch (e) {
+    messageError($q, e);
+  } finally {
+    isLoad.value = false;
   }
 }
 
diff --git a/src/modules/14_IDP/views/main.vue b/src/modules/14_IDP/views/main.vue
index 5d84827..e29f30e 100644
--- a/src/modules/14_IDP/views/main.vue
+++ b/src/modules/14_IDP/views/main.vue
@@ -395,11 +395,7 @@ onMounted(async () => {
                     "
                   >
                     <div v-if="col.name == 'no'">
-                      {{
-                        (pagination.page - 1) * pagination.rowsPerPage +
-                        props.rowIndex +
-                        1
-                      }}
+                      {{ props.rowIndex + 1 }}
                     </div>
                     <div v-else-if="col.name === 'document'">
                       <q-btn