Merge branch 'anandadev' into develop

This commit is contained in:
AnandaTon 2023-08-22 19:14:56 +07:00
commit 085373593b
16 changed files with 1331 additions and 141 deletions

View file

@ -266,7 +266,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
@ -278,6 +278,14 @@
hide-bottom-space
:label="`${'เงินเดือน'}`"
type="number"
/> -->
<CurrencyInput
v-model="salary"
:edit="edit"
:options="{
currency: 'THB',
}"
:label="`${'เงินเดือน'}`"
/>
</div>
</div>
@ -368,6 +376,7 @@ 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";