diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue index 49d56e2b..73452159 100644 --- a/ayanova/src/views/svc-workorder.vue +++ b/ayanova/src/views/svc-workorder.vue @@ -501,7 +501,7 @@ export default { window.$gz.form.setErrorBoxErrors(vm); //set generalerror errors in error box at top, not related to form field errors which happen alternatively based on formState.serverError which is confusing //TODO: If it's a fatal error set accordingly and bail out here - // if (err.fatal) { + // if (this.saveResult.fatal) { // //save failed fataly so just set the state and bail out // window.$gz.form.setFormState({ // vm: vm, @@ -700,14 +700,14 @@ async function deleteItems(vm) { vm.obj.items.splice(i, 1); } } - return err; + return; } -async function saveItems(vm, err) { +async function saveItems(vm) { //DELETE FLAGGED WOITEMS FIRST - err = await deleteItems(vm, err); - if (err.fatal) { - return err; + await deleteItems(vm); + if (this.saveResult.fatal) { + return; } //SAVE WOITEMS @@ -799,14 +799,14 @@ async function deleteScheduledUsers(vm, woItemIndex) { } //---- - return err; + return; } -async function saveScheduledUsers(vm, woItemIndex, err) { +async function saveScheduledUsers(vm, woItemIndex) { //DELETE FLAGGED ITEMS FIRST - err = await deleteScheduledUsers(vm, woItemIndex, err); - if (err.fatal) { - return err; + await deleteScheduledUsers(vm, woItemIndex); + if (this.saveResult.fatal) { + return; } for (let i = 0; i < vm.obj.items[woItemIndex].scheduledUsers.length; i++) { @@ -838,7 +838,7 @@ async function saveScheduledUsers(vm, woItemIndex, err) { } } } - return err; //made it + return; //made it } //todo: other grandchildren @@ -918,6 +918,8 @@ function formErrorFromSaveResult() { }); }); + return ret; + /* `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].estimatedQuantity`