diff --git a/src/pages/Account/AccountCreate.vue b/src/pages/Account/AccountCreate.vue index 204c8ffeb..486a9b06b 100644 --- a/src/pages/Account/AccountCreate.vue +++ b/src/pages/Account/AccountCreate.vue @@ -3,19 +3,14 @@ import { reactive, ref } from 'vue'; import { useI18n } from 'vue-i18n'; import { useRouter } from 'vue-router'; -import FormModel from 'components/FormModel.vue'; +import FormModelPopup from 'components/FormModelPopup.vue'; import VnRow from 'components/ui/VnRow.vue'; import VnSelect from 'src/components/common/VnSelect.vue'; import FetchData from 'components/FetchData.vue'; -import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; -import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import VnInput from 'src/components/common/VnInput.vue'; -import { useStateStore } from 'stores/useStateStore'; - const { t } = useI18n(); const router = useRouter(); -const stateStore = useStateStore(); const newAccountForm = reactive({ active: true, @@ -34,89 +29,77 @@ const redirectToAccountBasicData = (_, { id }) => { @on-fetch="(data) => (rolesOptions = data)" auto-load /> - - - - - - - + + + + diff --git a/src/pages/Account/AccountFilter.vue b/src/pages/Account/AccountFilter.vue index 72893472f..784c925bc 100644 --- a/src/pages/Account/AccountFilter.vue +++ b/src/pages/Account/AccountFilter.vue @@ -55,7 +55,7 @@ const rolesOptions = ref([]); import { useI18n } from 'vue-i18n'; import { useRouter } from 'vue-router'; -import { computed } from 'vue'; +import { computed, ref } from 'vue'; import VnPaginate from 'src/components/ui/VnPaginate.vue'; import VnSearchbar from 'components/ui/VnSearchbar.vue'; @@ -9,18 +9,19 @@ import VnLv from 'src/components/ui/VnLv.vue'; import CardList from 'src/components/ui/CardList.vue'; import AccountSummary from './Card/AccountSummary.vue'; import AccountFilter from './AccountFilter.vue'; +import AccountCreate from './AccountCreate.vue'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useStateStore } from 'stores/useStateStore'; import { useRole } from 'src/composables/useRole'; +import { QDialog } from 'quasar'; const stateStore = useStateStore(); const router = useRouter(); const { t } = useI18n(); const { viewSummary } = useSummaryDialog(); -const roleState = useRole(); - -const isItManagement = computed(() => roleState.hasAny(['itManagement'])); +const accountCreateDialogRef = ref(null); +const showNewUserBtn = computed(() => useRole().hasAny(['itManagement'])); const filter = { fields: ['id', 'nickname', 'name', 'role'], @@ -54,7 +55,7 @@ const navigate = (event, id) => { router.push({ path: `/account/${id}` }); }; -const redirectToItemCreate = () => router.push({ name: 'AccountCreate' }); +const openCreateModal = () => accountCreateDialogRef.value.show(); - - + + + + + {{ t('account.card.newUser') }} diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue index 55ae92b92..f7a7a16cc 100644 --- a/src/pages/Account/Card/AccountDescriptor.vue +++ b/src/pages/Account/Card/AccountDescriptor.vue @@ -1,15 +1,10 @@