diff --git a/src/modules/06_retirement/components/CurrencyInput.vue b/src/modules/06_retirement/components/CurrencyInput.vue
index 4894f47a2..04a5f4cfa 100644
--- a/src/modules/06_retirement/components/CurrencyInput.vue
+++ b/src/modules/06_retirement/components/CurrencyInput.vue
@@ -1,13 +1,29 @@
 <template>
-  <input ref="inputRef" type="text" />
+  <input
+    :class="
+      edit == true
+        ? 'full-width inputgreen cursor-pointer'
+        : 'full-width cursor-pointer'
+    "
+    :outlined="edit"
+    dense
+    ref="inputRef"
+    lazy-rules
+    :readonly="!edit"
+    :borderless="!edit"
+    v-model="salary"
+    :label="`${'เงินเดือน'}`"
+    hide-bottom-space
+    type="text"
+  />
 </template>
-
 <script>
 import { useCurrencyInput } from "vue-currency-input";
 
 export default {
   name: "CurrencyInput",
   props: {
+    edit: Boolean,
     modelValue: Number,
     options: Object,
   },
@@ -17,4 +33,4 @@ export default {
     return { inputRef };
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
index 583812fe2..7a86eb44a 100644
--- a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
+++ b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue
@@ -263,7 +263,7 @@
           </div>
           <div class="col-xs-6 col-sm-3 row items-center">
             <div class="col-12">
-              <q-input
+              <!-- <q-input
                 :class="getClass(edit)"
                 :outlined="edit"
                 dense
@@ -276,8 +276,12 @@
                 hide-bottom-space
                 :label="`${'เงินเดือน'}`"
                 type="number"
+              /> -->
+              <CurrencyInput
+                v-model="salary"
+                :edit="edit"
+                :options="{ currency: 'THB' }"
               />
-              <CurrencyInput v-model="salary" :options="{ currency: 'EUR' }" />
             </div>
           </div>
           <div class="col-12"><q-separator /></div>