From 2263302976b3333c215c0708a67ab19cce795da8 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 9 Oct 2024 11:13:12 +0700
Subject: [PATCH] profileId

---
 .../components/probation/DialogOrder.vue          | 15 +++++++++++++--
 .../components/probation/MainProbation.vue        |  4 +---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/modules/05_placement/components/probation/DialogOrder.vue b/src/modules/05_placement/components/probation/DialogOrder.vue
index be1e2db87..5ab58bcf0 100644
--- a/src/modules/05_placement/components/probation/DialogOrder.vue
+++ b/src/modules/05_placement/components/probation/DialogOrder.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch } from "vue";
+import { ref, watch, computed } from "vue";
 import { useQuasar } from "quasar";
 import { useRoute } from "vue-router";
 
@@ -53,6 +53,17 @@ const pagination = ref({
   rowsPerPage: 10,
 });
 
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.personal_id,
+    profileId: i.personal_id,
+    prefix: i.prefixName,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.idcard,
+  }));
+});
+
 /** ข้อมูลที่เเสดง */
 const visibleColumns = ref<string[]>([
   "no",
@@ -406,6 +417,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="commandType"
-    :persons="selected"
+    :persons="selected ? dataMapToSend : []"
   />
 </template>
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 8ed18840a..0088a74e2 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -389,10 +389,8 @@ onMounted(async () => {
   <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
     <div class="row q-col-gutter-sm">
       <div class="row col-12 q-col-gutter-sm">
-        <div class="col-6">
           <div class="row">
             <q-select
-              class="col-5 col-sm-3 col-md-4 "
               v-model="fillter"
               label="สถานะ"
               dense
@@ -449,7 +447,7 @@ onMounted(async () => {
               </q-btn>
             </div>
           </div>
-        </div>
+
         <q-space />
 
         <q-input