From 2c5450f66cf5b5da32dcef76dd59981c63d17aaf Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Tue, 4 Jul 2023 11:00:54 +0700
Subject: [PATCH 1/5] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20route=20=E0=B9=83=E0=B8=99=20=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?=
 =?UTF-8?q?=E0=B9=84=E0=B8=9B=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=20Detail?=
 =?UTF-8?q?=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20tap=20?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=82=E0=B8=AD=E0=B8=87?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts            |  4 ++--
 .../OrderPlacement/MainOrderPlacement.vue     |  4 ++--
 src/modules/08_registryEmployee/router.ts     | 24 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index faf46e4d3..f3f39af82 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -213,8 +213,8 @@ const menuList = readonly<any[]>([
   },
   {
     key: 9,
-    icon: "mdi-medal-outline",
-    activeIcon: "mdi-medal",
+    icon: "o_contact_page",
+    activeIcon: "contact_page",
     label: "ทะเบียนประวัติลูกจ้าง",
     path: "registryEmployee",
     role: "registryEmployee",
diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
index 09bc164d9..d8baff11e 100644
--- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
+++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue
@@ -527,8 +527,8 @@ const OriginalDataFetch = async () => {
 
 // ดูรายการหน้าต่อไป
 const redirectToPage = (id?: number) => {
-  // router.push({ name: 'placementDetail'});
-  //   router.push(`/placement/order/detail`);
+  router.push({ name: "placementDetail" });
+  router.push(`/placement/order/detail`);
 };
 
 const clickDelete = (id: string) => {
diff --git a/src/modules/08_registryEmployee/router.ts b/src/modules/08_registryEmployee/router.ts
index f65e37a06..c982d3cf5 100644
--- a/src/modules/08_registryEmployee/router.ts
+++ b/src/modules/08_registryEmployee/router.ts
@@ -3,8 +3,8 @@
  */
 
 const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
-const Detail = () =>
-  import("@/modules/08_registryEmployee/components/Profile.vue");
+// const Detail = () =>
+//   import("@/modules/08_registryEmployee/components/Profile.vue");
 
 export default [
   {
@@ -17,14 +17,14 @@ export default [
       Role: "registryEmployee",
     },
   },
-  {
-    path: "/registryEmployee/:id",
-    name: "registryEmployeeDetail",
-    component: Detail,
-    meta: {
-      Auth: true,
-      Key: [9],
-      Role: "registryEmployee",
-    },
-  },
+  //   {
+  //     path: "/registryEmployee/:id",
+  //     name: "registryEmployeeDetail",
+  //     component: Detail,
+  //     meta: {
+  //       Auth: true,
+  //       Key: [9],
+  //       Role: "registryEmployeeDetails",
+  //     },
+  //   },
 ];

From 2762782ef9785e626b6fe48c754db3af4dfcae8e Mon Sep 17 00:00:00 2001
From: Thanit Konmek <thanit@frappet.com>
Date: Tue, 4 Jul 2023 11:42:30 +0700
Subject: [PATCH 2/5] preview pdf

---
 .../components/OrderPlacement/detailOrderPlacement.vue     | 2 +-
 .../05_placement/components/OrderPlacement/step/step04.vue | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue
index e3fc70177..790db1c27 100644
--- a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue
+++ b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue
@@ -82,7 +82,7 @@ const step04 = defineAsyncComponent(
 );
 
 const router = useRouter();
-const step = ref<number>(4);
+const step = ref<number>(1);
 const stepper = ref<QStepper>();
 
 const nextStep = () => {
diff --git a/src/modules/05_placement/components/OrderPlacement/step/step04.vue b/src/modules/05_placement/components/OrderPlacement/step/step04.vue
index e10dbd022..3721ea978 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step04.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step04.vue
@@ -213,9 +213,10 @@ onMounted(async () => {
     "https://raw.githubusercontent.com/mozilla/pdf.js/ba2edeae/web/compressed.tracemonkey-pldi-09.pdf"
   );
 
-  console.log("pdfData.pages.value", pdfData);
-  console.log("pdfData.pages.value", pdfData.pages);
-  console.log("pdfData.pages.value", pdfData.pages.value);
+  setTimeout(() => {
+    pdfSrc.value = pdfData.pdf.value;
+    numOfPages.value = pdfData.pages.value;
+  }, 1000);
 });
 
 const myEventHandler = (e: any) => {

From 94c15dd016c17126b78acd58229565a295fa3303 Mon Sep 17 00:00:00 2001
From: Thanit Konmek <thanit@frappet.com>
Date: Tue, 4 Jul 2023 17:24:28 +0700
Subject: [PATCH 3/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrderPlacement/detailOrderPlacement.vue   |   2 +-
 .../components/OrderPlacement/step/step01.vue |  12 +-
 .../components/OrderPlacement/step/step04.vue | 230 ++++++++++++++----
 3 files changed, 186 insertions(+), 58 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue
index 790db1c27..e3fc70177 100644
--- a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue
+++ b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue
@@ -82,7 +82,7 @@ const step04 = defineAsyncComponent(
 );
 
 const router = useRouter();
-const step = ref<number>(1);
+const step = ref<number>(4);
 const stepper = ref<QStepper>();
 
 const nextStep = () => {
diff --git a/src/modules/05_placement/components/OrderPlacement/step/step01.vue b/src/modules/05_placement/components/OrderPlacement/step/step01.vue
index 80d650866..be299f242 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step01.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step01.vue
@@ -370,7 +370,7 @@
     </div>
     <q-separator />
     <div class="flex justify-end q-pa-sm q-gutter-sm">
-      <q-btn unelevated label="บันทึก" color="public" @click="next"
+      <q-btn unelevated label="บันทึก" color="public" @click="submit"
         ><!-- icon="mdi-content-save-outline"
         <q-tooltip>บันทึก</q-tooltip> -->
       </q-btn>
@@ -497,10 +497,12 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
 };
 
 const submit = async () => {
-  await myForm.value!.validate().then((result: boolean) => {
-    if (result == false) {
-    }
-  });
+  next();
+  //   await myForm.value!.validate().then((result: boolean) => {
+  //     if (result) {
+  //       next();
+  //     }
+  //   });
 };
 
 /**
diff --git a/src/modules/05_placement/components/OrderPlacement/step/step04.vue b/src/modules/05_placement/components/OrderPlacement/step/step04.vue
index 3721ea978..e28ec4e50 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step04.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step04.vue
@@ -132,40 +132,146 @@
         </template>
 
         <template v-slot:after>
-          <div class="q-pa-md">
-            <fieldset class="border q-pa-lg">
-              <legend class="text-header">อัปโหลดไฟล์</legend>
-              <q-form ref="myForm">
-                <div>
-                  <label class="text-file">คำสั่ง</label>
-                  <q-file
-                    outlined
-                    v-model="fileOrder"
-                    label="เลือกไฟล์คำสั่ง"
-                    lazy-rules
-                    :rules="[(val) => val || 'กรุณาเลือกไฟล์เอกสารแนบท้าย']"
-                  >
-                    <template v-slot:prepend>
-                      <q-icon name="attach_file" />
-                    </template>
-                  </q-file>
-                  <div class="q-py-lg" />
-                  <label class="text-file">เอกสารแนบท้าย</label>
-                  <q-file
-                    outlined
-                    v-model="fileTailer"
-                    label="เลือกไฟล์เอกสารแนบท้าย"
-                    lazy-rules
-                    :rules="[(val) => val || 'กรุณาเลือกไฟล์เอกสารแนบท้าย']"
-                  >
-                    <template v-slot:prepend>
-                      <q-icon name="attach_file" />
-                    </template>
-                  </q-file>
+          <q-form ref="myForm">
+            <div class="q-pa-md q-gutter-y-md">
+              <fieldset class="border q-pa-lg">
+                <legend class="text-header">อัปโหลดไฟล์</legend>
+                <div class="q-gutter-y-lg">
+                  <div>
+                    <label class="text-file">คำสั่ง</label>
+                    <q-file
+                      outlined
+                      dense
+                      v-model="fileOrder"
+                      label="เลือกไฟล์คำสั่ง"
+                      lazy-rules
+                      :rules="[(val) => val || 'กรุณาเลือกไฟล์เอกสารแนบท้าย']"
+                    >
+                      <template v-slot:prepend>
+                        <q-icon name="attach_file" />
+                      </template>
+                    </q-file>
+                  </div>
+                  <!-- <div class="q-py-lg" /> -->
+                  <div>
+                    <label class="text-file">เอกสารแนบท้าย</label>
+                    <q-file
+                      outlined
+                      dense
+                      v-model="fileTailer"
+                      label="เลือกไฟล์เอกสารแนบท้าย"
+                      lazy-rules
+                      :rules="[(val) => val || 'กรุณาเลือกไฟล์เอกสารแนบท้าย']"
+                    >
+                      <template v-slot:prepend>
+                        <q-icon name="attach_file" />
+                      </template>
+                    </q-file>
+                  </div>
                 </div>
-              </q-form>
-            </fieldset>
-          </div>
+              </fieldset>
+
+              <fieldset class="border q-pa-lg">
+                <legend class="text-header">รายละเอียด</legend>
+                <div class="q-gutter-y-md">
+                  <div>
+                    <label class="text-file">เลขที่คำสั่ง</label>
+                    <q-input
+                      :outlined="true"
+                      dense
+                      lazy-rules
+                      :readonly="!true"
+                      :borderless="!true"
+                      v-model="order"
+                      :rules="[(val) => !!val || `${'กรุณากรอกเลขที่คำสั่ง'}`]"
+                      hide-bottom-space
+                      :label="`${'เลขที่คำสั่ง'}`"
+                    />
+                  </div>
+                  <div>
+                    <label class="text-file">ปีที่ออกคำสั่ง</label>
+                    <datepicker
+                      menu-class-name="modalfix"
+                      v-model="years"
+                      :locale="'th'"
+                      autoApply
+                      year-picker
+                      :enableTimePicker="false"
+                      week-start="0"
+                    >
+                      <template #year="{ year }">{{ year + 543 }}</template>
+                      <template #year-overlay-value="{ value }">{{
+                        parseInt(value + 543)
+                      }}</template>
+                      <template #trigger>
+                        <q-input
+                          outlined
+                          dense
+                          lazy-rules
+                          :model-value="years + 543"
+                          :rules="[
+                            (val) => !!val || `${'กรุณาเลือกปีที่ออกคำสั่ง'}`,
+                          ]"
+                          hide-bottom-space
+                          :label="`${'ปีที่ออกคำสั่ง'}`"
+                        >
+                          <template v-slot:prepend>
+                            <q-icon
+                              name="event"
+                              class="cursor-pointer"
+                              style="color: var(--q-grey)"
+                            >
+                            </q-icon>
+                          </template>
+                        </q-input>
+                      </template>
+                    </datepicker>
+                  </div>
+                  <div>
+                    <label class="text-file">วันที่ลงนาม</label>
+                    <datepicker
+                      menu-class-name="modalfix"
+                      v-model="date"
+                      :locale="'th'"
+                      autoApply
+                      borderless
+                      :enableTimePicker="false"
+                      week-start="0"
+                    >
+                      <template #year="{ year }">
+                        {{ year + 543 }}
+                      </template>
+                      <template #year-overlay-value="{ value }">
+                        {{ parseInt(value + 543) }}
+                      </template>
+                      <template #trigger>
+                        <q-input
+                          outlined
+                          dense
+                          class="full-width datepicker"
+                          :model-value="date != null ? date2Thai(date) : null"
+                          :label="`${'วันที่มีผลออกคำสั่ง'}`"
+                          :rules="[
+                            (val) =>
+                              !!val || `${'กรุณาเลือกวันที่มีผลออกคำสั่ง'}`,
+                          ]"
+                        >
+                          <template v-slot:prepend>
+                            <q-icon
+                              name="event"
+                              class="cursor-pointer"
+                              style="color: var(--q-grey)"
+                            >
+                            </q-icon>
+                          </template>
+                        </q-input>
+                      </template>
+                    </datepicker>
+                  </div>
+                </div>
+              </fieldset>
+            </div>
+          </q-form>
         </template>
       </q-splitter>
     </div>
@@ -181,9 +287,13 @@
         label="เลือกรายชื่อส่งสำเนา"
       >
       </q-btn>
-      <q-btn unelevated label="บันทึก" color="public" @click="save">
-        <!-- icon="mdi-content-save-outline"
-        <q-tooltip>บันทึก</q-tooltip> -->
+      <q-btn
+        unelevated
+        label="บันทึก"
+        :color="validateForm() ? 'public' : 'grey'"
+        :disable="!validateForm()"
+        @click="save"
+      >
       </q-btn>
 
       <!-- <q-btn flat round color="primary" icon="chevron_right" @click="next">
@@ -193,21 +303,25 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted } from "vue";
+import { ref, onMounted, onUnmounted, computed } from "vue";
 import { VuePDF, usePDF } from "@tato30/vue-pdf";
 import type { PDFDocumentLoadingTask } from "pdfjs-dist/types/src/display/api";
 import type { QForm } from "quasar";
+import { useCounterMixin } from "@/stores/mixin";
 
-onUnmounted(() => {
-  window.removeEventListener("resize", (e: any) => {
-    myEventHandler(e);
-  });
-});
+const mixin = useCounterMixin();
+const { date2Thai } = mixin;
+
+// onUnmounted(() => {
+//   window.removeEventListener("resize", (e: any) => {
+//     myEventHandler(e);
+//   });
+// });
 
 onMounted(async () => {
-  window.addEventListener("resize", (e: any) => {
-    myEventHandler(e);
-  });
+  //   window.addEventListener("resize", (e: any) => {
+  //     myEventHandler(e);
+  //   });
 
   const pdfData = usePDF(
     "https://raw.githubusercontent.com/mozilla/pdf.js/ba2edeae/web/compressed.tracemonkey-pldi-09.pdf"
@@ -219,12 +333,12 @@ onMounted(async () => {
   }, 1000);
 });
 
-const myEventHandler = (e: any) => {
-  console.log("e", e.target.innerWidth);
-  //   if (vuePDFRef !== null) {
-  //     vuePDFRef.value.reload();
-  //   }
-};
+// const myEventHandler = (e: any) => {
+//   console.log("e", e.target.innerWidth);
+//   if (vuePDFRef !== null) {
+//     vuePDFRef.value.reload();
+//   }
+// };
 
 const pdfSrc = ref<PDFDocumentLoadingTask | undefined>();
 const numOfPages = ref<number>(0);
@@ -252,6 +366,10 @@ const tab = ref<string>("main");
 const fileOrder = ref<any>(null);
 const fileTailer = ref<any>(null);
 
+const order = ref<string>("");
+const years = ref<number>(new Date().getFullYear());
+const date = ref<Date>(new Date());
+
 const onchangePage = (val: any) => {
   //   console.log(val);
   if (vuePDFRef !== null) {
@@ -260,7 +378,7 @@ const onchangePage = (val: any) => {
 };
 
 const save = () => {
-  if (myForm !== null) {
+  if (myForm.value !== null) {
     myForm.value!.validate().then((success: Boolean) => {
       if (success) {
         // yay, models are correct
@@ -269,6 +387,14 @@ const save = () => {
   }
 };
 
+const validateForm = () => {
+  return (
+    fileOrder.value !== null &&
+    fileOrder.value !== null &&
+    order.value.trim() !== ""
+  );
+};
+
 const getClass = (val: boolean) => {
   return {
     "card-header-active q-px-lg q-py-md cursor-pointer": val,

From 96756dec996247af4fe9c53e873682e64b478ee5 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Tue, 4 Jul 2023 17:39:36 +0700
Subject: [PATCH 4/5] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20multiselect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/OrderPlacement/step/step03.vue | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
index 3f8dd9f8b..22e908679 100644
--- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue
+++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue
@@ -92,7 +92,7 @@
                 :outlined="true"
                 dense
                 lazy-rules
-                v-model="filter"
+                v-model="props.row.mutiselect"
                 :rules="[(val:any) => !!val || `${'กรุณาเลือกช่องทางการส่งสำเนา'}`,(val:any) => val.length > 0 || `${'กรุณาเลือกช่องทางการส่งสำเนา'}`]"
                 :label="`${'เลือกช่องทางการส่งสำเนา'}`"
                 emit-value
@@ -359,6 +359,7 @@ const { dialogMessage, messageError, showLoader, hideLoader } = mixin;
 const myForm = ref<QForm>();
 const filterRef = ref<QInput>();
 const filter = ref<string>("");
+const mutiselect = ref([]);
 const modal = ref<boolean>(false);
 const search = ref<string>("");
 const expanded = ref<string[]>([]);
@@ -366,6 +367,7 @@ const selected = ref<string>("");
 const nodesTree = ref<treeTab[]>([]);
 const send = ref<String[]>([]);
 const selectedModal = ref([]);
+const test = ref([]);
 const filterModal = ref<string>("");
 const visibleColumnsModal = ref<String[]>(["no", "idcard", "name"]);
 const columnsModal = [
@@ -519,7 +521,7 @@ const columns = [
   },
 ];
 
-const rows = [
+const rows = ref([
   {
     no: "0ac56905-1a74-4606-a120-233340adde95",
     name: "นางนัทธ์ เหล่าสกุล",
@@ -527,6 +529,7 @@ const rows = [
     send: "",
     position: "ผู้อำนวยการ",
     agency: "กลุ่มงานช่วยบริหาร",
+    mutiselect: [],
   },
   {
     no: "0de607a0-b094-4a6d-9e30-979343ab5e53",
@@ -535,6 +538,7 @@ const rows = [
     send: "",
     position: "นักจัดการทั่วไป",
     agency: "กลุ่มงานช่วยบริหาร",
+    mutiselect: [],
   },
   {
     no: "93ca7366-2a35-4f94-a331-9c23c9ea78d3",
@@ -543,6 +547,7 @@ const rows = [
     send: "",
     position: "นักจัดการทั่วไป",
     agency: "กลุ่มงานช่วยบริหาร",
+    mutiselect: [],
   },
   {
     no: "d3777c19-2bd0-42df-90ce-c3eeeee55ac6",
@@ -551,6 +556,7 @@ const rows = [
     send: "",
     position: "นักจัดการทั่วไป",
     agency: "กลุ่มงานช่วยบริหาร",
+    mutiselect: [],
   },
   {
     no: "1ccead6f-a851-4291-b3ab-a20757ecddbd",
@@ -559,6 +565,7 @@ const rows = [
     send: "",
     position: "นักจัดการทั่วไป",
     agency: "กลุ่มงานช่วยบริหาร",
+    mutiselect: [],
   },
   {
     no: "1ccead6f-a851-4291-b3ab-a20757ecddbd",
@@ -567,6 +574,7 @@ const rows = [
     send: "",
     position: "นิติกร",
     agency: "กลุ่มงานนิติกร",
+    mutiselect: [],
   },
   {
     no: "1ccead6f-a851-4291-b3ab-a20757ecddbd",
@@ -575,6 +583,7 @@ const rows = [
     send: "",
     position: "นิติกร",
     agency: "กลุ่มงานนิติกร",
+    mutiselect: [],
   },
   {
     no: "1ccead6f-a851-4291-b3ab-a20757ecddbd",
@@ -583,6 +592,7 @@ const rows = [
     send: "",
     position: "นิติกร",
     agency: "กลุ่มงานนิติกร",
+    mutiselect: [],
   },
   {
     no: "1ccead6f-a851-4291-b3ab-a20757ecddbd",
@@ -591,6 +601,7 @@ const rows = [
     send: "",
     position: "นิติกร",
     agency: "กลุ่มงานนิติกร",
+    mutiselect: [],
   },
   {
     no: "1ccead6f-a851-4291-b3ab-a20757ecddbd",
@@ -599,6 +610,7 @@ const rows = [
     send: "",
     position: "นิติกร",
     agency: "กลุ่มงานนิติกร",
+    mutiselect: [],
   },
   {
     no: "1ccead6f-a851-4291-b3ab-a20757ecddbd",
@@ -607,8 +619,9 @@ const rows = [
     send: "",
     position: "นิติกร",
     agency: "กลุ่มงานนิติกร",
+    mutiselect: [],
   },
-];
+]);
 
 onMounted(async () => {
   await nodeTree();

From ef85c4652ddc6a81bc5d750c8c3e46bcea1fa323 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Tue, 4 Jul 2023 17:40:05 +0700
Subject: [PATCH 5/5] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20UI=20=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=87=20Main?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/08_registryEmployee/router.ts     |   2 +-
 .../08_registryEmployee/views/Main.vue        | 602 ++++++++++++++++++
 src/router/index.ts                           |   2 +
 3 files changed, 605 insertions(+), 1 deletion(-)

diff --git a/src/modules/08_registryEmployee/router.ts b/src/modules/08_registryEmployee/router.ts
index c982d3cf5..d5bb3cc1d 100644
--- a/src/modules/08_registryEmployee/router.ts
+++ b/src/modules/08_registryEmployee/router.ts
@@ -1,5 +1,5 @@
 /**
- * Router ระบบทะเบียนประวัติ}6d0hk' (Registry)
+ * Router ระบบทะเบียนประวัติลูกจ้าง (registryEmployee)
  */
 
 const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index e69de29bb..f2ffa8b03 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -0,0 +1,602 @@
+<template>
+  <div class="toptitle text-dark col-12 row items-center">
+    รายชื่อลูกจ้างชั่วคราว
+  </div>
+  <div>
+    <div class="q-pa-md" style="min-height: 70vh; overflow-y: scroll">
+      <div class="col-12 row q-py-sm items-center">
+        <q-btn flat round color="primary" @click="clickAdd" icon="mdi-plus">
+          <q-tooltip>เพิ่มข้อมูล</q-tooltip>
+        </q-btn>
+        <q-space />
+        <div class="items-center" style="display: flex">
+          <!-- ค้นหาข้อความใน table -->
+          <q-input
+            standout
+            dense
+            v-model="filter"
+            ref="filterRef"
+            outlined
+            debounce="300"
+            placeholder="ค้นหา"
+            style="max-width: 200px"
+            class="q-ml-sm"
+          >
+            <template v-slot:append>
+              <q-icon v-if="filter == ''" name="search" />
+              <q-icon
+                v-if="filter !== ''"
+                name="clear"
+                class="cursor-pointer"
+                @click="resetFilter"
+              />
+            </template>
+          </q-input>
+          <!-- แสดงคอลัมน์ใน table -->
+          <q-select
+            v-model="visibleColumns"
+            :display-value="$q.lang.table.columns"
+            multiple
+            outlined
+            dense
+            :options="columns"
+            options-dense
+            option-value="name"
+            map-options
+            emit-value
+            style="min-width: 150px"
+            class="gt-xs q-ml-sm"
+          />
+        </div>
+      </div>
+      <q-table
+        flat
+        bordered
+        dense
+        :rows="rows"
+        :columns="columns"
+        :visible-columns="visibleColumns"
+        :filter="filter"
+        row-key="name"
+        class="custom-header-table"
+        :pagination-label="paginationLabel"
+        v-model:pagination="pagination"
+      >
+        <template v-slot:header="props">
+          <q-tr :props="props">
+            <q-th v-for="col in props.cols" :key="col.name" :props="props">
+              <span class="text-weight-medium">{{ col.label }}</span>
+            </q-th>
+            <q-th auto-width />
+          </q-tr>
+        </template>
+        <template v-slot:body="props">
+          <q-tr :props="props" class="cursor-pointer">
+            <q-td key="no" :props="props">
+              {{ props.rowIndex + 1 }}
+            </q-td>
+            <q-td key="positionNum" :props="props">
+              {{ props.row.positionNum }}
+            </q-td>
+            <q-td key="name" :props="props">
+              {{ props.row.name }}
+            </q-td>
+            <q-td key="position" :props="props">
+              {{ props.row.position }}
+            </q-td>
+            <q-td key="path" :props="props">
+              {{ props.row.path }}
+            </q-td>
+            <q-td key="type" :props="props">
+              {{ props.row.type }}
+            </q-td>
+            <q-td key="level" :props="props">
+              {{ props.row.level }}
+            </q-td>
+            <q-td key="affiliation" :props="props">
+              {{ props.row.affiliation }}
+            </q-td>
+            <q-td key="yearly" :props="props">
+              {{ props.row.yearly }}
+            </q-td>
+            <q-td key="pay" :props="props">
+              {{ props.row.pay }}
+            </q-td>
+            <q-td auto-width>
+              <q-btn
+                icon="mdi-dots-vertical"
+                size="12px"
+                color="grey-7"
+                flat
+                round
+                dense
+              >
+                <q-menu transition-show="jump-down" transition-hide="jump-up">
+                  <q-list dense style="min-width: 100px">
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="editDetail(props.row, 'wait')"
+                    >
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                      </q-item-section>
+                      <q-item-section>กำหนดตำแหน่ง</q-item-section>
+                    </q-item>
+                    <q-separator />
+                    <q-item
+                      clickable
+                      v-close-popup
+                      @click="editDetail(props.row, 'wait')"
+                    >
+                      <q-item-section
+                        style="min-width: 0px"
+                        avatar
+                        class="q-py-sm"
+                      >
+                      </q-item-section>
+                      <q-item-section>ลบ</q-item-section>
+                    </q-item>
+
+                    <q-separator />
+                  </q-list>
+                </q-menu>
+              </q-btn>
+            </q-td>
+          </q-tr>
+        </template>
+        <template v-slot:pagination="scope">
+          <q-pagination
+            v-model="pagination.page"
+            color="primary"
+            :max="scope.pagesNumber"
+            :max-pages="5"
+            size="sm"
+            boundary-links
+            direction-links
+          ></q-pagination>
+        </template>
+      </q-table>
+    </div>
+    <q-separator />
+  </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import { useQuasar } from "quasar";
+import { useCounterMixin } from "@/stores/mixin";
+import type { QInput, QForm } from "quasar";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+const props = defineProps({
+  next: {
+    type: Function,
+    default: () => console.log("not function"),
+  },
+  previous: {
+    type: Function,
+    default: () => console.log("not function"),
+  },
+});
+
+const $q = useQuasar();
+const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
+const { dialogMessage, messageError, showLoader, hideLoader } = mixin;
+
+const myForm = ref<QForm>();
+const filterRef = ref<QInput>();
+const filter = ref<string>("");
+const mutiselect = ref([]);
+const modal = ref<boolean>(false);
+const search = ref<string>("");
+const expanded = ref<string[]>([]);
+const nodesTree = ref<treeTab[]>([]);
+const send = ref<String[]>([]);
+const selectedModal = ref([]);
+const filterModal = ref<string>("");
+const visibleColumnsModal = ref<String[]>(["no", "positionNum", "name"]);
+const columnsModal = [
+  { name: "no", align: "left", label: "ลำดับ", field: "no", sortable: true },
+  {
+    name: "positionNum",
+    align: "left",
+    label: "เลขประจำตัวประชาชน",
+    field: "positionNum",
+    sortable: true,
+  },
+  {
+    name: "name",
+    align: "left",
+    label: "ชื่อ-สกุล",
+    field: "name",
+    sortable: true,
+  },
+];
+
+const rowsModal = [
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+];
+
+const paginationModal = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+const pagination = ref({
+  sortBy: "desc",
+  descending: false,
+  page: 1,
+  rowsPerPage: 10,
+});
+
+const visibleColumns = ref<String[]>([
+  "no",
+  "positionNum",
+  "name",
+  "position",
+  "path",
+  "type",
+  "level",
+  "affiliation",
+  "yearly",
+  "pay",
+]);
+const columns = [
+  { name: "no", align: "left", label: "ลำดับ", field: "no", sortable: true },
+  {
+    name: "name",
+    align: "left",
+    label: "ชื่อ-สกุล",
+    field: "name",
+    sortable: true,
+  },
+  {
+    name: "positionNum",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    field: "positionNum",
+    sortable: true,
+  },
+
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    field: "position",
+    sortable: true,
+  },
+  {
+    name: "path",
+    align: "left",
+    label: "สายงาน",
+    field: "path",
+    sortable: true,
+  },
+  {
+    name: "type",
+    align: "left",
+    label: "ประเภท",
+    field: "type",
+    sortable: true,
+  },
+  {
+    name: "level",
+    align: "left",
+    label: "ระดับชั้นงาน",
+    field: "level",
+    sortable: true,
+  },
+  {
+    name: "affiliation",
+    align: "left",
+    label: "สังกัด",
+    field: "affiliation",
+    sortable: true,
+  },
+  {
+    name: "yearly",
+    align: "left",
+    label: "ปีงบประมาณ",
+    field: "yearly",
+    sortable: true,
+  },
+  {
+    name: "pay",
+    align: "left",
+    label: "ค่าจ้าง",
+    field: "pay",
+    sortable: true,
+  },
+];
+
+const rows = [
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+  {
+    no: "0ac56905-1a74-4606-a120-233340adde95",
+    name: "นางนัทธ์ เหล่าสกุล",
+    positionNum: "สกก.3",
+    position: "นักบริหาร",
+    path: "บริหาร",
+    type: "บริหาร",
+    level: "ชำนาญการพิเศษ",
+    affiliation: "ฝ่ายบริหารงานทั่วไป",
+    yearly: 2565,
+    pay: "40,000",
+  },
+];
+
+onMounted(async () => {
+  await nodeTree();
+});
+
+const paginationLabel = (start: number, end: number, total: number) => {
+  //   if (props.paging == true)
+  //     return " " + start + " ใน " + end + " จากจำนวน " + total + " รายการ";
+  //   else
+  return start + "-" + end + " ใน " + total;
+};
+
+const resetFilter = () => {
+  // reset ค่าที่ค้นหาเมื่อกดปุ่ม X ในกล่องค้นหา
+  filter.value = "";
+  filterRef.value!.focus();
+};
+
+const getClass = (val: boolean) => {
+  return {
+    "full-width inputgreen cursor-pointer": val,
+    "full-width cursor-pointer": !val,
+  };
+};
+
+const clickClose = async () => {
+  //   if (editRow.value == true) {
+  //   dialogMessage(
+  //     $q,
+  //     "ข้อมูลมีการแก้ไข",
+  //     "ยืนยันที่จะปิดโดยไม่บันทึกใช่หรือไม่?",
+  //     "mdi-help-circle-outline",
+  //     "ตกลง",
+  //     "orange",
+  //     () => (modal.value = false),
+  //     undefined
+  //   );
+  //   } else {
+  modal.value = false;
+  //     next.value = false;
+  //     previous.value = false;
+  //   }
+};
+
+const clickAdd = () => {
+  modal.value = true;
+};
+
+const clickDelete = (id: string) => {
+  dialogMessage(
+    $q,
+    "ยืนยันการลบข้อมูล",
+    "ต้องการลบข้อมูลนี้ใช่หรือไม่?",
+    "mdi-help-circle-outline",
+    "ตกลง",
+    "red",
+    () => deleteData(id),
+    undefined
+  );
+};
+
+const nodeTree = async () => {
+  showLoader();
+  await http
+    .get(config.API.profileOrganizRoot)
+    .then((res: any) => {
+      const data = res.data.result;
+      nodesTree.value = data;
+      if (data.length > 0) {
+        expanded.value = [data[0].id];
+      }
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+};
+
+const onSelected = async (id: string) => {
+  //   await fetchPositionNumber(id);
+};
+
+const deleteData = async (id: string) => {};
+</script>
+<style lang="scss">
+.icon-color {
+  color: #4154b3;
+}
+.custom-header-table {
+  max-height: 64vh;
+  .q-table tr:nth-child(odd) td {
+    background: white;
+  }
+  .q-table tr:nth-child(even) td {
+    background: #f8f8f8;
+  }
+
+  .q-table thead tr {
+    background: #ecebeb;
+  }
+
+  .q-table thead tr th {
+    position: sticky;
+    z-index: 1;
+  }
+  /* this will be the loading indicator */
+  .q-table thead tr:last-child th {
+    /* height of all previous header rows */
+    top: 48px;
+  }
+  .q-table thead tr:first-child th {
+    top: 0;
+  }
+}
+</style>
diff --git a/src/router/index.ts b/src/router/index.ts
index 130834586..496100f83 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -11,6 +11,7 @@ import ModuleRegistry from "@/modules/04_registry/router";
 import ModulePlacement from "@/modules/05_placement/router";
 import ModuleRetirement from "@/modules/06_retirement/router";
 import ModuleInsignia from "@/modules/07_insignia/router";
+import ModuleRegistryEmployee from "@/modules/08_registryEmployee/router";
 
 // TODO: ใช้หรือไม่?
 import keycloak from "@/plugins/keycloak";
@@ -40,6 +41,7 @@ const router = createRouter({
         ...ModulePlacement,
         ...ModuleRetirement,
         ...ModuleInsignia,
+        ...ModuleRegistryEmployee,
       ],
     },
     /**