From 787ce2fc48d28728fcc27aa1df73705d02508188 Mon Sep 17 00:00:00 2001 From: guillermo Date: Mon, 14 Oct 2024 09:33:00 +0200 Subject: [PATCH 1/3] feat: refs #7006 itemTypeLog added --- src/pages/ItemType/Card/ItemTypeBasicData.vue | 1 + src/pages/ItemType/Card/ItemTypeLog.vue | 7 +++++++ src/pages/ItemType/locale/en.yml | 1 + src/pages/ItemType/locale/es.yml | 1 + src/router/modules/itemType.js | 11 ++++++++++- 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/pages/ItemType/Card/ItemTypeLog.vue diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue index 51e24272d..deaf4a5fe 100644 --- a/src/pages/ItemType/Card/ItemTypeBasicData.vue +++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue @@ -73,6 +73,7 @@ const temperaturesOptions = ref([]); option-label="name" hide-selected /> + diff --git a/src/pages/ItemType/Card/ItemTypeLog.vue b/src/pages/ItemType/Card/ItemTypeLog.vue new file mode 100644 index 000000000..b3f7a6597 --- /dev/null +++ b/src/pages/ItemType/Card/ItemTypeLog.vue @@ -0,0 +1,7 @@ + + + diff --git a/src/pages/ItemType/locale/en.yml b/src/pages/ItemType/locale/en.yml index 7889418ea..4b203bd68 100644 --- a/src/pages/ItemType/locale/en.yml +++ b/src/pages/ItemType/locale/en.yml @@ -4,6 +4,7 @@ shared: worker: Worker category: Category temperature: Temperature + life: Life summary: id: id life: Life diff --git a/src/pages/ItemType/locale/es.yml b/src/pages/ItemType/locale/es.yml index 9a94dceb6..43699c332 100644 --- a/src/pages/ItemType/locale/es.yml +++ b/src/pages/ItemType/locale/es.yml @@ -4,6 +4,7 @@ shared: worker: Trabajador category: Reino temperature: Temperatura + life: Vida summary: id: id code: Código diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js index 8064c41ff..0fd3797e6 100644 --- a/src/router/modules/itemType.js +++ b/src/router/modules/itemType.js @@ -12,7 +12,7 @@ export default { redirect: { name: 'ItemTypeList' }, menus: { main: [], - card: ['ItemTypeBasicData'], + card: ['ItemTypeBasicData', 'ItemTypeLog'], }, children: [ { @@ -40,6 +40,15 @@ export default { component: () => import('src/pages/ItemType/Card/ItemTypeBasicData.vue'), }, + { + path: 'log', + name: 'ItemTypeLog', + meta: { + title: 'log', + icon: 'vn:History', + }, + component: () => import('src/pages/ItemType/Card/ItemTypeLog.vue'), + }, ], }, ], From 8edba36a7401bad871b994d2e6f2a870c8ed92d0 Mon Sep 17 00:00:00 2001 From: guillermo Date: Fri, 25 Oct 2024 13:46:36 +0200 Subject: [PATCH 2/3] feat: refs #7006 itemType basic data new inputs --- src/pages/ItemType/Card/ItemTypeBasicData.vue | 36 ++++++++++++++++++- src/pages/ItemType/locale/en.yml | 3 ++ src/pages/ItemType/locale/es.yml | 3 ++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue index f4013e126..e447f565b 100644 --- a/src/pages/ItemType/Card/ItemTypeBasicData.vue +++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue @@ -8,12 +8,14 @@ import FormModel from 'components/FormModel.vue'; import VnRow from 'components/ui/VnRow.vue'; import VnInput from 'src/components/common/VnInput.vue'; import VnSelect from 'src/components/common/VnSelect.vue'; +import VnAvatar from 'src/components/ui/VnAvatar.vue'; const route = useRoute(); const { t } = useI18n(); const categoriesOptions = ref([]); const temperaturesOptions = ref([]); +const itemPackingTypesOptions = ref([]);