From 432d2243d1dd90ee6ff6a1100ba247f0a8e8526e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 9 Jul 2024 11:02:48 +0700
Subject: [PATCH 1/8] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=87=20=3D>=20=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogHistoryPos.vue           | 106 ++++++++++++++----
 1 file changed, 85 insertions(+), 21 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
index f99463770..9d930848f 100644
--- a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
+++ b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
@@ -1,21 +1,44 @@
 <script setup lang="ts">
-import { ref, computed, watch } from "vue";
+import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
+/**
+ * import Type
+ */
 import type { QTableProps } from "quasar";
 import type { HistoryPos } from "@/modules/02_organizationalNew/interface/response/organizational";
 
+/**
+ * import Components
+ */
 import Header from "@/components/DialogHeader.vue";
 
+/**
+ * import Store
+ */
 import { useCounterMixin } from "@/stores/mixin";
 import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+
+/** Use*/
 const store = useOrganizational();
 const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin();
 const $q = useQuasar();
-const modal = defineModel<boolean>("modal", { required: true });
 
+/**
+ * props
+ */
+const modal = defineModel<boolean>("modal", { required: true });
+const props = defineProps({
+  rowId: {
+    type: String,
+  },
+});
+
+/**
+ * Table
+ */
 const columns = ref<QTableProps["columns"]>([
   {
     name: "no",
@@ -26,6 +49,54 @@ const columns = ref<QTableProps["columns"]>([
     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",
+  },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posType",
+    align: "left",
+    label: "ประเภทตำแหน่ง",
+    sortable: true,
+    field: "posType",
+    format(val, row) {
+      let name = "";
+      if (row.posType && row.position) {
+        name = `${row.posType} (${row.position})`;
+      } else if (row.posType) {
+        name = `${row.posType}`;
+      } else if (row.position) {
+        name = `(${row.position})`;
+      } else name = "-";
+      return name;
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+
+  {
+    name: "posExecutive",
+    align: "left",
+    label: "ตำแหน่งทางการบริหาร",
+    sortable: true,
+    field: "posExecutive",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "orgShortName",
     align: "left",
@@ -40,6 +111,9 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "วันที่แก้ไข",
     field: "lastUpdatedAt",
+    format(val, row) {
+      return date2Thai(val);
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -71,28 +145,15 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-const rows = ref<any>([]);
+const rows = ref<HistoryPos[]>([]);
 
-const props = defineProps({
-  rowId: {
-    type: String,
-  },
-});
-
-async function fetchHistoryPos(id: string) {
+function fetchHistoryPos(id: string) {
   showLoader();
-  await http
+  http
     .get(config.API.orgPosHistory(id))
     .then((res) => {
       const data: HistoryPos[] = res.data.result;
-      const list = data.map((e: HistoryPos) => ({
-        ...e,
-        lastUpdatedAt: e.lastUpdatedAt ? date2Thai(e.lastUpdatedAt) : "-",
-        posMasterNoPrefix: e.posMasterNoPrefix ?? "-",
-        posMasterNo: e.posMasterNo ?? "-",
-        posMasterNoSuffix: e.posMasterNoSuffix ?? "-",
-      }));
-      rows.value = list;
+      rows.value = data;
     })
     .catch((err) => {
       messageError($q, err);
@@ -102,6 +163,9 @@ async function fetchHistoryPos(id: string) {
     });
 }
 
+/**
+ * callback function ทำงานเมื่อ   modal === true
+ */
 watch(
   () => modal.value,
   () => {
@@ -111,7 +175,7 @@ watch(
 </script>
 <template>
   <q-dialog v-model="modal">
-    <q-card style="width: 700px; max-width: 80vw">
+    <q-card style="width: 1000px; max-width: 100vw">
       <Header
         :tittle="'ประวัติตำแหน่ง'"
         :close="
@@ -153,7 +217,7 @@ watch(
                 </div>
 
                 <div v-else>
-                  {{ col.value }}
+                  {{ col.value ?? "-" }}
                 </div>
               </q-td>
             </q-tr>

From 749933a68fa2f89b97b268b2d33d4f9e59411450 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 9 Jul 2024 13:49:08 +0700
Subject: [PATCH 2/8] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A8=E0=B8=9C=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/14_KPI/api.KPI.ts                     |  6 ++
 src/interface/request/main/main.ts            |  5 +
 .../components/results/tableResults.vue       | 12 +++
 src/modules/14_KPI/router.ts                  | 12 +++
 src/modules/14_KPI/views/resultsMain.vue      | 99 +++++++++++++++++++
 5 files changed, 134 insertions(+)
 create mode 100644 src/modules/14_KPI/components/results/tableResults.vue
 create mode 100644 src/modules/14_KPI/views/resultsMain.vue

diff --git a/src/api/14_KPI/api.KPI.ts b/src/api/14_KPI/api.KPI.ts
index 04d37619e..11d64c69a 100644
--- a/src/api/14_KPI/api.KPI.ts
+++ b/src/api/14_KPI/api.KPI.ts
@@ -83,4 +83,10 @@ export default {
 
   kpiSendToGet: (id: string) => `${kpiEvaluationUser}/reason/${id}`,
   openPoint: (id: string) => `${kpiEvaluationUser}/open/${id}`,
+
+  /**
+   * ประกาศผล
+   */
+  evaluationUser: `${KpiUser}/evaluation/list`,
+  evaluationUserDone: `${KpiUser}/evaluation/done/kp7`,
 };
diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 9e0340d3a..df5d4f024 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -567,6 +567,11 @@ const menuList = readonly<any[]>([
         path: "KPI​List",
         role: "evaluateKPI",
       },
+      {
+        label: "ประกาศผล",
+        path: "KPIResults",
+        role: "evaluateKPI",
+      },
       {
         label: "รายงาน",
         path: "KPIReport",
diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
new file mode 100644
index 000000000..a1f2cf34d
--- /dev/null
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -0,0 +1,12 @@
+<script setup lang="ts">
+/**
+ * props
+ */
+const tab = defineModel<string>("tab", { required: true });
+</script>
+
+<template>
+  {{ tab }}
+</template>
+
+<style scoped></style>
diff --git a/src/modules/14_KPI/router.ts b/src/modules/14_KPI/router.ts
index 79c2d697e..be79872b2 100644
--- a/src/modules/14_KPI/router.ts
+++ b/src/modules/14_KPI/router.ts
@@ -14,6 +14,7 @@ const listPage = () => import("@/modules/14_KPI/views/list.vue");
 const detailPage = () => import("@/modules/14_KPI/views/detail.vue");
 const reportPage = () => import("@/modules/14_KPI/views/report.vue");
 const detailView = () => import("@/modules/14_KPI/views/detailView.vue");
+const ResultsView = () => import("@/modules/14_KPI/views/resultsMain.vue");
 
 export default [
   {
@@ -68,4 +69,15 @@ export default [
       Role: "evaluateKPI",
     },
   },
+
+  {
+    path: "/KPI/results",
+    name: "KPIResults",
+    component: ResultsView,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
 ];
diff --git a/src/modules/14_KPI/views/resultsMain.vue b/src/modules/14_KPI/views/resultsMain.vue
new file mode 100644
index 000000000..e10b62667
--- /dev/null
+++ b/src/modules/14_KPI/views/resultsMain.vue
@@ -0,0 +1,99 @@
+<script setup lang="ts">
+import { ref, onMounted, watch } from "vue";
+import { useQuasar } from "quasar";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+/**
+ * import type
+ */
+import type { ItemsTab } from "@/modules/14_KPI/interface/index/Main";
+
+/**
+ * import components
+ */
+import TableResults from "@/modules/14_KPI/components/results/tableResults.vue";
+
+/**
+ * importStore
+ */
+import { useCounterMixin } from "@/stores/mixin";
+
+/**
+ *  use
+ */
+const $q = useQuasar();
+const { dialogRemove, messageError, showLoader, hideLoader, success } =
+  useCounterMixin();
+
+/**
+ * ตัวแปร
+ */
+const tab = ref<string>("COMPLETE");
+const tabItems = ref<ItemsTab[]>([
+  { name: "COMPLETE", label: " รอประกาศผล" },
+  { name: "KP7", label: "ประกาศผลแล้ว" },
+]);
+
+const page = ref<number>(1);
+const pageSize = ref<number>(10);
+
+function fetcDatahList() {
+  showLoader();
+  http
+    .post(config.API.evaluationUser, {
+      status: tab.value,
+      page: page.value,
+      pageSize: pageSize.value,
+    })
+    .then((res) => {})
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+watch(tab, () => {
+  page.value = 1;
+  pageSize.value = 10;
+  fetcDatahList();
+});
+
+onMounted(() => {
+  fetcDatahList();
+});
+</script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">ประกาศผล</div>
+
+  <q-card flast bordered>
+    <q-tabs
+      v-model="tab"
+      dense
+      align="left"
+      inline-label
+      class="bg-white text-grey"
+      active-color="primary"
+      indicator-color="primary"
+    >
+      <div v-for="item in tabItems">
+        <q-tab :name="item.name" :label="item.label" />
+      </div>
+    </q-tabs>
+    <q-separator />
+    <q-tab-panels v-model="tab" animated class="shadow-2 rounded-borders">
+      <q-tab-panel name="COMPLETE">
+        <TableResults :tab="tab" />
+      </q-tab-panel>
+
+      <q-tab-panel name="KP7">
+        <TableResults :tab="tab" />
+      </q-tab-panel>
+    </q-tab-panels>
+  </q-card>
+</template>
+
+<style scoped></style>

From f8da86524b07200f67e44dcabc237c1c7b01fbbc Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 14:19:59 +0700
Subject: [PATCH 3/8] fixing

---
 src/modules/13_salary/views/salaryEmployeeRate.vue | 2 +-
 src/modules/13_salary/views/salaryRate.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/views/salaryEmployeeRate.vue b/src/modules/13_salary/views/salaryEmployeeRate.vue
index a2bbab67a..b95a7b35b 100644
--- a/src/modules/13_salary/views/salaryEmployeeRate.vue
+++ b/src/modules/13_salary/views/salaryEmployeeRate.vue
@@ -243,7 +243,7 @@ onMounted(async () => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราค่าจ้าง กลุ่มที่{{ groupSalary }}
+      อัตราค่าจ้างของ กลุ่มที่ {{ groupSalary }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">
diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue
index af6a9f1f9..c45838271 100644
--- a/src/modules/13_salary/views/salaryRate.vue
+++ b/src/modules/13_salary/views/salaryRate.vue
@@ -240,7 +240,7 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราเงินเดือน ของ{{ posType }}
+      อัตราเงินเดือนของ {{ posType }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">

From 094351585a0d89b60088e7bccb1c92124ad2f9df Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 14:31:07 +0700
Subject: [PATCH 4/8] fixing

---
 .../components/DialogHistoryPos.vue           | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
index 9d930848f..1ca12daf7 100644
--- a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
+++ b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
@@ -58,6 +58,42 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "orgShortName",
+    align: "left",
+    label: "อักษรย่อ",
+    sortable: true,
+    field: "orgShortName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posMasterNoPrefix",
+    align: "left",
+    label: " Prefix ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posMasterNoPrefix",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posMasterNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posMasterNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posMasterNoSuffix",
+    align: "left",
+    label: "Suffix ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posMasterNoSuffix",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "position",
     align: "left",
@@ -97,15 +133,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "orgShortName",
-    align: "left",
-    label: "อักษรย่อ",
-    sortable: true,
-    field: "orgShortName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "lastUpdatedAt",
     align: "left",
@@ -117,33 +144,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "posMasterNoPrefix",
-    align: "left",
-    label: " Prefix ตำแหน่งเลขที่",
-    sortable: true,
-    field: "posMasterNoPrefix",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posMasterNo",
-    align: "left",
-    label: "ตำแหน่งเลขที่",
-    sortable: true,
-    field: "posMasterNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posMasterNoSuffix",
-    align: "left",
-    label: "Suffix ตำแหน่งเลขที่",
-    sortable: true,
-    field: "posMasterNoSuffix",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
 ]);
 const rows = ref<HistoryPos[]>([]);
 

From ca264b44916871cd40611c17b2c7a50f0c5a043e Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Tue, 9 Jul 2024 14:53:19 +0700
Subject: [PATCH 5/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20report=20sala?=
 =?UTF-8?q?ry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/13_salary/components/SalaryLists/TabMain.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue
index b955d7560..9bb8797cb 100644
--- a/src/modules/13_salary/components/SalaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue
@@ -346,6 +346,7 @@ function onClickDownload(data: DataOption) {
         data.id === "gov-05" ||
         data.id === "gov-05-01" ||
         data.id === "gov-07" ||
+        data.id === "gov-07-01" ||
         data.id === "gov-08";
 
       const finalUrl = isGovernmentId ? `${url}/${store.tabGroup}` : url;

From 855a514d523f1608263ec0781ab48434f76da48a Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 15:02:42 +0700
Subject: [PATCH 6/8] hide add new registry

---
 src/modules/04_registryNew/components/TableView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/04_registryNew/components/TableView.vue b/src/modules/04_registryNew/components/TableView.vue
index 54d1feae6..db57ce664 100644
--- a/src/modules/04_registryNew/components/TableView.vue
+++ b/src/modules/04_registryNew/components/TableView.vue
@@ -190,7 +190,7 @@ watch(
 
 <template>
   <div class="col-12 row q-pb-sm q-col-gutter-sm items-center">
-    <div v-if="empType === 'officer'">
+    <!-- <div v-if="empType === 'officer'">
       <q-btn
         round
         flat
@@ -202,7 +202,7 @@ watch(
       >
         <q-tooltip>เพิ่มข้อมูล</q-tooltip></q-btn
       >
-    </div>
+    </div> -->
     <div>
       <q-btn
         round

From 7af273ad08626ec69931420117fd4d463cd653fd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 9 Jul 2024 15:52:41 +0700
Subject: [PATCH 7/8] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A8=E0=B8=9C=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/results/tableResults.vue       | 261 +++++++++++++++++-
 src/modules/14_KPI/interface/response/Main.ts |  16 +-
 src/modules/14_KPI/views/resultsMain.vue      |  67 ++++-
 3 files changed, 330 insertions(+), 14 deletions(-)

diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
index a1f2cf34d..26856dc89 100644
--- a/src/modules/14_KPI/components/results/tableResults.vue
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -1,12 +1,271 @@
 <script setup lang="ts">
+import { ref, watch } from "vue";
+import { useQuasar } from "quasar";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+/**
+ * importType
+ */
+import type { QTableProps } from "quasar";
+import type { ResResults } from "@/modules/14_KPI/interface/response/Main";
+
+/**
+ * importStore
+ */
+import { useCounterMixin } from "@/stores/mixin";
+import { useKpiDataStore } from "@/modules/14_KPI/store";
+
+/**
+ * use
+ */
+const $q = useQuasar();
+const {
+  showLoader,
+  success,
+  messageError,
+  dialogConfirm,
+  hideLoader,
+  date2Thai,
+} = useCounterMixin();
+const { convertResults, convertStatus } = useKpiDataStore();
+
 /**
  * props
  */
 const tab = defineModel<string>("tab", { required: true });
+const rows = defineModel<ResResults[]>("row", { required: true });
+const page = defineModel<number>("page", { required: true });
+const pageSize = defineModel<number>("pageSize", { required: true });
+const maxPage = defineModel<number>("maxPage", { required: true });
+const total = defineModel<number>("total", { required: true });
+const keyword = defineModel<string>("keyword", { required: true });
+const porps = defineProps({
+  fetchData: { type: Function, required: true },
+});
+
+/**
+ * Table
+ */
+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",
+    format: (val, row) => {
+      return `${row.prefix ?? ""}${row.firstname ?? ""} ${row.lastname ?? ""}`;
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่สร้างแบบประเมิน",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(val);
+    },
+    style: "font-size: 14px",
+  },
+  {
+    name: "evaluationStatus",
+    align: "left",
+    label: "สถานะการประเมิน",
+    sortable: true,
+    field: "evaluationStatus",
+    format(val, row) {
+      return val === "KP7" ? "ประการผลแล้ว" : convertStatus(val);
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "evaluationResults",
+    align: "left",
+    label: "ผลการประเมิน",
+    sortable: true,
+    field: "evaluationResults",
+    format(val, row) {
+      return convertResults(val);
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+]);
+const visibleColumns = ref<string[]>([
+  "no",
+  "fullName",
+  "createdAt",
+  "evaluationStatus",
+  "evaluationResults",
+]);
+const pagination = ref({
+  page: page.value,
+  rowsPerPage: pageSize.value,
+});
+const selected = ref<ResResults[]>([]);
+
+/**
+ * function บันทึกการประกาศผล
+ */
+function onAnnounce() {
+  const ids = selected.value.map((item) => item.id);
+  dialogConfirm(
+    $q,
+    () => {
+      showLoader();
+      http
+        .post(config.API.evaluationUserDone, {
+          id: ids,
+        })
+        .then(() => {
+          setTimeout(async () => {
+            await porps.fetchData();
+            await success($q, "ประกาศผลสำเร็จ");
+            selected.value = [];
+          }, 1000);
+        })
+        .catch((err) => {
+          messageError($q, err);
+          hideLoader();
+        });
+    },
+    "ยืนยันการประกาศผล",
+    "ต้องการยืนยันการประกาศผลใช่หรือไม่?"
+  );
+}
+
+/**
+ * ค้นหาข้อมูล
+ */
+function onSearchData() {
+  page.value = 1;
+  porps.fetchData();
+}
+
+/**
+ * ทำงานเมื่อมีการเปลี่ยนแถวต่อหน้า
+ */
+watch(pagination, () => {
+  page.value = 1;
+  pageSize.value = pagination.value.rowsPerPage;
+});
 </script>
 
 <template>
-  {{ tab }}
+  <q-card-section>
+    <div class="items-center col-12 row q-gutter-x-sm q-mb-sm">
+      <q-space />
+
+      <q-input
+        borderless
+        dense
+        outlined
+        v-model="keyword"
+        placeholder="ค้นหา"
+        @keydown.enter="onSearchData"
+      >
+        <template v-slot:append>
+          <q-icon v-if="keyword === ''" name="search" />
+          <q-icon
+            v-else
+            name="clear"
+            class="cursor-pointer"
+            @click="(keyword = ''), onSearchData()"
+          />
+        </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"
+        options-cover
+      />
+    </div>
+    <d-table
+      :columns="columns"
+      :rows="rows"
+      row-key="id"
+      :selection="tab === 'COMPLETE' ? 'multiple' : null"
+      v-model:selected="selected"
+      :rows-per-page-options="[10, 25, 50, 100]"
+      v-model:pagination="pagination"
+      :paging="true"
+    >
+      <template v-slot:header-selection="scope" v-if="tab === 'COMPLETE'">
+        <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 v-if="tab === 'COMPLETE'">
+            <q-checkbox
+              keep-color
+              color="primary"
+              dense
+              v-model="props.selected"
+            />
+          </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            <div v-if="col.name == 'no'">
+              {{ (page - 1) * pageSize + props.rowIndex + 1 }}
+            </div>
+            <div v-else>
+              {{ col.value ?? "-" }}
+            </div>
+          </q-td>
+        </q-tr>
+      </template>
+      <template v-slot:pagination="scope">
+        ทั้งหมด {{ total }} รายการ
+        <q-pagination
+          v-model="page"
+          active-color="primary"
+          color="dark"
+          :max="Number(maxPage)"
+          size="sm"
+          boundary-links
+          direction-links
+          :max-pages="5"
+          @update:model-value="porps.fetchData()"
+        ></q-pagination>
+      </template>
+    </d-table>
+  </q-card-section>
+  <q-separator v-if="tab === 'COMPLETE'" />
+
+  <q-card-actions
+    align="right"
+    class="bg-white text-teal"
+    v-if="tab === 'COMPLETE'"
+  >
+    <q-btn
+      label="ประกาศผล"
+      color="public"
+      @click="onAnnounce"
+      :disable="selected.length === 0"
+    />
+  </q-card-actions>
 </template>
 
 <style scoped></style>
diff --git a/src/modules/14_KPI/interface/response/Main.ts b/src/modules/14_KPI/interface/response/Main.ts
index 2d8cea4d2..cc702b947 100644
--- a/src/modules/14_KPI/interface/response/Main.ts
+++ b/src/modules/14_KPI/interface/response/Main.ts
@@ -39,5 +39,19 @@ interface ResEvaluator {
   topic: string;
   type: string;
 }
+interface ResResults {
+  commanderHighId: string | null;
+  commanderId: string | null;
+  createdAt: string;
+  evaluationResults: string;
+  evaluationStatus: string;
+  evaluatorId: string;
+  firstname: string;
+  id: string;
+  kpiPeriodId: string;
+  lastname: string;
+  prefix: string;
+  profileId: string;
+}
 
-export type { ResRound, ResDataCapacity, ResEvaluator };
+export type { ResRound, ResDataCapacity, ResEvaluator, ResResults };
diff --git a/src/modules/14_KPI/views/resultsMain.vue b/src/modules/14_KPI/views/resultsMain.vue
index e10b62667..c6be1b040 100644
--- a/src/modules/14_KPI/views/resultsMain.vue
+++ b/src/modules/14_KPI/views/resultsMain.vue
@@ -8,6 +8,7 @@ import config from "@/app.config";
  * import type
  */
 import type { ItemsTab } from "@/modules/14_KPI/interface/index/Main";
+import type { ResResults } from "@/modules/14_KPI/interface/response/Main";
 
 /**
  * import components
@@ -23,8 +24,7 @@ import { useCounterMixin } from "@/stores/mixin";
  *  use
  */
 const $q = useQuasar();
-const { dialogRemove, messageError, showLoader, hideLoader, success } =
-  useCounterMixin();
+const { messageError, showLoader, hideLoader } = useCounterMixin();
 
 /**
  * ตัวแปร
@@ -34,19 +34,31 @@ const tabItems = ref<ItemsTab[]>([
   { name: "COMPLETE", label: " รอประกาศผล" },
   { name: "KP7", label: "ประกาศผลแล้ว" },
 ]);
-
+const dataList = ref<ResResults[]>([]); // ข่อมูลรายการ
 const page = ref<number>(1);
 const pageSize = ref<number>(10);
+const maxPage = ref<number>(1);
+const total = ref<number>(1);
+const keyword = ref<string>("");
 
-function fetcDatahList() {
+/**
+ * function fetch รายการประกาศผล
+ */
+function fetcDataList() {
   showLoader();
   http
     .post(config.API.evaluationUser, {
       status: tab.value,
       page: page.value,
       pageSize: pageSize.value,
+      keyword: keyword.value,
+    })
+    .then((res) => {
+      const data = res.data.result;
+      dataList.value = data.data;
+      total.value = data.total;
+      maxPage.value = Math.ceil(total.value / pageSize.value);
     })
-    .then((res) => {})
     .catch((err) => {
       messageError($q, err);
     })
@@ -55,14 +67,27 @@ function fetcDatahList() {
     });
 }
 
+/**
+ * ทำงานเมื่อมีการเปลี่ยน Tab
+ */
 watch(tab, () => {
   page.value = 1;
-  pageSize.value = 10;
-  fetcDatahList();
+  keyword.value = "";
+  fetcDataList();
 });
 
+/**
+ * ทำงานเมื่อมีการเปลี่ยนแถวต่อหน้า
+ */
+watch(pageSize, () => {
+  fetcDataList();
+});
+
+/**
+ * HooK
+ */
 onMounted(() => {
-  fetcDatahList();
+  fetcDataList();
 });
 </script>
 
@@ -85,12 +110,30 @@ onMounted(() => {
     </q-tabs>
     <q-separator />
     <q-tab-panels v-model="tab" animated class="shadow-2 rounded-borders">
-      <q-tab-panel name="COMPLETE">
-        <TableResults :tab="tab" />
+      <q-tab-panel name="COMPLETE" style="padding: 0px">
+        <TableResults
+          :tab="tab"
+          :row="dataList"
+          v-model:page="page"
+          v-model:pageSize="pageSize"
+          v-model:maxPage="maxPage"
+          v-model:total="total"
+          v-model:keyword="keyword"
+          :fetchData="fetcDataList"
+        />
       </q-tab-panel>
 
-      <q-tab-panel name="KP7">
-        <TableResults :tab="tab" />
+      <q-tab-panel name="KP7" style="padding: 0px">
+        <TableResults
+          :tab="tab"
+          :row="dataList"
+          v-model:page="page"
+          v-model:pageSize="pageSize"
+          v-model:maxPage="maxPage"
+          v-model:total="total"
+          v-model:keyword="keyword"
+          :fetchData="fetcDataList"
+        />
       </q-tab-panel>
     </q-tab-panels>
   </q-card>

From e047e57a08852d38c0a739b5ff929d23e5aa51b1 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 16:02:27 +0700
Subject: [PATCH 8/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81=20?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99=E0=B8=B8=E0=B8=A1=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99=20=E0=B8=AD=E0=B8=99?=
 =?UTF-8?q?=E0=B8=B8=E0=B8=8D=E0=B8=B2=E0=B8=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/resign/ResignByid.vue             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue
index ac2e84749..23582e987 100644
--- a/src/modules/06_retirement/components/resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/resign/ResignByid.vue
@@ -237,7 +237,7 @@ const conditionPopup = () => {
   }
 };
 
-//pop up ยืนยันการอนุมัติ
+//pop up ยืนยันการอนุญาต
 const confirmpopUp = async () => {
   dialogConfirm(
     $q,
@@ -248,7 +248,7 @@ const confirmpopUp = async () => {
       await http
         .put(config.API.resignConfirm(roleUser.value, id.value), body)
         .then(() => {
-          success($q, "การอนุมัติสำเร็จ");
+          success($q, "การอนุญาตสำเร็จ");
           closeModal();
         })
         .catch((e) => {
@@ -258,8 +258,8 @@ const confirmpopUp = async () => {
           fetchData(id.value);
         });
     },
-    "ยืนยันการอนุมัติ",
-    "ต้องการยืนยันการอนุมัติการลานี้หรือไม่ ?"
+    "ยืนยันการอนุญาต",
+    "ต้องการยืนยันการอนุญาตการลานี้หรือไม่ ?"
   );
 };
 
@@ -379,9 +379,9 @@ const getClass = (val: boolean) => {
 const statusOrder = (val: boolean) => {
   switch (val) {
     case true:
-      return "ยับยั้งการลาออก";
+      return "ยับยั้ง";
     case false:
-      return "อนุมัติการลาออก";
+      return "อนุญาต";
   }
 };
 
@@ -580,7 +580,7 @@ function removeFile(fileName: string) {
           dense
           icon-right="check"
           class="q-px-sm"
-          label="อนุมัติ"
+          label="อนุญาต"
           @click="popUp('pass')"
         />
         <q-btn
@@ -1282,7 +1282,7 @@ function removeFile(fileName: string) {
     <q-card style="width: 800px">
       <q-form ref="myFormConfirm">
         <DialogHeader
-          :title="`${actionPass ? 'การอนุมัติการลาออก' : 'การยับยั้งการลาออก'}`"
+          :title="`${actionPass ? 'อนุญาตการลาออก' : 'ยับยั้งการลาออก'}`"
           :close="closeModal"
         />
         <q-separator />