From 0c473e14c3529524c71c880867ee56116a259b7e Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 5 Nov 2024 14:04:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B9=80=E0=B9=80=E0=B8=99=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B1=E0=B9=89=E0=B8=87=20=E0=B9=80=E0=B9=80?=
 =?UTF-8?q?=E0=B8=99=E0=B8=A7=E0=B8=99=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AppointEmployee/DialogOrders.vue | 15 +++++++++++++--
 .../components/AppointMent/DialogOrders.vue     | 15 +++++++++++++--
 .../components/Help-Government/DialogOrders.vue | 15 +++++++++++++--
 .../components/Other/DialogOrders.vue           | 15 +++++++++++++--
 .../components/Receive/DialogOrders.vue         | 15 +++++++++++++--
 .../components/Repatriate/DialogOrders.vue      | 13 ++++++++++++-
 .../components/Transfer/DialogOrders.vue        | 17 ++++++++++++++---
 .../DismissOrder/DialogSendToCommand.vue        | 13 ++++++++++++-
 .../components/resign/DialogSendToCommand.vue   | 16 ++++++++++++++--
 .../components/DialogCreateCommand.vue          |  5 ++++-
 10 files changed, 121 insertions(+), 18 deletions(-)

diff --git a/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue b/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
index 78b0d8163..98405400d 100644
--- a/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
+++ b/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, type PropType } from "vue";
+import { ref, watch, type PropType, computed } from "vue";
 import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
@@ -35,6 +35,17 @@ const emit = defineEmits([
 
 const rows = ref<PersonData[]>([]); //ราชชื่อส่งไปออกคำสั่ง
 const selected = ref<PersonData[]>([]); //ราชชื่อที่เลือกส่งไปออกคำสั่ง
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+  }));
+});
 const visibleColumns2 = ref<string[]>([
   "no",
   "citizenId",
@@ -377,6 +388,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="commandType"
-    :persons="selected"
+    :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/05_placement/components/AppointMent/DialogOrders.vue b/src/modules/05_placement/components/AppointMent/DialogOrders.vue
index 2aed2bb63..1188ff707 100644
--- a/src/modules/05_placement/components/AppointMent/DialogOrders.vue
+++ b/src/modules/05_placement/components/AppointMent/DialogOrders.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, type PropType } from "vue";
+import { ref, watch, type PropType, computed } from "vue";
 import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
@@ -49,6 +49,17 @@ const emit = defineEmits([
  */
 const rows = ref<PersonData[]>([]); //ราชชื่อส่งไปออกคำสั่ง
 const selected = ref<PersonData[]>([]); //ราชชื่อที่เลือกส่งไปออกคำสั่ง
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+  }));
+});
 const visibleColumns2 = ref<string[]>([
   "no",
   "citizenId",
@@ -406,6 +417,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="commandType"
-    :persons="selected"
+    :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/05_placement/components/Help-Government/DialogOrders.vue b/src/modules/05_placement/components/Help-Government/DialogOrders.vue
index c9b9d605c..74359540f 100644
--- a/src/modules/05_placement/components/Help-Government/DialogOrders.vue
+++ b/src/modules/05_placement/components/Help-Government/DialogOrders.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 { useCounterMixin } from "@/stores/mixin";
@@ -177,6 +177,17 @@ const visibleColumns2 = ref<string[]>([
   "status",
 ]);
 const selected = ref<officerType[]>([]); //รายการที่เลือก
+  const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+  }));
+});
 const modalCommand = ref<boolean>(false);
 
 /** ยืนยันการส่งไปออกคำสั่ง*/
@@ -333,6 +344,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-15'"
-    :persons="selected"
+    :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/05_placement/components/Other/DialogOrders.vue b/src/modules/05_placement/components/Other/DialogOrders.vue
index 07028feca..efad30fa9 100644
--- a/src/modules/05_placement/components/Other/DialogOrders.vue
+++ b/src/modules/05_placement/components/Other/DialogOrders.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, type PropType } from "vue";
+import { ref, watch, type PropType, computed } from "vue";
 import { useQuasar } from "quasar";
 
 import { useTransferDataStore } from "@/modules/05_placement/store";
@@ -42,6 +42,17 @@ const emit = defineEmits([
 //Table
 const rows = ref<listMain[]>([]); //ราชชื่อส่งไปออกคำสั่ง
 const selected = ref<listMain[]>([]); //ราชชื่อที่เลือกส่งไปออกคำสั่ง
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+  }));
+});
 const visibleColumns2 = ref<string[]>([
   "no",
   "fullname",
@@ -325,6 +336,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="commandType"
-    :persons="selected"
+    :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue
index b52dc7497..69a40e405 100644
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watchEffect } from "vue";
+import { ref, watchEffect,computed } from "vue";
 import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
@@ -16,6 +16,17 @@ const transferStore = useTransferDataStore();
 const { statusText } = transferStore;
 const $q = useQuasar();
 const selected = ref<ResponseRow[]>([]);
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+  }));
+});
 const mixin = useCounterMixin();
 const { dialogConfirm, date2Thai } = mixin;
 
@@ -310,6 +321,6 @@ watchEffect(() => {
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-14'"
-  :persons="selected"
+    :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/05_placement/components/Repatriate/DialogOrders.vue b/src/modules/05_placement/components/Repatriate/DialogOrders.vue
index cebb91b6f..266dd1624 100644
--- a/src/modules/05_placement/components/Repatriate/DialogOrders.vue
+++ b/src/modules/05_placement/components/Repatriate/DialogOrders.vue
@@ -30,6 +30,17 @@ const emit = defineEmits(["update:filterKeyword2", "update:selected"]);
 
 //table
 const selected = ref<officerType[]>([]);
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+  }));
+});
 const columns2 = ref<QTableProps["columns"]>([
   {
     name: "no",
@@ -292,6 +303,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-16'"
- :persons="selected"
+    :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/05_placement/components/Transfer/DialogOrders.vue b/src/modules/05_placement/components/Transfer/DialogOrders.vue
index 8e784b0e4..3025e42a4 100644
--- a/src/modules/05_placement/components/Transfer/DialogOrders.vue
+++ b/src/modules/05_placement/components/Transfer/DialogOrders.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 { useCounterMixin } from "@/stores/mixin";
@@ -27,6 +27,18 @@ const props = defineProps({
 const modalCommand = ref<boolean>(false); //เปิด-ปิด modal สร้างคำสั่ง
 //Table
 const selected = ref<ResponseData[]>([]); //รายชื่อที่เลือก
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+  }));
+});
+
 const filter = ref<string>(""); //คำค้นหา
 const visibleColumns2 = ref<string[]>([
   "no",
@@ -188,7 +200,6 @@ watch(
             </q-toolbar>
           </div>
         </div>
-
         <d-table
           :columns="columns2"
           :rows="rows"
@@ -255,6 +266,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     command-type-code="C-PM-13"
-   :persons="selected"
+    :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue b/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
index ee2500668..e79017de6 100644
--- a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
@@ -17,6 +17,17 @@ import DialogHeader from "@/components/DialogHeader.vue";
 const $q = useQuasar();
 const { statusText } = useTransferDataStore();
 const selected = ref<ResponseItems[]>([]);
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+  }));
+});
 const mixin = useCounterMixin();
 const {
   showLoader,
@@ -263,6 +274,6 @@ watchEffect(() => {
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-18'"
-    :persons="selected"
+    :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/06_retirement/components/resign/DialogSendToCommand.vue b/src/modules/06_retirement/components/resign/DialogSendToCommand.vue
index dc02727e5..74f2ed289 100644
--- a/src/modules/06_retirement/components/resign/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/resign/DialogSendToCommand.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watchEffect } from "vue";
+import { ref, watchEffect,computed } from "vue";
 import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
@@ -17,6 +17,18 @@ const $q = useQuasar();
 const stroe = useRetirementDataStore();
 const { statusText } = stroe;
 const selected = ref<ResponseItems[]>([]);
+const dataMapToSend = computed(() => {
+  return selected.value.map((i: any) => ({
+    id: i.id,
+    profileId: i.profileId,
+    prefix: i.prefix,
+    firstName: i.firstName,
+    lastName: i.lastName,
+    citizenId: i.citizenId,
+    remarkVertical: i.reason,
+    remarkHorizontal: i.remarkHorizontal,
+  }));
+});
 const mixin = useCounterMixin();
 const { dialogConfirm, date2Thai } = mixin;
 
@@ -269,6 +281,6 @@ watchEffect(() => {
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="props.mainTabs === '1' ? 'C-PM-17' : 'C-PM-41'"
-    :persons="selected"
+    :persons="dataMapToSend"
   />
 </template>
diff --git a/src/modules/18_command/components/DialogCreateCommand.vue b/src/modules/18_command/components/DialogCreateCommand.vue
index f1b58822d..c9ebfe8f0 100644
--- a/src/modules/18_command/components/DialogCreateCommand.vue
+++ b/src/modules/18_command/components/DialogCreateCommand.vue
@@ -165,7 +165,10 @@ function createCommand(isRedirect: boolean) {
       lastName: e.lastName,
       citizenId: e.citizenId,
       profileId: e.profileId,
+      remarkVertical: e.remarkVertical,
+      ...(e.remarkHorizontal ? { remarkHorizontal: e.remarkHorizontal } : {}),
     }));
+
     const body = {
       commandYear: commandYear.value,
       commandNo: commandNo.value,
@@ -268,7 +271,7 @@ async function fetchCommandType() {
     (v: ListCommand) => v.code == props.commandTypeCode
   );
   commandType.value = commandOp.value[0].id;
-  console.log("🚀 ~ fetchCommandType ~ commandType.value:", commandType.value)
+  console.log("🚀 ~ fetchCommandType ~ commandType.value:", commandType.value);
 }
 
 /**