diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue
index cfbcc4e8f..6ad6cabb8 100644
--- a/src/modules/05_placement/components/Transfer/transferRegistry.vue
+++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue
@@ -4,7 +4,7 @@ import { useQuasar } from "quasar";
 import { useRoute, useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 
-import CurrencyInput from "@/components/CurruncyInput.vue";
+// import CurrencyInput from "@/components/CurruncyInput.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import keycloak from "@/plugins/keycloak";
diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue
index 21dd1f463..d1cefb23b 100644
--- a/src/modules/10_order/components/step/step02.vue
+++ b/src/modules/10_order/components/step/step02.vue
@@ -12,7 +12,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 import DialogHeader from "@/modules/04_registry/components/DialogHeader.vue";
-import CurruncyInput from "@/components/CurruncyInput.vue";
+// import CurruncyInput from "@/components/CurruncyInput.vue";
 
 const props = defineProps({
   next: {
@@ -628,34 +628,70 @@ const pagination = ref({
             <div class="col-xs-12">
               <div class="col-12 row q-py-sm q-col-gutter-sm">
                 <div class="col-xs-6 col-sm-6 col-md-6">
-                  <CurruncyInput
+                  <q-input
+                    v-model="modalData.salaryAmount"
+                    :outlined="true"
+                    dense
+                    hide-bottom-space
+                    :label="`${'เงินเดือน'}`"
+                    :rules="[(val:number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
+                    lazy-rules
+                    class="inputgreen"
+                    mask="###,###,###,###"
+                    reverse-fill-mask
+                  />
+                  <!-- <CurruncyInput
                     :edit="true"
                     :dense="true"
                     v-model="modalData.salaryAmount"
                     :label="`${'เงินเดือน'}`"
                     :rules="[(val: any) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
                     hide-bottom-space
-                  />
+                  /> -->
                 </div>
 
                 <div class="col-xs-6 col-sm-6 col-md-6">
-                  <CurruncyInput
+                  <q-input
+                    v-model="modalData.positionSalaryAmount"
+                    :outlined="true"
+                    dense
+                    hide-bottom-space
+                    :label="`${'เงินประจำตำแหน่ง'}`"
+                    :rules="[(val:number) => !!val || `${'กรุณากรอกเงินประจำตำแหน่ง'}`]"
+                    lazy-rules
+                    class="inputgreen"
+                    mask="###,###,###,###"
+                    reverse-fill-mask
+                  />
+                  <!-- <CurruncyInput
                     :edit="true"
                     :dense="true"
                     v-model="modalData.positionSalaryAmount"
                     :label="`${'เงินประจำตำแหน่ง'}`"
                     hide-bottom-space
-                  />
+                  /> -->
                 </div>
 
                 <div class="col-xs-6 col-sm-6 col-md-6">
-                  <CurruncyInput
+                  <q-input
+                    v-model="modalData.monthSalaryAmount"
+                    :outlined="true"
+                    dense
+                    hide-bottom-space
+                    :label="`${'เงินค่าตอบแทนรายเดือน'}`"
+                    :rules="[(val:number) => !!val || `${'กรุณากรอกเงินค่าตอบแทนรายเดือน'}`]"
+                    lazy-rules
+                    class="inputgreen"
+                    mask="###,###,###,###"
+                    reverse-fill-mask
+                  />
+                  <!-- <CurruncyInput
                     :edit="true"
                     :dense="true"
                     v-model="modalData.monthSalaryAmount"
                     :label="`${'เงินค่าตอบแทนรายเดือน'}`"
                     hide-bottom-space
-                  />
+                  /> -->
                 </div>
                 <div class="col-xs-6 col-sm-6 col-md-12" v-if="checkNote">
                   <q-input