From 93855f662218eb8bd5c3052295eb0d4d17fa568b Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 4 Oct 2023 18:12:55 +0700
Subject: [PATCH 1/3] no message

---
 .../components/AppointEmployee/Detail.vue     |  4 +-
 .../components/AppointEmployee/Dialogbody.vue |  2 +-
 .../05_placement/components/Other/Detail.vue  | 56 ++++++++++++++++++-
 .../05_placement/components/Other/Main.vue    |  4 +-
 .../components/Transfer/transferMain.vue      |  4 +-
 .../interface/response/OhterMain.ts           |  5 +-
 6 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/src/modules/05_placement/components/AppointEmployee/Detail.vue b/src/modules/05_placement/components/AppointEmployee/Detail.vue
index a294adb15..e404fe7e6 100644
--- a/src/modules/05_placement/components/AppointEmployee/Detail.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Detail.vue
@@ -153,8 +153,8 @@ onMounted(async () => {
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     <q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm"
-      @click="router.push(`/appoint-promote`)" />
-    รายละเอียดการแต่งตั้ง-เลื่อน {{ title.fullname }}
+      @click="router.push(`/appoint-employee`)" />
+    รายละเอียดการแต่งตั้งลูกจ้างประจำ {{ title.fullname }}
   </div>
   <q-card bordered class="row col-12 text-dark">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
diff --git a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
index a0a943554..fd56e585d 100644
--- a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
@@ -122,7 +122,7 @@ const createdAppoint = async () => {
   };
   showLoader();
   await http
-    .put(config.API.apppointmentReport(Type), data)
+    .put(config.API.appointEmployeeOrder(Type), data)
     .then(() => {
       success($q, "บันทึกสำเร็จ");
     })
diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue
index ad55e7d6f..9b1c244ee 100644
--- a/src/modules/05_placement/components/Other/Detail.vue
+++ b/src/modules/05_placement/components/Other/Detail.vue
@@ -73,6 +73,7 @@ const Otherdata = ref<OtherdataInterface>({
 const avatar = ref<string>("");
 const educationOld = ref<string>("");
 const militaryDate = ref<Date | null>(null);
+const leaveDate = ref<Date | null>(null);
 
 //-----(fetch data by id)-----//
 const fecthOther = async () => {
@@ -110,6 +111,7 @@ const fecthOther = async () => {
       reason.value = data.reason ?? "";
       educationOld.value = data.educationOld ?? "-";
       militaryDate.value = data.militaryDate ?? null;
+      leaveDate.value = data.leaveDate ?? null;
     })
     .catch((e) => {
       messageError($q, e);
@@ -152,6 +154,7 @@ const saveOther = async () => {
     amountOld: Number(salary.value),
     educationOld: educationOld.value,
     militaryDate: militaryDate.value,
+    leaveDate: leaveDate.value,
   };
   await http
     .put(config.API.otherByid(paramsId.toString()), data)
@@ -398,7 +401,7 @@ onMounted(async () => {
             </div>
           </div>
           <div class="col-12"><q-separator /></div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-4 row items-center">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -443,7 +446,56 @@ onMounted(async () => {
               </datepicker>
             </div>
           </div>
-          <div class="col-xs-6 col-sm-6 row items-center">
+          <div class="col-xs-6 col-sm-4 row items-center">
+            <div class="col-12">
+              <datepicker
+                menu-class-name="modalfix"
+                :readonly="!edit"
+                v-model="leaveDate"
+                :locale="'th'"
+                autoApply
+                :enableTimePicker="false"
+                week-start="0"
+              >
+                <template #year="{ year }">{{ year + 543 }}</template>
+                <template #year-overlay-value="{ value }">{{
+                  parseInt(value + 543)
+                }}</template>
+                <template #trigger>
+                  <q-input
+                    :class="getClass(edit)"
+                    :outlined="edit"
+                    dense
+                    lazy-rules
+                    :readonly="!edit"
+                    :borderless="!edit"
+                    :model-value="
+                      leaveDate !== null ? date2Thai(leaveDate) : null
+                    "
+                    :rules="[
+                      (val) => !!val || `${'กรุณาเลือกวันออกจากราชการเมื่อ'}`,
+                    ]"
+                    hide-bottom-space
+                    :label="`${'ออกจากราชการเมื่อ'}`"
+                  >
+                    <template v-slot:prepend>
+                      <q-icon
+                        name="event"
+                        class="cursor-pointer"
+                        :style="
+                          edit
+                            ? 'color: var(--q-primary)'
+                            : 'color: var(--q-grey)'
+                        "
+                      >
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </template>
+              </datepicker>
+            </div>
+          </div>
+          <div class="col-xs-6 col-sm-4 row items-center">
             <div class="col-12">
               <datepicker
                 menu-class-name="modalfix"
diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue
index a8ea2c189..b758c1d64 100644
--- a/src/modules/05_placement/components/Other/Main.vue
+++ b/src/modules/05_placement/components/Other/Main.vue
@@ -152,6 +152,7 @@ const fecthlistOthet = async () => {
         fullname: `${r.prefix ?? ""}${r.firstname ?? ""} ${r.lastname ?? ""}`,
         amountOld: r.amountOld,
         positionDate: r.positionDate,
+        leaveDate: r.leaveDate,
       }));
       rows2.value = rows.value.filter(
         (e: listMain) =>
@@ -162,7 +163,8 @@ const fecthlistOthet = async () => {
           e.positionLevelOld &&
           e.positionNumberOld &&
           e.amountOld !== null &&
-          e.positionDate
+          e.positionDate &&
+          e.leaveDate !== null
       );
     })
     .catch((e) => {
diff --git a/src/modules/05_placement/components/Transfer/transferMain.vue b/src/modules/05_placement/components/Transfer/transferMain.vue
index 418c70bcd..1969df183 100644
--- a/src/modules/05_placement/components/Transfer/transferMain.vue
+++ b/src/modules/05_placement/components/Transfer/transferMain.vue
@@ -158,7 +158,7 @@ const openModalOrder = () => {
       r.posNo &&
       r.salary !== null &&
       r.organization &&
-      r.createdAt 
+      r.date 
   );
   rows2.value = row;
 };
@@ -175,7 +175,7 @@ const getData = async () => {
           dateText:
             r.createdAt !== null ? date2Thai(new Date(r.createdAt)) : "-",
           createdAt: r.createdAt !== null ? new Date(r.createdAt) : null,
-          date: new Date(),
+          date: r.date,
           firstName: r.firstName ?? "",
           id: r.id ?? "",
           isActive: r.isActive ? r.isActive : false,
diff --git a/src/modules/05_placement/interface/response/OhterMain.ts b/src/modules/05_placement/interface/response/OhterMain.ts
index e02af1f13..f2ec0b42f 100644
--- a/src/modules/05_placement/interface/response/OhterMain.ts
+++ b/src/modules/05_placement/interface/response/OhterMain.ts
@@ -21,7 +21,8 @@ interface listMain {
   statustext: string;
   createdAt: Date;
   amountOld: number;
-  positionDate: Date
+  positionDate: Date;
+  leaveDate: Date
 }
 //ข้อมูลจาก api
 interface listMainAPI {
@@ -48,6 +49,7 @@ interface listMainAPI {
   createdAt: Date;
   amountOld: number;
   positionDate: Date
+  leaveDate: Date
 }
 
 interface OtherdataInterface {
@@ -97,6 +99,7 @@ interface resApiData {
       avatar: string;
       commandType: string;
       militaryDate: Date
+      leaveDate: Date
     };
   };
 }

From ecdce88bddba664e812496f25613ee4c44e44938 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 5 Oct 2023 09:13:11 +0700
Subject: [PATCH 2/3] no message

---
 src/interface/request/main/main.ts | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 2d7329cb3..579656e94 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -375,6 +375,34 @@ const menuList = readonly<any[]>([
     ],
   },
   // {
+  //   key: 9,
+  //   icon: "mdi-calendar",
+  //   activeIcon: "mdi-calendar",
+  //   label: "การลา",
+  //   path: "leave",
+  //   role: "coin",
+  //   children: [
+  //     {
+  //       key: 9.1,
+  //       label: "รายการลงเวลาปฏิบัติงาน",
+  //       path: "/work-list",
+  //       role: "coin",
+  //     },
+  //     {
+  //       key: 9.2,
+  //       label: "รายการลา",
+  //       path: "/leave-list",
+  //       role: "coin",
+  //     },
+  //     {
+  //       key: 9.3,
+  //       label: "รายงานสถิติ",
+  //       path: "/statistics-report",
+  //       role: "coin",
+  //     },
+  //   ],
+  // },
+  // {
   //   key: 8,
   //   icon: "mdi-medal-outline",
   //   activeIcon: "mdi-medal",
@@ -470,7 +498,7 @@ const menuList = readonly<any[]>([
   //         },
   //       ],
   //     },
-    // ],
+  // ],
   // },
 ]);
 

From f4793732ed7a8730eeecb41d85b353a4e0dc9b29 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 5 Oct 2023 09:19:37 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=E0=B8=9B=E0=B8=B4=E0=B8=94=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts | 56 +++++++++++++++---------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index bc50f7dd1..2da326609 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -374,34 +374,34 @@ const menuList = readonly<any[]>([
       },
     ],
   },
-  {
-    key: 9,
-    icon: "mdi-calendar",
-    activeIcon: "mdi-calendar",
-    label: "การลา",
-    path: "leave",
-    role: "coin",
-    children: [
-      {
-        key: 9.1,
-        label: "รายการลงเวลาปฏิบัติงาน",
-        path: "/work-list",
-        role: "coin",
-      },
-      {
-        key: 9.2,
-        label: "รายการลา",
-        path: "/leave-list",
-        role: "coin",
-      },
-      {
-        key: 9.3,
-        label: "รายงานสถิติ",
-        path: "/statistics-report",
-        role: "coin",
-      },
-    ],
-  },
+  // {
+  //   key: 9,
+  //   icon: "mdi-calendar",
+  //   activeIcon: "mdi-calendar",
+  //   label: "การลา",
+  //   path: "leave",
+  //   role: "coin",
+  //   children: [
+  //     {
+  //       key: 9.1,
+  //       label: "รายการลงเวลาปฏิบัติงาน",
+  //       path: "/work-list",
+  //       role: "coin",
+  //     },
+  //     {
+  //       key: 9.2,
+  //       label: "รายการลา",
+  //       path: "/leave-list",
+  //       role: "coin",
+  //     },
+  //     {
+  //       key: 9.3,
+  //       label: "รายงานสถิติ",
+  //       path: "/statistics-report",
+  //       role: "coin",
+  //     },
+  //   ],
+  // },
 ]);
 
 const tabList = readonly<tabType[]>([