diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index 36df4b511..d6450acea 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -278,7 +278,7 @@ async function getDataTable(id: string, level: number = 0) {
         isPosition: e.isPosition,
         posMasterNo:
           e.orgShortname +
-          (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
+          (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") + ' ' +
           e.posMasterNo +
           (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
         positionName: e.positionName,
diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index 3eb4c7f02..dd1d9ad50 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -477,7 +477,11 @@ watch(modal, (newValue) => {
                         :model-value="
                           goverment.position ? goverment.position : '-'
                         "
-                        label="ตำแหน่ง"
+                        :label="
+                          props.type.toLocaleLowerCase() == 'employee'
+                            ? 'ตำแหน่ง'
+                            : 'ตำแหน่งในสายงาน'
+                        "
                       />
                     </div>
                     <div class="col-xs-6 col-md-6">
@@ -615,7 +619,7 @@ watch(modal, (newValue) => {
                             ? govermentTemp.positionEmployeePositionId
                             : '-'
                         "
-                        label="ตำแหน่งทางสายงาน"
+                        label="ตำแหน่ง"
                       />
                     </div>
 
diff --git a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
index 30248f407..7c6cc7c8f 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
@@ -175,7 +175,7 @@ const columns = ref<QTableColumn[]>([
   {
     name: "positionEmployeePositionId",
     align: "left",
-    label: "ตำแหน่งทางสายงาน",
+    label: "ตำแหน่ง",
     sortable: true,
     field: "positionEmployeePositionId",
     headerStyle: "font-size: 14px",
@@ -391,7 +391,7 @@ onMounted(() => {
         </div>
         <div class="row items-center">
           <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-            <div>ตำแหน่งทางสายงาน</div>
+            <div>ตำแหน่ง</div>
           </div>
           <div class="col-12 col-sm-12 col-md-7">
             {{ dataEmployee.positionEmployeePositionId ?? "-" }}
@@ -503,8 +503,8 @@ onMounted(() => {
                 hide-bottom-space
                 v-model="formData.positionEmployeePositionId"
                 class="inputgreen"
-                label="ตำแหน่งทางสายงาน"
-                :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่งทางสายงาน'}`]"
+                label="ตำแหน่ง"
+                :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
               />
             </div>
             <div class="col-xs-12 col-sm-6 col-md-6">
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index 115915860..81b5de3fa 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -349,11 +349,26 @@ const baseVisibleColumns = ref<string[]>([
 const columns = computed<QTableColumn[]>(() => {
   if (empType.value !== "") {
     if (baseColumns.value) {
-      return baseColumns.value.filter(
-        (column) =>
-          column.name !== "positionSalaryAmount" &&
-          column.name !== "mouthSalaryAmount"
+      const filterBaseColumn =
+        empType.value != "-temp"
+          ? baseColumns.value.filter(
+              (column) =>
+                column.name !== "positionSalaryAmount" &&
+                column.name !== "positionExecutive" && // ลูกจ้างไม่มีตำแหน่งทางการบริหาร
+                column.name !== "mouthSalaryAmount"
+            )
+          : baseColumns.value.filter(
+              (column) =>
+                column.name !== "positionSalaryAmount" &&
+                column.name !== "mouthSalaryAmount" &&
+                column.name !== "positionExecutive" && // ลูกจ้างชั่วคราวไม่มีตำแหน่งทางการบริหาร
+                column.name !== "positionLevel" && // ลูกจ้างชั่วคราวไม่มีระดับชั้นงาน
+                column.name !== "posNo" // ลูกจ้างชั่วคราวไม่มีตำแหน่งเลขที่
+            );
+      visibleColumnsHistory.value = filterBaseColumn.map(
+        (e: QTableColumn) => e.name
       );
+      return filterBaseColumn;
     }
   }
   return baseColumns.value.filter(
diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue
index 9bc19e94f..aeeffb14b 100644
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@@ -610,6 +610,14 @@ onMounted(async () => {
                         : "-"
                     }}
                   </div>
+
+                  <div
+                    v-else-if="col.name == 'organizationNameOld'"
+                    class="text-html"
+                  >
+                    {{ col.value ? col.value : "-" }}
+                  </div>
+
                   <div v-else-if="col.name == 'createdAt'">
                     {{
                       props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
diff --git a/src/modules/20_positionTemp/components/DialogAddPosition.vue b/src/modules/20_positionTemp/components/DialogAddPosition.vue
index 478b5ee8b..69f9cb4cf 100644
--- a/src/modules/20_positionTemp/components/DialogAddPosition.vue
+++ b/src/modules/20_positionTemp/components/DialogAddPosition.vue
@@ -196,7 +196,7 @@ watch(
               />
             </div>
 
-            <div class="col-6">
+            <!-- <div class="col-6">
               <q-select
                 ref="posLevelNameRef"
                 label="ระดับชั้นงาน"
@@ -214,7 +214,7 @@ watch(
                 :rules="[(val:string) => !!val || `${'กรุณาเลือกระดับชั้นงาน'}`]"
                 class="inputgreen"
               />
-            </div>
+            </div> -->
           </div>
 
           <q-separator />
diff --git a/src/modules/20_positionTemp/components/DialogFormPosition.vue b/src/modules/20_positionTemp/components/DialogFormPosition.vue
index a3399fdd2..aa72dd354 100644
--- a/src/modules/20_positionTemp/components/DialogFormPosition.vue
+++ b/src/modules/20_positionTemp/components/DialogFormPosition.vue
@@ -59,7 +59,7 @@ const type = ref<string>("positionName");
 const optionFilter = ref<DataOption[]>([
   { id: "positionName", name: "ชื่อตำแหน่ง" },
   { id: "positionType", name: "กลุ่มงาน" },
-  { id: "positionLevel", name: "ระดับชั้นงาน" },
+  // { id: "positionLevel", name: "ระดับชั้นงาน" },
 ]);
 
 const listMenu = ref<ListMenu[]>([
@@ -122,21 +122,21 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ระดับชั้นงาน",
-    sortable: true,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+  // {
+  //   name: "posLevelName",
+  //   align: "left",
+  //   label: "ระดับชั้นงาน",
+  //   sortable: true,
+  //   field: "posLevelName",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
 ]);
 const visibleColumns = ref<string[]>([
   "no",
   "posDictName",
   "posTypeName",
-  "posLevelName",
+  // "posLevelName",
 ]);
 
 async function fetchPosition(id: string) {
@@ -475,7 +475,7 @@ watch(
                             >
                               {{ col.value ? col.value : "-" }}
                             </div>
-                            <div v-else-if="col.name === 'posLevelName'">
+                            <!-- <div v-else-if="col.name === 'posLevelName'">
                               {{
                                 props.row.posLevelName
                                   ? props.row.isSpecial == true
@@ -483,7 +483,7 @@ watch(
                                     : props.row.posLevelName
                                   : "-"
                               }}
-                            </div>
+                            </div> -->
                             <div v-else-if="col.name === 'positionArea'">
                               {{ col.value ? col.value : "-" }}
                             </div>
@@ -525,14 +525,14 @@ watch(
                   class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
                 >
                   เลือกตำแหน่งที่ต้องการเพิ่ม
-                  <q-btn
+                  <!-- <q-btn
                     icon="mdi-plus"
                     flat
                     round
                     color="teal"
                     @click="() => (modalAdd = true)"
                     ><q-tooltip>สร้างตำแหน่ง</q-tooltip></q-btn
-                  >
+                  > -->
                 </div>
                 <div class="col-12"><q-separator /></div>
                 <div class="q-pa-sm">
@@ -671,7 +671,7 @@ watch(
                             >
                               {{ col.value ? col.value : "-" }}
                             </div>
-                            <div v-else-if="col.name === 'posLevelName'">
+                            <!-- <div v-else-if="col.name === 'posLevelName'">
                               {{
                                 props.row.posLevelName
                                   ? props.row.isSpecial == true
@@ -679,7 +679,7 @@ watch(
                                     : props.row.posLevelName
                                   : "-"
                               }}
-                            </div>
+                            </div> -->
 
                             <div v-else-if="col.name === 'positionArea'">
                               {{ col.value ? col.value : "-" }}
diff --git a/src/modules/20_positionTemp/components/DialogPositionDetail.vue b/src/modules/20_positionTemp/components/DialogPositionDetail.vue
index 073e34490..da2416b69 100644
--- a/src/modules/20_positionTemp/components/DialogPositionDetail.vue
+++ b/src/modules/20_positionTemp/components/DialogPositionDetail.vue
@@ -48,7 +48,7 @@ function close() {
               </div>
             </div>
 
-            <div class="row q-col-gutter-sm q-mb-xs">
+            <!-- <div class="row q-col-gutter-sm q-mb-xs">
               <div class="col-4 text-bold">
                 <div>
                   <p>ระดับชั้นงาน</p>
@@ -57,7 +57,7 @@ function close() {
               <div class="col-8 text-grey-8">
                 <p>{{ prosp?.dataDetailPos?.posLevelName }}</p>
               </div>
-            </div>
+            </div> -->
           </div>
         </q-card-section>
       </q-card>
diff --git a/src/modules/20_positionTemp/components/DialogSelectPerson.vue b/src/modules/20_positionTemp/components/DialogSelectPerson.vue
index 864c93b62..1e6413433 100644
--- a/src/modules/20_positionTemp/components/DialogSelectPerson.vue
+++ b/src/modules/20_positionTemp/components/DialogSelectPerson.vue
@@ -94,8 +94,7 @@ const visibleColumnsResult = ref<String[]>([
   "citizenId",
   "name",
   "posTypeName",
-  "posLevelName",
-  "positionName"
+  "positionName",
 ]);
 const columns = ref<QTableProps["columns"]>([
   {
@@ -126,15 +125,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ระดับชั้นงาน",
-    sortable: true,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+  // {
+  //   name: "posLevelName",
+  //   align: "left",
+  //   label: "ระดับชั้นงาน",
+  //   sortable: true,
+  //   field: "posLevelName",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
 ]);
 const columnsResult = ref<QTableProps["columns"]>([
   {
@@ -182,16 +181,15 @@ const columnsResult = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ระดับชั้นงาน",
-    sortable: true,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+  // {
+  //   name: "posLevelName",
+  //   align: "left",
+  //   label: "ระดับชั้นงาน",
+  //   sortable: true,
+  //   field: "posLevelName",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
 ]);
 
 /**
@@ -239,15 +237,15 @@ function inputEdit(val: boolean) {
 /**
  * function เรียกข้แมูลระดับตำแหน่ง
  */
-function updateSelectType(val: string) {
-  const listLevel: any = dataLevel.value.find((e: TypePos) => e.id === val);
-  levelOpsMain.value = listLevel?.posLevels.map((e: OptionLevel) => ({
-    id: e.id,
-    name: e.posLevelName,
-  }));
-  levelOps.value = levelOpsMain.value;
-  formData.positionLevel = "";
-}
+// function updateSelectType(val: string) {
+//   const listLevel: any = dataLevel.value.find((e: TypePos) => e.id === val);
+//   levelOpsMain.value = listLevel?.posLevels.map((e: OptionLevel) => ({
+//     id: e.id,
+//     name: e.posLevelName,
+//   }));
+//   levelOps.value = levelOpsMain.value;
+//   formData.positionLevel = "";
+// }
 
 /**
  * ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม
@@ -560,7 +558,6 @@ watch(
                       :options="typeOps"
                       emit-value
                       dense
-                      @update:model-value="updateSelectType"
                       map-options
                       outlined
                       option-label="name"
@@ -575,7 +572,7 @@ watch(
                         /> </template
                     ></q-select>
                   </div>
-                  <div class="col-2">
+                  <!-- <div class="col-2">
                     <q-select
                       ref="positionLevelRef"
                       :class="inputEdit(isReadonly)"
@@ -599,7 +596,7 @@ watch(
                           class="cursor-pointer"
                         /> </template
                     ></q-select>
-                  </div>
+                  </div> -->
                   <div class="col-2">
                     <q-btn
                       label="ค้นหา"
diff --git a/src/modules/20_positionTemp/components/TableMain.vue b/src/modules/20_positionTemp/components/TableMain.vue
index 046678f42..9650620f7 100644
--- a/src/modules/20_positionTemp/components/TableMain.vue
+++ b/src/modules/20_positionTemp/components/TableMain.vue
@@ -153,15 +153,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "posLevelName",
-    align: "left",
-    label: "ระดับชั้นงาน",
-    sortable: false,
-    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+  // {
+  //   name: "posLevelName",
+  //   align: "left",
+  //   label: "ระดับชั้นงาน",
+  //   sortable: false,
+  //   field: "posLevelName",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
   {
     name: "positionIsSelected",
     align: "left",
@@ -623,7 +623,7 @@ watch(
                   : col.value
               }}
             </div>
-            <div v-else-if="col.name === 'posLevelName'">
+            <!-- <div v-else-if="col.name === 'posLevelName'">
               {{
                 props.row.posLevelName
                   ? props.row.isSpecial == true
@@ -631,7 +631,7 @@ watch(
                     : props.row.posLevelName
                   : "-"
               }}
-            </div>
+            </div> -->
             <div v-else-if="col.name == 'positionIsSelected'">
               {{
                 props.row.positionIsSelected