From dcfe03737b6699108e1a02df5b18a90896e3dbc3 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 7 Jun 2024 12:41:28 +0700
Subject: [PATCH] fixing bug

---
 .../components/6_BasicInformation/Director/Form.vue           | 3 ++-
 src/modules/11_discipline/interface/request/director.ts       | 3 ++-
 src/modules/12_evaluatePersonal/components/Director/Form.vue  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
index 34d0a914b..69540d198 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -184,7 +184,7 @@ async function searchInput() {
       .then((res) => {
         const data = res.data.result;
         const list = data.map((e: ResponsePreson) => ({
-          personId: e.personId,
+          personId: e.id,
           idcard: e.idcard,
           prefix: e.prefix,
           firstName: e.firstName,
@@ -249,6 +249,7 @@ watch(props.data, async () => {
   formData.qualification = props.data.qualification;
 });
 </script>
+
 <template>
   <form @submit.prevent.stop="onValidate">
     <q-card bordered>
diff --git a/src/modules/11_discipline/interface/request/director.ts b/src/modules/11_discipline/interface/request/director.ts
index 36e9028d0..8c30c9708 100644
--- a/src/modules/11_discipline/interface/request/director.ts
+++ b/src/modules/11_discipline/interface/request/director.ts
@@ -33,7 +33,8 @@ interface typeOp {
 }
 
 interface ResponsePreson {
-  personId: string; //id อ้างอิง profile
+  id?: string; //id อ้างอิง profile
+  personId?: string; //id อ้างอิง profile
   idcard: string; //เลขประจำตัวประชาชน
   prefix: string; //คำนำหน้า
   firstName: string; //ชื่อ
diff --git a/src/modules/12_evaluatePersonal/components/Director/Form.vue b/src/modules/12_evaluatePersonal/components/Director/Form.vue
index d6b8fd09b..9a7b64e7e 100644
--- a/src/modules/12_evaluatePersonal/components/Director/Form.vue
+++ b/src/modules/12_evaluatePersonal/components/Director/Form.vue
@@ -12,7 +12,7 @@ import type {
 } from "@/modules/11_discipline/interface/request/director";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
+import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
 
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
@@ -207,7 +207,7 @@ async function searchInput() {
       .then((res) => {
         const data = res.data.result;
         const list = data.map((e: ResponsePreson) => ({
-          personId: e.personId,
+          personId: e.id,
           idcard: e.idcard,
           prefix: e.prefix,
           firstName: e.firstName,