diff --git a/src/components/Workflow/DialogSelectPerson.vue b/src/components/Workflow/DialogSelectPerson.vue
index 3a9b740..bc52e15 100644
--- a/src/components/Workflow/DialogSelectPerson.vue
+++ b/src/components/Workflow/DialogSelectPerson.vue
@@ -36,6 +36,15 @@ const rejectName = computed(() =>
 const selected = ref<DataCommander[]>([]);
 const rows = ref<DataCommander[]>([]);
 const columns = ref<QTableProps["columns"]>([
+  {
+    name: "posNo",
+    align: "left",
+    label: "เลขที่ตำแหน่ง",
+    sortable: true,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "fullName",
     align: "left",
diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index a1ee1de..d644ea2 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -432,7 +432,7 @@ watch(
 
       <q-separator />
 
-      <q-card-section>
+      <q-card-section class="scroll" style="max-height: 80vh;">
         <div class="row">
           <div
             flat
@@ -565,7 +565,6 @@ watch(
     </q-card>
 
     <q-card
-      q-card
       v-if="props.leaveStatus === 'DELETE'"
       style="min-width: 40vw"
     >
diff --git a/src/modules/10_registry/02_Government/01_Government.vue b/src/modules/10_registry/02_Government/01_Government.vue
index f9a6c23..e251927 100644
--- a/src/modules/10_registry/02_Government/01_Government.vue
+++ b/src/modules/10_registry/02_Government/01_Government.vue
@@ -542,7 +542,7 @@ onMounted(async () => {
             <div class="col-7">
               {{
                 formData.govAge
-                  ? `${formData.govAge.year} ปี ${formData.govAge.month} เดือน ${formData.govAge.year} วัน`
+                  ? `${formData.govAge.year} ปี ${formData.govAge.month} เดือน ${formData.govAge.day} วัน`
                   : "-"
               }}
             </div>
diff --git a/src/modules/10_registry/02_Government/07_Position.vue b/src/modules/10_registry/02_Government/07_Position.vue
index 93a2625..2fbaa00 100644
--- a/src/modules/10_registry/02_Government/07_Position.vue
+++ b/src/modules/10_registry/02_Government/07_Position.vue
@@ -561,7 +561,7 @@ onMounted(async () => {
                 icon="mdi-history"
                 @click="onHistory(props.row.id)"
               >
-                <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
+                <q-tooltip>ประวัติแก้ไขตำแหน่ง</q-tooltip>
               </q-btn>
             </q-td>
           </q-tr>
@@ -580,7 +580,7 @@ onMounted(async () => {
                   class="absolute_button"
                   @click="onHistory(props.row.id)"
                 >
-                  <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
+                  <q-tooltip>ประวัติแก้ไขตำแหน่ง</q-tooltip>
                 </q-btn>
                 <q-item v-for="col in props.cols" :key="col.name">
                   <q-item-section class="fix_top">
diff --git a/src/modules/10_registry/03_Salary/01_Salary.vue b/src/modules/10_registry/03_Salary/01_Salary.vue
index 1399784..7917069 100644
--- a/src/modules/10_registry/03_Salary/01_Salary.vue
+++ b/src/modules/10_registry/03_Salary/01_Salary.vue
@@ -38,6 +38,10 @@ const checkType = ref<boolean>(
 const modalHistory = ref<boolean>(false);
 /** ตัวแปรข้อมูล */
 
+const salaryText = computed(() => {
+  return link.value == "" ? "เงินเดือน" : "ค่าจ้าง";
+});
+
 const baseColumns = ref<QTableColumn[]>([
   {
     name: "commandDateAffect",
@@ -194,7 +198,7 @@ const baseColumns = ref<QTableColumn[]>([
   {
     name: "amount",
     align: "left",
-    label: link.value === "-employee" ? "ค่าจ้าง" : "เงินเดือน",
+    label: salaryText.value,
     sortable: true,
     field: "amount",
     headerStyle: "font-size: 14px",
@@ -503,7 +507,7 @@ const baseColumnsHistory = ref<QTableColumn[]>([
   {
     name: "amount",
     align: "left",
-    label: link.value === "-employee" ? "ค่าจ้าง" : "เงินเดือน",
+    label: salaryText.value,
     sortable: true,
     field: "amount",
     headerStyle: "font-size: 14px",
@@ -652,9 +656,9 @@ onMounted(async () => {
   <!-- v-if="mode" -->
   <div class="col-12">
     <q-toolbar class="q-px-none">
-      <span class="text-blue-6 text-weight-bold text-body1"
-        >ตำแหน่ง/เงินเดือน</span
-      >
+      <span class="text-blue-6 text-weight-bold text-body1">{{
+        `${salaryText}`
+      }}</span>
       <q-space />
       <q-input
         v-if="mode"
@@ -737,7 +741,7 @@ onMounted(async () => {
               icon="mdi-history"
               @click="onHistory(props.row.id)"
             >
-              <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
+              <q-tooltip>{{ `ประวัติแก้ไข${salaryText}` }}</q-tooltip>
             </q-btn>
           </q-td>
         </q-tr>
@@ -756,7 +760,7 @@ onMounted(async () => {
                 class="absolute_button"
                 @click="onHistory(props.row.id)"
               >
-                <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
+                <q-tooltip>{{ `ประวัติแก้ไข${salaryText}` }}</q-tooltip>
               </q-btn>
               <q-item v-for="col in props.cols" :key="col.name">
                 <q-item-section class="fix_top">
@@ -778,7 +782,7 @@ onMounted(async () => {
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
-    :title="'ประวัติแก้ไขตำแหน่ง/เงินเดือน'"
+    :title="`ประวัติแก้ไข${salaryText}`"
     :getData="getHistory"
     :rows="rowsHistory"
     :rows-data="rowsHistoryData"
diff --git a/src/modules/10_registry/03_Salary/02_Nopaid.vue b/src/modules/10_registry/03_Salary/02_Nopaid.vue
index ecdc9a4..1757c39 100644
--- a/src/modules/10_registry/03_Salary/02_Nopaid.vue
+++ b/src/modules/10_registry/03_Salary/02_Nopaid.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { ref, onMounted, computed } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar, type QTableProps } from "quasar";
-import { ref, onMounted } from "vue";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -28,7 +28,9 @@ const { showLoader, hideLoader, messageError, date2Thai, onSearchDataTable } =
 const { getPathUploadFlie } = useRegistryDataStore();
 
 const modalHistory = ref<boolean>(false);
-/** ตัวแปรข้อมูล */
+const salaryText = computed(() => {
+  return link.value == "" ? "เงินเดือน" : "ค่าจ้าง";
+});
 
 const visibleColumns = ref<string[]>([
   "date",
@@ -220,7 +222,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-const fileGroup = ref<string>("เอกสารบันทึกวันที่ไม่ได้รับเงินเดือน");
+const fileGroup = ref<string>(`เอกสารบันทึกวันที่ไม่ได้รับ${salaryText.value}`);
 
 function onHistory(id: string) {
   modalHistory.value = true;
@@ -287,9 +289,9 @@ onMounted(async () => {
   <!-- v-if="mode" -->
   <div class="col-12">
     <q-toolbar class="q-px-none q-mt-md">
-      <span class="text-blue-6 text-weight-bold text-body1"
-        >บันทึกวันที่ไม่ได้รับเงินเดือนฯ</span
-      >
+      <span class="text-blue-6 text-weight-bold text-body1">{{
+        `บันทึกวันที่ไม่ได้รับ${salaryText}ฯ`
+      }}</span>
       <q-space />
       <q-input
         v-if="mode"
@@ -381,7 +383,9 @@ onMounted(async () => {
               icon="mdi-history"
               @click="onHistory(props.row.id)"
             >
-              <q-tooltip>ประวัติแก้ไขบันทึกวันที่ไม่ได้รับเงินเดือนฯ</q-tooltip>
+              <q-tooltip>{{
+                `ประวัติแก้ไขบันทึกวันที่ไม่ได้รับ${salaryText}ฯ`
+              }}</q-tooltip>
             </q-btn>
           </q-td>
         </q-tr>
@@ -412,9 +416,9 @@ onMounted(async () => {
                   size="14px"
                   @click="onHistory(props.row.id)"
                 >
-                  <q-tooltip
-                    >ประวัติแก้ไขบันทึกวันที่ไม่ได้รับเงินเดือนฯ</q-tooltip
-                  >
+                  <q-tooltip>{{
+                    `ประวัติแก้ไขบันทึกวันที่ไม่ได้รับ${salaryText}ฯ`
+                  }}</q-tooltip>
                 </q-btn>
               </div>
               <q-item v-for="col in props.cols" :key="col.name">
@@ -438,7 +442,7 @@ onMounted(async () => {
 
   <DialogHistory
     v-model:modal="modalHistory"
-    :title="'ประวัติแก้ไขบันทึกวันที่ไม่ได้รับเงินเดือนฯ'"
+    :title="`ประวัติแก้ไขบันทึกวันที่ไม่ได้รับ${salaryText}ฯ`"
     :getData="getHistory"
     :rows="rowsHistory"
     :rows-data="rowsHistoryData"
diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue
index f19dcc2..7b1c10f 100644
--- a/src/modules/10_registry/views/main.vue
+++ b/src/modules/10_registry/views/main.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, computed } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDataStore } from "@/stores/data";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
@@ -25,6 +25,9 @@ const mixin = useCounterMixin();
 const { messageError, showLoader, hideLoader } = mixin;
 const router = useRouter();
 const tab = ref<string>("information");
+const salaryText = computed(() => {
+ return  dataStore.officerType == "OFFICER" ? "เงินเดือน" : "ค่าจ้าง";
+});
 
 const sizeImg = ref<string>("");
 function onResize(size: any) {
@@ -210,7 +213,7 @@ function redirectToPagePetition() {
                 class="bg-active"
               />
               <q-tab name="government" label="ข้อมูลราชการ" />
-              <q-tab name="salary" label="ข้อมูลเงินเดือน/ค่าจ้าง" />
+              <q-tab name="salary" :label="`ข้อมูล${salaryText}`" />
               <q-tab name="insignia" label="ข้อมูลผลงาน" />
               <q-tab name="other" label="ข้อมูลอื่นๆ" />
             </q-tabs>
@@ -316,7 +319,7 @@ function redirectToPagePetition() {
               </q-item-section>
             </q-item>
             <q-item clickable v-ripple @click="onMobile('salary')">
-              <q-item-section>ข้อมูลเงินเดือน/ค่าจ้าง</q-item-section>
+              <q-item-section>{{ `ข้อมูล${salaryText}` }}</q-item-section>
               <q-item-section avatar>
                 <q-avatar text-color="info" icon="mdi-chevron-right" />
               </q-item-section>
diff --git a/src/modules/11_probation/views/mainDetail.vue b/src/modules/11_probation/views/mainDetail.vue
index 8bcec15..6a35432 100644
--- a/src/modules/11_probation/views/mainDetail.vue
+++ b/src/modules/11_probation/views/mainDetail.vue
@@ -414,7 +414,7 @@ onMounted(async () => {
                           class="absolute_button"
                           @click="onDetail(props.row.id)"
                         >
-                          <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
+                          <q-tooltip>ดูรายละเอียด</q-tooltip>
                         </q-btn>
                         <q-item v-for="col in props.cols" :key="col.name">
                           <q-item-section class="fix_top">