From 8db24538e0bc218c317a797d2588a46bb9666e34 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 20 Feb 2025 13:33:26 +0700
Subject: [PATCH 1/2] =?UTF-8?q?filter=20=E0=B8=97=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/requestEdit/Page01_Detail.vue  | 10 +++----
 src/modules/04_registryPerson/store.ts        |  1 +
 .../04_registryPerson/views/listView.vue      | 12 +++------
 .../07_insignia/views/06_ReportMain.vue       | 26 ++++++++++++-------
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
index 36ffd9a6a..8751cfbf6 100644
--- a/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
+++ b/src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, reactive, computed, readonly } from "vue";
+import { onMounted, ref, reactive, computed } from "vue";
 import { useQuasar } from "quasar";
 
 import { useRouter, useRoute } from "vue-router";
@@ -80,8 +80,8 @@ async function fetchDataRequest() {
         typeEmp.value == "employee" ? "-employee" : ""
       ) + `${requestId.value}`
     )
-    .then((res) => {
-      const data = res.data.result;
+    .then(async (res) => {
+      const data = await res.data.result;
       dataRequest.value = data;
 
       formData.status = data.status;
@@ -93,7 +93,7 @@ async function fetchDataRequest() {
         isReadOnly.value = false;
       }
 
-      onDownloadFile(requestId.value);
+      await onDownloadFile(requestId.value);
     })
     .catch((err) => {
       messageError($q, err);
@@ -161,7 +161,7 @@ const fileDownloadName = ref<string>("");
  * function หาชื่อไฟล์
  * @param id รายการยื่นคำร้องขอแก้ไขข้อมูล
  */
-function onDownloadFile(id: string) {
+async function onDownloadFile(id: string) {
   http
     .get(
       config.API.file(
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 0ded7ece6..8e69cc5dc 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -83,6 +83,7 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     retireYear: "",
     node: "เลือกหน่วยงาน",
     retireType: "ทั้งหมด",
+    sortName: "ลำดับการแสดงผล",
   });
 
   function convertTypeRetired(val: string) {
diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue
index beb426486..40b5cba2f 100644
--- a/src/modules/04_registryPerson/views/listView.vue
+++ b/src/modules/04_registryPerson/views/listView.vue
@@ -237,6 +237,7 @@ function selectType() {
   if (store.formFilter.type != empType.value) {
     store.labelOption.posType = "ทั้งหมด";
     store.labelOption.posLevel = "ทั้งหมด";
+    store.labelOption.sortName = "ลำดับการแสดงผล";
     store.formFilter.type = empType.value;
     store.formFilter.dateAppoint = "";
     store.labelOption.node =
@@ -299,6 +300,7 @@ function selectRetireType(item: DataOption) {
 }
 
 function selectDisplayOrderType(item: DataOption) {
+  store.labelOption.sortName = item.name;
   store.formFilter.page = 1;
   store.formFilter.dateAppoint = item.id;
   fetchDataPerson();
@@ -755,15 +757,7 @@ onMounted(async () => {
               class="q-px-sm"
             >
               <template v-slot:label>
-                {{
-                  `ลำดับการแสดผล ${
-                    store.formFilter.dateAppoint
-                      ? store.formFilter.dateAppoint === "ASC"
-                        ? "เก่า-ล่าสุด"
-                        : "ล่าสุด-เก่า"
-                      : ""
-                  }`
-                }}
+                {{ store.labelOption.sortName }}
               </template>
               <q-list>
                 <q-item
diff --git a/src/modules/07_insignia/views/06_ReportMain.vue b/src/modules/07_insignia/views/06_ReportMain.vue
index 5f090531a..77deca558 100644
--- a/src/modules/07_insignia/views/06_ReportMain.vue
+++ b/src/modules/07_insignia/views/06_ReportMain.vue
@@ -196,6 +196,8 @@ async function onUpdateFilter() {
   ) {
     isLoadPDF.value = true;
     pdfSrc.value = undefined;
+    numOfPages.value = 1;
+    detailReport.value = null;
 
     await http
       .post(
@@ -222,6 +224,8 @@ async function onUpdateFilter() {
   } else if (roundId2.value && nodeId.value) {
     isLoadPDF.value = true;
     pdfSrc.value = undefined;
+    numOfPages.value = 1;
+    detailReport.value = null;
 
     await http
       .post(
@@ -236,7 +240,6 @@ async function onUpdateFilter() {
       .then(async (res) => {
         const data = await res.data.result;
         detailReport.value = data;
-
         await fetchDocumentTemplate(data, "xlsx");
       })
       .catch(async (e) => {
@@ -294,12 +297,14 @@ function downloadReport(type: string, download: "docx" | "" | "xlsx" = "") {
   const fileName =
     optionReport.value.find((e) => e.id === typeReport.value.id)?.name || "";
 
-  if (type === "xlsx" && download === "") {
-    genReportXLSX(detailReport.value, fileName, type);
-  } else if (type === "pdf" && download === "xlsx") {
-    genReportXLSX(detailReport.value, fileName, "pdf");
-  } else {
-    genReport(detailReport.value, fileName, type);
+  if (detailReport.value) {
+    if (type === "xlsx" && download === "") {
+      genReportXLSX(detailReport.value, fileName, type);
+    } else if (type === "pdf" && download === "xlsx") {
+      genReportXLSX(detailReport.value, fileName, "pdf");
+    } else {
+      genReport(detailReport.value, fileName, type);
+    }
   }
 }
 
@@ -333,6 +338,7 @@ onMounted(async () => {
           </q-select>
 
           <q-space />
+
           <q-btn
             flat
             round
@@ -350,9 +356,9 @@ onMounted(async () => {
                   @click="
                     downloadReport(
                       'pdf',
-                      typeReport.val != 'report1' ||
-                        typeReport.val != 'report2' ||
-                        typeReport.val != 'report3'
+                      !['report1', 'report2', 'report3'].includes(
+                        typeReport.val
+                      )
                         ? 'xlsx'
                         : 'docx'
                     )

From 28b25d31e2235630d189ef2309f4ec3335683124 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 20 Feb 2025 14:34:37 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B9=83=E0=B8=AB?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=A5=E0=B8=B9=E0=B8=81?=
 =?UTF-8?q?=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

---
 .../DialogSendToCommandEmp.vue                | 289 ++++++++++++++++++
 .../views/08_dismissOrderEmp.vue              |   6 +-
 2 files changed, 293 insertions(+), 2 deletions(-)
 create mode 100644 src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue

diff --git a/src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue b/src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue
new file mode 100644
index 000000000..e5e16dcfe
--- /dev/null
+++ b/src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue
@@ -0,0 +1,289 @@
+<script setup lang="ts">
+import { ref, computed, watchEffect } from "vue";
+import { useQuasar } from "quasar";
+import type { QTableProps } from "quasar";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useCounterMixin } from "@/stores/mixin";
+import { useTransferDataStore } from "@/modules/05_placement/store";
+
+import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
+import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
+
+import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCommand.vue";
+import DialogHeader from "@/components/DialogHeader.vue";
+
+/** props*/
+const props = defineProps({
+  closeModal: Function,
+  fecthlistRecevice: Function,
+});
+
+const modal = defineModel<boolean>("modal", { required: true });
+const rows = defineModel<ResponseData[]>("rows", { required: true });
+const rowsData = defineModel<ResponseData[]>("rowsData", { required: true });
+const filterKeyword = defineModel<string>("filterKeyword2", { required: true });
+
+/** use */
+const $q = useQuasar();
+const { statusText } = useTransferDataStore();
+const selected = ref<ResponseItems[]>([]);
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+    position: i.positionOld,
+    posType: i.positionTypeOld,
+    posLevel: i.positionLevelOld,
+  }));
+});
+const mixin = useCounterMixin();
+const {
+  showLoader,
+  success,
+  messageError,
+  dialogConfirm,
+  hideLoader,
+  date2Thai,
+  onSearchDataTable,
+} = mixin;
+
+/** คอลัมน์ */
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: false,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "fullname",
+    align: "left",
+    label: "ชื่อ-นามสกุล",
+    sortable: true,
+    field: "fullname",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return `${row.prefix}${row.firstName} ${row.lastName}`;
+    },
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "กลุ่มงาน",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "organizationPositionOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationPositionOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่ดำเนินการ",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val) => date2Thai(val),
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "status",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val) => statusText(val),
+  },
+]);
+/** คอลัมน์ที่แสดง */
+const visibleColumns = ref<string[]>([
+  "no",
+  "fullname",
+  "positionLevel",
+  "organizationPositionOld",
+  "createdAt",
+  "status",
+]);
+
+const modalCommand = ref<boolean>(false);
+
+/**
+ * ฟังก์ชั่นการ Selected Data
+ */
+const checkSelected = computed(() => {
+  if (selected.value.length === 0) {
+    return true;
+  }
+});
+
+//popup ยืนยันส่งัว
+function saveOrder() {
+  dialogConfirm(
+    $q,
+    () => {
+      modalCommand.value = true;
+      props.closeModal?.();
+    },
+    "ยืนยันส่งไปออกคำสั่ง",
+    "ต้องการยืนยันส่งไปออกคำสั่งใช่หรือไม่?"
+  );
+}
+
+const emit = defineEmits(["update:filterKeyword2", "update:selected"]);
+function updateInput(value: any) {
+  emit("update:filterKeyword2", value);
+}
+
+//รีเซ็ตค่าในช่องค้นหา
+function Reset() {
+  emit("update:filterKeyword2", "");
+}
+
+function onSearch() {
+  rows.value = onSearchDataTable(
+    filterKeyword.value,
+    rowsData.value,
+    columns.value ? columns.value : []
+  );
+}
+
+watchEffect(() => {
+  if (modal.value === true) {
+    selected.value = [];
+    updateInput("");
+  }
+});
+</script>
+<template>
+  <q-dialog v-model="modal" persistent>
+    <q-card style="width: 1200px; max-width: 80vw">
+      <DialogHeader tittle="ส่งไปออกคำสั่งให้ออก" :close="closeModal" />
+      <q-separator />
+      <q-card-section>
+        <div class="row col-12 q-col-gutter-sm">
+          <div class="row col-12">
+            <q-space />
+            <q-input
+              borderless
+              outlined
+              dense
+              v-model="filterKeyword"
+              placeholder="ค้นหา"
+              @keydown.enter="onSearch"
+            >
+              <template v-slot:append>
+                <q-icon name="search" />
+              </template>
+            </q-input>
+            <q-select
+              v-model="visibleColumns"
+              multiple
+              outlined
+              dense
+              options-dense
+              :display-value="$q.lang.table.columns"
+              emit-value
+              map-options
+              :options="columns"
+              option-value="name"
+              style="min-width: 140px"
+              class="gt-xs q-ml-sm"
+            />
+          </div>
+
+          <div class="col-12">
+            <d-table
+              :columns="columns"
+              :rows="rows"
+              row-key="id"
+              :visible-columns="visibleColumns"
+              selection="multiple"
+              v-model:selected="selected"
+            >
+              <template v-slot:header-selection="scope">
+                <q-checkbox
+                  keep-color
+                  color="primary"
+                  dense
+                  v-model="scope.selected"
+                />
+              </template>
+
+              <template v-slot:body="props">
+                <q-tr :props="props" class="cursor-pointer">
+                  <q-td>
+                    <q-checkbox
+                      keep-color
+                      color="primary"
+                      dense
+                      v-model="props.selected"
+                    />
+                  </q-td>
+                  <q-td v-for="col in props.cols" :key="col.id">
+                    <div v-if="col.name === 'no'">
+                      {{ props.rowIndex + 1 }}
+                    </div>
+
+                    <div
+                      v-else
+                      :class="col.name === 'org' ? 'table_ellipsis' : ''"
+                    >
+                      {{ col.value ? col.value : "-" }}
+                    </div>
+                  </q-td>
+                </q-tr>
+              </template>
+            </d-table>
+          </div>
+        </div>
+      </q-card-section>
+
+      <q-card-actions align="right" class="bg-white text-teal">
+        <q-btn
+          label="ส่งไปออกคำสั่ง"
+          @click="saveOrder"
+          :disable="checkSelected"
+          color="public"
+        />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+
+  <DialogCreateCommand
+    v-model:modal="modalCommand"
+    :command-type-code="'C-PM-23'"
+    :persons="dataMapToSend"
+  />
+</template>
diff --git a/src/modules/06_retirement/views/08_dismissOrderEmp.vue b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
index c34ce6568..3c04c3843 100644
--- a/src/modules/06_retirement/views/08_dismissOrderEmp.vue
+++ b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
@@ -12,7 +12,7 @@ import { useTransferDataStore } from "@/modules/05_placement/store";
 
 import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
 
-import DialogSendToCommand from "@/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue";
+import DialogSendToCommand from "@/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue";
 
 /** use */
 const $q = useQuasar();
@@ -306,7 +306,9 @@ onMounted(async () => {
                     color="edit"
                     icon="edit"
                     @click="
-                      router.push(`/retirementEmployee/dismiss-order/${props.row.id}`)
+                      router.push(
+                        `/retirementEmployee/dismiss-order/${props.row.id}`
+                      )
                     "
                   >
                     <q-tooltip>แก้ไขข้อมูล</q-tooltip>