diff --git a/src/components/DialogAddEmployee.vue b/src/components/DialogAddEmployee.vue
index 84186868a..99f149c2c 100644
--- a/src/components/DialogAddEmployee.vue
+++ b/src/components/DialogAddEmployee.vue
@@ -366,7 +366,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="min-width: 75vw">
       <Header
         tittle="เพิ่มข้อมูลทะเบียนประวัติข้าราชการ กทม.สามัญ"
diff --git a/src/components/Dialogs/PopupPersonal.vue b/src/components/Dialogs/PopupPersonal.vue
index 554cfc7bd..007c5b1cd 100644
--- a/src/components/Dialogs/PopupPersonal.vue
+++ b/src/components/Dialogs/PopupPersonal.vue
@@ -179,7 +179,7 @@ watch(modal, (newValue) => {
 </script>
 
 <template>
-  <q-dialog v-model="modal" position="right" :maximized="true">
+  <q-dialog v-model="modal" position="right" :maximized="true" persistent>
     <q-card style="width: 420px; overflow: visible">
       <q-toolbar>
         <q-toolbar-title class="text-subtitle1 text-bold"
diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index d93c51d62..ca0761734 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -209,7 +209,7 @@ async function fetchProfile(id: string, avatarName: string) {
 </script>
 
 <template>
-  <q-dialog v-model="modal" position="right" :maximized="true">
+  <q-dialog v-model="modal" position="right" :maximized="true" persistent>
     <q-card style="width: 420px; overflow: visible">
       <q-toolbar>
         <q-toolbar-title class="text-subtitle1 text-bold"
diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue
index d0b588c85..fe3d1e686 100644
--- a/src/modules/02_organization/components/DialogHistoryPos.vue
+++ b/src/modules/02_organization/components/DialogHistoryPos.vue
@@ -175,7 +175,7 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 1000px; max-width: 100vw">
       <Header
         :tittle="'ประวัติตำแหน่ง'"
diff --git a/src/modules/03_recruiting/components/Career.vue b/src/modules/03_recruiting/components/Career.vue
index 554a1e246..8e2f69356 100644
--- a/src/modules/03_recruiting/components/Career.vue
+++ b/src/modules/03_recruiting/components/Career.vue
@@ -704,8 +704,8 @@ const getClass = (val: boolean) => {
                     "
                     :model-value="date2Thai(startDate)"
                     :rules="[
-                      (val) => !!val || `${'กรุณาเลือกวันที่เริ่ม'}`,
-                      (val) =>
+                      (val:string) => !!val || `${'กรุณาเลือกวันที่เริ่ม'}`,
+                      (val:string) =>
                         startDate <= endDate ||
                         `${'กรุณาเลือกวันที่เริ่มให้ถูกต้อง'}`,
                     ]"
@@ -757,8 +757,8 @@ const getClass = (val: boolean) => {
                     "
                     :model-value="date2Thai(endDate)"
                     :rules="[
-                      (val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`,
-                      (val) =>
+                      (val:string) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`,
+                      (val:any) =>
                         startDate <= endDate ||
                         `${'กรุณาเลือกวันที่สิ้นสุดให้ถูกต้อง'}`,
                     ]"
diff --git a/src/modules/04_registry/components/PopupHistory.vue b/src/modules/04_registry/components/PopupHistory.vue
index c2c9a2c17..326ac9f89 100644
--- a/src/modules/04_registry/components/PopupHistory.vue
+++ b/src/modules/04_registry/components/PopupHistory.vue
@@ -207,7 +207,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
     <q-tooltip>แสดงประวัติถือครอง</q-tooltip></q-btn
   >
 
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 850px; max-width: 80vw">
       <q-card-section>
         <div class="my-content">
diff --git a/src/modules/04_registryPerson/components/DialogHistory.vue b/src/modules/04_registryPerson/components/DialogHistory.vue
index 96589003e..607e9f2a5 100644
--- a/src/modules/04_registryPerson/components/DialogHistory.vue
+++ b/src/modules/04_registryPerson/components/DialogHistory.vue
@@ -251,7 +251,7 @@ function closeDialog() {
 </script>
 
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 850px; max-width: 80vw">
       <DialogHeader :tittle="'ประวัติถือครองตำแหน่ง'" :close="closeDialog" />
 
diff --git a/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue b/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
index 2603c3ac7..9c003d29b 100644
--- a/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
+++ b/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
@@ -206,7 +206,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="props.Modal">
+  <q-dialog v-model="props.Modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <q-form greedy @submit.prevent @validation-success="clickAddlist">
         <DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="clickClose" />
diff --git a/src/modules/05_placement/components/AppointMent/DialogOrders.vue b/src/modules/05_placement/components/AppointMent/DialogOrders.vue
index f4224b413..c348758bc 100644
--- a/src/modules/05_placement/components/AppointMent/DialogOrders.vue
+++ b/src/modules/05_placement/components/AppointMent/DialogOrders.vue
@@ -227,7 +227,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="props.Modal">
+  <q-dialog v-model="props.Modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <q-form greedy @submit.prevent @validation-success="sendToCommand">
         <DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="clickClose" />
diff --git a/src/modules/05_placement/components/Help-Government/DialogOrders.vue b/src/modules/05_placement/components/Help-Government/DialogOrders.vue
index 7ff40477d..6fe92c2b0 100644
--- a/src/modules/05_placement/components/Help-Government/DialogOrders.vue
+++ b/src/modules/05_placement/components/Help-Government/DialogOrders.vue
@@ -230,7 +230,7 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="props.Modal">
+  <q-dialog v-model="props.Modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader :tittle="'ส่งไปออกคำสั่งช่วยราชการ'" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/05_placement/components/Other/DialogOrders.vue b/src/modules/05_placement/components/Other/DialogOrders.vue
index 0c9ef10fc..1d423f281 100644
--- a/src/modules/05_placement/components/Other/DialogOrders.vue
+++ b/src/modules/05_placement/components/Other/DialogOrders.vue
@@ -196,7 +196,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="props.Modal">
+  <q-dialog v-model="props.Modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <q-form greedy @submit.prevent @validation-success="clickAddlist">
         <DialogHeader
diff --git a/src/modules/05_placement/components/PersonalList/DialogOrders.vue b/src/modules/05_placement/components/PersonalList/DialogOrders.vue
index 70fdc5945..c13987f0d 100644
--- a/src/modules/05_placement/components/PersonalList/DialogOrders.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogOrders.vue
@@ -219,7 +219,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue
index ac3319173..46edd5b2a 100644
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@@ -169,7 +169,7 @@ watchEffect(() => {
 });
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader :tittle="'ส่งไปออกคำสั่งรับโอน'" :close="clickClose" />
       <q-separator />
diff --git a/src/modules/05_placement/components/Repatriate/DialogOrders.vue b/src/modules/05_placement/components/Repatriate/DialogOrders.vue
index 3961c41e4..9573883d3 100644
--- a/src/modules/05_placement/components/Repatriate/DialogOrders.vue
+++ b/src/modules/05_placement/components/Repatriate/DialogOrders.vue
@@ -190,7 +190,7 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="props.Modal">
+  <q-dialog v-model="props.Modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader :tittle="'ส่งไปออกคำสั่งส่งตัวกลับ'" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/05_placement/components/Transfer/DialogOrders.vue b/src/modules/05_placement/components/Transfer/DialogOrders.vue
index c33b03916..f88cb74b2 100644
--- a/src/modules/05_placement/components/Transfer/DialogOrders.vue
+++ b/src/modules/05_placement/components/Transfer/DialogOrders.vue
@@ -155,7 +155,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/05_placement/components/probation/DialogOrder.vue b/src/modules/05_placement/components/probation/DialogOrder.vue
index 5e7573274..1ee2e660b 100644
--- a/src/modules/05_placement/components/probation/DialogOrder.vue
+++ b/src/modules/05_placement/components/probation/DialogOrder.vue
@@ -255,7 +255,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue b/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue
index 71cf7d392..886c06ea7 100644
--- a/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue
+++ b/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue
@@ -138,7 +138,7 @@ watchEffect(() => {
 </script>
 
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader tittle="ส่งไปออกคำสั่ง" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index cdd2ff2e8..fd56e1f18 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -569,7 +569,7 @@ onMounted(() => {
   </q-card>
 
   <!-- อัปโหลดเอกสาร -->
-  <q-dialog v-model="modalupload">
+  <q-dialog v-model="modalupload" persistent>
     <q-card style="width: 600px">
       <q-form greedy @submit.prevent @validation-success="onSubmitDoc">
         <DialogHeader tittle="อัปโหลดเอกสาร" :close="clickCloseUpload" />
diff --git a/src/modules/06_retirement/components/Discharged/DialogSendToCommand.vue b/src/modules/06_retirement/components/Discharged/DialogSendToCommand.vue
index 29ef1e4ea..f7d7720fa 100644
--- a/src/modules/06_retirement/components/Discharged/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/Discharged/DialogSendToCommand.vue
@@ -149,7 +149,7 @@ watchEffect(() => {
 });
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader tittle="ส่งไปออกคำสั่งปลดออก" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue b/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
index e8762b68a..f9e6cc167 100644
--- a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
@@ -171,7 +171,7 @@ watchEffect(() => {
 });
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader tittle="ส่งไปออกคำสั่งให้ออก" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/06_retirement/components/Expulsion/DialogSendToCommand.vue b/src/modules/06_retirement/components/Expulsion/DialogSendToCommand.vue
index 3fb9fc6e9..dbc2eafc9 100644
--- a/src/modules/06_retirement/components/Expulsion/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/Expulsion/DialogSendToCommand.vue
@@ -152,7 +152,7 @@ watchEffect(() => {
 });
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader tittle="ส่งไปออกคำสั่งไล่ออก" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/06_retirement/components/resign/DialogSendToCommand.vue b/src/modules/06_retirement/components/resign/DialogSendToCommand.vue
index f4b9afb0c..60139e55c 100644
--- a/src/modules/06_retirement/components/resign/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/resign/DialogSendToCommand.vue
@@ -178,7 +178,7 @@ watchEffect(() => {
 });
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader tittle="ส่งไปออกคำสั่งลาออก" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue b/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
index a8d5658ec..7c305368d 100644
--- a/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
@@ -178,7 +178,7 @@ watchEffect(() => {
 });
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader tittle="ส่งไปออกคำสั่งลาออก" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/07_insignia/views/03_ResultMain.vue b/src/modules/07_insignia/views/03_ResultMain.vue
index 6d42aa4e7..da524ca7a 100644
--- a/src/modules/07_insignia/views/03_ResultMain.vue
+++ b/src/modules/07_insignia/views/03_ResultMain.vue
@@ -978,7 +978,7 @@ onMounted(() => {
   />
 
   <!-- ยืนยันรายการข้อมูล -->
-  <q-dialog v-model="modelPerview">
+  <q-dialog v-model="modelPerview" persistent>
     <q-card style="min-width: 80vw">
       <DialogHeader tittle="ยืนยันรายการข้อมูล" :close="closeDialogPerview" />
       <q-card-section class="q-pt-none">
diff --git a/src/modules/08_registryEmployee/components/DialogSendOrder.vue b/src/modules/08_registryEmployee/components/DialogSendOrder.vue
index d5109a56f..7942bc4c6 100644
--- a/src/modules/08_registryEmployee/components/DialogSendOrder.vue
+++ b/src/modules/08_registryEmployee/components/DialogSendOrder.vue
@@ -222,7 +222,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="min-width: 70%">
       <DialogHeader tittle="ส่งรายชื่อไปออกคำสั่ง" :close="closeDialog" />
       <q-separator />
diff --git a/src/modules/09_leave/components/1_Work/DialogDetail.vue b/src/modules/09_leave/components/1_Work/DialogDetail.vue
index 093a6cd64..1a58058d9 100644
--- a/src/modules/09_leave/components/1_Work/DialogDetail.vue
+++ b/src/modules/09_leave/components/1_Work/DialogDetail.vue
@@ -143,7 +143,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 950px; max-width: 80vw">
       <q-toolbar>
         <q-toolbar-title class="text-subtitle1 text-weight-bold">
diff --git a/src/modules/09_leave/components/1_Work/DialogEdit.vue b/src/modules/09_leave/components/1_Work/DialogEdit.vue
index 03e1de4e1..4245853cb 100644
--- a/src/modules/09_leave/components/1_Work/DialogEdit.vue
+++ b/src/modules/09_leave/components/1_Work/DialogEdit.vue
@@ -119,7 +119,7 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card class="column" style="width: 320px">
       <HeaderDialog :tittle="'แก้ไขสถานะการเข้า-ออกงาน'" :close="props.close" />
 
diff --git a/src/modules/09_leave/components/1_Work/DialogMap.vue b/src/modules/09_leave/components/1_Work/DialogMap.vue
index c08463974..face9f589 100644
--- a/src/modules/09_leave/components/1_Work/DialogMap.vue
+++ b/src/modules/09_leave/components/1_Work/DialogMap.vue
@@ -97,7 +97,7 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 950px; max-width: 80vw; min-height: 65vh">
       <q-toolbar>
         <q-toolbar-title class="text-subtitle1 text-weight-bold">
diff --git a/src/modules/09_leave/components/1_Work/DialogReport.vue b/src/modules/09_leave/components/1_Work/DialogReport.vue
index 10409e76c..007efd4b2 100644
--- a/src/modules/09_leave/components/1_Work/DialogReport.vue
+++ b/src/modules/09_leave/components/1_Work/DialogReport.vue
@@ -173,7 +173,7 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 700px; max-width: 100vw">
       <Header :close="props.close" :tittle="'รายงานสถิติการลงเวลา'" />
 
diff --git a/src/modules/10_order/components/PopupHistory.vue b/src/modules/10_order/components/PopupHistory.vue
index 930ee2521..bee9b9714 100644
--- a/src/modules/10_order/components/PopupHistory.vue
+++ b/src/modules/10_order/components/PopupHistory.vue
@@ -166,7 +166,7 @@ function updatemodalPersonal(modal: boolean) {
   >
     <q-tooltip>แสดงประวัติออกคำสั่ง</q-tooltip></q-btn
   >
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 900px; max-width: 80vw">
       <q-card-section>
         <div class="my-content">
diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index 90286fcb2..858e004e3 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -2613,7 +2613,7 @@ const getClass = (val: boolean) => {
     </q-form>
   </q-card>
 
-  <q-dialog v-model="dialogVisible">
+  <q-dialog v-model="dialogVisible" persistent>
     <q-card style="width: 900px; max-width: 80vw">
       <DialogHeader tittle="เลือกรายชื่อตามหน่วยงาน" v-close-popup />
       <q-separator />
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
index a8c9439f1..2484ad824 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
@@ -153,7 +153,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="min-width: 60vw">
       <q-toolbar>
         <q-toolbar-title class="text-subtitle2 text-bold">
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue
index 7fc2f0e9f..9bdfd4d44 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue
@@ -151,7 +151,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="min-width: 60vw">
       <q-toolbar>
         <q-toolbar-title class="text-subtitle2 text-bold">
diff --git a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
index 7e72cba6a..d4dd1135a 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
@@ -168,7 +168,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader tittle="ส่งไปออกคำสั่ง" :close="closeModal" />
       <q-separator />
diff --git a/src/modules/11_discipline/components/PopupSendToNext.vue b/src/modules/11_discipline/components/PopupSendToNext.vue
index cf6c680c7..95488161d 100644
--- a/src/modules/11_discipline/components/PopupSendToNext.vue
+++ b/src/modules/11_discipline/components/PopupSendToNext.vue
@@ -121,7 +121,7 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 820px; max-width: 80vw">
       <DialogHeader :tittle="props.title" :close="onClickClose" />
       <q-separator />
diff --git a/src/modules/12_evaluatePersonal/components/Detail/popupHistory.vue b/src/modules/12_evaluatePersonal/components/Detail/popupHistory.vue
index 6dbec1a14..a63a0d184 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/popupHistory.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/popupHistory.vue
@@ -120,7 +120,7 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="props.modal">
+  <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 700px; max-width: 80vw">
       <HeaderDialog :tittle="'ประวัติการประเมิน'" :close="props.close" />
       <q-separator />
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue
index 5e49646d8..2afa8c014 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue
@@ -68,7 +68,7 @@ const modalPerview = ref<boolean>(false);  //แสดง Popup เอกสา
     </q-tab-panels>
   </q-card>
 
-  <q-dialog v-model="modalPerview" full-width fullHeight>
+  <q-dialog v-model="modalPerview" full-width fullHeight persistent>
     <q-card>
       <q-card-section>
         <DialogHeader :close="() => (modalPerview = false)" />
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue
index 1c29a0d75..7f5e1a28f 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue
@@ -42,7 +42,7 @@ const modalPerview = ref<boolean>(false);
     <div class="col-12"><ViewPDF class="col-12" /></div>
   </q-card>
 
-  <q-dialog v-model="modalPerview" full-width fullHeight>
+  <q-dialog v-model="modalPerview" full-width fullHeight persistent>
     <q-card>
       <q-card-section>
         <DialogHeader :close="() => (modalPerview = false)" />
diff --git a/src/modules/13_salary/components/DialogInfoMain.vue b/src/modules/13_salary/components/DialogInfoMain.vue
index 19e78a1c8..156218414 100644
--- a/src/modules/13_salary/components/DialogInfoMain.vue
+++ b/src/modules/13_salary/components/DialogInfoMain.vue
@@ -94,7 +94,7 @@ watch(
 </script>
 
 <template>
-  <q-dialog v-model="modal" position="right" :maximized="true">
+  <q-dialog v-model="modal" position="right" :maximized="true" persistent>
     <q-card style="width: 1300px; overflow: visible">
       <q-toolbar>
         <q-space />
diff --git a/src/modules/16_positionEmployee/components/DialogHistoryPos.vue b/src/modules/16_positionEmployee/components/DialogHistoryPos.vue
index ef79f4db4..48f5eac78 100644
--- a/src/modules/16_positionEmployee/components/DialogHistoryPos.vue
+++ b/src/modules/16_positionEmployee/components/DialogHistoryPos.vue
@@ -123,7 +123,7 @@ watch(
 );
 </script>
 <template>
-  <q-dialog v-model="modal">
+  <q-dialog v-model="modal" persistent>
     <q-card style="width: 700px; max-width: 80vw">
       <Header
         :tittle="'ประวัติตำแหน่ง'"