diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue
index 2d391d2e9..9bd8a66e9 100644
--- a/src/components/CardProfile.vue
+++ b/src/components/CardProfile.vue
@@ -36,7 +36,9 @@ const modalPersonal = ref<boolean>(false);
 const profileId = ref<string | null>("");
 
 function fetchDataProfile(data: DataProfile) {
-  fetchProfile(data.profileId);
+  if (data.profileId) {
+    fetchProfile(data.profileId);
+  }
   profile.id = data.profileId;
   profile.fullName = `${data.prefix}${data.firstName} ${data.lastName}`;
   profile.position =
diff --git a/src/modules/05_placement/components/AppointEmployee/Detail.vue b/src/modules/05_placement/components/AppointEmployee/Detail.vue
index 64b07c6b3..727a947df 100644
--- a/src/modules/05_placement/components/AppointEmployee/Detail.vue
+++ b/src/modules/05_placement/components/AppointEmployee/Detail.vue
@@ -3,7 +3,6 @@ import { onMounted, ref } from "vue";
 import { useQuasar } from "quasar";
 import { useRoute, useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
-import CurrencyInput from "@/components/CurruncyInput.vue";
 import type { ResponseTitle } from "@/modules/05_placement/interface/response/Receive";
 import type {
   appointmentData,
@@ -119,7 +118,7 @@ const putAppointment = async () => {
     positionTypeOld: positionTypeOld.value,
     positionLevelOld: positionLevelOld.value,
     positionNumberOld: posNo.value,
-    amountOld: Number(salary.value),
+    amountOld: salary.value.toString().replace(/,/g, ""),
     reason: reason.value,
     positionDate: date.value,
   };
@@ -364,12 +363,19 @@ onMounted(async () => {
           </div>
           <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
-              <CurrencyInput
+              <q-input
                 v-model="salary"
-                label="เงินเดือน"
-                :edit="edit"
-                :rules="[(val: number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
+                :outlined="edit"
+                dense
+                :readonly="!edit"
+                hide-bottom-space
+                :borderless="!edit"
+                :label="`${'เงินเดือน'}`"
+                :rules="[(val:number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
                 lazy-rules
+                mask="###,###,###,###"
+                reverse-fill-mask
+                class="inputgreen"
               />
             </div>
           </div>
diff --git a/src/modules/05_placement/components/Relocation/RelocationbyId.vue b/src/modules/05_placement/components/Relocation/RelocationbyId.vue
index 964b99a7a..2e1607cc4 100644
--- a/src/modules/05_placement/components/Relocation/RelocationbyId.vue
+++ b/src/modules/05_placement/components/Relocation/RelocationbyId.vue
@@ -10,7 +10,7 @@ import keycloak from "@/plugins/keycloak";
 import CurrencyInput from "@/components/CurruncyInput.vue";
 import type { QTableProps, QForm } from "quasar";
 import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
-  
+
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
 const $q = useQuasar();
@@ -300,39 +300,40 @@ onMounted(async () => {
         แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
       </div>
       <q-space />
-      <div v-if="status !== 'REPORT' && status !== 'DONE'">      <div class="q-gutter-sm" v-if="!edit">
-        <q-btn
-          outline
-          color="primary"
-          dense
-          icon-right="mdi-file-edit-outline"
-          class="q-px-sm"
-          label="แก้ไข"
-          style="width: 80px"
-          @click="edit = !edit"
-        />
+      <div v-if="status !== 'REPORT' && status !== 'DONE'">
+        <div class="q-gutter-sm" v-if="!edit">
+          <q-btn
+            outline
+            color="primary"
+            dense
+            icon-right="mdi-file-edit-outline"
+            class="q-px-sm"
+            label="แก้ไข"
+            style="width: 80px"
+            @click="edit = !edit"
+          />
+        </div>
+        <div class="q-gutter-sm" v-else>
+          <q-btn
+            outline
+            color="public"
+            dense
+            class="q-px-sm"
+            label="บันทึก"
+            style="width: 80px"
+            @click="conditionSave"
+          />
+          <q-btn
+            outline
+            color="red"
+            dense
+            class="q-px-sm"
+            label="ยกเลิก"
+            style="width: 80px"
+            @click="cancelBtn"
+          />
+        </div>
       </div>
-      <div class="q-gutter-sm" v-else>
-        <q-btn
-          outline
-          color="public"
-          dense
-          class="q-px-sm"
-          label="บันทึก"
-          style="width: 80px"
-          @click="conditionSave"
-        />
-        <q-btn
-          outline
-          color="red"
-          dense
-          class="q-px-sm"
-          label="ยกเลิก"
-          style="width: 80px"
-          @click="cancelBtn"
-        />
-      </div></div>
-
     </div>
     <div class="col-12"><q-separator /></div>
     <q-form ref="myForm">
diff --git a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
index 1ac798df4..40cfc5940 100644
--- a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
+++ b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue
@@ -3,7 +3,6 @@ import { onMounted, ref } from "vue";
 import { useQuasar } from "quasar";
 import { useRoute, useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
-import CurrencyInput from "@/components/CurruncyInput.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
diff --git a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
index 508a050c9..181fab19b 100644
--- a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
+++ b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue
@@ -3,7 +3,6 @@ import { onMounted, ref } from "vue";
 import { useQuasar } from "quasar";
 import { useRoute, useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
-import CurrencyInput from "@/components/CurruncyInput.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import keycloak from "@/plugins/keycloak";
@@ -109,7 +108,7 @@ const onSubmit = async () => {
         positionTypeOld: positionTypeOld.value,
         positionLevelOld: positionLevelOld.value,
         positionNumberOld: posNo.value,
-        amountOld: salary.value,
+        amountOld: salary.value.toString().replace(/,/g, ""),
         organization: organization.value,
         reason: reason.value,
         date: date.value,
@@ -291,13 +290,19 @@ onMounted(async () => {
           </div>
           <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
-              <CurrencyInput
+              <q-input
                 v-model="salary"
-                :edit="edit"
-                :options="{
-                  currency: 'THB',
-                }"
+                :outlined="edit"
+                dense
+                :readonly="!edit"
+                hide-bottom-space
+                :borderless="!edit"
                 :label="`${'เงินเดือน'}`"
+                :rules="[(val:number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
+                lazy-rules
+                mask="###,###,###,###"
+                reverse-fill-mask
+                class="inputgreen"
               />
             </div>
           </div>