From 8957e38165cdd8ab3e5421e4e36b6690450ee60b Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 29 Aug 2024 14:03:49 +0700
Subject: [PATCH 1/3] fixing load registry

---
 src/modules/04_registryPerson/views/list.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/04_registryPerson/views/list.vue b/src/modules/04_registryPerson/views/list.vue
index 0efa3d10c..d1456cc28 100644
--- a/src/modules/04_registryPerson/views/list.vue
+++ b/src/modules/04_registryPerson/views/list.vue
@@ -256,12 +256,13 @@ async function selectType() {
         : "เลือกหน่วยงาน";
   } else {
     // แต่ถ้าประเภทเดิมระบบจะใช้ filter เดิมที่เคยค้นหาไว้
+
     if (
       store.formFilter.keyword != "" ||
       store.labelOption.posType != "ทั้งหมด" ||
       store.labelOption.posLevel != "ทั้งหมด" ||
-      store.formFilter.isShowRetire != null ||
-      store.formFilter.isProbation != null
+      store.formFilter.isShowRetire ||
+      store.formFilter.isProbation
     ) {
       store.formFilter.page = 1;
       fetchDataPerson();

From 71ef13e1f2b79fa0a5fd1135439cdfa4731ea151 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 29 Aug 2024 14:26:25 +0700
Subject: [PATCH 2/3] fixing register filter

---
 src/modules/04_registryPerson/store.ts       | 2 +-
 src/modules/04_registryPerson/views/list.vue | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index 73c15a8fc..44fba1bf2 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -88,6 +88,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
     mode,
     formFilter,
     labelOption,
-    nodeData
+    nodeData,
   };
 });
diff --git a/src/modules/04_registryPerson/views/list.vue b/src/modules/04_registryPerson/views/list.vue
index d1456cc28..5c1ca07d8 100644
--- a/src/modules/04_registryPerson/views/list.vue
+++ b/src/modules/04_registryPerson/views/list.vue
@@ -143,9 +143,9 @@ function fetchDataPerson() {
     queryParams.type = empType.value;
   }
 
-  if (nodeData.node !== null && nodeData.nodeId !== null) {
-    queryParams.node = nodeData.node;
-    queryParams.nodeId = nodeData.nodeId;
+  if (store.nodeData.node !== null && store.nodeData.nodeId !== null) {
+    queryParams.node = store.nodeData.node;
+    queryParams.nodeId = store.nodeData.nodeId;
   }
   http
     .get(
@@ -262,7 +262,8 @@ async function selectType() {
       store.labelOption.posType != "ทั้งหมด" ||
       store.labelOption.posLevel != "ทั้งหมด" ||
       store.formFilter.isShowRetire ||
-      store.formFilter.isProbation
+      store.formFilter.isProbation ||
+      store.nodeData.nodeId != null
     ) {
       store.formFilter.page = 1;
       fetchDataPerson();

From c2ae110e498e916081e0e616c57f645f25690e82 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Thu, 29 Aug 2024 14:37:53 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/14_KPI/api.KPI.ts                          |  2 +-
 .../components/DialogDevelopmant.vue               | 14 +++++++++++++-
 src/modules/14_KPI/views/round.vue                 |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/api/14_KPI/api.KPI.ts b/src/api/14_KPI/api.KPI.ts
index 9b0e0de25..32658f12a 100644
--- a/src/api/14_KPI/api.KPI.ts
+++ b/src/api/14_KPI/api.KPI.ts
@@ -88,7 +88,7 @@ export default {
   /**
    * ประกาศผล
    */
-  evaluationUser: `${KpiUser}/evaluation/list`,
+  evaluationUser: `${KpiUser}/evaluation/list-announce`,
   evaluationUserDone: `${KpiUser}/evaluation/done/kp7`,
   achievementDev: `${KpiUser}/achievement/development/admin`,
   achievementDevByid: (id: string) =>
diff --git a/src/modules/04_registryPerson/components/DialogDevelopmant.vue b/src/modules/04_registryPerson/components/DialogDevelopmant.vue
index 079373e6c..5963e8dd3 100644
--- a/src/modules/04_registryPerson/components/DialogDevelopmant.vue
+++ b/src/modules/04_registryPerson/components/DialogDevelopmant.vue
@@ -142,6 +142,7 @@ const emType = computed(() => {
 });
 const formData = reactive<{
   year: number | null;
+  point: number | null;
   name: string;
   group: any[];
   target: string;
@@ -155,6 +156,7 @@ const formData = reactive<{
   year: null,
   name: "",
   group: [],
+  point: 0,
   target: "",
   isDevelopment70: false,
   isDevelopment20: false,
@@ -168,6 +170,7 @@ function close() {
   id.value = "";
 
   formData.name = "";
+  formData.point = 0;
   formData.group = [];
   formData.target = "";
   formData.isDevelopment70 = false;
@@ -197,7 +200,10 @@ watch(
     if (i) {
       showLoader();
       http
-        .get(config.API.kpiAchievementDevelop + `/registry/${emType.value}/${id.value}`)
+        .get(
+          config.API.kpiAchievementDevelop +
+            `/registry/${emType.value}/${id.value}`
+        )
         .then(async (res) => {
           const data = res.data.result;
           formData.year = data.selectTypeYear;
@@ -607,6 +613,12 @@ function filterOptionFn(val: string, update: Function) {
             </q-card>
           </div>
         </div>
+        <div class="row q-pa-sm justify-center">
+          <span class="text-body2 text-weight-bold">ผลการพัฒนา </span>
+          <div class="text-primary q-pl-md">
+            {{ formData.point }}
+          </div>
+        </div>
       </q-card-section>
     </q-card>
   </q-dialog>
diff --git a/src/modules/14_KPI/views/round.vue b/src/modules/14_KPI/views/round.vue
index d2ea33607..669b0c866 100644
--- a/src/modules/14_KPI/views/round.vue
+++ b/src/modules/14_KPI/views/round.vue
@@ -144,7 +144,7 @@ function fetchList() {
   http
     .get(
       config.API.kpiPeriod +
-        `?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&year=${formQuery.year}`
+        `/user?page=${formQuery.page}&pageSize=${formQuery.pageSize}&keyword=${formQuery.keyword}&year=${formQuery.year}`
     )
     .then((res) => {
       const data: ResRound[] = res.data.result.data;