From 054c3d5eba285ded86409caf2fa643ca5d8652e6 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 9 Apr 2025 15:35:48 +0700
Subject: [PATCH 1/3] hide error get commeand

---
 src/modules/06_evaluate/components/step/step2.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue
index 3b286f8..ec64486 100644
--- a/src/modules/06_evaluate/components/step/step2.vue
+++ b/src/modules/06_evaluate/components/step/step2.vue
@@ -338,7 +338,8 @@ function getCommander() {
       formCommand.commanderAbovePosition = data.commanderAbovePosition;
     })
     .catch((e) => {
-      messageError($q, e);
+      console.log(e);
+      // messageError($q, e);
     });
 }
 /** callback function */

From e1a75a392bf75e07ddef304f8bb0aae8f33936a1 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 9 Apr 2025 15:53:19 +0700
Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_dashboard/views/Dashboard.vue | 17 +++++++----------
 src/modules/07_appealComplain/views/Main.vue |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue
index 937509a..e3b32af 100644
--- a/src/modules/01_dashboard/views/Dashboard.vue
+++ b/src/modules/01_dashboard/views/Dashboard.vue
@@ -31,22 +31,19 @@ const idInboxActive = ref<string>(); // Id ข้อความที่เล
 const filteredItems = computed(() => {
   const isOfficer = dataStore.officerType === "OFFICER";
   const conditions: Record<string, boolean> = {
-    "ทดลองปฏิบัติหน้าที่ราชการ": dataStore.isProbation,
-    "ประเมินบุคคล": isOfficer,
-    "ผลงาน": isOfficer,
-    "ขอโอน": isOfficer,
+    ทดลองปฏิบัติหน้าที่ราชการ: dataStore.isProbation,
+    ประเมินบุคคล: isOfficer,
+    ผลงาน: isOfficer,
+    ขอโอน: isOfficer,
     "ผู้ขอรับการประเมิน (KPI)": isOfficer,
     "ผู้ประเมิน (KPI)": isOfficer,
     "ทุนการศึกษา/ฝึกอบรม": isOfficer,
-    "การพัฒนารายบุคคล": isOfficer,
+    การพัฒนารายบุคคล: isOfficer,
   };
 
-  return items.value.filter(
-    (item) => conditions[item.title] ?? true
-  );
+  return items.value.filter((item) => conditions[item.title] ?? true);
 });
 
-
 const items = ref<MenuMainList[]>([
   {
     icon: "mdi-account-group-outline",
@@ -98,7 +95,7 @@ const items = ref<MenuMainList[]>([
   },
   {
     icon: "mdi-scale-balance",
-    title: "อุทธรณ์ร้องทุกข์",
+    title: "อุทธรณ์/ร้องทุกข์",
     sub: "ทำเรื่องขออุทธรณ์ หรือร้องทุกข์",
     color: "green-3",
     path: "/appeal-complain",
diff --git a/src/modules/07_appealComplain/views/Main.vue b/src/modules/07_appealComplain/views/Main.vue
index 008db43..9abeffb 100644
--- a/src/modules/07_appealComplain/views/Main.vue
+++ b/src/modules/07_appealComplain/views/Main.vue
@@ -252,7 +252,7 @@ onMounted(async () => {
           class="q-mr-sm"
           @click="clickBack"
         />
-        อุทธรณ์ร้องทุกข์
+        อุทธรณ์/ร้องทุกข์
       </div>
       <div class="col-12">
         <q-card bordered class="q-pa-md">

From 4cf9595a6d45f3e2c7f9595a144f560b70a6b835 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 9 Apr 2025 15:57:11 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=AA=E0=B8=96?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=A3=E0=B8=AD=E0=B8=AD=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/02_transfer/store.ts                              | 3 ++-
 src/modules/03_retire/store.ts                                | 2 ++
 src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/modules/02_transfer/store.ts b/src/modules/02_transfer/store.ts
index 038bc84..0450d7a 100644
--- a/src/modules/02_transfer/store.ts
+++ b/src/modules/02_transfer/store.ts
@@ -13,9 +13,10 @@ export const useTransferDataStore = defineStore("transfer", () => {
         return "ไม่อนุมัติ";
       case "REPORT":
         return "ส่งรายชื่อไปออกคำสั่ง";
+      case "WAITING":
+        return "รอออกคำสั่ง";
       case "DONE":
         return "ออกคำสั่งเสร็จแล้ว";
-
       default:
         return "-";
     }
diff --git a/src/modules/03_retire/store.ts b/src/modules/03_retire/store.ts
index abe9e86..c133f06 100644
--- a/src/modules/03_retire/store.ts
+++ b/src/modules/03_retire/store.ts
@@ -13,6 +13,8 @@ export const useRestDataStore = defineStore("Rest", () => {
         return "ไม่อนุมัติ";
       case "REPORT":
         return "ส่งรายชื่อไปออกคำสั่ง";
+      case "WAITING":
+        return "รอออกคำสั่ง";
       case "DONE":
         return "ออกคำสั่งเสร็จแล้ว";
       case "DONECANCEL":
diff --git a/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue b/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
index bab7875..75d2dc1 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
@@ -188,6 +188,8 @@ function statusText(val: string) {
       return "ไม่อนุมัติ";
     case "REPORT":
       return "ส่งรายชื่อไปออกคำสั่ง";
+    case "WAITING":
+      return "รอออกคำสั่ง";
     case "DONE":
       return "ออกคำสั่งเสร็จแล้ว";