From a1bfbba9b689f3e6ab51678adce4156ad2858333 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 7 Jun 2024 11:45:41 +0700
Subject: [PATCH 1/8] =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=88=E0=B8=B3=20=E0=B8=AF=20=3D>=20ffix?=
 =?UTF-8?q?=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogFormPosition.vue                 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/modules/16_positionEmployee/components/DialogFormPosition.vue b/src/modules/16_positionEmployee/components/DialogFormPosition.vue
index 29b766e07..ea0a09522 100644
--- a/src/modules/16_positionEmployee/components/DialogFormPosition.vue
+++ b/src/modules/16_positionEmployee/components/DialogFormPosition.vue
@@ -300,12 +300,12 @@ function deletePos(id: string) {
       .delete(config.API.orgEmployeePosById(id))
       .then(() => {
         success($q, "ลบข้อมูลสำเร็จ");
+        searchInput();
       })
       .catch((err) => {
         messageError($q, err);
       })
       .finally(() => {
-        searchInput();
         hideLoader();
       });
   });
@@ -351,6 +351,15 @@ watch(
     }
   }
 );
+
+watch(
+  () => modalAdd.value,
+  () => {
+    if (!modalAdd.value) {
+      dataCopy.value = [];
+    }
+  }
+);
 </script>
 
 <template>

From e53f81890eeeeef84fca2b09d9467dd8f9f53638 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 7 Jun 2024 12:09:33 +0700
Subject: [PATCH 2/8] fixing bug

---
 .../02_organizationalNew/components/DialogFormAgency.vue       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
index 145b745da..08743e945 100644
--- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
@@ -146,7 +146,8 @@ function onSubmit() {
       ["org" + type + "RankSub"]:
         level.value !== 0 ? formData.orgLevelSub : undefined,
       [nameId]: rootId,
-      responsibility: formData.responsibility,
+      responsibility:
+        formData.responsibility != null ? formData.responsibility : "",
     };
 
     if (actionType.value === "ADD") {

From e3c0670b269972d358166574732860152e958b94 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 7 Jun 2024 12:10:11 +0700
Subject: [PATCH 3/8] fixing bug

---
 .../components/probation/MainProbation.vue    | 89 ++++++++++---------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 2b519e827..237c3ff9c 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -173,11 +173,14 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "posLevelName",
     align: "left",
-    label: "ระดับ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "posLevelName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.posTypeName + " (" + row.posLevelName + ")";
+    },
   },
   {
     name: "organizationOrganization",
@@ -299,21 +302,21 @@ async function filterKeyword2Fn(page: number) {
 }
 
 /** fecth profile */
-async function fecthlistPersonal() {
-  showLoader();
-  await http
-    .get(config.API.profileOrganizRoot)
-    .then((res) => {
-      const id = res.data.result[0].id;
-      if (id !== "") {
-        findlist(id);
-      }
-    })
-    .catch((e) => {
-      messageError($q, e);
-    })
-    .finally(() => {});
-}
+// async function fecthlistPersonal() {
+//   showLoader();
+//   await http
+//     .get(config.API.profileOrganizRoot)
+//     .then((res) => {
+//       const id = res.data.result[0].id;
+//       if (id !== "") {
+//         findlist(id);
+//       }
+//     })
+//     .catch((e) => {
+//       messageError($q, e);
+//     })
+//     .finally(() => {});
+// }
 
 /**
  * ส่งข้อมูลเพื่อ รับ res
@@ -341,34 +344,34 @@ async function fecthlistProbation(id: string, data: any) {
  * ค้นหาข้อมูลตามไอดี
  * @param id string
  */
-async function findlist(id: string) {
-  let data: CriteriaType[] = [
-    { criteriaType: "is_retire", criteriaValue: "false" },
-    { criteriaType: "is_probation", criteriaValue: "true" },
-  ];
-  let data2: CriteriaType[] = [
-    { criteriaType: "is_retire", criteriaValue: "false" },
-    { criteriaType: "is_probation", criteriaValue: "false" },
-  ];
-  let response1 = await fecthlistProbation(id, data);
-  let response2 = await fecthlistProbation(id, data2);
+// async function findlist(id: string) {
+//   let data: CriteriaType[] = [
+//     { criteriaType: "is_retire", criteriaValue: "false" },
+//     { criteriaType: "is_probation", criteriaValue: "true" },
+//   ];
+//   let data2: CriteriaType[] = [
+//     { criteriaType: "is_retire", criteriaValue: "false" },
+//     { criteriaType: "is_probation", criteriaValue: "false" },
+//   ];
+//   let response1 = await fecthlistProbation(id, data);
+//   let response2 = await fecthlistProbation(id, data2);
 
-  response1.forEach((e: any) =>
-    probationlist.value.push({ ...e, probation: true })
-  );
-  response2.forEach((e: any) =>
-    probationlist.value.push({ ...e, probation: false })
-  );
-  rows2.value = probationlist.value.map((e: mapData) => ({
-    id: e.id,
-    fullname: e.fullname,
-    position: e.position,
-    level: e.positionEmployeeLevel,
-    organizationOrganization: e.oc,
-    status: e.probation,
-  }));
-  modal.value = true;
-}
+//   response1.forEach((e: any) =>
+//     probationlist.value.push({ ...e, probation: true })
+//   );
+//   response2.forEach((e: any) =>
+//     probationlist.value.push({ ...e, probation: false })
+//   );
+//   rows2.value = probationlist.value.map((e: mapData) => ({
+//     id: e.id,
+//     fullname: e.fullname,
+//     position: e.position,
+//     level: e.positionEmployeeLevel,
+//     organizationOrganization: e.oc,
+//     status: e.probation,
+//   }));
+//   modal.value = true;
+// }
 
 /**
  * เพิ่มข้อมูล ผู้ทดลองปฏิบัติหน้าที่ราชการ

From 1680f26414d3e715129c739dc88075af943be43f Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 7 Jun 2024 12:23:23 +0700
Subject: [PATCH 4/8] =?UTF-8?q?=E0=B8=A5=E0=B8=9A=E0=B9=80=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B9=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=AB=E0=B8=A5=E0=B8=B1=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/request/main/main.ts | 70 +++++++++++++++---------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index b1d333a01..63b0fafbb 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -51,41 +51,41 @@ const menuList = readonly<any[]>([
     path: "dashboard",
     role: "dashboard",
   },
-  {
-    key: 2,
-    icon: "o_person",
-    activeIcon: "person",
-    label: "ข้อมูลหลัก",
-    path: "metadataNew",
-    role: "metadata",
-    children: [
-      {
-        key: 2.0,
-        label: "ข้อมูลเกี่ยวกับบุคคล",
-        path: "masterPersonal",
-      },
-      {
-        key: 2.0,
-        label: "ข้อมูลตำแหน่งข้าราชการ ฯ",
-        path: "masterPosition",
-      },
-      {
-        key: 2.0,
-        label: "ข้อมูลตำแหน่งลูกจ้างประจำ",
-        path: "masterPositionEmployee",
-      },
-      {
-        key: 2.0,
-        label: "ข้อมูลปฏิทินวันหยุด",
-        path: "masterCalendarWork",
-      },
-      {
-        key: 2.0,
-        label: "ข้อมูลเครื่องราชอิสริยาภรณ์",
-        path: "masterInsignia",
-      },
-    ],
-  },
+  // {
+  //   key: 2,
+  //   icon: "o_person",
+  //   activeIcon: "person",
+  //   label: "ข้อมูลหลัก",
+  //   path: "metadataNew",
+  //   role: "metadata",
+  //   children: [
+  //     {
+  //       key: 2.0,
+  //       label: "ข้อมูลเกี่ยวกับบุคคล",
+  //       path: "masterPersonal",
+  //     },
+  //     {
+  //       key: 2.0,
+  //       label: "ข้อมูลตำแหน่งข้าราชการ ฯ",
+  //       path: "masterPosition",
+  //     },
+  //     {
+  //       key: 2.0,
+  //       label: "ข้อมูลตำแหน่งลูกจ้างประจำ",
+  //       path: "masterPositionEmployee",
+  //     },
+  //     {
+  //       key: 2.0,
+  //       label: "ข้อมูลปฏิทินวันหยุด",
+  //       path: "masterCalendarWork",
+  //     },
+  //     {
+  //       key: 2.0,
+  //       label: "ข้อมูลเครื่องราชอิสริยาภรณ์",
+  //       path: "masterInsignia",
+  //     },
+  //   ],
+  // },
   {
     key: 2,
     icon: "o_person",

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 5/8] 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,

From 5611c95f025b02e71350a763fdaef4d620fbeeab Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 7 Jun 2024 14:23:42 +0700
Subject: [PATCH 6/8] fixing recruiting

---
 src/modules/03_recruiting/components/top1.vue       | 3 ---
 src/modules/03_recruiting/views/03_editor/index.vue | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/modules/03_recruiting/components/top1.vue b/src/modules/03_recruiting/components/top1.vue
index 6236a8bc9..58db8da3a 100644
--- a/src/modules/03_recruiting/components/top1.vue
+++ b/src/modules/03_recruiting/components/top1.vue
@@ -99,9 +99,6 @@
   </div>
 </template>
 <script setup lang="ts">
-import { useProfileDataStore } from "@/modules/04_registry/store";
-const profileStore = useProfileDataStore();
-
 const props = defineProps({
   header: {
     type: String,
diff --git a/src/modules/03_recruiting/views/03_editor/index.vue b/src/modules/03_recruiting/views/03_editor/index.vue
index 50d05a178..295c7f12c 100644
--- a/src/modules/03_recruiting/views/03_editor/index.vue
+++ b/src/modules/03_recruiting/views/03_editor/index.vue
@@ -15,8 +15,8 @@ import type { QForm } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import HeaderTop from "@/modules/04_registry/components/Information/top.vue";
-import ProfileTable from "@/modules/04_registry/components/Table.vue";
+import HeaderTop from "@/modules/03_recruiting/components/top1.vue";
+import ProfileTable from "@/modules/03_recruiting/components/Table1.vue";
 
 import { useQuasar } from "quasar";
 
@@ -130,7 +130,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "lastUpdatedAt",
     align: "left",
-    label: "ว้นที่แก้ไขล่าสุด",
+    label: "วันที่แก้ไขล่าสุด",
     sortable: true,
     field: "lastUpdatedAt",
     headerStyle: "font-size: 14px",

From cd19100cfedbc861493b6373553632cf3820a10a Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 7 Jun 2024 14:35:24 +0700
Subject: [PATCH 7/8] closed#836

---
 src/modules/05_placement/components/Other/Dialogbody.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/05_placement/components/Other/Dialogbody.vue b/src/modules/05_placement/components/Other/Dialogbody.vue
index 7d3efef9c..4cbfbb54c 100644
--- a/src/modules/05_placement/components/Other/Dialogbody.vue
+++ b/src/modules/05_placement/components/Other/Dialogbody.vue
@@ -146,7 +146,7 @@ const addOther = async () => {
   let pId: string[] = [];
   let Type = props.type as string;
   selected.value.forEach((e: any) => {
-    pId.push(e.personalId);
+    pId.push(e.profileId);
   });
   let data = {
     id: pId,

From 0d697dc0e4e583f309462a8866cd1cb24719fd07 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 7 Jun 2024 15:36:28 +0700
Subject: [PATCH 8/8] =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88?=
 =?UTF-8?q?=E0=B8=B8=20=E0=B9=81=E0=B8=95=E0=B9=88=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=89=E0=B8=87=20=3D>=20fix=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/AppointEmployee/Dialogbody.vue      | 2 +-
 src/modules/05_placement/components/AppointMent/Dialogbody.vue  | 2 +-
 src/modules/05_placement/components/Receive/Dialogbody.vue      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
index 182ab6fc9..26f72a8f4 100644
--- a/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
@@ -224,7 +224,7 @@ watchEffect(() => {
           :columns="columns2"
           :rows="rows2"
           :filter="filterKeyword2"
-          row-key="personalId"
+          row-key="profileId"
           flat
           :visible-columns="visibleColumns2"
           selection="multiple"
diff --git a/src/modules/05_placement/components/AppointMent/Dialogbody.vue b/src/modules/05_placement/components/AppointMent/Dialogbody.vue
index d8de10d71..74a49b7e6 100644
--- a/src/modules/05_placement/components/AppointMent/Dialogbody.vue
+++ b/src/modules/05_placement/components/AppointMent/Dialogbody.vue
@@ -241,7 +241,7 @@ watchEffect(() => {
           :columns="columns2"
           :rows="rows2"
           :filter="filterKeyword2"
-          row-key="personalId"
+          row-key="profileId"
           flat
           :visible-columns="visibleColumns2"
           selection="multiple"
diff --git a/src/modules/05_placement/components/Receive/Dialogbody.vue b/src/modules/05_placement/components/Receive/Dialogbody.vue
index 5dc66c591..b7ced349c 100644
--- a/src/modules/05_placement/components/Receive/Dialogbody.vue
+++ b/src/modules/05_placement/components/Receive/Dialogbody.vue
@@ -224,7 +224,7 @@ watchEffect(() => {
           :columns="columns2"
           :rows="rows2"
           :filter="filterKeyword2"
-          row-key="personalId"
+          row-key="id"
           flat
           :visible-columns="visibleColumns2"
           selection="multiple"