Merge pull request 'refactor: refs #8316 used VnSection and VnBetaCard' (!1147) from 8316-itemCardWithVnCardBeta into dev

Reviewed-on: #1147
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

src/components/ui/VnFilterPanel.vue

@@ -190,7 +190,10 @@ const getLocale = (label) => {
     const globalLocale = `globals.params.${param}`;
     if (te(globalLocale)) return t(globalLocale);
     else if (te(t(`params.${param}`)));
-    else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
+    else {
+        const camelCaseModuleName = route.meta.moduleName.charAt(0).toLowerCase() + route.meta.moduleName.slice(1);    
+        return t(`${camelCaseModuleName}.params.${param}`);
+    }
 };
 </script>
 

src/i18n/locale/en.yml

@@ -728,62 +728,6 @@ travel:
         destination: Destination
         thermograph: Thermograph
         travelFileDescription: 'Travel id { travelId }'
-item:
-    descriptor:
-        buyer: Buyer
-        color: Color
-        category: Category
-        available: Available
-        warehouseText: 'Calculated on the warehouse of { warehouseName }'
-        itemDiary: Item diary
-    list:
-        id: Identifier
-        stems: Stems
-        category: Category
-        typeName: Type
-        isActive: Active
-        userName: Buyer
-        weightByPiece: Weight/Piece
-        stemMultiplier: Multiplier
-    fixedPrice:
-        itemFk: Item ID
-        groupingPrice: Grouping price
-        packingPrice: Packing price
-        hasMinPrice: Has min price
-        minPrice: Min price
-        started: Started
-        ended: Ended
-    create:
-        priority: Priority
-    buyRequest:
-        requester: Requester
-        requested: Requested
-        attender: Atender
-        achieved: Achieved
-        concept: Concept
-    summary:
-        otherData: Other data
-        tax: Tax
-        botanical: Botanical
-        barcode: Barcode
-        completeName: Complete name
-        family: Familiy
-        stems: Stems
-        multiplier: Multiplier
-        buyer: Buyer
-        doPhoto: Do photo
-        intrastatCode: Intrastat code
-        ref: Reference
-        relevance: Relevance
-        weight: Weight (gram)/stem
-        units: Units/box
-        expense: Expense
-        generic: Generic
-        recycledPlastic: Recycled plastic
-        nonRecycledPlastic: Non recycled plastic
-        minSalesQuantity: Min sales quantity
-        genus: Genus
-        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -724,62 +724,6 @@ travel:
         destination: Destino
         thermograph: Termógrafo
         travelFileDescription: 'Id envío { travelId }'
-item:
-    descriptor:
-        buyer: Comprador
-        color: Color
-        category: Categoría
-        available: Disponible
-        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
-        itemDiary: Registro de compra-venta
-    list:
-        id: Identificador
-        stems: Tallos
-        category: Reino
-        typeName: Tipo
-        isActive: Activo
-        weightByPiece: Peso (gramos)/tallo
-        userName: Comprador
-        stemMultiplier: Multiplicador
-    fixedPrice:
-        itemFk: ID Artículo
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
-        hasMinPrice: Tiene precio mínimo
-        minPrice: Precio min
-        started: Inicio
-        ended: Fin
-    create:
-        priority: Prioridad
-    summary:
-        otherData: Otros datos
-        tax: IVA
-        botanical: Botánico
-        barcode: Código de barras
-        completeName: Nombre completo
-        family: Familia
-        stems: Tallos
-        multiplier: Multiplicador
-        buyer: Comprador
-        doPhoto: Hacer foto
-        intrastatCode: Código intrastat
-        ref: Referencia
-        relevance: Relevancia
-        weight: Peso (gramos)/tallo
-        units: Unidades/caja
-        expense: Gasto
-        generic: Genérico
-        recycledPlastic: Plástico reciclado
-        nonRecycledPlastic: Plástico no reciclado
-        minSalesQuantity: Cantidad mínima de venta
-        genus: Genus
-        specie: Specie
-    buyRequest:
-        requester: Solicitante
-        requested: Solicitado
-        attender: Comprador
-        achieved: Conseguido
-        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:

src/pages/Customer/CustomerList.vue

@@ -408,7 +408,7 @@ function handleLocation(data, location) {
             order: ['id DESC'],
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <CustomerFilter data-key="CustomerList" />
         </template>
         <template #body>

src/pages/Entry/EntryList.vue

@@ -205,7 +205,7 @@ const columns = computed(() => [
             userFilter: entryFilter,
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <EntryFilter data-key="EntryList" />
         </template>
         <template #body>
@@ -231,7 +231,7 @@ const columns = computed(() => [
                         >
                             <QTooltip>{{
                                 t(
-                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable'
+                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable',
                                 )
                             }}</QTooltip>
                         </QIcon>

src/pages/Item/Card/ItemCard.vue

@@ -1,19 +1,11 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
-import ItemListFilter from '../ItemListFilter.vue';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Item"
         base-url="Items"
         :descriptor="ItemDescriptor"
-        :filter-panel="ItemListFilter"
-        search-data-key="ItemList"
-        :searchbar-props="{
-            url: 'Items/filter',
-            label: 'searchbar.label',
-            info: 'searchbar.info',
-        }"
     />
 </template>

src/pages/Item/ItemList.vue

@@ -6,18 +6,17 @@ 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 VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import axios from 'axios';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const entityId = computed(() => route.params.id);
 const { openCloneDialog } = cloneItem();
@@ -25,9 +24,11 @@ const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const tableRef = ref();
 const route = useRoute();
+const dataKey = 'ItemList';
 const validPriorities = ref([]);
 const defaultTag = ref();
 const defaultPriority = ref();
+
 const itemFilter = {
     include: [
         {
@@ -324,22 +325,29 @@ onBeforeMount(async () => {
     });
 });
 </script>
+
 <template>
-    <VnSearchbar
+    <VnSection
-        data-key="ItemList"
+        :data-key="dataKey"
-        :label="t('item.searchbar.label')"
+        :columns="columns"
-        :info="t('item.searchbar.info')"
+        prefix="item"
-    />
+        :array-data-props="{
-    <RightMenu>
+            url: 'Items/filter',
-        <template #right-panel>
+            order: ['isActive DESC', 'name', 'id'],
+            userFilter: itemFilter,
+        }"
+    >
+        <template #advanced-menu>
             <ItemListFilter data-key="ItemList" />
         </template>
-    </RightMenu>
+        <template #body>
             <VnTable
                 v-if="defaultTag"
                 ref="tableRef"
-        data-key="ItemList"
+                :data-key="dataKey"
-        url="Items/filter"
+                :columns="columns"
+                :right-search="false"
+                redirect="Item"
                 :create="{
                     urlCreate: 'Items/new',
                     title: t('item.list.newItem'),
@@ -350,12 +358,7 @@ onBeforeMount(async () => {
                         priority: defaultPriority,
                     },
                 }"
-        :order="['isActive DESC', 'name', 'id']"
-        :columns="columns"
-        redirect="Item"
                 :is-editable="false"
-        :right-search="false"
-        :filter="itemFilter"
             >
                 <template #column-image="{ row }">
                     <VnImg
@@ -391,7 +394,7 @@ onBeforeMount(async () => {
                             {{ row?.subName.toUpperCase() }}
                         </div>
                     </div>
-            <FetchedTags :item="row" />
+                    <FetchedTags :item="row" :columns="3" />
                 </template>
                 <template #more-create-dialog="{ data }">
                     <VnInput
@@ -413,7 +416,9 @@ onBeforeMount(async () => {
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
                                     <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
@@ -457,7 +462,9 @@ onBeforeMount(async () => {
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
                                     <QItemLabel>{{ scope.opt?.description }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
@@ -485,6 +492,8 @@ onBeforeMount(async () => {
                 </template>
             </VnTable>
         </template>
+    </VnSection>
+</template>
 <style lang="scss" scoped>
 .subName {
     text-transform: uppercase;

src/pages/Item/ItemListFilter.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
@@ -233,7 +232,7 @@ onMounted(async () => {
                 <QItemSection>
                     <VnSelect
                         :label="t('params.buyerFk')"
-                        v-model="params.buyerFk"
+                        v-model="params.workerFk"
                         @update:model-value="searchFn()"
                         :options="buyersOptions"
                         option-value="id"

src/pages/Item/ItemType/Card/ItemTypeCard.vue

@@ -1,20 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
-import ItemTypeFilter from 'src/pages/Item/ItemType/ItemTypeFilter.vue';
-import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="ItemTypeSummary"
         base-url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
-        :filter-panel="ItemTypeFilter"
+    />
-        search-data-key="ItemTypeList"
-        search-url="ItemTypes"
-    >
-        <template #searchbar>
-            <ItemTypeSearchbar />
-        </template>
-    </VnCard>
 </template>

src/pages/Item/ItemType/ItemTypeFilter.vue

@@ -1,90 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-const { t } = useI18n();
-
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const emit = defineEmits(['search']);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return {
-                name: { like: `%${value}%` },
-            };
-        case 'code':
-            return {
-                code: { like: `%${value}%` },
-            };
-        case 'search':
-            if (value) {
-                if (!isNaN(value)) {
-                    return { id: value };
-                } else {
-                    return {
-                        or: [
-                            {
-                                name: {
-                                    like: `%${value}%`,
-                                },
-                            },
-                            {
-                                code: {
-                                    like: `%${value}%`,
-                                },
-                            },
-                        ],
-                    };
-                }
-            }
-    }
-};
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        @search="emit('search')"
-        search-url="table"
-        :expr-builder="exprBuilder"
-    >
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        name: Name
-        code: Code
-es:
-    params:
-        name: Nombre
-        code: Código
-    Name: Nombre
-    Code: Código
-</i18n>

src/pages/Item/ItemType/ItemTypeSearchbar.vue

@@ -1,19 +0,0 @@
-<script setup>
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import { useI18n } from 'vue-i18n';
-const { t } = useI18n();
-</script>
-
-<template>
-    <VnSearchbar
-        data-key="ItemTypeList"
-        url="ItemTypes"
-        :label="t('Search item type')"
-        :info="t('Search itemType by id, name or code')"
-    />
-</template>
-<i18n>
-es:
-    Search item type: Buscar familia
-    Search itemType by id, name or code: Buscar familia por id, nombre o código
-</i18n>

src/pages/Item/ItemType/locale/en.yml

@@ -15,3 +15,5 @@ itemType:
         promo: Promo
         itemPackingType: Item packing type
         isUnconventionalSize: Is unconventional size
+    search: Search item type
+    searchInfo: Search item type by id, name or code

src/pages/Item/ItemType/locale/es.yml

@@ -15,3 +15,5 @@ itemType:
         promo: Promoción
         itemPackingType: Tipo de embalaje
         isUnconventionalSize: Es de tamaño poco convencional
+    search: Buscar familia
+    searchInfo: Buscar familia por id, nombre o código

src/pages/Item/ItemTypeList.vue

@@ -1,17 +1,50 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
-import ItemTypeSearchbar from 'src/pages/Item/ItemType/ItemTypeSearchbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import ItemTypeFilter from './ItemType/ItemTypeFilter.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
 const itemCategoriesOptions = ref([]);
 const temperatureOptions = ref([]);
+const dataKey = 'ItemTypeList';
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        or: [
+                            {
+                                name: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                            {
+                                code: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                        ],
+                    };
+                }
+            }
+    }
+};
 
 const columns = computed(() => [
     {
@@ -103,23 +136,15 @@ const columns = computed(() => [
         @on-fetch="(data) => (temperatureOptions = data)"
         auto-load
     />
-    <RightMenu>
+    <VnSection
-        <template #right-panel>
+        :data-key="dataKey"
-            <ItemTypeFilter data-key="ItemTypeList" />
+        :columns="columns"
-        </template>
+        prefix="itemType"
-    </RightMenu>
+        :array-data-props="{
-    <ItemTypeSearchbar />
+            url: 'ItemTypes',
-    <VnTable
+            order: 'name ASC',
-        ref="tableRef"
+            exprBuilder,
-        data-key="ItemTypeList"
+            userFilter: {
-        url="ItemTypes"
-        :create="{
-            urlCreate: 'ItemTypes',
-            title: t('Create ItemTypes'),
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: {},
-        }"
-        :user-filter="{
                 include: {
                     relation: 'worker',
                     scope: {
@@ -132,11 +157,21 @@ const columns = computed(() => [
                         },
                     },
                 },
+            },
+        }"
+    >
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'ItemTypes',
+                    title: t('Create ItemTypes'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {},
                 }"
-        order="name ASC"
                 :columns="columns"
                 auto-load
-        :right-search="false"
                 redirect="item/item-type"
             >
                 <template #column-workerFk="{ row }">
@@ -147,6 +182,8 @@ const columns = computed(() => [
                 </template>
             </VnTable>
         </template>
+    </VnSection>
+</template>
 
 <i18n>
     es:

src/pages/Item/locale/en.yml

@@ -180,44 +180,46 @@ item:
         intrastat: Intrastat
         origin: Origin
     buyRequest:
-        ticketId: 'Ticket ID'
+        ticketId: Ticket ID
-        shipped: 'Shipped'
+        shipped: Shipped
-        requester: 'Requester'
+        requester: Requester
-        requested: 'Requested'
+        requested: Requested
-        price: 'Price'
+        price: Price
-        attender: 'Attender'
+        attender: Attender
-        item: 'Item'
+        item: Item
-        achieved: 'Achieved'
+        achieved: Achieved
-        concept: 'Concept'
+        concept: Concept
-        state: 'State'
+        state: State
     summary:
-        basicData: 'Basic data'
+        basicData: Basic data
-        otherData: 'Other data'
+        otherData: Other data
-        description: 'Description'
+        description: Description
-        tax: 'Tax'
+        tax: Tax
-        tags: 'Tags'
+        tags: Tags
-        botanical: 'Botanical'
+        botanical: Botanical
-        barcode: 'Barcode'
+        barcode: Barcode
-        name: 'Nombre'
+        name: Name
-        completeName: 'Nombre completo'
+        completeName: Complete name
-        family: 'Familia'
+        family: Family
-        size: 'Medida'
+        size: Size
-        origin: 'Origen'
+        origin: Origin
-        stems: 'Tallos'
+        stems: Stems
-        multiplier: 'Multiplicador'
+        multiplier: Multiplier
-        buyer: 'Comprador'
+        buyer: Buyer
-        doPhoto: 'Do photo'
+        doPhoto: Do photo
-        intrastatCode: 'Código intrastat'
+        intrastatCode: Intrastat code
         intrastat: 'Intrastat'
-        ref: 'Referencia'
+        ref: Reference
-        relevance: 'Relevancia'
+        relevance: Relevance
-        weight: 'Peso (gramos)/tallo'
+        weight: Weight (gram)/stem
-        units: 'Unidades/caja'
+        units: Units/box
-        expense: 'Gasto'
+        expense: Expense
-        generic: 'Genérico'
+        generic: Generic
-        recycledPlastic: 'Plástico reciclado'
+        recycledPlastic: Recycled plastic
-        nonRecycledPlastic: 'Plástico no reciclado'
+        nonRecycledPlastic: Non recycled plastic
-        minSalesQuantity: 'Cantidad mínima de venta'
+        minSalesQuantity: Min sales quantity
-        genus: 'Genus'
+        genus: Genus
-        specie: 'Specie'
+        specie: Specie
+    search: 'Search item'
+    searchInfo: 'You can search by id'
     regularizeStock: Regularize stock

src/pages/Item/locale/es.yml

@@ -73,9 +73,6 @@ itemTags:
     addTag: Añadir etiqueta
     tag: Etiqueta
     value: Valor
-searchbar:
-    label: Buscar artículo
-    info: Buscar por id de artículo
 itemType:
     shared:
         code: Código
@@ -108,9 +105,6 @@ item:
         concept: Concepto
         denyOptions: Denegado
         scopeDays: Días en adelante
-    searchbar:
-        label: Buscar artículo
-        info: Puedes buscar por id
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -182,35 +176,35 @@ item:
         intrastat: Intrastat
         origin: Origen
     summary:
-        basicData: 'Datos básicos'
+        basicData: Datos básicos
-        otherData: 'Otros datos'
+        otherData: Otros datos
-        description: 'Descripción'
+        description: Descripción
-        tax: 'IVA'
+        tax: IVA
-        tags: 'Etiquetas'
+        tags: Etiquetas
-        botanical: 'Botánico'
+        botanical: Botánico
-        barcode: 'Código de barras'
+        barcode: Código de barras
-        name: 'Nombre'
+        name: Nombre
-        completeName: 'Nombre completo'
+        completeName: Nombre completo
-        family: 'Familia'
+        family: Familia
-        size: 'Medida'
+        size: Medida
-        origin: 'Origen'
+        origin: Origen
-        stems: 'Tallos'
+        stems: Tallos
-        multiplier: 'Multiplicador'
+        multiplier: Multiplicador
-        buyer: 'Comprador'
+        buyer: Comprador
-        doPhoto: 'Hacer foto'
+        doPhoto: Hacer foto
-        intrastatCode: 'Código intrastat'
+        intrastatCode: Código intrastat
-        intrastat: 'Intrastat'
+        intrastat: Intrastat
-        ref: 'Referencia'
+        ref: Referencia
-        relevance: 'Relevancia'
+        relevance: Relevancia
-        weight: 'Peso (gramos)/tallo'
+        weight: Peso (gramos)/tallo
-        units: 'Unidades/caja'
+        units: Unidades/caja
-        expense: 'Gasto'
+        expense: Gasto
-        generic: 'Genérico'
+        generic: Genérico
-        recycledPlastic: 'Plástico reciclado'
+        recycledPlastic: Plástico reciclado
-        nonRecycledPlastic: 'Plástico no reciclado'
+        nonRecycledPlastic: Plástico no reciclado
-        minSalesQuantity: 'Cantidad mínima de venta'
+        minSalesQuantity: Cantidad mínima de venta
-        genus: 'Genus'
+        genus: Genus
-        specie: 'Specie'
+        specie: Specie
     regularizeStock: Regularizar stock
     buyRequest:
         ticketId: 'ID Ticket'
@@ -223,3 +217,5 @@ item:
         achieved: 'Conseguido'
         concept: 'Concepto'
         state: 'Estado'       
+    search: 'Buscar artículo'
+    searchInfo: 'Puedes buscar por id'

src/router/modules/index.js

@@ -15,7 +15,6 @@ import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
 import Agency from './agency';
-import ItemType from './itemType';
 import Zone from './zone';
 import Account from './account';
 import Monitor from './monitor';
@@ -38,7 +37,6 @@ export default [
     roadmap,
     Parking,
     Agency,
-    ItemType,
     Zone,
     Account,
     Monitor,

src/router/modules/item.js

@@ -1,109 +1,23 @@
 import { RouterView } from 'vue-router';
 
-export default {
+const itemCard = {
-    path: '/item',
-    name: 'Item',
-    meta: {
-        title: 'items',
-        icon: 'vn:item',
-        moduleName: 'Item',
-        keyBinding: 'a',
-    },
-    component: RouterView,
-    redirect: { name: 'ItemMain' },
-    menus: {
-        main: [
-            'ItemList',
-            'WasteBreakdown',
-            'ItemFixedPrice',
-            'ItemRequest',
-            'ItemTypeList',
-        ],
-        card: [
-            'ItemBasicData',
-            'ItemLog',
-            'ItemDiary',
-            'ItemTags',
-            'ItemTax',
-            'ItemBotanical',
-            'ItemBarcode',
-            'ItemShelving',
-            'ItemLastEntries',
-            'ItemTags',
-        ],
-    },
-    children: [
-        {
-            path: '',
-            name: 'ItemMain',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ItemList' },
-            children: [
-                {
-                    path: 'list',
-                    name: 'ItemList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Item/ItemList.vue'),
-                },
-                {
-                    path: 'request',
-                    name: 'ItemRequest',
-                    meta: {
-                        title: 'buyRequest',
-                        icon: 'vn:buyrequest',
-                    },
-                    component: () => import('src/pages/Item/ItemRequest.vue'),
-                },
-                {
-                    path: 'waste-breakdown',
-                    name: 'WasteBreakdown',
-                    meta: {
-                        title: 'wasteBreakdown',
-                        icon: 'vn:claims',
-                    },
-                    beforeEnter: (to, from, next) => {
-                        next({ name: 'ItemList' });
-                        window.location.href =
-                            'https://grafana.verdnatura.es/d/TTNXQAxVk';
-                    },
-                },
-                {
-                    path: 'fixed-price',
-                    name: 'ItemFixedPrice',
-                    meta: {
-                        title: 'fixedPrice',
-                        icon: 'vn:fixedPrice',
-                    },
-                    component: () => import('src/pages/Item/ItemFixedPrice.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'ItemCreate',
-                    meta: {
-                        title: 'itemCreate',
-                    },
-                    component: () => import('src/pages/Item/ItemCreate.vue'),
-                },
-
-                {
-                    path: 'item-type-list',
-                    name: 'ItemTypeList',
-                    meta: {
-                        title: 'family',
-                        icon: 'contact_support',
-                    },
-                    component: () => import('src/pages/Item/ItemTypeList.vue'),
-                },
-            ],
-        },
-        {
     name: 'ItemCard',
     path: ':id',
     component: () => import('src/pages/Item/Card/ItemCard.vue'),
     redirect: { name: 'ItemSummary' },
+    meta: {
+        menu: [
+            'ItemBasicData',
+            'ItemTags',
+            'ItemLastEntries',
+            'ItemTax',
+            'ItemBotanical',
+            'ItemShelving',
+            'ItemBarcode',
+            'ItemDiary',
+            'ItemLog',
+        ],
+    },
     children: [
         {
             name: 'ItemSummary',
@@ -155,7 +69,7 @@ export default {
             name: 'ItemBotanical',
             meta: {
                 title: 'botanical',
-                        icon: 'local_florist',
+                icon: 'vn:botanical',
             },
             component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
         },
@@ -196,6 +110,138 @@ export default {
             component: () => import('src/pages/Item/Card/ItemLog.vue'),
         },
     ],
+};
+
+const itemTypeCard = {
+    name: 'ItemTypeCard',
+    path: ':id',
+    component: () => import('src/pages/Item/ItemType/Card/ItemTypeCard.vue'),
+    redirect: { name: 'ItemTypeSummary' },
+    meta: {
+        menu: ['ItemTypeBasicData', 'ItemTypeLog'],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'ItemTypeSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Item/ItemType/Card/ItemTypeSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ItemTypeBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Item/ItemType/Card/ItemTypeBasicData.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ItemTypeLog',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+            },
+            component: () => import('src/pages/Item/ItemType/Card/ItemTypeLog.vue'),
+        },
+    ],
+};
+
+export default {
+    name: 'Item',
+    path: '/item',
+    meta: {
+        title: 'items',
+        icon: 'vn:item',
+        moduleName: 'Item',
+        keyBinding: 'a',
+        menu: [
+            'ItemList',
+            'WasteBreakdown',
+            'ItemFixedPrice',
+            'ItemRequest',
+            'ItemTypeList',
+        ],
+    },
+    component: RouterView,
+    redirect: { name: 'ItemMain' },
+    children: [
+        {
+            name: 'ItemMain',
+            path: '',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'ItemIndexMain' },
+            children: [
+                {
+                    path: '',
+                    name: 'ItemIndexMain',
+                    redirect: { name: 'ItemList' },
+                    component: () => import('src/pages/Item/ItemList.vue'),
+                    children: [
+                        {
+                            name: 'ItemList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        itemCard,
+                    ],
+                },
+                {
+                    path: 'request',
+                    name: 'ItemRequest',
+                    meta: {
+                        title: 'buyRequest',
+                        icon: 'vn:buyrequest',
+                    },
+                    component: () => import('src/pages/Item/ItemRequest.vue'),
+                },
+                {
+                    path: 'waste-breakdown',
+                    name: 'WasteBreakdown',
+                    meta: {
+                        title: 'wasteBreakdown',
+                        icon: 'vn:claims',
+                    },
+                    beforeEnter: (to, from, next) => {
+                        next({ name: 'ItemList' });
+                        window.location.href =
+                            'https://grafana.verdnatura.es/d/TTNXQAxVk';
+                    },
+                },
+                {
+                    path: 'fixed-price',
+                    name: 'ItemFixedPrice',
+                    meta: {
+                        title: 'fixedPrice',
+                        icon: 'vn:fixedPrice',
+                    },
+                    component: () => import('src/pages/Item/ItemFixedPrice.vue'),
+                },
+                {
+                    path: 'item-type',
+                    name: 'ItemTypeMain',
+                    redirect: { name: 'ItemTypeList' },
+                    component: () => import('src/pages/Item/ItemTypeList.vue'),
+                    children: [
+                        {
+                            name: 'ItemTypeList',
+                            path: 'list',
+                            meta: {
+                                title: 'family',
+                                icon: 'contact_support',
+                            },
+                        },
+                        itemTypeCard,
+                    ],
+                },
+            ],
         },
     ],
 };

src/router/modules/itemType.js

@@ -1,56 +0,0 @@
-import { RouterView } from 'vue-router';
-
-export default {
-    path: '/item/item-type',
-    name: 'ItemType',
-    meta: {
-        title: 'itemType',
-        icon: 'contact_support',
-        moduleName: 'ItemType',
-    },
-    component: RouterView,
-    redirect: { name: 'ItemTypeList' },
-    menus: {
-        main: [],
-        card: ['ItemTypeBasicData', 'ItemTypeLog'],
-    },
-    children: [
-        {
-            name: 'ItemTypeCard',
-            path: ':id',
-            component: () => import('src/pages/Item/ItemType/Card/ItemTypeCard.vue'),
-            redirect: { name: 'ItemTypeSummary' },
-            children: [
-                {
-                    name: 'ItemTypeSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                    },
-                    component: () =>
-                        import('src/pages/Item/ItemType/Card/ItemTypeSummary.vue'),
-                },
-                {
-                    name: 'ItemTypeBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Item/ItemType/Card/ItemTypeBasicData.vue'),
-                },
-                {
-                    path: 'log',
-                    name: 'ItemTypeLog',
-                    meta: {
-                        title: 'log',
-                        icon: 'vn:History',
-                    },
-                    component: () =>
-                        import('src/pages/Item/ItemType/Card/ItemTypeLog.vue'),
-                },
-            ],
-        },
-    ],
-};

src/router/routes.js

@@ -9,7 +9,6 @@ import invoiceIn from './modules/invoiceIn';
 import wagon from './modules/wagon';
 import supplier from './modules/supplier';
 import travel from './modules/travel';
-import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
@@ -88,7 +87,6 @@ const routes = [
             entry,
             parking,
             agency,
-            ItemType,
             zone,
             account,
             {