diff --git a/src/modules/06_retirement/components/DialogFooter.vue b/src/modules/06_retirement/components/DialogFooter.vue
deleted file mode 100644
index a9f8a4eee..000000000
--- a/src/modules/06_retirement/components/DialogFooter.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<script setup lang="ts">
-/** props*/
-const props = defineProps({
-  editvisible: Boolean,
-  modalEdit: Boolean,
-  cancel: {
-    type: Function,
-    default: () => console.log("not function"),
-  },
-  edit: {
-    type: Function,
-    default: () => console.log("not function"),
-  },
-  save: {
-    type: Function,
-    default: () => console.log("not function"),
-  },
-  validate: {
-    type: Function,
-    default: () => console.log("not function"),
-  },
-});
-const emit = defineEmits([
-  "update:editvisible",
-  "update:next",
-  "update:previous",
-]);
-
-function updateEdit(value: Boolean) {
-  emit("update:editvisible", value);
-}
-async function edit() {
-  updateEdit(!props.editvisible);
-  props.edit();
-}
-
-/* บันทึกข้อมูล**/
-function checkSave() {
-  props.validate();
-  props.save();
-}
-</script>
-<template>
-  <q-card-actions class="text-primary">
-    <q-space />
-    <q-btn
-      v-if="!editvisible"
-      outline
-      :disabled="editvisible"
-      :color="editvisible ? 'grey-7' : 'primary'"
-      @click="edit"
-      >
-    </q-btn>
-    <div v-else>
-      <q-btn
-        unelevated
-        label="บันทึก"
-        :disabled="!editvisible"
-        :color="!editvisible ? 'grey-7' : 'public'"
-        @click="checkSave"
-      >
-      </q-btn>
-    </div>
-  </q-card-actions>
-</template>
diff --git a/src/modules/06_retirement/components/DialogHeader.vue b/src/modules/06_retirement/components/DialogHeader.vue
deleted file mode 100644
index 7bc9b4207..000000000
--- a/src/modules/06_retirement/components/DialogHeader.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<script setup lang="ts">
-/** props*/
-const props = defineProps({
-  title: String,
-  close: {
-    type: Function,
-    default: () => console.log("not function"),
-  },
-});
-
-/**
- * ฟังก์ชั่น close
- */
-const close = async () => {
-  props.close();
-};
-</script>
-<template>
-  <q-toolbar class="q-py-md">
-    <q-toolbar-title class="header-text">{{ title }}</q-toolbar-title>
-    <q-btn
-      icon="close"
-      unelevated
-      round
-      dense
-      @click="close"
-      style="color: #ff8080; background-color: #ffdede"
-    />
-  </q-toolbar>
-</template>
-
-<style scoped lang="scss">
-.header-text {
-  font-size: 18px;
-  font-weight: 600;
-  line-height: 26px;
-  color: #35373c;
-}
-</style>
diff --git a/src/modules/06_retirement/components/Discharged/DialogSendToCommand.vue b/src/modules/06_retirement/components/Discharged/DialogSendToCommand.vue
index 26b77412b..4feac862e 100644
--- a/src/modules/06_retirement/components/Discharged/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/Discharged/DialogSendToCommand.vue
@@ -9,7 +9,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import type { QTableProps } from "quasar";
 import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
 
-import DialogHeader from "@/modules/06_retirement/components/DialogHeader.vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 
 /** use */
 const $q = useQuasar();
@@ -151,7 +151,7 @@ watchEffect(() => {
 <template>
   <q-dialog v-model="props.modal">
     <q-card style="width: 1200px; max-width: 80vw">
-      <DialogHeader title="ส่งไปออกคำสั่งปลดออก" :close="closeModal" />
+      <DialogHeader tittle="ส่งไปออกคำสั่งปลดออก" :close="closeModal" />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-end">
diff --git a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue b/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
index 42470b3ca..ee2500668 100644
--- a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue
@@ -11,7 +11,7 @@ import { useTransferDataStore } from "@/modules/05_placement/store";
 import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
 
 import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCommand.vue";
-import DialogHeader from "@/modules/06_retirement/components/DialogHeader.vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 
 /** use */
 const $q = useQuasar();
@@ -162,7 +162,7 @@ watchEffect(() => {
 <template>
   <q-dialog v-model="props.modal">
     <q-card style="width: 1200px; max-width: 80vw">
-      <DialogHeader title="ส่งไปออกคำสั่งให้ออก" :close="closeModal" />
+      <DialogHeader tittle="ส่งไปออกคำสั่งให้ออก" :close="closeModal" />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-end">
diff --git a/src/modules/06_retirement/components/Expulsion/DialogSendToCommand.vue b/src/modules/06_retirement/components/Expulsion/DialogSendToCommand.vue
index 4cbba1fcd..ef9056b77 100644
--- a/src/modules/06_retirement/components/Expulsion/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/Expulsion/DialogSendToCommand.vue
@@ -9,7 +9,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import type { QTableProps } from "quasar";
 import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
 
-import DialogHeader from "@/modules/06_retirement/components/DialogHeader.vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 
 /** use */
 const $q = useQuasar();
@@ -154,7 +154,7 @@ watchEffect(() => {
 <template>
   <q-dialog v-model="props.modal">
     <q-card style="width: 1200px; max-width: 80vw">
-      <DialogHeader title="ส่งไปออกคำสั่งไล่ออก" :close="closeModal" />
+      <DialogHeader tittle="ส่งไปออกคำสั่งไล่ออก" :close="closeModal" />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-end">