From 6dcbd7140b63a2ccc7325510fafde483dfee9161 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 25 Jun 2026 21:51:08 +0700
Subject: [PATCH 1/5] fix ui noti

---
 src/views/MainLayout.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index f51d140..cd96390 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -277,7 +277,7 @@ function handleDeleteNotification() {
       }
     },
     "ยืนยันการล้างการแจ้งเตือนทั้งหมด",
-    "ต้องการยืนยันการล้างการแจ้งเตือนทั้งหมดใช่หรือไม่?",
+    `ต้องการล้างการแจ้งเตือนทั้งหมด (${totalInbox.value} รายการ) ใช่หรือไม่? การกระทำนี้ไม่สามารถย้อนกลับได้`,
   );
 }
 
@@ -393,9 +393,13 @@ watch(
                 v-if="totalInbox !== 0"
                 flat
                 dense
-                round
-                color="grey-7"
+                no-caps
+                size="12px"
+                color="red-7"
                 icon="mdi-trash-can-outline"
+                label="ล้างทั้งหมด"
+                class="q-ml-sm"
+                aria-label="ล้างการแจ้งเตือนทั้งหมด"
                 @click.stop.prevent="handleDeleteNotification"
               >
                 <q-tooltip>ล้างการแจ้งเตือนทั้งหมด</q-tooltip>

From 8f744121280d229dcd0b1ebc284e3eacfb67bc72 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 30 Jun 2026 11:08:33 +0700
Subject: [PATCH 2/5] refactor(registry): show salary data

---
 src/modules/10_registry/tabs/03_salary.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/10_registry/tabs/03_salary.vue b/src/modules/10_registry/tabs/03_salary.vue
index 12db2d2..22a83ac 100644
--- a/src/modules/10_registry/tabs/03_salary.vue
+++ b/src/modules/10_registry/tabs/03_salary.vue
@@ -25,7 +25,7 @@ const router = useRouter();
   </div>
 
   <div :class="`row q-my-sm ${$q.screen.gt.xs ? '' : 'mobileClass'}`">
-    <!-- <Salary /> -->
+    <Salary />
     <Nopaid />
   </div>
 </template>

From 3d34b2ab9acd1b048a1d14ee16a7a7c833dcbf84 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 30 Jun 2026 11:25:43 +0700
Subject: [PATCH 3/5] refactor(registry): show salary data

---
 src/modules/10_registry/02_Government/07_Position.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/10_registry/02_Government/07_Position.vue b/src/modules/10_registry/02_Government/07_Position.vue
index f981efb..639431b 100644
--- a/src/modules/10_registry/02_Government/07_Position.vue
+++ b/src/modules/10_registry/02_Government/07_Position.vue
@@ -491,7 +491,7 @@ onMounted(async () => {
       </div>
     </div>
 
-    <!-- <div class="row col-12">
+    <div class="row col-12">
       <q-space />
       <q-input
         v-if="mode"
@@ -522,9 +522,9 @@ onMounted(async () => {
         :options="columns"
         :display-value="$q.lang.table.columns"
       />
-    </div> -->
+    </div>
 
-    <!-- <div class="col-12 q-mt-sm">
+    <div class="col-12 q-mt-sm">
       <d-table
         flat
         dense
@@ -649,7 +649,7 @@ onMounted(async () => {
           </div>
         </template>
       </d-table>
-    </div> -->
+    </div>
   </div>
 
   <DialogHistory

From 87a47e4aa00395ab54b0d07148e8e97b352e6dfe Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 30 Jun 2026 11:26:28 +0700
Subject: [PATCH 4/5] refactor(registry): show salary data

---
 src/modules/10_registry/02_Government/07_Position.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/10_registry/02_Government/07_Position.vue b/src/modules/10_registry/02_Government/07_Position.vue
index f981efb..639431b 100644
--- a/src/modules/10_registry/02_Government/07_Position.vue
+++ b/src/modules/10_registry/02_Government/07_Position.vue
@@ -491,7 +491,7 @@ onMounted(async () => {
       </div>
     </div>
 
-    <!-- <div class="row col-12">
+    <div class="row col-12">
       <q-space />
       <q-input
         v-if="mode"
@@ -522,9 +522,9 @@ onMounted(async () => {
         :options="columns"
         :display-value="$q.lang.table.columns"
       />
-    </div> -->
+    </div>
 
-    <!-- <div class="col-12 q-mt-sm">
+    <div class="col-12 q-mt-sm">
       <d-table
         flat
         dense
@@ -649,7 +649,7 @@ onMounted(async () => {
           </div>
         </template>
       </d-table>
-    </div> -->
+    </div>
   </div>
 
   <DialogHistory

From be32ac518e5dc2e4a9234e1b80807bc57390117b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 1 Jul 2026 11:16:36 +0700
Subject: [PATCH 5/5] refactor(leave): rules leaveDocument

---
 .../05_leave/components/FormLeave/01_SickForm.vue    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
index 9b6df27..04caeb8 100644
--- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue
+++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
@@ -508,9 +508,15 @@ onMounted(() => {
                 multiple
                 hide-bottom-space
                 bg-color="white"
-                :rules="typeForm == 'LV-001' && formDataSick.leaveTotal >= 30 ?[
-                (val:string) => !!val && val.length >= 30 || `${'กรุณาแนบเอกสารประกอบ หรือ ใบรับรองแพทย์ กรณีลาป่วยตั้งเเต่ 30 วันขึ้นไป'}`,
-              ]:[]"
+                :rules="
+                  typeForm == 'LV-001' && formDataSick.leaveTotal >= 30
+                    ? [
+                        (val) =>
+                          (val && val.length > 0) ||
+                          'กรุณาแนบเอกสารประกอบ หรือ ใบรับรองแพทย์ กรณีลาป่วยตั้งเเต่ 30 วันขึ้นไป',
+                      ]
+                    : []
+                "
               >
                 <template v-slot:prepend>
                   <q-icon name="attach_file" color="primary" />