This commit is contained in:
2020-12-22 01:38:15 +00:00
parent 4de43b0bdc
commit e0b70a49e3
3 changed files with 19 additions and 8 deletions

View File

@@ -65,8 +65,10 @@ TODO: //MIGRATE_OUTSTANDING comment tag
currently doing: Review currently doing: Review
Display, printable Display, printable
Create new in both modes from another object so self and assign to another based on extra biz rule rights Currently just started create new from Customer
need route with type and id appended for new 0 one. make name display at top a link back to the customer / source object to save hunting around
Make sure can review from all edit forms
test it out full from front to back start to finish, lots of edges on this one

View File

@@ -4,7 +4,10 @@
<div v-if="formState.ready"> <div v-if="formState.ready">
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error> <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-form ref="form"> <v-form ref="form">
<span class="text-h5"> {{ name }}</span> <div class="mb-6" v-if="obj.objectType">
<v-icon large>{{ iconForType }}</v-icon
><span class="text-h5"> {{ name }}</span>
</div>
<v-row> <v-row>
<v-col v-if="currentUserIsASupervisor" cols="12" sm="6" lg="4" xl="3"> <v-col v-if="currentUserIsASupervisor" cols="12" sm="6" lg="4" xl="3">
<gz-pick-list <gz-pick-list
@@ -203,6 +206,7 @@ export default {
//is there already an obj from a prior operation? //is there already an obj from a prior operation?
if (vm.$route.params.obj) { if (vm.$route.params.obj) {
//yes, no need to fetch it //yes, no need to fetch it
vm.name = vm.$route.params.name;
vm.obj = vm.$route.params.obj; vm.obj = vm.$route.params.obj;
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
@@ -298,7 +302,8 @@ export default {
window.$gz.role.AUTHORIZATION_ROLES.InventoryFull, window.$gz.role.AUTHORIZATION_ROLES.InventoryFull,
window.$gz.role.AUTHORIZATION_ROLES.SalesFull, window.$gz.role.AUTHORIZATION_ROLES.SalesFull,
window.$gz.role.AUTHORIZATION_ROLES.AccountingFull window.$gz.role.AUTHORIZATION_ROLES.AccountingFull
]) ]),
name: null
}; };
}, },
//WATCHERS //WATCHERS
@@ -339,6 +344,10 @@ export default {
selfAssigned: function() { selfAssigned: function() {
return this.obj.userId == this.obj.assignedByUserId; return this.obj.userId == this.obj.assignedByUserId;
}, },
iconForType() {
return window.$gz.util.iconForType(Number.parseInt(this.obj.objectType));
},
hasSupervisorRole: function() { hasSupervisorRole: function() {
//mirrored from ReviewBiz.cs validation rule at server //mirrored from ReviewBiz.cs validation rule at server
/* /*
@@ -454,7 +463,8 @@ export default {
name: "review-edit", name: "review-edit",
params: { params: {
recordid: res.data.id, recordid: res.data.id,
obj: res.data // Pass data object to new form obj: res.data, // Pass data object to new form,
name: this.name
} }
}); });
} else { } else {

View File

@@ -1,8 +1,7 @@
<template> <template>
<div> <div>
{{ iconForType() }} <div v-if="objectType" class="mb-6">
<div v-if="objectType"> <v-icon large>{{ iconForType() }}</v-icon
<v-icon>{{ iconForType() }}</v-icon
><span class="text-h5"> {{ name }}</span> ><span class="text-h5"> {{ name }}</span>
</div> </div>
<gz-report-selector ref="reportSelector"></gz-report-selector> <gz-report-selector ref="reportSelector"></gz-report-selector>