Merge branch 'anandadev' into develop

src/modules/05_placement/components/Repatriate/RepatriatebyId.vue

@@ -176,18 +176,16 @@
           </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"
+              <!-- <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
+                v-model="salary" :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]" hide-bottom-space
+                :label="`${'เงินเดือน'}`" type="number" /> -->
+              <CurrencyInput
                 v-model="salary"
-                :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
-                hide-bottom-space
+                :edit="edit"
+                :options="{
+                  currency: 'THB',
+                }"
                 :label="`${'เงินเดือน'}`"
-                type="number"
               />
             </div>
           </div>
@@ -278,6 +276,8 @@ 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";