From ea8f4287bd814e4216cd7ce43487eade92372bb9 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 30 Sep 2021 22:30:08 +0000 Subject: [PATCH] Workorderitempriority, woitemstatus and wostatus edit forms missing NEW menu option, also weird error on save about leaving unsaved --- ayanova/devdocs/todo.txt | 1 + ayanova/src/views/svc-project.vue | 2 +- .../svc-work-order-item-priorities-edit.vue | 17 ++++++++++++++++- .../views/svc-work-order-item-status-edit.vue | 16 +++++++++++++++- .../src/views/svc-work-order-status-edit.vue | 15 +++++++++++++++ 5 files changed, 48 insertions(+), 3 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 4c04aa12..7c2e6fc0 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -780,6 +780,7 @@ BUILD 132 CHANGES OF NOTE - fixed issue when grid is on last page then filter added it wasn't automaticaly going back to page one so it looked like there were no results - changed format of serials on parts list report data to be a single string of comma separated rather than a JSON array of strings - Fixed bug where form overlay not clearing when error returned from delete on any form +- Workorderitempriority, woitemstatus and wostatus edit forms missing NEW menu option, also weird error on save about leaving unsaved - case 3977 this might still be an issue / potential bug or I'm misreading what you wrote - case 3987 - case 3988 diff --git a/ayanova/src/views/svc-project.vue b/ayanova/src/views/svc-project.vue index 6c240d07..248e0259 100644 --- a/ayanova/src/views/svc-project.vue +++ b/ayanova/src/views/svc-project.vue @@ -219,7 +219,7 @@ export default { vm.formState.ready = true; } }, - async beforeRouteLeave(next) { + async beforeRouteLeave(to, from, next) { if (!this.formState.dirty || JUST_DELETED) { next(); return; diff --git a/ayanova/src/views/svc-work-order-item-priorities-edit.vue b/ayanova/src/views/svc-work-order-item-priorities-edit.vue index c864b3eb..472b5e2a 100644 --- a/ayanova/src/views/svc-work-order-item-priorities-edit.vue +++ b/ayanova/src/views/svc-work-order-item-priorities-edit.vue @@ -251,7 +251,7 @@ export default { //POST vm.obj = res.data; this.$router.replace({ - name: "svc-work-order-item-priority-edit", + name: "svc-work-order-item-priorities-edit", params: { recordid: res.data.id, obj: res.data @@ -330,6 +330,12 @@ async function clickHandler(menuItem) { case "save": m.vm.submit(); break; + case "new": + m.vm.$router.push({ + name: "svc-work-order-item-priorities-edit", + params: { recordid: 0 } + }); + break; case "delete": m.vm.remove(); break; @@ -389,6 +395,15 @@ function generateMenu(vm) { }); } + if (vm.rights.change && !vm.formState.readOnly) { + menuOptions.menuItems.push({ + title: "New", + icon: "$ayiPlus", + key: FORM_KEY + ":new", + vm: vm + }); + } + menuOptions.menuItems.push({ divider: true, inset: false }); menuOptions.menuItems.push({ title: "WorkOrderItemPriorityList", diff --git a/ayanova/src/views/svc-work-order-item-status-edit.vue b/ayanova/src/views/svc-work-order-item-status-edit.vue index 7dc29bfa..e01fbd8b 100644 --- a/ayanova/src/views/svc-work-order-item-status-edit.vue +++ b/ayanova/src/views/svc-work-order-item-status-edit.vue @@ -265,7 +265,7 @@ export default { //POST vm.obj = res.data; this.$router.replace({ - name: "svc-work-order-status-edit", + name: "svc-work-order-item-status-edit", params: { recordid: res.data.id, obj: res.data @@ -344,6 +344,12 @@ async function clickHandler(menuItem) { case "delete": m.vm.remove(); break; + case "new": + m.vm.$router.push({ + name: "svc-work-order-item-status-edit", + params: { recordid: 0 } + }); + break; case "list": m.vm.$router.push({ name: "svc-work-order-item-status" @@ -401,6 +407,14 @@ function generateMenu(vm) { }); } + if (vm.rights.change && !vm.formState.readOnly) { + menuOptions.menuItems.push({ + title: "New", + icon: "$ayiPlus", + key: FORM_KEY + ":new", + vm: vm + }); + } menuOptions.menuItems.push({ divider: true, inset: false }); menuOptions.menuItems.push({ diff --git a/ayanova/src/views/svc-work-order-status-edit.vue b/ayanova/src/views/svc-work-order-status-edit.vue index 11b4b06f..87c5894d 100644 --- a/ayanova/src/views/svc-work-order-status-edit.vue +++ b/ayanova/src/views/svc-work-order-status-edit.vue @@ -388,6 +388,12 @@ async function clickHandler(menuItem) { case "delete": m.vm.remove(); break; + case "new": + m.vm.$router.push({ + name: "svc-work-order-status-edit", + params: { recordid: 0 } + }); + break; case "statuslist": m.vm.$router.push({ name: "svc-work-order-status" @@ -445,6 +451,15 @@ function generateMenu(vm) { }); } + if (vm.rights.change && !vm.formState.readOnly) { + menuOptions.menuItems.push({ + title: "New", + icon: "$ayiPlus", + key: FORM_KEY + ":new", + vm: vm + }); + } + menuOptions.menuItems.push({ divider: true, inset: false }); menuOptions.menuItems.push({ title: "WorkOrderStatusList",