Merge branch 'feature/ItemLastEntries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemLastEntries

src/pages/Item/Card/ItemLastEntries.vue

@@ -260,6 +260,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QBadge>
                 </QTd>
             </template>
+            <template #body-cell-pvp="{ value }">
+                <QTd @click.stop
+                    ><span> {{ value }}</span>
+                    <QTooltip>
+                        {{ t('lastEntries.grouping') }}/{{ t('lastEntries.packing') }}
+                    </QTooltip></QTd
+                >
+            </template>
             <template #body-cell-grouping="{ row }">
                 <QTd @click.stop>
                     <QBadge
@@ -296,9 +304,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </template>
 
 <style lang="scss" scoped>
+.q-badge--rounded {
+    border-radius: 50%;
+}
 .center-content {
     display: flex;
     max-width: max-content;
     margin: auto;
+    padding: 0 11px;
+    height: 28px;
 }
 </style>

src/router/modules/item.js

@@ -113,6 +113,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemTags.vue'),
                 },
+                {
+                    path: 'last-entries',
+                    name: 'ItemLastEntries',
+                    meta: {
+                        title: 'lastEntries',
+                        icon: 'vn:regentry',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemLastEntries.vue'),
+                },
                 {
                     path: 'tax',
                     name: 'ItemTax',
@@ -122,6 +131,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemTax.vue'),
                 },
+                {
+                    path: 'botanical',
+                    name: 'ItemBotanical',
+                    meta: {
+                        title: 'botanical',
+                        icon: 'local_florist',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
+                },
                 {
                     path: 'barcode',
                     name: 'ItemBarcode',
@@ -135,8 +153,8 @@ export default {
                     path: 'diary',
                     name: 'ItemDiary',
                     meta: {
-                        title: 'basicData',
+                        title: 'diary',
-                        icon: 'vn:settings',
+                        icon: 'vn:transaction',
                     },
                     component: () => import('src/pages/Item/Card/ItemDiary.vue'),
                 },
@@ -149,24 +167,6 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemLog.vue'),
                 },
-                {
-                    path: 'botanical',
-                    name: 'ItemBotanical',
-                    meta: {
-                        title: 'botanical',
-                        icon: 'vn:botanical',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
-                },
-                {
-                    path: 'last-entries',
-                    name: 'ItemLastEntries',
-                    meta: {
-                        title: 'lastEntries',
-                        icon: 'vn:botanical',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemLastEntries.vue'),
-                },
             ],
         },
     ],