diff --git a/src/components/Apps/AccountCreateUpdateForm/const.js b/src/components/Apps/AccountCreateUpdateForm/const.js index cddd0c623..5e0fcaf31 100644 --- a/src/components/Apps/AccountCreateUpdateForm/const.js +++ b/src/components/Apps/AccountCreateUpdateForm/const.js @@ -121,11 +121,6 @@ export const accountFieldsMeta = (vm) => { el: { multiple: false, clearable: true, - disabled: { - get disabled() { - return vm.isDisabled - } - }, ajax: { url: `/api/v1/accounts/accounts/su-from-accounts/?account=${vm.account?.id || ''}&asset=${vm.asset?.id || ''}`, transformOption: (item) => { diff --git a/src/components/Apps/AccountListTable/AccountList.vue b/src/components/Apps/AccountListTable/AccountList.vue index afcc726a5..877dcada8 100644 --- a/src/components/Apps/AccountListTable/AccountList.vue +++ b/src/components/Apps/AccountListTable/AccountList.vue @@ -297,14 +297,13 @@ export default { can: () => { return vm.$hasPerm('accounts.add_account') && !this.$store.getters.currentOrgIsRoot }, - callback: async() => { - await this.getAssetDetail() + callback: () => { setTimeout(() => { - vm.iAsset = this.asset - vm.account = {} - vm.addTemplate = false - vm.showAddDialog = true - }) + // this.iAsset = {} + // this.account = {} + this.addTemplate = false + this.showAddDialog = true + }, 200) } }, { diff --git a/src/components/Apps/ManyJsonTabs/AssetJsonTab.vue b/src/components/Apps/ManyJsonTabs/AssetJsonTab.vue index 9f1d640a2..65f767a5a 100644 --- a/src/components/Apps/ManyJsonTabs/AssetJsonTab.vue +++ b/src/components/Apps/ManyJsonTabs/AssetJsonTab.vue @@ -7,6 +7,7 @@ - - diff --git a/src/components/Apps/ManyJsonTabs/UserJsonTab.vue b/src/components/Apps/ManyJsonTabs/UserJsonTab.vue index 797b0ba54..fa09a6088 100644 --- a/src/components/Apps/ManyJsonTabs/UserJsonTab.vue +++ b/src/components/Apps/ManyJsonTabs/UserJsonTab.vue @@ -8,6 +8,7 @@ import { DrawerListTable as ListTable } from '@/components' import { toM2MJsonParams } from '@/utils/jms' import TwoCol from '@/layout/components/Page/TwoColPage.vue' +import { DetailFormatter } from '@/components/Table/TableFormatters' export default { name: 'User', @@ -44,15 +45,13 @@ export default { columnsMeta: { name: { label: this.$t('Name'), - formatter: (row) => { - const to = { - name: 'UserDetail', - params: { id: row.id } - } - if (this.$hasPerm('users.view_user')) { - return {row.name} - } else { - return {row.name} + formatter: DetailFormatter, + formatterArgs: { + getRoute: ({ row }) => { + return { + name: 'UserDetail', + params: { id: row.id } + } } } }, @@ -90,7 +89,3 @@ export default { } } - -