From ee8e45d8375a7cbed1d81eb987bf561b75f36e12 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 27 Oct 2023 13:04:21 +0700
Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87=20CPM=20?=
 =?UTF-8?q?-22=20-=2024=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20step=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/10_order/store.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/10_order/store.ts b/src/modules/10_order/store.ts
index c158e7af8..35f29bae4 100644
--- a/src/modules/10_order/store.ts
+++ b/src/modules/10_order/store.ts
@@ -142,9 +142,11 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
       case "C-PM-21":
         return "จ้างและแต่งตั้งลูกจ้างประจำ";
       case "C-PM-22":
-        return "จ้างและแต่งตั้งลูกจ้างประจำ";
+        return "แต่งตั้งลูกจ้างประจำ";
       case "C-PM-23":
         return "อนุญาตให้ลูกจ้างประจำลาออกจากราชการ";
+      case "C-PM-24":
+        return "แต่งตั้งลูกจ้างประจำ";
       default:
         return "";
     }

From 601e288457c451a5615b78296664df319f9a8192 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 31 Oct 2023 14:55:55 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20UI?=
 =?UTF-8?q?=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=87=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Work/DialogDetail.vue        |  4 ++--
 .../09_leave/components/1_Work/ToolBar.vue    | 19 ++++++++++------
 .../09_leave/components/2_Leave/ToolBar.vue   | 14 ++++++------
 .../09_leave/interface/response/work.ts       |  5 +++--
 src/modules/09_leave/stores/WorkStore.ts      | 22 ++++++++++++-------
 src/modules/09_leave/views/WorkingMain.vue    | 12 +++++-----
 .../components/1_Complaint/MainPage.vue       |  1 +
 7 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/src/modules/09_leave/components/1_Work/DialogDetail.vue b/src/modules/09_leave/components/1_Work/DialogDetail.vue
index bb668e52e..a02604db2 100644
--- a/src/modules/09_leave/components/1_Work/DialogDetail.vue
+++ b/src/modules/09_leave/components/1_Work/DialogDetail.vue
@@ -92,7 +92,7 @@ function colsePopup() {
                   </q-item-section>
                 </q-item>
               </div>
-              <div class="col row items-center">
+              <!-- <div class="col row items-center">
                 <q-btn
                   v-if="!statusEdit"
                   for="editDialog"
@@ -132,7 +132,7 @@ function colsePopup() {
                     <q-tooltip>บันทึกข้อมูล</q-tooltip>
                   </q-btn>
                 </div>
-              </div>
+              </div> -->
             </div>
           </q-card>
           <div class="row q-gutter-md q-pt-md">
diff --git a/src/modules/09_leave/components/1_Work/ToolBar.vue b/src/modules/09_leave/components/1_Work/ToolBar.vue
index cf91a2bca..f00acfb44 100644
--- a/src/modules/09_leave/components/1_Work/ToolBar.vue
+++ b/src/modules/09_leave/components/1_Work/ToolBar.vue
@@ -11,8 +11,8 @@ const { filterFn, searchDataFn } = workStore;
 </script>
 
 <template>
-  <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
-    <div class="col-2">
+  <div class="row col-12 q-col-gutter-sm q-mb-sm">
+    <div class="col-xs-12 col-sm-3 col-md-2">
       <datepicker
         menu-class-name="modalfix"
         v-model="workStore.selectDate"
@@ -50,7 +50,7 @@ const { filterFn, searchDataFn } = workStore;
         </template>
       </datepicker>
     </div>
-    <div class="col-3">
+    <div class="col-xs-12 col-sm-3 col-md-2">
       <q-select
         for="selectStatus"
         emit-value
@@ -76,16 +76,21 @@ const { filterFn, searchDataFn } = workStore;
       >
     </div>
     <q-space />
-    <div class="col-2">
+    <div class="col-xs-12 col-sm-3 col-md-2">
       <q-input
         for="filterTable"
         dense
         outlined
         v-model="workStore.filterTable"
         label="ค้นหา"
-      />
+        debounce="300"
+      >
+        <template v-slot:append>
+          <q-icon name="search" />
+        </template>
+      </q-input>
     </div>
-    <div class="col-2">
+    <div class="col-xs-12 col-sm-3 col-md-2">
       <q-select
         for="visibleColumns"
         v-model="workStore.visibleColumns"
@@ -101,7 +106,7 @@ const { filterFn, searchDataFn } = workStore;
         options-cover
       />
     </div>
-  </q-toolbar>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/09_leave/components/2_Leave/ToolBar.vue b/src/modules/09_leave/components/2_Leave/ToolBar.vue
index 3cdb35df5..31d4aca07 100644
--- a/src/modules/09_leave/components/2_Leave/ToolBar.vue
+++ b/src/modules/09_leave/components/2_Leave/ToolBar.vue
@@ -7,8 +7,8 @@ const { searchDataFn, filterOption } = leaveStore;
 </script>
 
 <template>
-  <q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
-    <div class="col-2">
+  <div class="row col-12 q-col-gutter-sm q-mb-sm">
+    <div class="col-xs-12 col-sm-3 col-md-2">
       <q-select
         for="selectYear"
         emit-value
@@ -22,7 +22,7 @@ const { searchDataFn, filterOption } = leaveStore;
         label="ปีงบประมาณ"
       />
     </div>
-    <div class="col-3">
+    <div class="col-xs-12 col-sm-3 col-md-2">
       <q-select
         for="selectType"
         emit-value
@@ -50,7 +50,7 @@ const { searchDataFn, filterOption } = leaveStore;
         </template></q-select
       >
     </div>
-    <div class="col-2">
+    <div class="col-xs-12 col-sm-3 col-md-2">
       <q-select
         for="selectStatus"
         v-if="leaveStore.tab == '2'"
@@ -74,7 +74,7 @@ const { searchDataFn, filterOption } = leaveStore;
       />
     </div>
     <q-space />
-    <div class="col-2">
+    <div class="col-xs-12 col-sm-3 col-md-2">
       <q-input
         for="filterTable"
         dense
@@ -83,7 +83,7 @@ const { searchDataFn, filterOption } = leaveStore;
         label="ค้นหา"
       />
     </div>
-    <div class="col-2">
+    <div class="col-xs-12 col-sm-3 col-md-2">
       <q-select
         for="visibleColumns"
         v-model="leaveStore.visibleColumns"
@@ -99,7 +99,7 @@ const { searchDataFn, filterOption } = leaveStore;
         options-cover
       />
     </div>
-  </q-toolbar>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/09_leave/interface/response/work.ts b/src/modules/09_leave/interface/response/work.ts
index 5c16cf207..50bfc3b4d 100644
--- a/src/modules/09_leave/interface/response/work.ts
+++ b/src/modules/09_leave/interface/response/work.ts
@@ -8,8 +8,9 @@ interface TableRows {
     coordinatesOut: string
     latOut: string
     longOut: string
-    status: string
-    date: String | null
+    status: string | undefined
+    date: string | null
+
 }
 interface DataRes {
     fullName: string
diff --git a/src/modules/09_leave/stores/WorkStore.ts b/src/modules/09_leave/stores/WorkStore.ts
index bb1dae063..d91efe185 100644
--- a/src/modules/09_leave/stores/WorkStore.ts
+++ b/src/modules/09_leave/stores/WorkStore.ts
@@ -13,7 +13,7 @@ export const useWorklistDataStore = defineStore("work", () => {
     const visibleColumns = ref<string[]>([]);
     const dataMain = ref<TableRows[]>([])
     function fetchList(data: DataRes[]) {
-        let datalist = data.map((e: DataRes) => ({
+        let datalist: TableRows[] = data.map((e: DataRes) => ({
             fullName: e.fullName,
             timeIn: e.timeIn,
             coordinatesIn: e.coordinatesIn,
@@ -33,11 +33,17 @@ export const useWorklistDataStore = defineStore("work", () => {
 
     //ค้นหาข้อมูล
     const filterTable = ref<string>('')
-    const selectDate = ref<Date | null>(null);
+    const selectDate = ref<Date | null>(new Date());
     const selectStatus = ref<String>('all')
     const optionStatusMain = ref<DataOption[]>([])
     const optionStatus = ref<DataOption[]>([])
     function searchDataFn(searchDate: any, searchStatus: any) {
+        let a = new Date(searchDate);// วันที่เลือก
+        let b = new Date(); // วันที่ปัจจุบัน
+        if (a > b) {
+            selectDate.value = new Date()
+            searchDate = new Date()
+        }
         searchStatus = searchStatus || "all";
         if (searchDate == null && searchStatus == "all") {
             rows.value = dataMain.value
@@ -84,12 +90,12 @@ export const useWorklistDataStore = defineStore("work", () => {
     // convertSatatus
     function convertSatatus(val: string) {
         switch (val) {
-            case "1":
-                return "ลงเวลาเรียบร้อย"
-            case "2":
-                return "สายทำงานครบ"
-            default:
-                return "ยังไม่ได้ลงเวลา"
+            case "normal":
+                return "ปกติ"
+            case "late":
+                return "สาย"
+            case "absent":
+                return "ขาดราชการ"
         }
     }
     return {
diff --git a/src/modules/09_leave/views/WorkingMain.vue b/src/modules/09_leave/views/WorkingMain.vue
index 23941c4ec..6580dc807 100644
--- a/src/modules/09_leave/views/WorkingMain.vue
+++ b/src/modules/09_leave/views/WorkingMain.vue
@@ -33,8 +33,8 @@ function fecthWorkList() {
       coordinatesOut: "สำนักงาน",
       latOut: "18.7903",
       longOut: "99.0029",
-      status: "1",
-      date: new Date("2023-10-27"),
+      status: "normal",
+      date: new Date(new Date()),
     },
     {
       fullName: "นายนครชัย วันดี",
@@ -46,8 +46,8 @@ function fecthWorkList() {
       coordinatesOut: "สำนักงาน",
       latOut: "18.7903",
       longOut: "99.0029",
-      status: "2",
-      date: new Date("2023-10-28"),
+      status: "late",
+      date: new Date(new Date()),
     },
     {
       fullName: "นายปิยรมย์ ศิริธาราฟ",
@@ -59,7 +59,7 @@ function fecthWorkList() {
       coordinatesOut: "สำนักงาน",
       latOut: "18.7903",
       longOut: "99.0029",
-      status: "3",
+      status: "absent",
       date: new Date("2023-10-27"),
     },
     {
@@ -72,7 +72,7 @@ function fecthWorkList() {
       coordinatesOut: "สำนักงาน",
       latOut: "18.7903",
       longOut: "99.0029",
-      status: "1",
+      status: "normal",
       date: new Date("2023-10-27"),
     },
   ];
diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
index 32560b97d..a66d1273b 100644
--- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@@ -86,6 +86,7 @@ function redirectToPageadd() {
         outlined
         v-model="filterTable"
         label="ค้นหา"
+        debounce="300"
       >
         <template v-slot:append>
           <q-icon name="search" />