diff --git a/src/modules/08_KPI/components/Tab/Dialog/DialogCommentProgress.vue b/src/modules/08_KPI/components/Tab/Dialog/DialogCommentProgress.vue
index 2a0dfb6..4a4d0bd 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/DialogCommentProgress.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/DialogCommentProgress.vue
@@ -257,10 +257,10 @@ watch(
                   <div class="row q-px-md q-py-sm items-center bg-grey-1">
                     <div class="col-12">
                       <span>{{
-                    type == "capacity" || type == "development"
-                      ? "เหตุการณ์/พฤติกรรม"
-                      : "ความก้าวหน้า"
-                  }}</span>
+                        type == "capacity" || type == "development"
+                          ? "เหตุการณ์/พฤติกรรม"
+                          : "ความก้าวหน้า"
+                      }}</span>
                     </div>
                   </div>
 
@@ -350,157 +350,159 @@ watch(
                     <q-separator />
                   </div>
 
-                  <!-- ความคิดเห็นของผู้ประเมิน -->
-                  <q-form
-                    v-if="store.dataEvaluation.evaluatorId"
-                    ref="reasonEvaluatorRef"
-                    greedy
-                    @submit.prevent
-                    @validation-success="onSubmitComment('evaluator')"
-                    class="full-width q-mt-sm"
-                  >
-                    <div class="row col-12 q-col-gutter-sm">
-                      <div class="col-12">
-                        <span class="text-weight-medium text-grey-6"
-                          >ความคิดเห็นของผู้ประเมิน</span
-                        >
-                      </div>
-                      <div class="col-12">
-                        <q-input
-                          outlined
-                          dense
-                          :readonly="
-                            formDataView.reasonEvaluator !== null ||
-                            store.rolePerson !== 'EVALUATOR'
+                  <div if="type == 'capacity' || type == 'development'">
+                    <!-- ความคิดเห็นของผู้ประเมิน -->
+                    <q-form
+                      v-if="store.dataEvaluation.evaluatorId"
+                      ref="reasonEvaluatorRef"
+                      greedy
+                      @submit.prevent
+                      @validation-success="onSubmitComment('evaluator')"
+                      class="full-width q-mt-sm"
+                    >
+                      <div class="row col-12 q-col-gutter-sm">
+                        <div class="col-12">
+                          <span class="text-weight-medium text-grey-6"
+                            >ความคิดเห็นของผู้ประเมิน</span
+                          >
+                        </div>
+                        <div class="col-12">
+                          <q-input
+                            outlined
+                            dense
+                            :readonly="
+                              formDataView.reasonEvaluator !== null ||
+                              store.rolePerson !== 'EVALUATOR'
+                            "
+                            label="ความคิดเห็นของผู้ประเมิน"
+                            v-model="reasonEvaluator"
+                            type="textarea"
+                            class="inputgreen"
+                            lazy-rules
+                            hide-bottom-space
+                            :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้ประเมิน'}`,]"
+                          ></q-input>
+                        </div>
+
+                        <div
+                          v-if="
+                            formDataView.reasonEvaluator == null &&
+                            store.rolePerson == 'EVALUATOR'
                           "
-                          label="ความคิดเห็นของผู้ประเมิน"
-                          v-model="reasonEvaluator"
-                          type="textarea"
-                          class="inputgreen"
-                          lazy-rules
-                          hide-bottom-space
-                          :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้ประเมิน'}`,]"
-                        ></q-input>
-                      </div>
-
-                      <div
-                        v-if="
-                          formDataView.reasonEvaluator == null &&
-                          store.rolePerson == 'EVALUATOR'
-                        "
-                        class="col-12"
-                        align="right"
-                      >
-                        <q-btn
-                          label="บันทึกความคิดเห็น"
-                          color="secondary"
-                          type="submit"
-                          ><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
+                          class="col-12"
+                          align="right"
                         >
+                          <q-btn
+                            label="บันทึกความคิดเห็น"
+                            color="secondary"
+                            type="submit"
+                            ><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
+                          >
+                        </div>
                       </div>
-                    </div>
-                  </q-form>
+                    </q-form>
 
-                  <!-- ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป -->
-                  <q-form
-                    v-if="store.dataEvaluation.commanderId"
-                    class="full-width q-mt-sm"
-                    ref="reasonCommanderRef"
-                    greedy
-                    @submit.prevent
-                    @validation-success="onSubmitComment('commander')"
-                  >
-                    <div class="row col-12 q-col-gutter-sm">
-                      <div class="col-12">
-                        <span class="text-weight-medium text-grey-6"
-                          >ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป</span
-                        >
-                      </div>
-                      <div class="col-12">
-                        <q-input
-                          outlined
-                          dense
-                          label="ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป"
-                          v-model="reasonCommander"
-                          type="textarea"
-                          class="inputgreen"
-                          lazy-rules
-                          :readonly="
-                            formDataView.reasonCommander !== null ||
-                            store.rolePerson !== 'COMMANDER'
+                    <!-- ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป -->
+                    <q-form
+                      v-if="store.dataEvaluation.commanderId"
+                      class="full-width q-mt-sm"
+                      ref="reasonCommanderRef"
+                      greedy
+                      @submit.prevent
+                      @validation-success="onSubmitComment('commander')"
+                    >
+                      <div class="row col-12 q-col-gutter-sm">
+                        <div class="col-12">
+                          <span class="text-weight-medium text-grey-6"
+                            >ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป</span
+                          >
+                        </div>
+                        <div class="col-12">
+                          <q-input
+                            outlined
+                            dense
+                            label="ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป"
+                            v-model="reasonCommander"
+                            type="textarea"
+                            class="inputgreen"
+                            lazy-rules
+                            :readonly="
+                              formDataView.reasonCommander !== null ||
+                              store.rolePerson !== 'COMMANDER'
+                            "
+                            hide-bottom-space
+                            :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]"
+                          ></q-input>
+                        </div>
+
+                        <div
+                          v-if="
+                            formDataView.reasonCommander == null &&
+                            store.rolePerson == 'COMMANDER'
                           "
-                          hide-bottom-space
-                          :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]"
-                        ></q-input>
-                      </div>
-
-                      <div
-                        v-if="
-                          formDataView.reasonCommander == null &&
-                          store.rolePerson == 'COMMANDER'
-                        "
-                        class="col-12"
-                        align="right"
-                      >
-                        <q-btn
-                          label="บันทึกความคิดเห็น"
-                          color="secondary"
-                          type="submit"
-                          ><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
+                          class="col-12"
+                          align="right"
                         >
+                          <q-btn
+                            label="บันทึกความคิดเห็น"
+                            color="secondary"
+                            type="submit"
+                            ><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
+                          >
+                        </div>
                       </div>
-                    </div>
-                  </q-form>
+                    </q-form>
 
-                  <q-form
-                    v-if="store.dataEvaluation.commanderHighId"
-                    class="full-width q-mt-sm"
-                    ref="reasonCommanderHighRef"
-                    greedy
-                    @submit.prevent
-                    @validation-success="onSubmitComment('commanderhigh')"
-                  >
-                    <div class="row col-12 q-col-gutter-sm">
-                      <div class="col-12">
-                        <span class="text-weight-medium text-grey-6"
-                          >ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง</span
-                        >
-                      </div>
-                      <div class="col-12">
-                        <q-input
-                          outlined
-                          dense
-                          label="ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง"
-                          v-model="reasonCommanderHigh"
-                          type="textarea"
-                          class="inputgreen"
-                          lazy-rules
-                          :readonly="
-                            formDataView.reasonCommanderHigh !== null ||
-                            store.rolePerson !== 'COMMANDERHIGH'
+                    <q-form
+                      v-if="store.dataEvaluation.commanderHighId"
+                      class="full-width q-mt-sm"
+                      ref="reasonCommanderHighRef"
+                      greedy
+                      @submit.prevent
+                      @validation-success="onSubmitComment('commanderhigh')"
+                    >
+                      <div class="row col-12 q-col-gutter-sm">
+                        <div class="col-12">
+                          <span class="text-weight-medium text-grey-6"
+                            >ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง</span
+                          >
+                        </div>
+                        <div class="col-12">
+                          <q-input
+                            outlined
+                            dense
+                            label="ความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง"
+                            v-model="reasonCommanderHigh"
+                            type="textarea"
+                            class="inputgreen"
+                            lazy-rules
+                            :readonly="
+                              formDataView.reasonCommanderHigh !== null ||
+                              store.rolePerson !== 'COMMANDERHIGH'
+                            "
+                            hide-bottom-space
+                            :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]"
+                          ></q-input>
+                        </div>
+
+                        <div
+                          v-if="
+                            formDataView.reasonCommanderHigh == null &&
+                            store.rolePerson == 'COMMANDERHIGH'
                           "
-                          hide-bottom-space
-                          :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]"
-                        ></q-input>
-                      </div>
-
-                      <div
-                        v-if="
-                          formDataView.reasonCommanderHigh == null &&
-                          store.rolePerson == 'COMMANDERHIGH'
-                        "
-                        class="col-12"
-                        align="right"
-                      >
-                        <q-btn
-                          label="บันทึกความคิดเห็น"
-                          color="secondary"
-                          type="submit"
-                          ><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
+                          class="col-12"
+                          align="right"
                         >
+                          <q-btn
+                            label="บันทึกความคิดเห็น"
+                            color="secondary"
+                            type="submit"
+                            ><q-tooltip>บันทึกความคิดเห็น</q-tooltip></q-btn
+                          >
+                        </div>
                       </div>
-                    </div>
-                  </q-form>
+                    </q-form>
+                  </div>
                 </div>
               </div>
             </template>
diff --git a/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue b/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
index 77ddb0d..d9e31ca 100644
--- a/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
+++ b/src/modules/08_KPI/components/Tab/Dialog/DialogGovernment.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import DialogHeader from "@/components/DialogHeader.vue";
 import type { QTableProps } from "quasar";
-import { ref,watch } from "vue";
+import { ref, watch } from "vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 import { useRouter, useRoute } from "vue-router";
@@ -25,7 +25,7 @@ const {
 
 const route = useRoute();
 const router = useRouter();
-const id = ref<string>(route.params.id as string)
+const id = ref<string>(route.params.id as string);
 const modal = defineModel<boolean>("modal", { required: true });
 const filterKeyword = ref<string>("");
 const rows = ref<any[]>([]);
@@ -56,7 +56,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posMasterNoOld",
     align: "left",
-    label: "เลขที่ตำแหน่ง",
+    label: "ตำแหน่งเลขที่",
     sortable: true,
     field: "posMasterNoOld",
     headerStyle: "font-size: 14px",
@@ -77,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภท",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -192,24 +192,29 @@ function close() {
   modal.value = false;
 }
 
-function getData(){
-    showLoader()
-    http
-    .get(config.API.placementKeycloak+`/${store.dataProfile.profileId}`)
-    .then((res)=>{
-        const data = res.data.result
-        rows.value = data
-    }).catch((e)=>{
-        messageError($q,e)
-    }).finally(()=>{
-        hideLoader()
+function getData() {
+  showLoader();
+  http
+    .get(config.API.placementKeycloak + `/${store.dataProfile.profileId}`)
+    .then((res) => {
+      const data = res.data.result;
+      rows.value = data;
     })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
 }
-watch(()=>modal.value,(n)=>{
-    if(n == true){
-        getData()
+watch(
+  () => modal.value,
+  (n) => {
+    if (n == true) {
+      getData();
     }
-})
+  }
+);
 </script>
 <template>
   <q-dialog persistent v-model="modal">
diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue
index b7c0273..da9fb9f 100644
--- a/src/modules/08_KPI/views/form.vue
+++ b/src/modules/08_KPI/views/form.vue
@@ -562,7 +562,7 @@ onMounted(async () => {
                   </div>
                   <div class="col-xs-12 col-md-2">
                     <div :class="$q.screen.gt.sm ? 'column' : 'row'">
-                      <span class="text-grey-6 col">ประเภทตำแหน่ง</span>
+                      <span class="text-grey-6 col">ตำแหน่งประเภท</span>
                       <span class="text-weight-medium text-dark col">{{
                         store.dataEvaluation.posTypeName
                       }}</span>
@@ -570,7 +570,7 @@ onMounted(async () => {
                   </div>
                   <div class="col-xs-12 col-md-2">
                     <div :class="$q.screen.gt.sm ? 'column' : 'row'">
-                      <span class="text-grey-6 col">ระดับตำแหน่ง</span>
+                      <span class="text-grey-6 col">ระดับ</span>
                       <span class="text-weight-medium text-dark col">{{
                         store.dataEvaluation.posLevelName
                       }}</span>
diff --git a/src/modules/09_scholarship/views/detail.vue b/src/modules/09_scholarship/views/detail.vue
index b105760..780cb7b 100644
--- a/src/modules/09_scholarship/views/detail.vue
+++ b/src/modules/09_scholarship/views/detail.vue
@@ -583,11 +583,11 @@ onMounted(async () => {
                 <div class="col-8 text-weight-medium">
                   {{ dataPerson.firstName ? dataPerson.name : "-" }}
                 </div>
-                <div class="col-4 text-grey">ตำแหน่ง</div>
+                <div class="col-4 text-grey">ตำแหน่งในสายงาน</div>
                 <div class="col-8 text-weight-medium">
                   {{ dataPerson.position ? dataPerson.position : "-" }}
                 </div>
-                <div class="col-4 text-grey">ประเภทตำแหน่ง</div>
+                <div class="col-4 text-grey">ตำแหน่งประเภท</div>
                 <div class="col-8 text-weight-medium">
                   {{ dataPerson.type ? dataPerson.type : "-" }}
                 </div>
@@ -595,7 +595,7 @@ onMounted(async () => {
             </div>
             <div class="col-xs-12 col-md-6">
               <div class="row q-col-gutter-md">
-                <div class="col-4 text-grey">ระดับตำแหน่ง</div>
+                <div class="col-4 text-grey">ระดับ</div>
                 <div class="col-8 text-weight-medium">
                   {{ dataPerson.level ? dataPerson.level : "-" }}
                 </div>
diff --git a/src/modules/10_registry/01_Information/01_Information.vue b/src/modules/10_registry/01_Information/01_Information.vue
index 3c7a9b5..b9933a7 100644
--- a/src/modules/10_registry/01_Information/01_Information.vue
+++ b/src/modules/10_registry/01_Information/01_Information.vue
@@ -19,7 +19,7 @@ const { showLoader, hideLoader, messageError, date2Thai } = mixin;
 const modalHistory = ref<boolean>(false);
 /** ตัวแปรข้อมูล */
 const formDataInformation = reactive<any>({
-  citizenId: "", //เลขบัตรประจำตัวประชาชน
+  citizenId: "", //เลขประจำตัวประชาชน
   prefix: "",
   firstName: "",
   lastName: "",
@@ -304,7 +304,7 @@ onMounted(() => {
         <div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm">
           <div class="row">
             <div class="col-5 text-grey-6 text-weight-medium">
-              เลขบัตรประจำตัวประชาชน
+              เลขประจำตัวประชาชน
             </div>
             <div class="col-7">
               {{
diff --git a/src/modules/10_registry/01_Information/02_ChangeName.vue b/src/modules/10_registry/01_Information/02_ChangeName.vue
index f07935a..6dbe5e4 100644
--- a/src/modules/10_registry/01_Information/02_ChangeName.vue
+++ b/src/modules/10_registry/01_Information/02_ChangeName.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByrow = ref<string>('')
+const idByrow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -152,9 +152,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByrow.value = id
+  idByrow.value = id;
 }
 
 /** get data */
@@ -178,7 +178,7 @@ function getData() {
 function getHistory() {
   showLoader();
   http
-    .get(config.API.dataUserChangeNameHistory+`/${idByrow.value}`)
+    .get(config.API.dataUserChangeNameHistory + `/${idByrow.value}`)
     .then((res) => {
       const data = res.data.result;
       rowsHistory.value = data;
@@ -273,7 +273,7 @@ onMounted(() => {
               {{ props.rowIndex + 1 }}
             </div>
             <div v-else>
-              {{ col.value? col.value:'-' }}
+              {{ col.value ? col.value : "-" }}
             </div>
           </q-td>
           <q-td auto-width>
@@ -308,7 +308,6 @@ onMounted(() => {
                 <q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
               </q-btn>
               <q-item v-for="col in props.cols" :key="col.name">
-
                 <q-item-section>
                   <q-item-label class="text-grey-6 text-weight-medium">{{
                     col.label
@@ -325,10 +324,10 @@ onMounted(() => {
         </div>
       </template>
       <template v-slot:no-data>
-        <div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
-          <span>
-            ไม่พบข้อมูลประวัติการเปลี่ยนชื่อ-นามสกุล
-          </span>
+        <div
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
+        >
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
@@ -348,4 +347,4 @@ onMounted(() => {
   right: 5px;
   top: -20px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/modules/10_registry/01_Information/03_Address.vue b/src/modules/10_registry/01_Information/03_Address.vue
index f84a26f..7678f62 100644
--- a/src/modules/10_registry/01_Information/03_Address.vue
+++ b/src/modules/10_registry/01_Information/03_Address.vue
@@ -238,7 +238,10 @@ function getData() {
 
 /** get history */
 function getHistory() {
-  const url = store.typeProfile == 'OFFICER' ? config.API.dataUserHistory(''):config.API.dataUserHistory('-employee')
+  const url =
+    store.typeProfile == "OFFICER"
+      ? config.API.dataUserHistory("")
+      : config.API.dataUserHistory("-employee");
   showLoader();
   http
     .get(url)
@@ -263,10 +266,19 @@ onMounted(() => {
     <q-toolbar class="q-px-none">
       <span class="text-blue-6 text-weight-bold text-body1">ข้อมูลที่อยู่</span>
       <q-space />
-      <q-btn icon="mdi-history" color="info" flat dense round size="14px" @click="onHistory">
+      <q-btn
+        icon="mdi-history"
+        color="info"
+        flat
+        dense
+        round
+        size="14px"
+        @click="onHistory"
+      >
         <q-tooltip>ประวัติข้อมูลที่อยู่</q-tooltip>
       </q-btn>
     </q-toolbar>
+
     <q-card bordered class="bg-grey-1 q-pa-md">
       <div class="row">
         <div class="col-12 col-sm-12 col-md-6 q-gutter-y-sm">
diff --git a/src/modules/10_registry/01_Information/04_Family.vue b/src/modules/10_registry/01_Information/04_Family.vue
index 039f01f..5242184 100644
--- a/src/modules/10_registry/01_Information/04_Family.vue
+++ b/src/modules/10_registry/01_Information/04_Family.vue
@@ -11,7 +11,7 @@ import config from "@/app.config";
 import type { FormChildren } from "@/modules/10_registry/interface/index/Family";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
 
-const idFamily = ref<string>('')
+const idFamily = ref<string>("");
 const store = useRegistryInFormationStore();
 const rowsHistory = ref<any[]>([]);
 const $q = useQuasar();
@@ -41,7 +41,7 @@ const fatherData = reactive<any>({
   firstName: "",
   lastName: "",
   job: "",
-  profileId:''
+  profileId: "",
 });
 const motherData = reactive<any>({
   isLive: null,
@@ -50,7 +50,7 @@ const motherData = reactive<any>({
   firstName: "",
   lastName: "",
   job: "",
-  profileId:''
+  profileId: "",
 });
 const coupleData = reactive<any>({
   isLive: null,
@@ -61,7 +61,7 @@ const coupleData = reactive<any>({
   job: "",
   lastNameOld: "",
   statusMarital: "",
-  profileId:''
+  profileId: "",
 });
 
 const childData = ref<FormChildren[]>([]);
@@ -79,7 +79,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
   {
     name: "citizenId",
     align: "left",
-    label: "เลขบัตรประจำตัวประชาชน",
+    label: "เลขประจำตัวประชาชน",
     sortable: true,
     field: "citizenId",
     headerStyle: "font-size: 14px",
@@ -143,10 +143,10 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(type: string,id:string) {
+function onHistory(type: string, id: string) {
   modalHistory.value = true;
   typeForm.value = type;
-  idFamily.value = id ? id:'user'
+  idFamily.value = id ? id : "user";
 }
 
 /** get data */
@@ -202,7 +202,14 @@ function getData(type: string) {
 
 /** get history */
 function getHistory() {
-  const url = store.typeProfile == 'OFFICER' ? config.API.dataUserFamilyHistory(typeForm.value,'',idFamily.value):config.API.dataUserFamilyHistory(typeForm.value,'-employee',idFamily.value)
+  const url =
+    store.typeProfile == "OFFICER"
+      ? config.API.dataUserFamilyHistory(typeForm.value, "", idFamily.value)
+      : config.API.dataUserFamilyHistory(
+          typeForm.value,
+          "-employee",
+          idFamily.value
+        );
 
   showLoader();
   http
@@ -216,7 +223,8 @@ function getHistory() {
         lastName: e[`${typeForm.value}LastName`],
         job: e[`${typeForm.value}Career`],
         isLive: e[`${typeForm.value}Live`],
-        lastNameOld: typeForm.value === "couple" ? e.coupleLastNameOld : undefined,
+        lastNameOld:
+          typeForm.value === "couple" ? e.coupleLastNameOld : undefined,
       }));
     })
     .catch((e) => {
@@ -242,8 +250,6 @@ onMounted(async () => {
       >
     </q-toolbar>
     <div class="row q-col-gutter-sm">
-
-
       <div class="col-12" v-if="fatherData.profileId !== ''">
         <q-card bordered class="q-pa-md">
           <div class="row">
@@ -256,7 +262,7 @@ onMounted(async () => {
               dense
               round
               size="14px"
-              @click="onHistory('father','')"
+              @click="onHistory('father', '')"
             >
               <q-tooltip>ประวัติการแก้ไขข้อมูลบิดา</q-tooltip>
             </q-btn>
@@ -266,7 +272,7 @@ onMounted(async () => {
                   <div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm">
                     <div class="row">
                       <div class="col-5 text-grey-6 text-weight-medium">
-                        เลขบัตรประจำตัวประชาชน
+                        เลขประจำตัวประชาชน
                       </div>
                       <div class="col-7">
                         {{ fatherData.citizenId ? fatherData.citizenId : "-" }}
@@ -329,7 +335,7 @@ onMounted(async () => {
               dense
               round
               size="14px"
-              @click="onHistory('mother','')"
+              @click="onHistory('mother', '')"
             >
               <q-tooltip>ประวัติการแก้ไขข้อมูลมารดา</q-tooltip>
             </q-btn>
@@ -339,7 +345,7 @@ onMounted(async () => {
                   <div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm">
                     <div class="row">
                       <div class="col-5 text-grey-6 text-weight-medium">
-                        เลขบัตรประจำตัวประชาชน
+                        เลขประจำตัวประชาชน
                       </div>
                       <div class="col-7">
                         {{ motherData.citizenId ? motherData.citizenId : "-" }}
@@ -405,7 +411,7 @@ onMounted(async () => {
               dense
               round
               size="14px"
-              @click="onHistory('couple','')"
+              @click="onHistory('couple', '')"
             >
               <q-tooltip>ประวัติการแก้ไขข้อมูลคู่สมรส</q-tooltip>
             </q-btn>
@@ -418,12 +424,16 @@ onMounted(async () => {
                         สถานภาพการสมรส
                       </div>
                       <div class="col-7">
-                        {{ coupleData.statusMarital ? coupleData.statusMarital : "-" }}
+                        {{
+                          coupleData.statusMarital
+                            ? coupleData.statusMarital
+                            : "-"
+                        }}
                       </div>
                     </div>
                     <div class="row">
                       <div class="col-5 text-grey-6 text-weight-medium">
-                        เลขบัตรประจำตัวประชาชน
+                        เลขประจำตัวประชาชน
                       </div>
                       <div class="col-7">
                         {{ coupleData.citizenId ? coupleData.citizenId : "-" }}
@@ -448,7 +458,9 @@ onMounted(async () => {
                         นามสกุลเดิม
                       </div>
                       <div class="col-7">
-                        {{ coupleData.lastNameOld ? coupleData.lastNameOld : "-" }}
+                        {{
+                          coupleData.lastNameOld ? coupleData.lastNameOld : "-"
+                        }}
                       </div>
                     </div>
                   </div>
@@ -503,7 +515,7 @@ onMounted(async () => {
               dense
               round
               size="14px"
-              @click="onHistory('children',item.id)"
+              @click="onHistory('children', item.id)"
             >
               <q-tooltip>ประวัติการแก้ไขข้อมูลบุตร</q-tooltip>
             </q-btn>
@@ -513,7 +525,7 @@ onMounted(async () => {
                   <div class="col-12 col-sm-12 col-md-12 q-gutter-y-sm">
                     <div class="row">
                       <div class="col-5 text-grey-6 text-weight-medium">
-                        เลขบัตรประจำตัวประชาชน
+                        เลขประจำตัวประชาชน
                       </div>
                       <div class="col-7">
                         {{
diff --git a/src/modules/10_registry/01_Information/05_Educations.vue b/src/modules/10_registry/01_Information/05_Educations.vue
index 1aa163c..d334590 100644
--- a/src/modules/10_registry/01_Information/05_Educations.vue
+++ b/src/modules/10_registry/01_Information/05_Educations.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -428,9 +428,9 @@ const visibleColumnsHistory = ref<string[]>([
   "lastUpdatedAt",
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -587,7 +587,6 @@ onMounted(() => {
                 <q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
               </q-btn>
               <q-item v-for="col in props.cols" :key="col.name">
-
                 <q-item-section class="fix_top">
                   <q-item-label class="text-grey-6 text-weight-medium">{{
                     col.label
@@ -604,13 +603,12 @@ onMounted(() => {
         </div>
       </template>
       <template v-slot:no-data>
-        <div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
-          <span>
-            ไม่พบข้อมูลประวัติการศึกษา
-          </span>
+        <div
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
+        >
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
-
     </d-table>
   </div>
   <DialogHistory
@@ -630,7 +628,7 @@ onMounted(() => {
   top: -20px;
 }
 
-.fix_top{
-  justify-content: start!important;
+.fix_top {
+  justify-content: start !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/modules/10_registry/01_Information/06_Ability.vue b/src/modules/10_registry/01_Information/06_Ability.vue
index fe92a46..b2697ba 100644
--- a/src/modules/10_registry/01_Information/06_Ability.vue
+++ b/src/modules/10_registry/01_Information/06_Ability.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -153,9 +153,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -329,10 +329,10 @@ onMounted(() => {
         </div>
       </template>
       <template v-slot:no-data>
-        <div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
-          <span>
-            ไม่พบข้อมูลความสามารถพิเศษ
-          </span>
+        <div
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
+        >
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
@@ -353,7 +353,7 @@ onMounted(() => {
   top: -20px;
 }
 
-.fix_top{
-  justify-content: start!important;
+.fix_top {
+  justify-content: start !important;
 }
 </style>
diff --git a/src/modules/10_registry/02_Government/01_Government.vue b/src/modules/10_registry/02_Government/01_Government.vue
index 38db5a3..8287225 100644
--- a/src/modules/10_registry/02_Government/01_Government.vue
+++ b/src/modules/10_registry/02_Government/01_Government.vue
@@ -2,7 +2,7 @@
 import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar, type QTableProps } from "quasar";
 import { ref, reactive, onMounted } from "vue";
-import { useRegistryInFormationStore } from '@/modules/10_registry/store/registry'
+import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
 
 //history dialog
 import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
@@ -10,7 +10,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const store = useRegistryInFormationStore()
+const store = useRegistryInFormationStore();
 const rowsHistory = ref<any[]>([]);
 const $q = useQuasar();
 const mixin = useCounterMixin();
@@ -309,7 +309,10 @@ function getData() {
 
 /** get history */
 function getHistory() {
-  const url = store.typeProfile == 'OFFICER' ? config.API.dataUserGovernmentHistory(''):config.API.dataUserGovernmentHistory('-employee')
+  const url =
+    store.typeProfile == "OFFICER"
+      ? config.API.dataUserGovernmentHistory("")
+      : config.API.dataUserGovernmentHistory("-employee");
   showLoader();
   http
     .get(url)
@@ -354,23 +357,31 @@ onMounted(() => {
             <div class="col-7">
               {{ formData.org ? formData.org : "-" }}
             </div>
-            <div class="col-5 text-grey-6 text-weight-medium">ตำแหน่ง</div>
+            <div class="col-5 text-grey-6 text-weight-medium">
+              ตำแหน่งในสายงาน
+            </div>
             <div class="col-7">
               {{ formData.position ? formData.position : "-" }}
             </div>
             <div class="col-5 text-grey-6 text-weight-medium">
-              เลขที่ตำแหน่ง
+              ตำแหน่งเลขที่
             </div>
             <div class="col-7">
               {{ formData.posMasterNo ? formData.posMasterNo : "-" }}
             </div>
-            <div v-if="store.typeProfile == 'OFFICER'" class="col-5 text-grey-6 text-weight-medium">
+            <div
+              v-if="store.typeProfile == 'OFFICER'"
+              class="col-5 text-grey-6 text-weight-medium"
+            >
               ตำแหน่งทางการบริหาร
             </div>
             <div v-if="store.typeProfile == 'OFFICER'" class="col-7">
               {{ formData.posExecutive ? formData.posExecutive : "-" }}
             </div>
-            <div v-if="store.typeProfile == 'OFFICER'" class="col-5 text-grey-6 text-weight-medium">
+            <div
+              v-if="store.typeProfile == 'OFFICER'"
+              class="col-5 text-grey-6 text-weight-medium"
+            >
               ด้านทางการบริหาร
             </div>
             <div v-if="store.typeProfile == 'OFFICER'" class="col-7">
@@ -385,17 +396,26 @@ onMounted(() => {
 
         <div class="col-12 col-sm-12 col-md-6">
           <div class="row q-col-gutter-y-sm">
-            <div v-if="store.typeProfile == 'OFFICER'" class="col-5 text-grey-6 text-weight-medium">สายงาน</div>
+            <div
+              v-if="store.typeProfile == 'OFFICER'"
+              class="col-5 text-grey-6 text-weight-medium"
+            >
+              สายงาน
+            </div>
             <div v-if="store.typeProfile == 'OFFICER'" class="col-7">
               {{ formData.positionField ? formData.positionField : "-" }}
             </div>
             <div class="col-5 text-grey-6 text-weight-medium">
-              {{store.typeProfile == 'OFFICER' ? 'ประเภทตำแหน่ง':'กลุ่มงาน'}}
+              {{
+                store.typeProfile == "OFFICER" ? "ตำแหน่งประเภท" : "กลุ่มงาน"
+              }}
             </div>
             <div class="col-7">
               {{ formData.posType ? formData.posType : "-" }}
             </div>
-            <div class="col-5 text-grey-6 text-weight-medium">{{store.typeProfile == 'OFFICER' ? 'ระดับตำแหน่ง':'ระดับชั้นงาน'}}</div>
+            <div class="col-5 text-grey-6 text-weight-medium">
+              {{ store.typeProfile == "OFFICER" ? "ระดับ" : "ระดับชั้นงาน" }}
+            </div>
             <div class="col-7">
               {{ formData.posLevel ? formData.posLevel : "-" }}
             </div>
diff --git a/src/modules/10_registry/02_Government/02_Discipline.vue b/src/modules/10_registry/02_Government/02_Discipline.vue
index 9fb7f1d..ddd6445 100644
--- a/src/modules/10_registry/02_Government/02_Discipline.vue
+++ b/src/modules/10_registry/02_Government/02_Discipline.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -205,9 +205,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -252,9 +252,7 @@ onMounted(() => {
   <!-- 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">วินัย</span>
       <q-space />
       <q-input
         v-if="mode"
@@ -329,7 +327,7 @@ onMounted(() => {
               {{ props.row.status ? props.row.status : "-" }}
             </div>
             <div v-else>
-              {{ col.value?col.value:'-' }}
+              {{ col.value ? col.value : "-" }}
             </div>
           </q-td>
           <q-td auto-width>
@@ -364,7 +362,6 @@ onMounted(() => {
                 <q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
               </q-btn>
               <q-item v-for="col in props.cols" :key="col.name">
-
                 <q-item-section class="fix_top">
                   <q-item-label class="text-grey-6 text-weight-medium">{{
                     col.label
@@ -381,10 +378,10 @@ onMounted(() => {
         </div>
       </template>
       <template v-slot:no-data>
-        <div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
-          <span>
-            ไม่พบข้อมูลวินัย
-          </span>
+        <div
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
+        >
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
@@ -397,7 +394,6 @@ onMounted(() => {
     :visibleColumns="visibleColumns"
     :columns="columns"
   />
-
 </template>
 <style scoped>
 .absolute_button {
@@ -406,7 +402,7 @@ onMounted(() => {
   top: -20px;
 }
 
-.fix_top{
-  justify-content: start!important;
+.fix_top {
+  justify-content: start !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/modules/10_registry/02_Government/03_Leave.vue b/src/modules/10_registry/02_Government/03_Leave.vue
index 9324f24..d07cbfa 100644
--- a/src/modules/10_registry/02_Government/03_Leave.vue
+++ b/src/modules/10_registry/02_Government/03_Leave.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -203,9 +203,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -225,7 +225,6 @@ function getData() {
         status: item.status,
         reason: item.reason,
         typeLeaveId: item.leaveTypeId,
-
       }));
     })
     .catch((e) => {
@@ -415,7 +414,7 @@ onMounted(() => {
               >
                 <q-tooltip>ประวัติแก้ไขการลา</q-tooltip>
               </q-btn>
-              <q-item v-for="col in props.cols" :key="col.name" >
+              <q-item v-for="col in props.cols" :key="col.name">
                 <q-item-section class="fix_top">
                   <q-item-label class="text-grey-6 text-weight-medium">{{
                     col.label
@@ -434,10 +433,12 @@ onMounted(() => {
                     }}</q-item-label
                   >
                   <q-item-label
-                  v-else-if="col.name == 'status'"
+                    v-else-if="col.name == 'status'"
                     class="text-dark text-weight-medium"
                   >
-                  {{ props.row.status ? statusLeave(props.row.status) : "-" }}</q-item-label
+                    {{
+                      props.row.status ? statusLeave(props.row.status) : "-"
+                    }}</q-item-label
                   >
                   <q-item-label v-else class="text-dark text-weight-medium">{{
                     col.value ? col.value : "-"
@@ -450,9 +451,9 @@ onMounted(() => {
       </template>
       <template v-slot:no-data>
         <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
         >
-          <span> ไม่พบข้อมูลการลา </span>
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
@@ -474,7 +475,7 @@ onMounted(() => {
   top: -20px;
 }
 
-.fix_top{
-  justify-content: start!important;
+.fix_top {
+  justify-content: start !important;
 }
 </style>
diff --git a/src/modules/10_registry/02_Government/04_Duty.vue b/src/modules/10_registry/02_Government/04_Duty.vue
index afdeec4..97f22c6 100644
--- a/src/modules/10_registry/02_Government/04_Duty.vue
+++ b/src/modules/10_registry/02_Government/04_Duty.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -206,9 +206,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -330,7 +330,7 @@ onMounted(() => {
               {{ props.row.status ? props.row.status : "-" }}
             </div>
             <div v-else>
-              {{ col.value?col.value:'-' }}
+              {{ col.value ? col.value : "-" }}
             </div>
           </q-td>
           <q-td auto-width>
@@ -365,7 +365,6 @@ onMounted(() => {
                 <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ</q-tooltip>
               </q-btn>
               <q-item v-for="col in props.cols" :key="col.name">
-
                 <q-item-section class="fix_top">
                   <q-item-label class="text-grey-6 text-weight-medium">{{
                     col.label
@@ -382,10 +381,10 @@ onMounted(() => {
         </div>
       </template>
       <template v-slot:no-data>
-        <div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
-          <span>
-            ไม่พบข้อมูลปฏิบัติราชการพิเศษ
-          </span>
+        <div
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
+        >
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
@@ -398,7 +397,6 @@ onMounted(() => {
     :visibleColumns="visibleColumnsHistory"
     :columns="columnsHistory"
   />
-
 </template>
 <style scoped>
 .absolute_button {
@@ -407,7 +405,7 @@ onMounted(() => {
   top: -20px;
 }
 
-.fix_top{
-  justify-content: start!important;
+.fix_top {
+  justify-content: start !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/modules/10_registry/03_Salary/02_Nopaid.vue b/src/modules/10_registry/03_Salary/02_Nopaid.vue
index e812045..e94fb5c 100644
--- a/src/modules/10_registry/03_Salary/02_Nopaid.vue
+++ b/src/modules/10_registry/03_Salary/02_Nopaid.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -90,7 +90,6 @@ const columns = ref<QTableProps["columns"]>([
   },
 ]);
 
-
 const visibleColumnsHistory = ref<string[]>([
   "date",
   "reference",
@@ -184,10 +183,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -309,7 +307,7 @@ onMounted(() => {
               {{ props.row.status ? props.row.status : "-" }}
             </div>
             <div v-else>
-              {{ col.value?col.value:'-' }}
+              {{ col.value ? col.value : "-" }}
             </div>
           </q-td>
           <q-td auto-width>
@@ -341,10 +339,11 @@ onMounted(() => {
                 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">
                   <q-item-label class="text-grey-6 text-weight-medium">{{
                     col.label
@@ -361,10 +360,10 @@ onMounted(() => {
         </div>
       </template>
       <template v-slot:no-data>
-        <div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
-          <span>
-            ไม่พบข้อมูลบันทึกวันที่ไม่ได้รับเงินเดือนฯ
-          </span>
+        <div
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
+        >
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
@@ -377,7 +376,6 @@ onMounted(() => {
     :visibleColumns="visibleColumnsHistory"
     :columns="columnsHistory"
   />
-
 </template>
 <style scoped>
 .absolute_button {
@@ -386,7 +384,7 @@ onMounted(() => {
   top: -20px;
 }
 
-.fix_top{
-  justify-content: start!important;
+.fix_top {
+  justify-content: start !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/modules/10_registry/04_Achievement/01_Certificate.vue b/src/modules/10_registry/04_Achievement/01_Certificate.vue
index 8d507e8..ba0facd 100644
--- a/src/modules/10_registry/04_Achievement/01_Certificate.vue
+++ b/src/modules/10_registry/04_Achievement/01_Certificate.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -181,9 +181,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -207,7 +207,7 @@ function getData() {
 function getHistory() {
   showLoader();
   http
-    .get(config.API.dataUserCertificateHistory("certificate",idByRow.value))
+    .get(config.API.dataUserCertificateHistory("certificate", idByRow.value))
     .then((res) => {
       const data = res.data.result;
       rowsHistory.value = data;
@@ -357,9 +357,9 @@ onMounted(() => {
       </template>
       <template v-slot:no-data>
         <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
         >
-          <span> ไม่พบข้อมูลใบอนุญาตประกอบวิชาชีพ </span>
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
diff --git a/src/modules/10_registry/04_Achievement/02_Training.vue b/src/modules/10_registry/04_Achievement/02_Training.vue
index 78d63e3..925f704 100644
--- a/src/modules/10_registry/04_Achievement/02_Training.vue
+++ b/src/modules/10_registry/04_Achievement/02_Training.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -309,9 +309,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
 ]);
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -335,7 +335,7 @@ function getData() {
 function getHistory() {
   showLoader();
   http
-    .get(config.API.dataUserCertificateHistory("training",idByRow.value))
+    .get(config.API.dataUserCertificateHistory("training", idByRow.value))
     .then((res) => {
       const data = res.data.result;
       rowsHistory.value = data;
@@ -477,9 +477,9 @@ onMounted(() => {
       </template>
       <template v-slot:no-data>
         <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
         >
-          <span> ไม่พบข้อมูลการฝึกอบรม/ดูงาน </span>
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
diff --git a/src/modules/10_registry/04_Achievement/03_Insignia.vue b/src/modules/10_registry/04_Achievement/03_Insignia.vue
index 3eba8b8..3192c30 100644
--- a/src/modules/10_registry/04_Achievement/03_Insignia.vue
+++ b/src/modules/10_registry/04_Achievement/03_Insignia.vue
@@ -10,7 +10,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const store = useRegistryInFormationStore();
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
@@ -388,9 +388,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -414,7 +414,7 @@ function getData() {
 function getHistory() {
   showLoader();
   http
-    .get(config.API.dataUserCertificateHistory("insignia",idByRow.value))
+    .get(config.API.dataUserCertificateHistory("insignia", idByRow.value))
     .then((res) => {
       const data = res.data.result;
       rowsHistory.value = data;
@@ -577,9 +577,9 @@ onMounted(async () => {
       </template>
       <template v-slot:no-data>
         <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
         >
-          <span> ไม่พบข้อมูลเครื่องราชอิสริยาภรณ์ </span>
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
diff --git a/src/modules/10_registry/04_Achievement/04_Honor.vue b/src/modules/10_registry/04_Achievement/04_Honor.vue
index 7b0d67c..dc2a59e 100644
--- a/src/modules/10_registry/04_Achievement/04_Honor.vue
+++ b/src/modules/10_registry/04_Achievement/04_Honor.vue
@@ -10,7 +10,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRegistryInFormationStore } from "@/modules/10_registry/store/registry";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const store = useRegistryInFormationStore();
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
@@ -183,16 +183,16 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
 function getData() {
   showLoader();
   http
-    .get(config.API.dataUserCertificate('honor'))
+    .get(config.API.dataUserCertificate("honor"))
     .then((res) => {
       const data = res.data.result;
       rows.value = data;
@@ -207,7 +207,10 @@ function getData() {
 
 /** get history */
 function getHistory() {
-  const url = store.typeProfile == 'OFFICER' ? config.API.dataUserHonorHistory('honor','',idByRow.value):config.API.dataUserHonorHistory('honor','-employee',idByRow.value)
+  const url =
+    store.typeProfile == "OFFICER"
+      ? config.API.dataUserHonorHistory("honor", "", idByRow.value)
+      : config.API.dataUserHonorHistory("honor", "-employee", idByRow.value);
   showLoader();
   http
     .get(url)
@@ -308,7 +311,7 @@ onMounted(() => {
               {{ props.row.status ? props.row.status : "-" }}
             </div>
             <div v-else>
-              {{ col.value?col.value:'-' }}
+              {{ col.value ? col.value : "-" }}
             </div>
           </q-td>
           <q-td auto-width>
@@ -343,7 +346,6 @@ onMounted(() => {
                 <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
               </q-btn>
               <q-item v-for="col in props.cols" :key="col.name">
-
                 <q-item-section class="fix_top">
                   <q-item-label class="text-grey-6 text-weight-medium">{{
                     col.label
@@ -360,10 +362,10 @@ onMounted(() => {
         </div>
       </template>
       <template v-slot:no-data>
-        <div class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium">
-          <span>
-            ไม่พบข้อมูลประกาศเกียรติคุณ
-          </span>
+        <div
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
+        >
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
@@ -376,7 +378,6 @@ onMounted(() => {
     :visibleColumns="visibleColumnsHistory"
     :columns="columnsHistory"
   />
-
 </template>
 <style scoped>
 .absolute_button {
@@ -385,7 +386,7 @@ onMounted(() => {
   top: -20px;
 }
 
-.fix_top{
-  justify-content: start!important;
+.fix_top {
+  justify-content: start !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/modules/10_registry/04_Achievement/05_Assessments.vue b/src/modules/10_registry/04_Achievement/05_Assessments.vue
index 75efd37..7e77294 100644
--- a/src/modules/10_registry/04_Achievement/05_Assessments.vue
+++ b/src/modules/10_registry/04_Achievement/05_Assessments.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -244,9 +244,9 @@ const visibleColumns = ref<string[]>([
   "date",
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
 /** get data */
@@ -270,7 +270,7 @@ function getData() {
 function getHistory() {
   showLoader();
   http
-    .get(config.API.dataUserCertificateHistory("assessments",idByRow.value))
+    .get(config.API.dataUserCertificateHistory("assessments", idByRow.value))
     .then((res) => {
       const data = res.data.result;
       rowsHistory.value = data;
@@ -440,9 +440,9 @@ onMounted(() => {
       </template>
       <template v-slot:no-data>
         <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
         >
-          <span> ไม่พบข้อมูลผลการประเมินการปฏิบัติราชการ </span>
+          <span> ไม่พบข้อมูล</span>
         </div>
       </template>
     </d-table>
diff --git a/src/modules/10_registry/05_Other/01_Other.vue b/src/modules/10_registry/05_Other/01_Other.vue
index 6eb7b05..339fbe7 100644
--- a/src/modules/10_registry/05_Other/01_Other.vue
+++ b/src/modules/10_registry/05_Other/01_Other.vue
@@ -9,7 +9,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-const idByRow = ref<string>('')
+const idByRow = ref<string>("");
 const rows = ref<any[]>([]);
 const filter = ref<string>("");
 const rowsHistory = ref<any[]>([]);
@@ -99,12 +99,11 @@ const columnsHistory = ref<QTableProps["columns"]>([
   },
 ]);
 
-function onHistory(id:string) {
+function onHistory(id: string) {
   modalHistory.value = true;
-  idByRow.value = id
+  idByRow.value = id;
 }
 
-
 /** get data */
 function getData() {
   showLoader();
@@ -147,9 +146,7 @@ onMounted(() => {
   <!-- 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">ข้อมูลอื่นๆ</span>
       <q-space />
       <q-input
         v-if="mode"
@@ -268,9 +265,9 @@ onMounted(() => {
       </template>
       <template v-slot:no-data>
         <div
-          class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
         >
-          <span> ไม่พบข้อมูลข้อมูลอื่นๆ </span>
+          <span> ไม่พบข้อมูล </span>
         </div>
       </template>
     </d-table>
diff --git a/src/modules/10_registry/Dialog/DialogHistory.vue b/src/modules/10_registry/Dialog/DialogHistory.vue
index 9fb7592..81fabc7 100644
--- a/src/modules/10_registry/Dialog/DialogHistory.vue
+++ b/src/modules/10_registry/Dialog/DialogHistory.vue
@@ -226,9 +226,9 @@ watch(
           </template>
           <template v-slot:no-data>
             <div
-              class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+              class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
             >
-              <span> ไม่พบข้อมูลประวัติการแก้ไข </span>
+              <span> ไม่พบข้อมูล </span>
             </div>
           </template>
         </d-table>
diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue
index 99db19a..bfa7837 100644
--- a/src/modules/10_registry/views/main.vue
+++ b/src/modules/10_registry/views/main.vue
@@ -21,7 +21,7 @@ import { useQuasar } from "quasar";
 const store = useRegistryInFormationStore();
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { messageError, dialogConfirm ,showLoader,hideLoader } = mixin;
+const { messageError, dialogConfirm, showLoader, hideLoader } = mixin;
 const profileImg = ref<string>("");
 const router = useRouter();
 const tab = ref<string>("information");
@@ -179,7 +179,7 @@ onMounted(async () => {
               </q-item>
               <q-item>
                 <q-item-section class="text-grey-6">{{
-                  store.typeProfile == "OFFICER" ? "ประเภทตำแหน่ง" : "กลุ่มงาน"
+                  store.typeProfile == "OFFICER" ? "ตำแหน่งประเภท" : "กลุ่มงาน"
                 }}</q-item-section>
                 <q-item-section>{{
                   formData.posTypeName ? formData.posTypeName : "-"
@@ -187,9 +187,7 @@ onMounted(async () => {
               </q-item>
               <q-item>
                 <q-item-section class="text-grey-6">{{
-                  store.typeProfile == "OFFICER"
-                    ? "ระดับตำแหน่ง"
-                    : "ระดับชั้นงาน"
+                  store.typeProfile == "OFFICER" ? "ระดับ" : "ระดับชั้นงาน"
                 }}</q-item-section>
                 <q-item-section>{{
                   formData.posLevelName ? formData.posLevelName : "-"
diff --git a/src/modules/11_probation/views/main.vue b/src/modules/11_probation/views/main.vue
index 3cc14dc..c84c092 100644
--- a/src/modules/11_probation/views/main.vue
+++ b/src/modules/11_probation/views/main.vue
@@ -145,7 +145,7 @@ function getList(id: string) {
   http
     .get(config.API.probationMain(id))
     .then((res) => {
-      const data = res.data.data
+      const data = res.data.data;
       rows.value = data;
     })
     .catch((e) => {})
@@ -168,7 +168,6 @@ function onDetail(id: string) {
 }
 
 onMounted(async () => {
-
   await getMain();
 });
 </script>
@@ -292,7 +291,7 @@ onMounted(async () => {
                 dense
                 v-model="filter"
                 label="ค้นหา"
-                :style="mode ? `max-width: 200px`:`max-width: 150px`"
+                :style="mode ? `max-width: 200px` : `max-width: 150px`"
               >
                 <template v-slot:append>
                   <q-icon
@@ -355,7 +354,11 @@ onMounted(async () => {
 
                 <template v-if="$q.screen.gt.xs" v-slot:body="props">
                   <q-tr :props="props" class="cursor-pointer">
-                    <q-td v-for="(col, index) in props.cols" :key="col.name" @click="onDetail(props.row.id)">
+                    <q-td
+                      v-for="(col, index) in props.cols"
+                      :key="col.name"
+                      @click="onDetail(props.row.id)"
+                    >
                       <div v-if="col.name == 'no'">
                         {{ props.rowIndex + 1 }}
                       </div>
@@ -404,9 +407,9 @@ onMounted(async () => {
                 </template>
                 <template v-slot:no-data>
                   <div
-                    class="full-width row flex-center bg-grey-3 q-pa-md rounded-borders text-body2 text-weight-medium"
+                    class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
                   >
-                    <span> ไม่พบข้อมูลตำแหน่ง/เงินเดือน </span>
+                    <span> ไม่พบข้อมูล </span>
                   </div>
                 </template>
               </d-table>