From 86895e49bc873a18874565b48d88036ef12a0c78 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 27 Jan 2025 14:55:06 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=82=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B9=80=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=84=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=81=E0=B8=94=E0=B8=B9=E0=B9=84=E0=B8=94=E0=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonalList/Table.vue         | 45 +++++++++++++++++++
 .../components/DialogCreateCommand.vue        | 13 ++++++
 2 files changed, 58 insertions(+)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 94f0a224c..c1c4be31a 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -23,6 +23,7 @@ import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogF
 import DialogHeader from "@/components/DialogHeader.vue";
 import DialogOrders from "@/modules/05_placement/components/PersonalList/DialogOrders.vue"; //ส่งไปออกคำสั่งขอโอน
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
+import DialogPreviewCommand from "@/modules/18_command/components/DialogPreviewCommand.vue";
 
 const $q = useQuasar(); // show dialog
 const DataStore = usePlacementDataStore();
@@ -48,6 +49,10 @@ const props = defineProps({
   },
 });
 
+const modalCommand = ref<boolean>(false);
+const command = ref<string>("");
+const commandId = ref<string>("");
+
 let roleAdmin = ref<boolean>(false);
 const edit = ref<boolean>(true);
 const modalPersonal = ref<boolean>(false);
@@ -116,6 +121,7 @@ const visibleColumns = ref<any[]>([
   "statusName",
   "draft",
   "positionCandidate",
+  "refCommandNo",
 ]);
 
 /** แสดงข้แมูลใน ตาราง
@@ -227,6 +233,17 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "refCommandNo",
+    align: "left",
+    label: "คำสั่งบรรจุ",
+    sortable: true,
+    field: "refCommandNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
 ]);
 
 /**
@@ -370,6 +387,8 @@ async function getTable() {
             citizenId: data.citizenId,
             id: data.id,
             profileId: data.profileId,
+            refCommandNo: data.refCommandNo,
+            commandId: data.commandId,
           };
           rowsAll.value.push(rowData);
         });
@@ -845,6 +864,13 @@ function onSearchAdd() {
   );
 }
 
+function onRefCommand(data: any) {
+  modalCommand.value = true;
+  command.value = data.refCommandNo;
+  commandId.value = data.commandId;
+  // commandId.value = 'bdf9da91-ba45-497a-a2b7-cc49e2446d97'; //จำลอง
+}
+
 onMounted(async () => {
   await getWorkFlow();
   await getTable();
@@ -1283,6 +1309,19 @@ onMounted(async () => {
                 {{ props.row.statusName }}
               </div>
             </template>
+            <template v-else-if="col.name === 'refCommandNo'">
+              <div
+                class="text-weight-medium"
+                :class="
+                  props.row.refCommandNo && props.row.commandId
+                    ? 'table_ellipsis text-blue cursor-pointer'
+                    : 'table_ellipsis '
+                "
+                @click="props.row.refCommandNo && props.row.commandId ? onRefCommand(props.row) : null"
+              >
+                {{ props.row.refCommandNo ? props.row.refCommandNo : "-" }}
+              </div>
+            </template>
           </q-td>
         </q-tr>
       </template>
@@ -1677,6 +1716,12 @@ onMounted(async () => {
     :id="personalId"
     @update:modal="updatemodalPersonal"
   />
+
+  <DialogPreviewCommand
+    v-model:modal="modalCommand"
+    v-model:command="command"
+    v-model:commandId="commandId"
+  />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/modules/18_command/components/DialogCreateCommand.vue b/src/modules/18_command/components/DialogCreateCommand.vue
index 8911e824e..16af9363f 100644
--- a/src/modules/18_command/components/DialogCreateCommand.vue
+++ b/src/modules/18_command/components/DialogCreateCommand.vue
@@ -169,6 +169,19 @@ function createCommand(isRedirect: boolean) {
       rootId: e.rootId,
       ...(e.remarkVertical ? { remarkVertical: e.remarkVertical } : {}),
       ...(e.remarkHorizontal ? { remarkHorizontal: e.remarkHorizontal } : {}),
+
+      ...(props.commandTypeCode == "C-PM-01" ||
+      props.commandTypeCode == "C-PM-02"
+        ? { position: e.position ? e.position : null }
+        : {}),
+      ...(props.commandTypeCode == "C-PM-01" ||
+      props.commandTypeCode == "C-PM-02"
+        ? { posType: e.posType ? e.posType : null }
+        : {}),
+      ...(props.commandTypeCode == "C-PM-01" ||
+      props.commandTypeCode == "C-PM-02"
+        ? { posLevel: e.posLevel ? e.posLevel : null }
+        : {}),
     }));
 
     const body = {