From 62ad5673c623670a0bf1b9c7cc64dbf2dabe4a70 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 1 Dec 2023 11:44:11 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=96=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=81=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B9=80=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/AddPersonal.vue          | 14 +++++++++++---
 .../components/1_Complaint/Form.vue             |  2 +-
 .../components/2_InvestigateFacts/Form.vue      |  2 +-
 .../interface/response/investigate.ts           | 17 ++++++++++++++++-
 src/modules/11_discipline/store.ts              |  4 ++--
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 412b7a5b5..598b82936 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -46,7 +46,7 @@ const typeOps = ref<typeOp[]>([
 
 /** รับค่ามาจาก หน้าหลัก */
 const props = defineProps({
-  checkId: {
+  mainData: {
     type: Array,
     default: [],
   },
@@ -118,8 +118,9 @@ async function searchInput() {
       .post(config.API.searchPersonal(), body)
       .then((res) => {
         const data = res.data.result;
+        console.log(data)
         const list = data.map((e: ResponsePreson) => ({
-          personId: e.personId,
+          id: e.personId,
           idcard: e.idcard,
           prefix: e.prefix,
           firstName: e.firstName,
@@ -145,10 +146,17 @@ async function searchInput() {
   }
 }
 
+
 /** update เมื่อเปลี่ยน option */
 function updateSelect() {
   search.value = "";
 }
+watch(()=>props.mainData,()=>{
+  if(props.mainData){
+    console.log('mainData',props.mainData)
+    selected.value = props.mainData
+  }
+})
 </script>
 
 <template>
@@ -214,7 +222,7 @@ function updateSelect() {
             ref="table"
             :columns="mainStore.columnsRespondent"
             :rows="rows"
-            row-key="personId"
+            row-key="idcard"
             flat
             bordered
             :paging="true"
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 12313a440..361415cbb 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -984,7 +984,7 @@ onMounted(() => {
   <!-- Popup ผู้ถูกร้องเรียน -->
   <DialogAddPersonal
     title="ผู้ถูกร้องเรียน"
-    :checkId="mainStore.rowsAdd"
+    :mainData="mainStore.rowsAdd"
     :modal="modal"
     btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
     :close="toggleModal"
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 7227edb4f..edf07e8fd 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -1303,7 +1303,7 @@ onMounted(async () => {
 
   <DialogAddPersonal
     title="ผู้ถูกร้องเรียน"
-    :checkId="mainStore.rowsAdd"
+    :mainData="mainStore.rowsAdd"
     :modal="modalPerson"
     btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
     :close="toggleModal"
diff --git a/src/modules/11_discipline/interface/response/investigate.ts b/src/modules/11_discipline/interface/response/investigate.ts
index 0bd7d136e..d9355dea9 100644
--- a/src/modules/11_discipline/interface/response/investigate.ts
+++ b/src/modules/11_discipline/interface/response/investigate.ts
@@ -12,6 +12,20 @@ interface ListData {
 }
 
 interface ArrayPerson {
+  id:string
+  idcard:string
+  name:string
+  prefix:string
+  firstName:string
+  lastName:string
+  posNo:string
+  position:string
+  positionLevel:string
+  salary:number|null
+  organization:string
+}
+
+interface ArrayPersonAdd {
   personId:string
   idcard:string
   name:string
@@ -24,8 +38,9 @@ interface ArrayPerson {
   salary:number|null
   organization:string
 }
+
 interface ocListType{
   organizationId:string
   organizationName:string
 }
-export type { ListData,ArrayPerson,ocListType };
+export type { ListData,ArrayPerson,ocListType,ArrayPersonAdd };
diff --git a/src/modules/11_discipline/store.ts b/src/modules/11_discipline/store.ts
index 589f0e90c..b705596c8 100644
--- a/src/modules/11_discipline/store.ts
+++ b/src/modules/11_discipline/store.ts
@@ -2,7 +2,7 @@ import { defineStore } from "pinia";
 import type { QTableProps } from "quasar";
 import { ref } from "vue";
 import type { DataOption } from "@/modules/11_discipline/interface/index/Main";
-import type { ArrayPerson } from "@/modules/11_discipline/interface/response/investigate";
+import type { ArrayPerson, ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate";
 
 export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
   /** option ผู้ถูกสอบสวน*/
@@ -278,6 +278,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     rowsAdd.value = data;
   }
 
+
   return {
     complainantoptionsMain,
     convertFault,
@@ -292,7 +293,6 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
     visibleColumnsDirector,
     rowsAdd,
     fetchData,
-
     statusResultOptions,
     convertStatusResult,