From 56ef811584970ae0c53f04f35604be941cd5a3ef Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 24 Oct 2024 07:47:26 +0200 Subject: [PATCH] fix: refs #7283 order translation --- src/pages/Item/ItemTypeList.vue | 4 +-- src/router/modules/item.js | 45 +++++++++++++++++---------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue index 9981a0d68..d9f7bba85 100644 --- a/src/pages/Item/ItemTypeList.vue +++ b/src/pages/Item/ItemTypeList.vue @@ -84,11 +84,11 @@ const columns = computed(() => [ :url="`ItemTypes`" :create="{ urlCreate: 'ItemTypes', - title: 'Create ItemTypes', + title: t('Create ItemTypes'), onDataSaved: () => tableRef.reload(), formInitialData: {}, }" - order="code ASC" + order="name ASC" :columns="columns" auto-load :right-search="false" diff --git a/src/router/modules/item.js b/src/router/modules/item.js index 48e19dd54..2838c3be7 100644 --- a/src/router/modules/item.js +++ b/src/router/modules/item.js @@ -48,6 +48,28 @@ export default { }, 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', @@ -65,19 +87,7 @@ export default { }, component: () => import('src/pages/Item/ItemCreate.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: 'item-type-list', name: 'ItemTypeList', @@ -95,15 +105,6 @@ export default { }, component: () => import('src/pages/Item/ItemTypeCreate.vue'), }, - { - path: 'request', - name: 'ItemRequest', - meta: { - title: 'buyRequest', - icon: 'vn:buyrequest', - }, - component: () => import('src/pages/Item/ItemRequest.vue'), - }, ], }, {