From b7329370d6f537b1a65b887cf9c3c961b7a188fa Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Sat, 6 Dec 2025 13:50:23 +0700
Subject: [PATCH 1/2] fix: dialog pagination

---
 src/modules/11_discipline/components/PopupSendToNext.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/11_discipline/components/PopupSendToNext.vue b/src/modules/11_discipline/components/PopupSendToNext.vue
index 02e1f5b41..a06b13017 100644
--- a/src/modules/11_discipline/components/PopupSendToNext.vue
+++ b/src/modules/11_discipline/components/PopupSendToNext.vue
@@ -194,7 +194,7 @@ watch(
           :visible-columns="props.visibleColumns"
           selection="multiple"
           v-model:selected="selected"
-          :pagination="initialPagination"
+          v-model:pagination="initialPagination"
         >
           <template v-slot:header-selection="scope">
             <q-checkbox

From 7016378ac66ecce9fd8bcbebe34a222cbd3e8e82 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Sat, 6 Dec 2025 13:59:01 +0700
Subject: [PATCH 2/2] fix(investigatefacts):display icon

---
 .../11_discipline/components/2_InvestigateFacts/MainPage.vue   | 3 ++-
 src/modules/11_discipline/store/InvestigateFactStore.ts        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
index 088b511ca..10f69a45c 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
@@ -264,7 +264,8 @@ onMounted(() => {
                 <q-btn
                   v-if="
                     checkPermission($route)?.attrIsGet &&
-                    checkPermission($route)?.attrIsUpdate
+                    checkPermission($route)?.attrIsUpdate && 
+                    props.row.statusMain != 'SEND_DISCIPLINARY'
                   "
                   flat
                   dense
diff --git a/src/modules/11_discipline/store/InvestigateFactStore.ts b/src/modules/11_discipline/store/InvestigateFactStore.ts
index 54d3c0f75..9e25516bb 100644
--- a/src/modules/11_discipline/store/InvestigateFactStore.ts
+++ b/src/modules/11_discipline/store/InvestigateFactStore.ts
@@ -248,6 +248,7 @@ export const useInvestigateFactStore = defineStore(
             ? date2Thai(e.dateReceived as Date)
             : "-",
           status: e.status ? convertStatus(e.status) : "-",
+          statusMain: e.status ? e.status : "",
         };
       });
     }