diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
index e69de29bb..932d4c62a 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>ใบอนุญาตประกอบวิชาชีพ</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
index e69de29bb..aea112f0d 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>การฝึกอบรม/ดูงาน</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
index e69de29bb..c5d57415b 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>เครื่องราชอิสริยาภรณ์</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
index e69de29bb..d2f2565c1 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>ประกาศเกียรติคุณ</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
index e69de29bb..9d68fe9d6 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>ผลการประเมินการปฏิบัติราชการ</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Achievement/Main.vue b/src/modules/04_registryNew/components/detail/Achievement/Main.vue
new file mode 100644
index 000000000..76961142d
--- /dev/null
+++ b/src/modules/04_registryNew/components/detail/Achievement/Main.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import { ref } from "vue";
+
+/** importComponents*/
+import ProfessionalLicense from "@/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue";
+import Train from "@/modules/04_registryNew/components/detail/Achievement/02_Train.vue";
+import Insignia from "@/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue";
+import DeclarationHonor from "@/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue";
+import ResultsPerformance from "@/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue";
+
+const tab = ref<string>("1");
+</script>
+<template>
+  <div class="row items-center q-mb-lg">
+    <div class="text-dark row items-center" style="font-size: 22px">
+      <q-icon name="mdi-cash" class="q-mr-md" />
+      <span>ข้อมูลผลงานและเครื่องราชฯ</span>
+    </div>
+  </div>
+
+  <q-separator />
+  <q-tabs
+    v-model="tab"
+    dense
+    class="text-grey"
+    active-color="blue"
+    indicator-color="white"
+    align="justify"
+    narrow-indicator
+    bordered
+  >
+    <q-tab name="1" label="ใบอนุญาตประกอบวิชาชีพ" />
+    <q-tab name="2" label="การฝึกอบรม/ดูงาน" />
+    <q-tab name="3" label="เครื่องราชอิสริยาภรณ์" />
+    <q-tab name="4" label="ประกาศเกียรติคุณ" />
+    <q-tab name="5" label="ผลการประเมินการปฏิบัติราชการ" />
+  </q-tabs>
+  <q-separator />
+
+  <q-tab-panels v-model="tab" animated>
+    <q-tab-panel name="1">
+      <ProfessionalLicense />
+    </q-tab-panel>
+    <q-tab-panel name="2">
+      <Train />
+    </q-tab-panel>
+    <q-tab-panel name="3">
+      <Insignia />
+    </q-tab-panel>
+    <q-tab-panel name="4">
+      <DeclarationHonor />
+    </q-tab-panel>
+    <q-tab-panel name="4">
+      <PerformSpecialWork />
+    </q-tab-panel>
+    <q-tab-panel name="5">
+      <ResultsPerformance />
+    </q-tab-panel>
+  </q-tab-panels>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
index e69de29bb..94f83fdf0 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>ข้อมูลราชการ</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
index e69de29bb..e45a38cb1 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>วินัย</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
index e69de29bb..81dda8c85 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>การลา</div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
index e69de29bb..b02110a3a 100644
--- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>ปฏิบัติราชการพิเศษ</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue
new file mode 100644
index 000000000..5ed90d2a8
--- /dev/null
+++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue
@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import { ref } from "vue";
+
+/** importComponents*/
+import Info from "@/modules/04_registryNew/components/detail/GovernmentInformation/01_Info.vue";
+import Discipline from "@/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue";
+import Leave from "@/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue";
+import PerformSpecialWork from "@/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue";
+
+const tab = ref<string>("1");
+</script>
+<template>
+  <div class="row items-center q-mb-lg">
+    <div class="text-dark row items-center" style="font-size: 22px">
+      <q-icon name="mdi-account-tie" class="q-mr-md" />
+      <span>ข้อมูลราชการ</span>
+    </div>
+  </div>
+
+  <q-separator />
+  <q-tabs
+    v-model="tab"
+    dense
+    class="text-grey"
+    active-color="blue"
+    indicator-color="white"
+    align="justify"
+    narrow-indicator
+    bordered
+  >
+    <q-tab name="1" label="ข้อมูลราชการ" />
+    <q-tab name="2" label="วินัย" />
+    <q-tab name="3" label="การลา" />
+    <q-tab name="4" label="ปฏิบัติราชการพิเศษ" />
+  </q-tabs>
+  <q-separator />
+
+  <q-tab-panels v-model="tab" animated>
+    <q-tab-panel name="1">
+      <Info />
+    </q-tab-panel>
+    <q-tab-panel name="2">
+      <Discipline />
+    </q-tab-panel>
+    <q-tab-panel name="3">
+      <Leave />
+    </q-tab-panel>
+    <q-tab-panel name="4">
+      <PerformSpecialWork />
+    </q-tab-panel>
+  </q-tab-panels>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
index e69de29bb..aabd5af38 100644
--- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
+++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>ข้อมูลอื่นๆ</div>
+</template>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/modules/04_registryNew/components/detail/Other/02_Document.vue b/src/modules/04_registryNew/components/detail/Other/02_Document.vue
index e69de29bb..e37f734cb 100644
--- a/src/modules/04_registryNew/components/detail/Other/02_Document.vue
+++ b/src/modules/04_registryNew/components/detail/Other/02_Document.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>เอกสารหลักฐาน</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Other/Main.vue b/src/modules/04_registryNew/components/detail/Other/Main.vue
new file mode 100644
index 000000000..494c2138e
--- /dev/null
+++ b/src/modules/04_registryNew/components/detail/Other/Main.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { ref } from "vue";
+
+/** importComponents*/
+import OtherInformation from "@/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue";
+import Documentipline from "@/modules/04_registryNew/components/detail/Other/02_Document.vue";
+
+const tab = ref<string>("1");
+</script>
+<template>
+  <div class="row items-center q-mb-lg">
+    <div class="text-dark row items-center" style="font-size: 22px">
+      <q-icon name="mdi-bookmark" class="q-mr-md" />
+      <span>เอกสารหลักฐานและอื่นๆ</span>
+    </div>
+  </div>
+
+  <q-separator />
+  <q-tabs
+    v-model="tab"
+    dense
+    class="text-grey"
+    active-color="blue"
+    indicator-color="white"
+    align="justify"
+    narrow-indicator
+    bordered
+  >
+    <q-tab name="1" label="ข้อมูลอื่นๆ" />
+    <q-tab name="2" label="เอกสารหลักฐาน" />
+  </q-tabs>
+  <q-separator />
+
+  <q-tab-panels v-model="tab" animated>
+    <q-tab-panel name="1">
+      <OtherInformation />
+    </q-tab-panel>
+    <q-tab-panel name="2">
+      <Documentipline />
+    </q-tab-panel>
+  </q-tab-panels>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
index e69de29bb..15b2df816 100644
--- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>ตำแหน่ง/เงินเดือน</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
index e69de29bb..5e1998c77 100644
--- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div>บันทึกวันที่ไม่ได้รับเงินเดือนฯ</div>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/Salary/Main.vue b/src/modules/04_registryNew/components/detail/Salary/Main.vue
new file mode 100644
index 000000000..dc8c8124b
--- /dev/null
+++ b/src/modules/04_registryNew/components/detail/Salary/Main.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { ref } from "vue";
+
+/** importComponents*/
+import PositionSalary from "@/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue";
+import NotReceiveSalary from "@/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue";
+
+const tab = ref<string>("1");
+</script>
+<template>
+  <div class="row items-center q-mb-lg">
+    <div class="text-dark row items-center" style="font-size: 22px">
+      <q-icon name="mdi-account" class="q-mr-md" />
+      <span>ข้อมูลเงินเดือน/ค่าจ้าง</span>
+    </div>
+  </div>
+
+  <q-separator />
+  <q-tabs
+    v-model="tab"
+    dense
+    class="text-grey"
+    active-color="blue"
+    indicator-color="white"
+    align="justify"
+    narrow-indicator
+    bordered
+  >
+    <q-tab name="1" label="ตำแหน่ง/เงินเดือน" />
+    <q-tab name="2" label="บันทึกวันที่ไม่ได้รับเงินเดือนฯ" />
+  </q-tabs>
+  <q-separator />
+
+  <q-tab-panels v-model="tab" animated>
+    <q-tab-panel name="1">
+      <PositionSalary />
+    </q-tab-panel>
+    <q-tab-panel name="2">
+      <NotReceiveSalary />
+    </q-tab-panel>
+  </q-tab-panels>
+</template>
+
+<style scoped></style>
diff --git a/src/modules/04_registryNew/components/detail/TabMain.vue b/src/modules/04_registryNew/components/detail/TabMain.vue
index b7d7b7465..de806977d 100644
--- a/src/modules/04_registryNew/components/detail/TabMain.vue
+++ b/src/modules/04_registryNew/components/detail/TabMain.vue
@@ -4,6 +4,10 @@ import { ref } from "vue";
 import { useRegistryDetailNewDataStore } from "@/modules/04_registryNew/stores/DetailMain";
 
 import PersonalInformationMain from "@/modules/04_registryNew/components/detail/PersonalInformation/Main.vue";
+import GovernmentInformationMain from "@/modules/04_registryNew/components/detail/GovernmentInformation/Main.vue";
+import salaryMain from "@/modules/04_registryNew/components/detail/Salary/Main.vue";
+import AchievementMain from "@/modules/04_registryNew/components/detail/Achievement/Main.vue";
+import OtherMaim from "@/modules/04_registryNew/components/detail/Other/Main.vue";
 
 const store = useRegistryDetailNewDataStore();
 
@@ -26,12 +30,12 @@ const itemsTab = ref<any>([
   {
     name: "4",
     icon: "mdi-cash",
-    label: "ข้อมูลเครื่องราช",
+    label: "ข้อมูลผลงานและเครื่องราชฯ",
   },
   {
     name: "5",
     icon: "mdi-bookmark",
-    label: "ข้อมูลอื่นๆ",
+    label: "เอกสารหลักฐานและอื่นๆ",
   },
 ]);
 
@@ -66,7 +70,10 @@ const splitterModel = ref<number>(12);
           :name="tab.name"
         >
           <PersonalInformationMain v-if="store.tabMain === '1'" />
-          <!-- <div class="text-h4 q-mb-md">{{ tab.label }}</div> -->
+          <GovernmentInformationMain v-if="store.tabMain === '2'" />
+          <salaryMain v-if="store.tabMain === '3'" />
+          <AchievementMain v-if="store.tabMain === '4'" />
+          <OtherMaim v-if="store.tabMain === '5'" />
         </q-tab-panel>
       </q-tab-panels>
     </template>