From 0c315eed8ae879092745d6d2d53e689f26e55a61 Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet <thanaphon@frappet.com>
Date: Tue, 1 Apr 2025 12:50:30 +0700
Subject: [PATCH 1/6] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20socket=20=20=E0=B9=81=E0=B8=88=E0=B9=89=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=95=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=AD=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue          |  9 ++++++++-
 src/api/socket.ts    |  7 +++++++
 src/app.config.ts    |  6 ++++++
 src/stores/socket.ts | 48 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 src/api/socket.ts
 create mode 100644 src/stores/socket.ts

diff --git a/src/App.vue b/src/App.vue
index ba0f91688..45da90b64 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,4 +1,11 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { useSocketStore } from "@/stores/socket";
+import { onMounted } from "vue";
+
+onMounted(() => {
+  useSocketStore();
+});
+</script>
 
 <template>
   <div id="azay-admin-app">
diff --git a/src/api/socket.ts b/src/api/socket.ts
new file mode 100644
index 000000000..b0186667e
--- /dev/null
+++ b/src/api/socket.ts
@@ -0,0 +1,7 @@
+import env from "./index";
+
+const socket = `${env.API_URI}/org-socket`;
+
+export default {
+  socket,
+};
diff --git a/src/app.config.ts b/src/app.config.ts
index 9dd8f3ead..5aa834a1f 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -70,6 +70,9 @@ import development from "./api/15_development/api.development";
 /** ออกคำสั่งใหม่ */
 import command from "./api/18_command/api.command";
 
+/** socket */
+import socket from "./api/socket";
+
 import file from "./api/file/api.file";
 
 // environment variables
@@ -140,6 +143,9 @@ const API = {
 
   /*file*/
   ...file,
+
+  /*socket*/
+  ...socket,
 };
 
 const path = import.meta.env.VITE_MANUAL_URL ?? "";
diff --git a/src/stores/socket.ts b/src/stores/socket.ts
new file mode 100644
index 000000000..bf77d30f1
--- /dev/null
+++ b/src/stores/socket.ts
@@ -0,0 +1,48 @@
+import { defineStore } from "pinia";
+import { Notify } from "quasar";
+
+import { io, Socket } from "socket.io-client";
+
+import config from "@/app.config";
+import { getToken } from "@/plugins/auth";
+
+interface sockeBackup {
+  message: string;
+  success?: boolean;
+}
+
+export const useSocketStore = defineStore("socket", () => {
+  let socket: Socket;
+
+  async function init() {
+    socket = io(new URL(config.API.socket).origin, {
+      auth: { token: await getToken() },
+      path: "/api/v1/org-socket",
+    });
+    socket.on("send-command-notification", (payload) => {
+      let body: sockeBackup = JSON.parse(payload);
+      notifyStatus(body.message, body.success);
+    });
+  }
+
+  function notifyStatus(message: string, success?: boolean) {
+    Notify.create({
+      group: false,
+      type: success === undefined || success ? "positive" : "negative",
+      message: `${message}`,
+      position: "top",
+      timeout: 0,
+      actions: [
+        {
+          icon: "close",
+          color: "white",
+          round: true,
+        },
+      ],
+    });
+  }
+
+  init();
+
+  return {};
+});

From 184e1a881555bfaed5dc077fb2483b63475de9f6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 1 Apr 2025 17:20:47 +0700
Subject: [PATCH 2/6] =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88?=
 =?UTF-8?q?=E0=B8=B8=E0=B9=81=E0=B8=95=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=89=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppointEmployee/DialogOrders.vue          | 136 +++++++++++++++---
 .../components/AppointMent/DialogOrders.vue   | 129 +++++++++++++++--
 .../Help-Government/DialogOrders.vue          |  32 ++---
 .../components/Receive/DialogOrders.vue       |  42 ++++++
 .../components/Repatriate/DialogOrders.vue    |  12 +-
 .../components/Transfer/DialogOrders.vue      |  17 ++-
 .../05_placement/views/02_transferMain.vue    |  17 ++-
 .../05_placement/views/03_receiveMain.vue     |  63 +++++++-
 .../views/04_helpGovernmentMain.vue           |  25 ++--
 .../05_placement/views/05_repatriateMain.vue  |  12 +-
 .../views/06_appointPromoteMain.vue           |  80 ++++++++++-
 .../views/07_appointEmployeeMain.vue          |  81 ++++++++++-
 12 files changed, 552 insertions(+), 94 deletions(-)

diff --git a/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue b/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
index f74fdab4d..5070be06d 100644
--- a/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
+++ b/src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
@@ -4,6 +4,7 @@ import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
 import { useCommandMainStore } from "@/modules/18_command/store/Main";
+import { useTransferDataStore } from "@/modules/05_placement/store";
 
 import type { QTableProps } from "quasar";
 import type { ListCommand } from "@/modules/18_command/interface/index/Main";
@@ -16,6 +17,7 @@ const $q = useQuasar();
 const storeCommand = useCommandMainStore();
 const mixin = useCounterMixin();
 const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
+const { statusText } = useTransferDataStore();
 
 const props = defineProps({
   Modal: Boolean,
@@ -57,9 +59,14 @@ const visibleColumns2 = ref<string[]>([
   "no",
   "citizenId",
   "fullname",
+  "positionLevel",
+  "positionNumberOld",
+  "organizationNameOld",
   "organizationName",
-  "typeCommand",
   "dateOfBirth",
+  "typeCommand",
+  "createdAt",
+  "status",
 ]);
 
 const commandType = ref<string>(""); //ประเภทคำสั่ง
@@ -98,10 +105,56 @@ const columns2 = ref<QTableProps["columns"]>([
     field: "fullname",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${
+        row.firstName
+          ? `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`
+          : "-"
+      }`;
+    },
+  },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "ตำแหน่งเลขที่เดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionNumberOld;
+    },
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
     format: (val, row) => {
-      return row.firstName
-        ? `${row.prefix}${row.firstName} ${row.lastName}`
-        : "-";
+      return `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")}`;
     },
   },
   {
@@ -112,10 +165,20 @@ const columns2 = ref<QTableProps["columns"]>([
     field: "organizationName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     format: (val, row) => {
-      return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+      return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+    },
+  },
+  {
+    name: "dateOfBirth",
+    align: "left",
+    label: "วัน/เดือน/ปี เกิด",
+    sortable: true,
+    field: "dateOfBirth",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(row.dateOfBirth);
     },
   },
   {
@@ -135,15 +198,27 @@ const columns2 = ref<QTableProps["columns"]>([
     },
   },
   {
-    name: "dateOfBirth",
+    name: "createdAt",
     align: "left",
-    label: "วัน/เดือน/ปี เกิด",
+    label: "วันที่ดำเนินการ",
     sortable: true,
-    field: "dateOfBirth",
+    field: "createdAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return date2Thai(row.dateOfBirth);
+      return date2Thai(row.createdAt);
+    },
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "status",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return statusText(row.status);
     },
   },
 ]);
@@ -231,7 +306,7 @@ watch(
 
 <template>
   <q-dialog v-model="props.Modal" persistent>
-    <q-card style="width: 1200px; max-width: 80vw">
+    <q-card style="min-width: 80%">
       <q-form greedy @submit.prevent @validation-success="clickAddlist">
         <DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="clickClose" />
         <q-separator />
@@ -342,21 +417,49 @@ watch(
                             : "-"
                         }}
                       </div>
+                      <div
+                        v-else-if="col.name == 'organizationNameOld'"
+                        class="text-html"
+                      >
+                        {{
+                          props.row.organizationPositionOld !== null
+                            ? props.row.organizationPositionOld
+                            : "-"
+                        }}
+                      </div>
+
                       <div v-else-if="col.name == 'organizationName'">
                         <div class="col-4">
-                          <div class="text-weight-medium">
-                            {{ props.row.root !== null ? props.row.root : "-" }}
+                          <div>
+                            {{
+                              props.row.position !== null
+                                ? props.row.position
+                                : ""
+                            }}{{
+                              (props.row.posTypeName !== null &&
+                                props.row.posTypeName === "บริหาร") ||
+                              props.row.posTypeName === "อำนวยการ"
+                                ? `${props.row.posTypeName}`
+                                : ""
+                            }}{{
+                              props.row.posLevelName !== null
+                                ? `${props.row.posLevelName}`
+                                : ""
+                            }}
+                          </div>
+                          <div>
+                            {{ props.row.root !== null ? props.row.root : "" }}
                             {{
                               props.row.rootShortName !== null
                                 ? `(${props.row.rootShortName})`
                                 : ""
                             }}
                           </div>
-                          <div class="text-weight-light">
+                          <div>
                             {{
                               props.row.nodeName !== null
                                 ? props.row.nodeName
-                                : ""
+                                : "-"
                             }}
                             {{
                               props.row.nodeShortName !== null
@@ -366,6 +469,7 @@ watch(
                           </div>
                         </div>
                       </div>
+
                       <div v-else-if="col.name == 'createdAt'">
                         {{
                           props.row.createdAt
diff --git a/src/modules/05_placement/components/AppointMent/DialogOrders.vue b/src/modules/05_placement/components/AppointMent/DialogOrders.vue
index b742c4c53..62a7bd15e 100644
--- a/src/modules/05_placement/components/AppointMent/DialogOrders.vue
+++ b/src/modules/05_placement/components/AppointMent/DialogOrders.vue
@@ -66,9 +66,14 @@ const visibleColumns2 = ref<string[]>([
   "no",
   "citizenId",
   "fullname",
+  "positionNumberOld",
+  "positionLevel",
+  "organizationNameOld",
   "organizationName",
-  "dateOfBirth",
   "typeCommand",
+  "dateOfBirth",
+  "createdAt",
+  "status",
 ]);
 const columns2 = ref<QTableProps["columns"]>([
   {
@@ -97,10 +102,56 @@ const columns2 = ref<QTableProps["columns"]>([
     field: "fullname",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${
+        row.firstName
+          ? `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`
+          : "-"
+      }`;
+    },
+  },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionNumberOld;
+    },
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
     format: (val, row) => {
-      return row.firstName
-        ? `${row.prefix}${row.firstName} ${row.lastName}`
-        : "-";
+      return `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")}`;
     },
   },
   {
@@ -111,10 +162,20 @@ const columns2 = ref<QTableProps["columns"]>([
     field: "organizationName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     format: (val, row) => {
-      return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+      return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+    },
+  },
+  {
+    name: "dateOfBirth",
+    align: "left",
+    label: "วัน/เดือน/ปี เกิด",
+    sortable: true,
+    field: "dateOfBirth",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return date2Thai(row.dateOfBirth);
     },
   },
   {
@@ -136,15 +197,27 @@ const columns2 = ref<QTableProps["columns"]>([
     },
   },
   {
-    name: "dateOfBirth",
+    name: "createdAt",
     align: "left",
-    label: "วัน/เดือน/ปี เกิด",
+    label: "วันที่ดำเนินการ",
     sortable: true,
-    field: "dateOfBirth",
+    field: "createdAt",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return date2Thai(row.dateOfBirth);
+      return date2Thai(row.createdAt);
+    },
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "status",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return statusText(row.status);
     },
   },
 ]);
@@ -244,7 +317,7 @@ watch(
 
 <template>
   <q-dialog v-model="props.Modal" persistent>
-    <q-card style="width: 1200px; max-width: 80vw">
+    <q-card style="min-width: 80%">
       <q-form greedy @submit.prevent @validation-success="sendToCommand">
         <DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="clickClose" />
         <q-separator />
@@ -351,9 +424,37 @@ watch(
                         }}
                       </div>
 
+                      <div
+                        v-else-if="col.name == 'organizationNameOld'"
+                        class="text-html"
+                      >
+                        {{
+                          props.row.organizationPositionOld !== null
+                            ? props.row.organizationPositionOld
+                            : "-"
+                        }}
+                      </div>
+
                       <div v-else-if="col.name == 'organizationName'">
                         <div class="col-4">
-                          <div class="text-weight-medium">
+                          <div>
+                            {{
+                              props.row.position !== null
+                                ? props.row.position
+                                : "-"
+                            }}{{
+                              (props.row.posTypeName !== null &&
+                                props.row.posTypeName === "บริหาร") ||
+                              props.row.posTypeName === "อำนวยการ"
+                                ? `${props.row.posTypeName}`
+                                : ""
+                            }}{{
+                              props.row.posLevelName !== null
+                                ? `${props.row.posLevelName}`
+                                : ""
+                            }}
+                          </div>
+                          <div>
                             {{ props.row.root !== null ? props.row.root : "-" }}
                             {{
                               props.row.rootShortName !== null
@@ -361,7 +462,7 @@ watch(
                                 : ""
                             }}
                           </div>
-                          <div class="text-weight-light">
+                          <div>
                             {{
                               props.row.nodeName !== null
                                 ? props.row.nodeName
diff --git a/src/modules/05_placement/components/Help-Government/DialogOrders.vue b/src/modules/05_placement/components/Help-Government/DialogOrders.vue
index 0a5f5a9f2..d2216c21d 100644
--- a/src/modules/05_placement/components/Help-Government/DialogOrders.vue
+++ b/src/modules/05_placement/components/Help-Government/DialogOrders.vue
@@ -16,14 +16,8 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom
 /** use*/
 const $q = useQuasar();
 const { statusText } = useTransferDataStore();
-const {
-  dialogConfirm,
-  findOrgNameOld,
-  findPosMasterNoOld,
-  date2Thai,
-  onSearchDataTable,
-  findOrgNameOldHtml,
-} = useCounterMixin();
+const { dialogConfirm, findPosMasterNoOld, date2Thai, onSearchDataTable } =
+  useCounterMixin();
 
 /** props*/
 const props = defineProps({
@@ -66,7 +60,7 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "posMasterNoOld",
     align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่งเดิม",
     sortable: true,
     field: "posMasterNoOld",
     headerStyle: "font-size: 14px",
@@ -75,19 +69,10 @@ const columns2 = ref<QTableProps["columns"]>([
       return findPosMasterNoOld(row);
     },
   },
-  {
-    name: "positionOld",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "positionOld",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -112,7 +97,11 @@ const columns2 = ref<QTableProps["columns"]>([
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (val, row) => findOrgNameOld(row),
+    format: (val, row) => {
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
+        : "-";
+    },
   },
   {
     name: "organization",
@@ -168,7 +157,6 @@ const visibleColumns2 = ref<string[]>([
   "no",
   "name",
   "posMasterNoOld",
-  "positionOld",
   "positionLevel",
   "organizationPositionOld",
   "organization",
@@ -310,7 +298,7 @@ function onSearch() {
                       v-else-if="col.name === 'organizationPositionOld'"
                       class="text-html"
                     >
-                      {{ findOrgNameOldHtml(props.row) }}
+                      {{ col.value }}
                     </div>
 
                     <div v-else>
diff --git a/src/modules/05_placement/components/Receive/DialogOrders.vue b/src/modules/05_placement/components/Receive/DialogOrders.vue
index c8b119402..41e1a749a 100644
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@@ -86,6 +86,45 @@ const columns2 = ref<QTableProps["columns"]>([
       return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
     },
   },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posTypeOld",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "posTypeOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionTypeOld
+        ? `${row.positionTypeOld}${
+            row.positionLevelOld ? `(${row.positionLevelOld})` : ""
+          }`
+        : "";
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val, row) => {
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
+        : "-";
+    },
+  },
   {
     name: "organizationName",
     align: "left",
@@ -149,6 +188,9 @@ const visibleColumns2 = ref<string[]>([
   "no",
   "citizenId",
   "fullname",
+  "posTypeOld",
+  "positionNumberOld",
+  "organizationNameOld",
   "organizationName",
   "dateOfBirth",
   "createdAt",
diff --git a/src/modules/05_placement/components/Repatriate/DialogOrders.vue b/src/modules/05_placement/components/Repatriate/DialogOrders.vue
index 67a155026..53f177dad 100644
--- a/src/modules/05_placement/components/Repatriate/DialogOrders.vue
+++ b/src/modules/05_placement/components/Repatriate/DialogOrders.vue
@@ -71,21 +71,21 @@ const columns2 = ref<QTableProps["columns"]>([
     },
   },
   {
-    name: "posMasterNoOld",
+    name: "positionNumberOld",
     align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่ง",
     sortable: true,
-    field: "posMasterNoOld",
+    field: "positionNumberOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return findPosMasterNoOld(row);
+      return row.positionNumberOld;
     },
   },
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -147,7 +147,7 @@ const columns2 = ref<QTableProps["columns"]>([
 const visibleColumns2 = ref<string[]>([
   "no",
   "name",
-  "posMasterNoOld",
+  "positionNumberOld",
   "positionLevel",
   "organizationPositionOld",
   "organization",
diff --git a/src/modules/05_placement/components/Transfer/DialogOrders.vue b/src/modules/05_placement/components/Transfer/DialogOrders.vue
index c706a121d..a6c636cb9 100644
--- a/src/modules/05_placement/components/Transfer/DialogOrders.vue
+++ b/src/modules/05_placement/components/Transfer/DialogOrders.vue
@@ -48,6 +48,7 @@ const visibleColumns2 = ref<string[]>([
   "no",
   "fullname",
   "posType",
+  "positionNumberOld",
   "organizationPositionOld",
   "organization",
   "status",
@@ -75,10 +76,19 @@ const columns2 = ref<QTableProps["columns"]>([
       return `${row.prefix}${row.firstName} ${row.lastName}`;
     },
   },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "posType",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "posType",
     headerStyle: "font-size: 14px",
@@ -87,6 +97,7 @@ const columns2 = ref<QTableProps["columns"]>([
       return row.positionTypeOld + " (" + row.positionLevelOld + ")";
     },
   },
+
   {
     name: "organizationPositionOld",
     align: "left",
@@ -94,7 +105,9 @@ const columns2 = ref<QTableProps["columns"]>([
     sortable: true,
     field: "organizationPositionOld",
     format(val, row) {
-      return row.organizationPositionOld.replace(/\n/g, " ");
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/\n/g, " ")}`
+        : "-";
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
diff --git a/src/modules/05_placement/views/02_transferMain.vue b/src/modules/05_placement/views/02_transferMain.vue
index ff096a0dd..3347146af 100644
--- a/src/modules/05_placement/views/02_transferMain.vue
+++ b/src/modules/05_placement/views/02_transferMain.vue
@@ -54,10 +54,19 @@ const columns = ref<QTableProps["columns"]>([
       return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
     },
   },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "posType",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
     sortable: true,
     field: "posType",
     headerStyle: "font-size: 14px",
@@ -70,6 +79,7 @@ const columns = ref<QTableProps["columns"]>([
         : "";
     },
   },
+
   {
     name: "organizationPositionOld",
     align: "left",
@@ -79,7 +89,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return row.organizationPositionOld.replace(/\n/g, " ");
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/\n/g, " ")}`
+        : "-";
     },
   },
   {
@@ -118,6 +130,7 @@ const visibleColumns = ref<string[]>([
   "no",
   "fullname",
   "posType",
+  "positionNumberOld",
   "organizationPositionOld",
   "organization",
   "status",
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index 0461548d3..0073696e5 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -64,6 +64,9 @@ const visibleColumns = ref<string[]>([
   "no",
   "citizenId",
   "fullname",
+  "posTypeOld",
+  "positionNumberOld",
+  "organizationNameOld",
   "organizationName",
   "dateOfBirth",
   "createdAt",
@@ -104,6 +107,46 @@ const columns = ref<QTableProps["columns"]>([
       return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
     },
   },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posTypeOld",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "posTypeOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionTypeOld
+        ? `${row.positionTypeOld}${
+            row.positionLevelOld ? `(${row.positionLevelOld})` : ""
+          }`
+        : "";
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val, row) => {
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
+        : "-";
+    },
+  },
+
   {
     name: "organizationName",
     align: "left",
@@ -572,9 +615,25 @@ onMounted(async () => {
                       props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
                     }}
                   </div>
+
                   <div v-else-if="col.name == 'organizationName'">
                     <div class="col-4">
-                      <div class="text-weight-medium">
+                      <div>
+                        {{
+                          props.row.position !== null ? props.row.position : ""
+                        }}{{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }}{{
+                          props.row.posLevelName !== null
+                            ? `${props.row.posLevelName}`
+                            : ""
+                        }}
+                      </div>
+                      <div>
                         {{ props.row.root !== null ? props.row.root : "-" }}
                         {{
                           props.row.rootShortName !== null
@@ -582,7 +641,7 @@ onMounted(async () => {
                             : ""
                         }}
                       </div>
-                      <div class="text-weight-light">
+                      <div>
                         {{
                           props.row.nodeName !== null ? props.row.nodeName : ""
                         }}
diff --git a/src/modules/05_placement/views/04_helpGovernmentMain.vue b/src/modules/05_placement/views/04_helpGovernmentMain.vue
index 8ce212b18..ddeb8a0e1 100644
--- a/src/modules/05_placement/views/04_helpGovernmentMain.vue
+++ b/src/modules/05_placement/views/04_helpGovernmentMain.vue
@@ -28,10 +28,8 @@ const {
   hideLoader,
   success,
   dialogRemove,
-  findOrgNameOld,
   findPosMasterNoOld,
   onSearchDataTable,
-  findOrgNameOldHtml,
 } = mixin;
 
 /** Table*/
@@ -69,7 +67,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posMasterNoOld",
     align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่งเดิม",
     sortable: true,
     field: "posMasterNoOld",
     headerStyle: "font-size: 14px",
@@ -78,19 +76,10 @@ const columns = ref<QTableProps["columns"]>([
       return findPosMasterNoOld(row);
     },
   },
-  {
-    name: "positionOld",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "positionOld",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -110,12 +99,16 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px;min-width: 280px",
     style: "font-size: 14px",
-    format: (val, row) => findOrgNameOld(row),
+    format: (val, row) => {
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
+        : "-";
+    },
   },
   {
     name: "organization",
@@ -409,7 +402,7 @@ onMounted(async () => {
                     v-else-if="col.name === 'organizationPositionOld'"
                     class="text-html"
                   >
-                    {{ findOrgNameOldHtml(props.row) }}
+                    {{ col.value }}
                   </div>
 
                   <div v-else>
diff --git a/src/modules/05_placement/views/05_repatriateMain.vue b/src/modules/05_placement/views/05_repatriateMain.vue
index c40231639..5f0960242 100644
--- a/src/modules/05_placement/views/05_repatriateMain.vue
+++ b/src/modules/05_placement/views/05_repatriateMain.vue
@@ -64,21 +64,21 @@ const columns = ref<QTableProps["columns"]>([
     },
   },
   {
-    name: "posMasterNoOld",
+    name: "positionNumberOld",
     align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่งเดิม",
     sortable: true,
-    field: "posMasterNoOld",
+    field: "positionNumberOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return findPosMasterNoOld(row);
+      return row.positionNumberOld;
     },
   },
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -140,7 +140,7 @@ const columns = ref<QTableProps["columns"]>([
 const visibleColumns = ref<string[]>([
   "no",
   "name",
-  "posMasterNoOld",
+  "positionNumberOld",
   "positionLevel",
   "organizationPositionOld",
   "organization",
diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue
index 19d1fda9e..4fe09183e 100644
--- a/src/modules/05_placement/views/06_appointPromoteMain.vue
+++ b/src/modules/05_placement/views/06_appointPromoteMain.vue
@@ -90,6 +90,50 @@ const columns = ref<QTableProps["columns"]>([
       }`;
     },
   },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionNumberOld;
+    },
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val, row) => {
+      return `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")}`;
+    },
+  },
   {
     name: "organizationName",
     align: "left",
@@ -99,7 +143,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (val, row) => {
-      return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+      return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
     },
   },
   {
@@ -161,6 +205,9 @@ const visibleColumns = ref<string[]>([
   "no",
   "citizenId",
   "fullname",
+  "positionNumberOld",
+  "positionLevel",
+  "organizationNameOld",
   "organizationName",
   "typeCommand",
   "dateOfBirth",
@@ -178,7 +225,7 @@ const pagination = ref({
 async function fecthlistappointment() {
   showLoader();
   await http
-    .get(config.API.appointmentMain()+`?status=${status.value}`)
+    .get(config.API.appointmentMain() + `?status=${status.value}`)
     .then((res) => {
       let response = res.data.result;
       listRecevice.value = response;
@@ -544,10 +591,35 @@ onMounted(async () => {
                   <div v-if="col.name == 'no'">
                     {{ props.rowIndex + 1 }}
                   </div>
+                  <div
+                    v-else-if="col.name == 'organizationNameOld'"
+                    class="text-html"
+                  >
+                    {{
+                      props.row.organizationPositionOld !== null
+                        ? props.row.organizationPositionOld
+                        : "-"
+                    }}
+                  </div>
 
                   <div v-else-if="col.name == 'organizationName'">
                     <div class="col-4">
-                      <div class="text-weight-medium">
+                      <div>
+                        {{
+                          props.row.position !== null ? props.row.position : ""
+                        }}{{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }}{{
+                          props.row.posLevelName !== null
+                            ? `${props.row.posLevelName}`
+                            : ""
+                        }}
+                      </div>
+                      <div>
                         {{ props.row.root !== null ? props.row.root : "-" }}
                         {{
                           props.row.rootShortName !== null
@@ -555,7 +627,7 @@ onMounted(async () => {
                             : ""
                         }}
                       </div>
-                      <div class="text-weight-light">
+                      <div>
                         {{
                           props.row.nodeName !== null ? props.row.nodeName : ""
                         }}
diff --git a/src/modules/05_placement/views/07_appointEmployeeMain.vue b/src/modules/05_placement/views/07_appointEmployeeMain.vue
index 00e388034..83bb960e1 100644
--- a/src/modules/05_placement/views/07_appointEmployeeMain.vue
+++ b/src/modules/05_placement/views/07_appointEmployeeMain.vue
@@ -58,6 +58,9 @@ const visibleColumns = ref<string[]>([
   "no",
   "citizenId",
   "fullname",
+  "positionLevel",
+  "positionNumberOld",
+  "organizationNameOld",
   "organizationName",
   "dateOfBirth",
   "typeCommand",
@@ -105,6 +108,50 @@ const columns = ref<QTableProps["columns"]>([
       }`;
     },
   },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "ตำแหน่งเลขที่เดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionNumberOld;
+    },
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val, row) => {
+      return `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")}`;
+    },
+  },
   {
     name: "organizationName",
     align: "left",
@@ -114,7 +161,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (val, row) => {
-      return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+      return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
     },
   },
   {
@@ -175,7 +222,7 @@ const columns = ref<QTableProps["columns"]>([
 async function fecthlistappointment() {
   showLoader();
   await http
-    .get(config.API.appointEmployee()+`?status=${status.value}`)
+    .get(config.API.appointEmployee() + `?status=${status.value}`)
     .then(async (res) => {
       let response = await res.data.result;
       listRecevice.value = response;
@@ -517,9 +564,35 @@ onMounted(async () => {
                     {{ props.rowIndex + 1 }}
                   </div>
 
+                  <div
+                    v-else-if="col.name == 'organizationNameOld'"
+                    class="text-html"
+                  >
+                    {{
+                      props.row.organizationPositionOld !== null
+                        ? props.row.organizationPositionOld
+                        : "-"
+                    }}
+                  </div>
+
                   <div v-else-if="col.name == 'organizationName'">
                     <div class="col-4">
-                      <div class="text-weight-medium">
+                      <div>
+                        {{
+                          props.row.position !== null ? props.row.position : ""
+                        }}{{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }}{{
+                          props.row.posLevelName !== null
+                            ? `${props.row.posLevelName}`
+                            : ""
+                        }}
+                      </div>
+                      <div>
                         {{ props.row.root !== null ? props.row.root : "-" }}
                         {{
                           props.row.rootShortName !== null
@@ -527,7 +600,7 @@ onMounted(async () => {
                             : ""
                         }}
                       </div>
-                      <div class="text-weight-light">
+                      <div>
                         {{
                           props.row.nodeName !== null ? props.row.nodeName : ""
                         }}

From 08596d4603674ed12bcf5d7cc406092bf1e43286 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 2 Apr 2025 09:33:51 +0700
Subject: [PATCH 3/6] fix Load Salary

---
 src/modules/13_salary/views/04_salaryLists.vue         | 2 +-
 src/modules/13_salary/views/05_salaryListsEmployee.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue
index a70e216e6..1d6a59a21 100644
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@@ -274,7 +274,7 @@ async function fetchSalalyPeriod(
           isLoad.value = true;
         }
 
-        if (data.group1id) {
+        if (!data.group1id) {
           hideLoader();
         }
       })
diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue
index afa13d3c1..e7973cafa 100644
--- a/src/modules/13_salary/views/05_salaryListsEmployee.vue
+++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue
@@ -257,7 +257,7 @@ async function fetchSalalyPeriod(
         data && store.fetchPeriodLatest(data, store.tabGroup);
         periodLatest.value = data;
         isLoad.value = data.group1id ? true : false;
-        if (data.group1id) {
+        if (!data.group1id) {
           hideLoader();
         }
       })

From 6f0cfce70ba30d8d0381fa1917a71b90161ea440 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 2 Apr 2025 11:47:59 +0700
Subject: [PATCH 4/6] fix report salary gov-10

---
 src/modules/13_salary/components/04_salaryLists/TabMain.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/13_salary/components/04_salaryLists/TabMain.vue b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
index 3c0cd658e..7bfde9c46 100644
--- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
@@ -361,7 +361,8 @@ function onClickDownload(data: DataOption, type: string = "xlsx") {
         data.id === "gov-05-01" ||
         data.id === "gov-07" ||
         data.id === "gov-07-01" ||
-        data.id === "gov-08";
+        data.id === "gov-08" ||
+        data.id === "gov-10";
 
       const finalUrl = isGovernmentId ? `${url}/${store.tabGroup}` : url;
       http

From 1a109fd5e389d9a7c92a41aaaa2e3f5be936e864 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 2 Apr 2025 14:29:20 +0700
Subject: [PATCH 5/6] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=AD=E0=B8=B7=E0=B9=88=E0=B8=99=E0=B9=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Other/DialogOrders.vue         | 87 +++++++++++++++++--
 .../05_placement/views/08_otherMain.vue       | 64 ++++++++++----
 2 files changed, 128 insertions(+), 23 deletions(-)

diff --git a/src/modules/05_placement/components/Other/DialogOrders.vue b/src/modules/05_placement/components/Other/DialogOrders.vue
index 0e068787a..b06649823 100644
--- a/src/modules/05_placement/components/Other/DialogOrders.vue
+++ b/src/modules/05_placement/components/Other/DialogOrders.vue
@@ -53,16 +53,18 @@ const dataMapToSend = computed(() => {
     lastName: i.lastName,
     citizenId: i.citizenId,
     remarkVertical: i.reason,
-    position: i.positionOld,
-    posType: i.positionTypeOld,
-    posLevel: i.positionLevelOld,
+    position: i.position,
+    posType: i.posTypeName,
+    posLevel: i.posLevelName,
   }));
 });
 const visibleColumns2 = ref<string[]>([
   "no",
   "fullname",
+  "positionNumberOld",
   "positionLevel",
   "organizationPositionOld",
+  "organizationPositionReturn",
   "createdAt",
   "status",
 ]);
@@ -85,13 +87,29 @@ const columns2 = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.prefix}${row.firstName} ${row.lastName}`;
+      return `${row.prefix === null ? "" : row.prefix}${row.firstName} ${
+        row.lastName
+      }`;
     },
   },
+
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "ตำแหน่งเลขที่เดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionNumberOld;
+    },
+  },
+
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -120,6 +138,19 @@ const columns2 = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+
+  {
+    name: "organizationPositionReturn",
+    align: "left",
+    label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
+    sortable: true,
+    field: "organizationPositionReturn",
+    format(val, row) {
+      return row.organizationPositionOld.replace(/\n/g, " ");
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "createdAt",
     align: "left",
@@ -315,7 +346,51 @@ watch(
                         v-else-if="col.name === 'organizationPositionOld'"
                         class="text-html"
                       >
-                        {{ props.row.organizationPositionOld ?? '-' }}
+                        {{ props.row.organizationPositionOld ?? "-" }}
+                      </div>
+
+                      <div
+                        v-else-if="col.name === 'organizationPositionReturn'"
+                      >
+                        <div class="col-4">
+                          <div>
+                            {{
+                              props.row.position !== null
+                                ? props.row.position
+                                : ""
+                            }}{{
+                              (props.row.posTypeName !== null &&
+                                props.row.posTypeName === "บริหาร") ||
+                              props.row.posTypeName === "อำนวยการ"
+                                ? `${props.row.posTypeName}`
+                                : ""
+                            }}{{
+                              props.row.posLevelName !== null
+                                ? `${props.row.posLevelName}`
+                                : ""
+                            }}
+                          </div>
+                          <div>
+                            {{ props.row.root !== null ? props.row.root : "-" }}
+                            {{
+                              props.row.rootShortName !== null
+                                ? `(${props.row.rootShortName})`
+                                : ""
+                            }}
+                          </div>
+                          <div>
+                            {{
+                              props.row.nodeName !== null
+                                ? props.row.nodeName
+                                : ""
+                            }}
+                            {{
+                              props.row.nodeShortName !== null
+                                ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
+                                : ""
+                            }}
+                          </div>
+                        </div>
                       </div>
 
                       <div v-else>
diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue
index a5da05bf0..11e3775cb 100644
--- a/src/modules/05_placement/views/08_otherMain.vue
+++ b/src/modules/05_placement/views/08_otherMain.vue
@@ -45,9 +45,10 @@ const filterKeyword2 = ref<string>(""); //คำค้นหารายกา
 const visibleColumns = ref<string[]>([
   "no",
   "fullname",
-  "organizationPositionReturn",
+  "positionNumberOld",
   "positionLevel",
   "organizationPositionOld",
+  "organizationPositionReturn",
   "createdAt",
   "status",
 ]);
@@ -77,21 +78,22 @@ const columns = ref<QTableProps["columns"]>([
   },
 
   {
-    name: "organizationPositionReturn",
+    name: "positionNumberOld",
     align: "left",
-    label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
+    label: "ตำแหน่งเลขที่เดิม",
     sortable: true,
-    field: "organizationPositionReturn",
-    format(val, row) {
-      return row.organizationPositionOld.replace(/\n/g, " ");
-    },
+    field: "positionNumberOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.positionNumberOld;
+    },
   },
+
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -120,6 +122,19 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+
+  {
+    name: "organizationPositionReturn",
+    align: "left",
+    label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
+    sortable: true,
+    field: "organizationPositionReturn",
+    format(val, row) {
+      return row.organizationPositionOld.replace(/\n/g, " ");
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "createdAt",
     align: "left",
@@ -455,9 +470,31 @@ onMounted(() => {
                     {{ props.rowIndex + 1 }}
                   </div>
 
+                  <div
+                    v-else-if="col.name === 'organizationPositionOld'"
+                    class="text-html"
+                  >
+                    {{ props.row.organizationPositionOld ?? "-" }}
+                  </div>
+
                   <div v-else-if="col.name === 'organizationPositionReturn'">
                     <div class="col-4">
-                      <div class="text-weight-medium">
+                      <div>
+                        {{
+                          props.row.position !== null ? props.row.position : ""
+                        }}{{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }}{{
+                          props.row.posLevelName !== null
+                            ? `${props.row.posLevelName}`
+                            : ""
+                        }}
+                      </div>
+                      <div>
                         {{ props.row.root !== null ? props.row.root : "-" }}
                         {{
                           props.row.rootShortName !== null
@@ -465,7 +502,7 @@ onMounted(() => {
                             : ""
                         }}
                       </div>
-                      <div class="text-weight-light">
+                      <div>
                         {{
                           props.row.nodeName !== null ? props.row.nodeName : ""
                         }}
@@ -478,13 +515,6 @@ onMounted(() => {
                     </div>
                   </div>
 
-                  <div
-                    v-else-if="col.name === 'organizationPositionOld'"
-                    class="text-html"
-                  >
-                    {{ props.row.organizationPositionOld ?? "-" }}
-                  </div>
-
                   <div v-else>
                     {{ col.value ? col.value : "-" }}
                   </div>

From d438c1accc9c0d264227e9a0cc7f11d1749ca826 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 2 Apr 2025 14:38:28 +0700
Subject: [PATCH 6/6] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=97?=
 =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Other/DialogOrders.vue            |  2 +-
 .../components/Other/OtherDetail.vue             |  6 +++---
 .../components/PersonalList/CardPosition.vue     | 16 ++++++++--------
 .../components/PersonalList/DialogSelectOrg.vue  |  2 +-
 .../components/Receive/receiveDetail.vue         |  6 +++---
 .../components/Repatriate/RepatriateDetail.vue   |  4 ++--
 .../components/Transfer/TransferDetail.vue       |  6 +++---
 .../probation/FormAppoint/FormAppoint.vue        |  4 ++--
 .../FormEvaluation/DialogSelectAuthority.vue     |  2 +-
 .../components/probation/MainProbation.vue       |  2 +-
 .../components/probation/ProbationDetail.vue     |  2 +-
 .../05_placement/views/03_receiveMain.vue        |  2 +-
 .../05_placement/views/06_appointPromoteMain.vue |  2 +-
 .../views/07_appointEmployeeMain.vue             |  2 +-
 src/modules/05_placement/views/08_otherMain.vue  |  4 ++--
 15 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/modules/05_placement/components/Other/DialogOrders.vue b/src/modules/05_placement/components/Other/DialogOrders.vue
index b06649823..18aa8326a 100644
--- a/src/modules/05_placement/components/Other/DialogOrders.vue
+++ b/src/modules/05_placement/components/Other/DialogOrders.vue
@@ -96,7 +96,7 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "positionNumberOld",
     align: "left",
-    label: "ตำแหน่งเลขที่เดิม",
+    label: "เลขที่ตำแหน่งเดิม",
     sortable: true,
     field: "positionNumberOld",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/05_placement/components/Other/OtherDetail.vue b/src/modules/05_placement/components/Other/OtherDetail.vue
index f89603145..84d141a11 100644
--- a/src/modules/05_placement/components/Other/OtherDetail.vue
+++ b/src/modules/05_placement/components/Other/OtherDetail.vue
@@ -42,7 +42,7 @@ const mainData = ref<any>();
 
 const educationOld = ref<string>(""); //วุฒิ/สาขา
 const organizationPositionOld = ref<string>(""); //ตำแหน่ง/สังกัด
-const positionTypeOld = ref<string>(""); //ประเภทตำแหน่ง
+const positionTypeOld = ref<string>(""); //ตำแหน่งประเภท
 const positionLevelOld = ref<string>(""); //ระดับตำแหน่ง
 const posNo = ref<string>(""); //เลขที่
 const salary = ref<number>(0); //เงินเดือน
@@ -283,9 +283,9 @@ onMounted(async () => {
                   :readonly="!edit"
                   :borderless="!edit"
                   v-model="positionTypeOld"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
                   hide-bottom-space
-                  :label="`${'ประเภทตำแหน่ง'}`"
+                  :label="`${'ตำแหน่งประเภท'}`"
                 />
               </div>
             </div>
diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index 70d9da79e..378517a06 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -24,12 +24,12 @@ const selected = defineModel("selectedPos", { required: true }); //ตำแห
 const positionId = defineModel<string>("positionId", { required: true }); //id ตำแหน่งที่เลือก
 const seletcId = defineModel<string>("seletcId", { required: true }); // ตำแหน่งที่เลือก
 const date = defineModel<Date>("datePos", { required: true }); //วันยที่รายงานคัว
-const positionData = defineModel<any[]>("position", { required: true }); //ข้อมูลรายการตำแหน่งเลขที่
+const positionData = defineModel<any[]>("position", { required: true }); //ข้อมูลรายการเลขที่ตำแหน่ง
 const isAll = defineModel<boolean>("isAll", { required: true }); //แสดงตำแหน่งทั้งหมด
 const isBlank = defineModel<boolean>("isBlank", { required: true }); //แสดงเฉพาะตำแหน่งว่าง
 const isPosition = defineModel<string>("isPosition", { required: true });
 // const isPositionOld = defineModel<boolean>("isPositionOld", { required: true }); //แสดงตำแหน่งที่ตรงกับประเภทและระดับเดิม
-const posType = defineModel<FormPosType>("posType", { required: true }); //ประเภทตำแหน่ง
+const posType = defineModel<FormPosType>("posType", { required: true }); //ตำแหน่งประเภท
 const posLevel = defineModel<string>("posLevel", { required: true }); //ระดับตำแหน่ง
 const optionPosType = defineModel<FormPosType[]>("optionPosType", {
   required: true,
@@ -74,7 +74,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posMasterNo",
     align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่ง",
     sortable: true,
     field: "posMasterNo",
     headerStyle: "font-size: 14px",
@@ -92,7 +92,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posTypeName",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "posTypeName",
     headerStyle: "font-size: 14px",
@@ -202,7 +202,7 @@ const visibleColumns = ref<string[]>([
 ]);
 
 /**
- * function เลือกตำแหน่งเลขที่
+ * function เลือกเลขที่ตำแหน่ง
  * @param id เลชที่ตำแหน่ง
  */
 async function onClickSelectPos(id: string) {
@@ -265,11 +265,11 @@ onMounted(async () => {
 
 <template>
   <div class="column q-col-gutter-sm">
-    <!-- เลือกตำแหน่งเลขที่ -->
+    <!-- เลือกเลขที่ตำแหน่ง -->
     <div class="col-7">
       <q-card bordered style="height: 100%; border: 1px solid #d6dee1">
         <div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
-          เลือกตำแหน่งเลขที่
+          เลือกเลขที่ตำแหน่ง
         </div>
 
         <!-- <div class="col-12">
@@ -306,7 +306,7 @@ onMounted(async () => {
                 v-model="posType"
                 :options="optionPosType"
                 option-label="posTypeName"
-                label="ประเภทตำแหน่ง"
+                label="ตำแหน่งประเภท"
                 dense
                 outlined
                 @update:model-value="props.onPosType?.()"
diff --git a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
index 7c6323cb2..bc8ac6786 100644
--- a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
@@ -227,7 +227,7 @@ async function onClickSubmit() {
         nodeId: dataPosMaster.nodeId,
         orgRevisionId: orgRevisionId.value,
         positionId: selectedPos.value[0].id,
-        posMasterNo: dataPosMaster.posMasterNo, //ตำแหน่งเลขที่(เลขอย่่างเดียว)
+        posMasterNo: dataPosMaster.posMasterNo, //เลขที่ตำแหน่ง(เลขอย่่างเดียว)
         positionName: selectedPos.value[0].positionName, //ชื่อตำแหน่ง
         positionField: selectedPos.value[0].positionField, //ชื่อตำแหน่ง
         posTypeId: selectedPos.value[0].posTypeId, //ชื่อตำแหน่ง
diff --git a/src/modules/05_placement/components/Receive/receiveDetail.vue b/src/modules/05_placement/components/Receive/receiveDetail.vue
index 85c57430b..a31636fad 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail.vue
@@ -88,7 +88,7 @@ const columns = ref<QTableProps["columns"]>([
 const profileId = ref<string>("");
 const educationOld = ref<string>(""); //วุฒิ/สาขา
 const organizationPositionOld = ref<string>(""); //ตำแหน่ง/สังกัด
-const positionTypeOld = ref<string>(""); //ประเภทตำแหน่ง
+const positionTypeOld = ref<string>(""); //ตำแหน่งประเภท
 const positionLevelOld = ref<string>(""); //ระดับตำแหน่ง
 const posNo = ref<string>(""); //เลขที่
 const salary = ref<number>(0); //เงินเดือน
@@ -988,9 +988,9 @@ onMounted(async () => {
                   :readonly="!edit"
                   :borderless="!edit"
                   v-model="positionTypeOld"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
                   hide-bottom-space
-                  :label="`${'ประเภทตำแหน่ง'}`"
+                  :label="`${'ตำแหน่งประเภท'}`"
                 />
               </div>
               <div class="col-xs-6 col-sm-4">
diff --git a/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue b/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue
index 1f7f682f8..4321cfbff 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriateDetail.vue
@@ -260,9 +260,9 @@ onMounted(() => {
                   :readonly="!edit"
                   :borderless="!edit"
                   v-model="positionTypeOld"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
                   hide-bottom-space
-                  :label="`${'ประเภทตำแหน่ง'}`"
+                  :label="`${'ตำแหน่งประเภท'}`"
                 />
               </div>
             </div>
diff --git a/src/modules/05_placement/components/Transfer/TransferDetail.vue b/src/modules/05_placement/components/Transfer/TransferDetail.vue
index 2f1824c59..bff124b57 100644
--- a/src/modules/05_placement/components/Transfer/TransferDetail.vue
+++ b/src/modules/05_placement/components/Transfer/TransferDetail.vue
@@ -44,7 +44,7 @@ const dataProfile = ref<DataProfile>(); //ข้อมูลส่วนตั
 const workflowRef = ref<any>(null);
 
 const organizationPositionOld = ref<string>(""); //ตำแหน่ง/สังกัด
-const positionTypeOld = ref<string>(""); //ประเภทตำแหน่ง
+const positionTypeOld = ref<string>(""); //ตำแหน่งประเภท
 const positionLevelOld = ref<string>(""); //ระดับตำแหน่ง
 const posNo = ref<string>(""); //เลขที่
 const salary = ref<number>(0); //เงินเดือน
@@ -561,9 +561,9 @@ onMounted(async () => {
                       :readonly="!edit"
                       :borderless="!edit"
                       v-model="positionTypeOld"
-                      :rules="edit ? [(val:string) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]:[]"
+                      :rules="edit ? [(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]:[]"
                       hide-bottom-space
-                      :label="`${'ประเภทตำแหน่ง'}`"
+                      :label="`${'ตำแหน่งประเภท'}`"
                     />
                   </div>
                   <div class="col-xs-6 col-sm-4">
diff --git a/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue b/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
index 87ed0f29e..26a177290 100644
--- a/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
+++ b/src/modules/05_placement/components/probation/FormAppoint/FormAppoint.vue
@@ -162,7 +162,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "positionType",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "positionType",
     headerStyle: "font-size: 14px",
@@ -225,7 +225,7 @@ const columnsMember = ref<QTableProps["columns"]>([
   {
     name: "posType",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "posType",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
index 07128bf6f..4ace8f0cb 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/DialogSelectAuthority.vue
@@ -74,7 +74,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posType",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "posType",
     format(val, row) {
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 0f872bbd6..805edb686 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -181,7 +181,7 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "posLevelName",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "posLevelName",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/05_placement/components/probation/ProbationDetail.vue b/src/modules/05_placement/components/probation/ProbationDetail.vue
index 652191a8e..5003c7bca 100644
--- a/src/modules/05_placement/components/probation/ProbationDetail.vue
+++ b/src/modules/05_placement/components/probation/ProbationDetail.vue
@@ -354,7 +354,7 @@ onMounted(async () => {
 
         <div class="col-xs-6 col-sm-2 row items-center">
           <div class="col-12">
-            <div class="col-12 text-top">ประเภทตำแหน่ง</div>
+            <div class="col-12 text-top">ตำแหน่งประเภท</div>
             <div class="col-12 text-detail">{{ position_level }}</div>
           </div>
         </div>
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index 0073696e5..9bc19e94f 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -48,7 +48,7 @@ const personalId = ref<string>(""); //บุคคล
 
 const files = ref<any>(); //ไฟล์
 
-const posType = ref<string>(""); //ประเภทตำแหน่ง
+const posType = ref<string>(""); //ตำแหน่งประเภท
 const posLevel = ref<string>(""); //ระดับตำแหน่ง
 const position = ref<string>(""); //ตำแหน่ง
 const type = ref<string | null>(null);
diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue
index 4fe09183e..87471d218 100644
--- a/src/modules/05_placement/views/06_appointPromoteMain.vue
+++ b/src/modules/05_placement/views/06_appointPromoteMain.vue
@@ -38,7 +38,7 @@ const status = ref<string>("");
 
 const modal = ref<boolean>(false); //แสดง popup ส่งไปออกคำสั่ง
 const modalTree = ref<boolean>(false); //แสดง popup  เลือกหน่วยงานที่แต่งตั้ง - เลื่อน - ย้าย
-const posType = ref<string>(""); //ประเภทตำแหน่ง
+const posType = ref<string>(""); //ตำแหน่งประเภท
 const posLevel = ref<string>(""); //ระดับตำแหน่ง
 const position = ref<string>(""); //ตำแหน่ง
 const typeModal = ref<string | null>(null); //ประเภท popup แต่งตั้ง , เลื่อน , ย้าย
diff --git a/src/modules/05_placement/views/07_appointEmployeeMain.vue b/src/modules/05_placement/views/07_appointEmployeeMain.vue
index 83bb960e1..cd72d5e63 100644
--- a/src/modules/05_placement/views/07_appointEmployeeMain.vue
+++ b/src/modules/05_placement/views/07_appointEmployeeMain.vue
@@ -39,7 +39,7 @@ const personalId = ref<string>("");
 const modal = ref<boolean>(false); //แสดง popup ส่งไปออกคำสั่ง
 const modalTree = ref<boolean>(false); //แสดง popup  เลือกหน่วยงานที่รับการปรับระดับชั้นงาน
 const typeModal = ref<string>(""); //ประเภท popup ปรับระดับชั้นงาน,รับย้าย
-const posType = ref<string>(""); //ประเภทตำแหน่ง
+const posType = ref<string>(""); //ตำแหน่งประเภท
 const posLevel = ref<string>(""); //ระดับตำแหน่ง
 const position = ref<string>(""); //ตำแหน่ง
 const dataRows = ref<PersonData>();
diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue
index 11e3775cb..dee9d9d81 100644
--- a/src/modules/05_placement/views/08_otherMain.vue
+++ b/src/modules/05_placement/views/08_otherMain.vue
@@ -80,7 +80,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "positionNumberOld",
     align: "left",
-    label: "ตำแหน่งเลขที่เดิม",
+    label: "เลขที่ตำแหน่งเดิม",
     sortable: true,
     field: "positionNumberOld",
     headerStyle: "font-size: 14px",
@@ -232,7 +232,7 @@ const modalSelectOrg = ref<boolean>(false);
 const type = ref<string | null>(null);
 const personalId = ref<string>("");
 
-const posType = ref<string>(""); //ประเภทตำแหน่ง
+const posType = ref<string>(""); //ตำแหน่งประเภท
 const posLevel = ref<string>(""); //ระดับตำแหน่ง
 const position = ref<string>(""); //ตำแหน่ง
 const dataRows = ref<any>(); //ข้อมูลที่ต้องการเลือกหน่วยงานที่รับโอน