From 144b4abea61fa7913936d51ecb12ce33c794e152 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 24 Jan 2025 17:24:19 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97?=
 =?UTF-8?q?=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=9B=E0=B8=8F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=AB=E0=B8=99=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/05_placement/api.probation.ts                      | 5 +++++
 .../probation/FormEvaluation/DialogSelectAuthority.vue     | 7 ++++++-
 .../components/probation/FormEvaluation/FormReport.vue     | 6 +++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/api/05_placement/api.probation.ts b/src/api/05_placement/api.probation.ts
index 93cb904a9..b7c610a12 100644
--- a/src/api/05_placement/api.probation.ts
+++ b/src/api/05_placement/api.probation.ts
@@ -98,4 +98,9 @@ export default {
   //รายงาน
   probationReport: `${report}`,
   probationSurvey: `${probation}/survey/admin`,
+
+  //ราชชื่อเลือกผู้มีอำนาจออกคำสั่ง
+  probationCommanderDirector : `${orgProfile}/profile/commander-director-position`,
+
+  
 };
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
index 99ce1703c..07128bf6f 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
@@ -2,6 +2,7 @@
 import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 
+import { useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -11,12 +12,15 @@ import type { QTableProps } from "quasar";
 import DialogHeader from "@/components/DialogHeader.vue";
 
 const $q = useQuasar();
+const route = useRoute();
 const { showLoader, hideLoader, messageError } = useCounterMixin();
 
 const modal = defineModel<boolean>("modal", { required: true }); //popup เลือกผู้บังคับบัญชา/ผู้มีอำนาจออกคำสั่ง
 
 const emit = defineEmits(["update-authority"]);
 
+const personalId = ref<string>(route.params.personalId.toString());
+
 const selected = ref<any[]>([]);
 const isAct = ref<boolean>(false);
 const search = ref<string>("");
@@ -106,12 +110,13 @@ function onCloseDialog() {
 function fetchList() {
   showLoader();
   http
-    .post(config.API.commandDirector, {
+    .post(config.API.probationCommanderDirector, {
       isDirector: true, // fix ค่านี้เป็น true
       isAct: isAct.value,
       keyword: search.value.trim(),
       page: page.value,
       pageSize: pageSize.value,
+      profileId: personalId.value,
     })
     .then((res) => {
       const data = res.data.result;
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index cb43e5f19..e1b13ff4a 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -158,6 +158,7 @@ async function fecthAssign() {
  * @param id personal id
  */
 const fecthResult = async (id: string) => {
+  showLoader();
   const noNumber = props?.tab ? Number(props?.tab.charAt(4)) : "";
   await http
     .get(config.API.createformReport(id) + `&evaluate_no=${noNumber}`)
@@ -184,7 +185,10 @@ const fecthResult = async (id: string) => {
         changeReson52(Number(data.pass_result));
       }
     })
-    .catch((e) => {});
+    .catch((e) => {})
+    .finally(() => {
+      hideLoader();
+    });
 };
 
 /** เช็คก่อน save */