diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue index 291b14db8..a43b35ec1 100644 --- a/src/pages/Account/AccountAliasList.vue +++ b/src/pages/Account/AccountAliasList.vue @@ -3,28 +3,23 @@ import { useRouter } from 'vue-router'; import { useI18n } from 'vue-i18n'; import { ref, computed } from 'vue'; import VnTable from 'components/VnTable/VnTable.vue'; -import VnPaginate from 'components/ui/VnPaginate.vue'; import VnSearchbar from 'components/ui/VnSearchbar.vue'; -import CardList from 'src/components/ui/CardList.vue'; -import VnLv from 'src/components/ui/VnLv.vue'; -import AliasSummary from './Alias/Card/AliasSummary.vue'; -import AliasCreateForm from './Alias/AliasCreateForm.vue'; - -import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useStateStore } from 'stores/useStateStore'; +const route = useRoute(); +import { useRoute } from 'vue-router'; -defineProps({ +const $props = defineProps({ id: { type: Number, default: 0, }, }); +const entityId = computed(() => $props.id || route.params.id); +const tableRef = ref(); const { t } = useI18n(); -const { viewSummary } = useSummaryDialog(); const router = useRouter(); const stateStore = useStateStore(); -const aliasCreateDialogRef = ref(null); const exprBuilder = (param, value) => { switch (param) { @@ -49,6 +44,7 @@ const columns = computed(() => [ label: t('alias'), field: 'alias', cardVisible: true, + create: true, }, { align: 'left', @@ -56,12 +52,9 @@ const columns = computed(() => [ label: t('description'), field: 'description', cardVisible: true, + create: true, }, ]); - -const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } }); - -const openCreateModal = () => aliasCreateDialogRef.value.show(); $props.id || route.params.id); const roleCreateDialogRef = ref(null); @@ -130,7 +123,7 @@ const navigate = (event, id) => { :columns="columns" default-mode="table" auto-load - redirect="role" + redirect="account/role" :right-search="false" :is-editable="true" /> diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue index 200ef817b..017cca685 100644 --- a/src/pages/Travel/TravelList.vue +++ b/src/pages/Travel/TravelList.vue @@ -9,7 +9,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { computed } from 'vue'; import TravelSummary from './Card/TravelSummary.vue'; import VnSearchbar from 'components/ui/VnSearchbar.vue'; -import { dashIfEmpty, toDate } from 'src/filters'; +import { toDate } from 'src/filters'; const { viewSummary } = useSummaryDialog(); const router = useRouter(); const { t } = useI18n();