From 08e3add09170904fbb5eab41f1d4a99a03c3e3cd Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 1 Dec 2023 16:21:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=88=E0=B8=B2=E0=B8=A3=E0=B8=93=E0=B8=B2=E0=B8=97=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/4_Result/Form.vue              | 28 +++++++++++++++++--
 .../11_discipline/store/ResultStore.ts        | 15 +---------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index f94590047..d46036552 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -1,10 +1,12 @@
-div<script setup lang="ts">
+div
+<script setup lang="ts">
 import { ref, onMounted, reactive, watch } from "vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useQuasar, QForm } from "quasar";
 import { useRouter, useRoute } from "vue-router";
 
+import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
 import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
@@ -65,6 +67,18 @@ const objectdisciplinary: FormRef = {
 };
 
 const organizationOption = ref<DataOption[]>([]);
+
+async function addPerson(data: any) {
+  await mainStore.fetchData(data);
+  console.log(mainStore.rowsAdd)
+  toggleModal();
+}
+
+function handleSave(returnData: any) {
+  addPerson(returnData);
+  toggleModal();
+}
+
 /** function เรียกรายชื่อหน่วยงาน*/
 async function fetchOrganization() {
   await http
@@ -142,8 +156,9 @@ async function fetchDatadetail() {
 watch(
   () => props.data,
   async () => {
-    console.log(props.data);
+    console.log('pros',props.data);
     respondentType.value = props.data.respondentType;
+    mainStore.rowsAdd = props.data.persons;
     await fetchDatadetail();
     await fetchOrganization();
   }
@@ -360,5 +375,14 @@ onMounted(async () => {});
         >
       </div>
     </q-card>
+    <DialogAddPersonal
+      title="ผู้ถูกร้องเรียน"
+      :mainData="mainStore.rowsAdd"
+      :modal="modalPerson"
+      btn-title="เพิ่มรายชื่อผู้ถูกร้องเรียน"
+      :close="toggleModal"
+      :save="addPerson"
+      @returnData="handleSave"
+    />
   </form>
 </template>
diff --git a/src/modules/11_discipline/store/ResultStore.ts b/src/modules/11_discipline/store/ResultStore.ts
index 921aa5b66..5a8762b44 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -13,7 +13,6 @@ import type {
 import { useCounterMixin } from "@/stores/mixin";
 
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
-import { useCounterMixin } from "@/stores/mixin";
 const mixin = useCounterMixin();
 const storeMain = useDisciplineMainStore();
 const { date2Thai } = mixin;
@@ -64,19 +63,7 @@ export const useDisciplineResultStore = defineStore(
     }
 
     
-    async function fecthDirector(data: directorType[]) {
-      let datalistDirector: directorType[] = data.map((e: directorType) => ({
-        nameDirector: e.nameDirector,
-        position: e.position,
-        duty: e.duty,
-        email: e.email,
-        telephone: e.telephone,
-        role: e.role,
-      }));
-      rows2.value = datalistDirector;
-      selected.value = rows2.value;
-      console.log(rows2.value);
-    }
+
 
     const visibleColumns = ref<String[]>([
       "no",