Merge branch 'anandadev' into develop

src/modules/05_placement/components/Relocation/RelocationbyId.vue

@@ -7,7 +7,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import keycloak from "@/plugins/keycloak";
-
+import CurrencyInput from "@/components/CurruncyInput.vue";
 import type { QTableProps, QForm } from "quasar";
 // import type {
 //   TypeFile,
@@ -423,18 +423,13 @@ onMounted(async () => {
           </div>
           <div class="col-xs-6 col-sm-3 row items-center">
             <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
+              <CurrencyInput
                 v-model="amountOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
-                hide-bottom-space
+                :edit="edit"
+                :options="{
+                  currency: 'THB',
+                }"
                 :label="`${'เงินเดือน'}`"
-                type="number"
               />
             </div>
           </div>
@@ -461,7 +456,7 @@ onMounted(async () => {
               เงินเดือนตำแหน่งและหน่วยงานที่รับย้าย
             </div>
             <div class="col-12">
-              <q-input
+              <!-- <q-input
                 :class="getClass(edit)"
                 :outlined="edit"
                 dense
@@ -473,6 +468,14 @@ onMounted(async () => {
                 hide-bottom-space
                 :label="`${'เงินเดือน'}`"
                 type="number"
+              /> -->
+              <CurrencyInput
+                v-model="amount"
+                :edit="edit"
+                :options="{
+                  currency: 'THB',
+                }"
+                :label="`${'เงินเดือน'}`"
               />
             </div>
           </div>