diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue index 2412f2bf9..2546982eb 100644 --- a/src/pages/Item/Card/ItemCard.vue +++ b/src/pages/Item/Card/ItemCard.vue @@ -1,19 +1,11 @@ - diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue index 5119b5177..e4bb9b9a2 100644 --- a/src/pages/Item/ItemList.vue +++ b/src/pages/Item/ItemList.vue @@ -6,15 +6,14 @@ import VnImg from 'src/components/ui/VnImg.vue'; import VnTable from 'components/VnTable/VnTable.vue'; import { toDate } from 'src/filters'; import FetchedTags from 'src/components/ui/FetchedTags.vue'; -import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import ItemSummary from '../Item/Card/ItemSummary.vue'; import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue'; import ItemTypeDescriptorProxy from './ItemType/Card/ItemTypeDescriptorProxy.vue'; import { cloneItem } from 'src/pages/Item/composables/cloneItem'; -import RightMenu from 'src/components/common/RightMenu.vue'; import ItemListFilter from './ItemListFilter.vue'; +import VnSection from 'src/components/common/VnSection.vue'; const entityId = computed(() => route.params.id); const { openCloneDialog } = cloneItem(); @@ -22,6 +21,7 @@ const { viewSummary } = useSummaryDialog(); const { t } = useI18n(); const tableRef = ref(); const route = useRoute(); +const dataKey = 'ItemList'; const itemFilter = { include: [ @@ -298,73 +298,78 @@ const columns = computed(() => [ }, ]); + - - - + + - - - - + + + + + + + + {{ row.id }} + + + + + + {{ row.typeName }} + {{ row.typeFk }} + + + + + + {{ row.userName }} + + + + + + {{ row?.name }} + + {{ row?.subName.toUpperCase() }} + + + + + - - - {{ row.id }} - - - - - - {{ row.typeName }} - {{ row.typeFk }} - - - - - - {{ row.userName }} - - - - - - {{ row?.name }} - - {{ row?.subName.toUpperCase() }} - - - - - +