Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

# Conflicts:
#	src/modules/08_registryEmployee/views/Main.vue
This commit is contained in:
Thanit Konmek 2023-07-07 15:30:24 +07:00
commit e72f86e1d4
6 changed files with 297 additions and 711 deletions

View file

@ -14,7 +14,7 @@ const Detail = defineAsyncComponent(
export default [
{
path: "/registryEmployee",
path: "/registry-employee",
name: "registryEmployee",
component: Main,
meta: {

View file

@ -112,7 +112,7 @@
dense
>
<q-menu transition-show="jump-down" transition-hide="jump-up">
<q-list dense style="min-width: 100px">
<q-list dense style="min-width: 150px">
<q-item
clickable
v-close-popup
@ -166,6 +166,7 @@
</template>
<script setup lang="ts">
import { ref, onMounted } from "vue";
import router from "@/router";
import { useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import type { QInput, QForm } from "quasar";