From 8ccebc72bced8e4bc1e1cc77f3859e2acf5f4e4f Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 16 Aug 2023 18:05:16 +0700
Subject: [PATCH] no message

---
 .../05_placement/components/Relocation/RelocationModal.vue   | 2 +-
 .../05_placement/components/Relocation/RelocationbyId.vue    | 2 +-
 .../05_placement/components/Repatriate/RepatriateMain.vue    | 4 ++--
 .../05_placement/components/helpgovernment/mainHelp.vue      | 5 +++--
 src/modules/05_placement/interface/response/officer.ts       | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/modules/05_placement/components/Relocation/RelocationModal.vue b/src/modules/05_placement/components/Relocation/RelocationModal.vue
index 2318223cf..8a1df91c6 100644
--- a/src/modules/05_placement/components/Relocation/RelocationModal.vue
+++ b/src/modules/05_placement/components/Relocation/RelocationModal.vue
@@ -434,7 +434,7 @@ function findByPerson(element: any): any {
   <q-dialog v-model="props.modal" persistent>
     <q-card style="width: 900px; max-width: 80vw">
       <q-form ref="myFormPosition">
-        <DialogHeader title="เลือกหน่วยงานที่รับโอน" :close="closeModal" />
+        <DialogHeader title="เลือกหน่วยงานที่รับย้าย" :close="closeModal" />
         <q-separator />
         <q-card-section class="q-pa-sm bg-grey-1">
           <div class="row col-12 q-col-gutter-sm">
diff --git a/src/modules/05_placement/components/Relocation/RelocationbyId.vue b/src/modules/05_placement/components/Relocation/RelocationbyId.vue
index 6ee4a91a8..2c166912c 100644
--- a/src/modules/05_placement/components/Relocation/RelocationbyId.vue
+++ b/src/modules/05_placement/components/Relocation/RelocationbyId.vue
@@ -488,7 +488,7 @@ onMounted(async () => {
             </div> -->
           <div class="col-xs-6 col-sm-3 row items-center">
             <div class="text-weight-bold text-grey col-12">
-              เงินเดือนตำแหน่งและหน่วยงานที่รับโอน
+              เงินเดือนตำแหน่งและหน่วยงานที่รับย้าย
             </div>
             <div class="col-12">
               <q-input
diff --git a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
index c678620e9..79901761c 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue
@@ -43,7 +43,7 @@ const visibleColumns = ref<string[]>([
   "position",
   "positionLevel",
   "organizationPositionOld",
-  "organization",
+  // "organization",
   "statusText",
   "btn",
 ]);
@@ -53,7 +53,7 @@ const visibleColumns2 = ref<string[]>([
   "position",
   "positionLevel",
   "organizationPositionOld",
-  "organization",
+  // "organization",
   "statusText",
 ]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const filterKeyword = ref<string>("");
diff --git a/src/modules/05_placement/components/helpgovernment/mainHelp.vue b/src/modules/05_placement/components/helpgovernment/mainHelp.vue
index 0b66418ce..c6899d25f 100644
--- a/src/modules/05_placement/components/helpgovernment/mainHelp.vue
+++ b/src/modules/05_placement/components/helpgovernment/mainHelp.vue
@@ -20,6 +20,7 @@ const checkSelected = computed(() => {
     return true;
   }
 });
+const firstName = ref<string>("")
 
 const $q = useQuasar();
 const router = useRouter();
@@ -43,7 +44,7 @@ const visibleColumns = ref<string[]>([
   "position",
   "positionLevel",
   "organizationPositionOld",
-  "organization",
+  // "organization",
   "statusText",
   "btn",
 ]);
@@ -53,7 +54,7 @@ const visibleColumns2 = ref<string[]>([
   "position",
   "positionLevel",
   "organizationPositionOld",
-  "organization",
+  // "organization",
   "statusText",
 ]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const filterKeyword = ref<string>("");
diff --git a/src/modules/05_placement/interface/response/officer.ts b/src/modules/05_placement/interface/response/officer.ts
index 4cf58b1bb..64d298641 100644
--- a/src/modules/05_placement/interface/response/officer.ts
+++ b/src/modules/05_placement/interface/response/officer.ts
@@ -2,8 +2,8 @@ interface officerType {
     no:number,
     id: string,
     prefix: string,
-    firstname: string,
-    lastname: string,
+    firstName: string,
+    lastName: string,
     position: string,
     posNo: string,
     positionLevel: string,