case 4090

This commit is contained in:
2022-01-21 23:41:41 +00:00
parent 06f48b52c3
commit c1c1172942
3 changed files with 11 additions and 5 deletions

View File

@@ -180,13 +180,13 @@ export default new Router({
import(/* webpackChunkName: "ay-common" */ "./views/home-reminder.vue") import(/* webpackChunkName: "ay-common" */ "./views/home-reminder.vue")
}, },
{ {
path: "/home-reviews/:aType?/:objectId?", path: "/home-reviews/:aType?/:objectId?/:name?",
name: "home-reviews", name: "home-reviews",
component: () => component: () =>
import(/* webpackChunkName: "ay-common" */ "./views/home-reviews.vue") import(/* webpackChunkName: "ay-common" */ "./views/home-reviews.vue")
}, },
{ {
path: "/home-reviews/:recordid/:aType?/:objectId?", path: "/home-reviews/:recordid/:aType?/:objectId?/:name?",
name: "review-edit", name: "review-edit",
component: () => component: () =>
import(/* webpackChunkName: "ay-common" */ "./views/home-review.vue") import(/* webpackChunkName: "ay-common" */ "./views/home-review.vue")

View File

@@ -261,6 +261,9 @@ export default {
}, },
async created() { async created() {
const vm = this; const vm = this;
if (vm.$route.params.name) {
vm.name = vm.$route.params.name;
}
try { try {
await initForm(vm); await initForm(vm);
vm.rights = window.$gz.role.getRights(window.$gz.type.Review); vm.rights = window.$gz.role.getRights(window.$gz.type.Review);
@@ -298,7 +301,6 @@ export default {
if (!vm.obj.objectId || !vm.obj.aType) { if (!vm.obj.objectId || !vm.obj.aType) {
throw "AType and ObjectId are required to create a review"; throw "AType and ObjectId are required to create a review";
} }
vm.name = vm.$route.params.name;
} }
} }
window.$gz.form.setFormState({ window.$gz.form.setFormState({
@@ -377,6 +379,7 @@ export default {
window.$gz.form.setErrorBoxErrors(vm); window.$gz.form.setErrorBoxErrors(vm);
} else { } else {
vm.obj = res.data; vm.obj = res.data;
vm.name = res.data.reviewObjectViz;
generateMenu(vm); generateMenu(vm);
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
@@ -417,13 +420,14 @@ export default {
name: "review-edit", name: "review-edit",
params: { params: {
recordid: res.data.id, recordid: res.data.id,
obj: res.data, //??THERE MIGHT HAVE BEEN ANOTHER PARAMETER HERE before cleanup??? obj: res.data,
name: this.name name: res.data.reviewObjectViz
} }
}); });
} else { } else {
//PUT //PUT
vm.obj.concurrency = res.data.concurrency; vm.obj.concurrency = res.data.concurrency;
vm.name = res.data.reviewObjectViz;
} }
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,

View File

@@ -38,11 +38,13 @@ export default {
}; };
}, },
async created() { async created() {
console.log("hmrvw-created route params:", this.$route.params);
const vm = this; const vm = this;
vm.rights = window.$gz.role.getRights(window.$gz.type.Review); vm.rights = window.$gz.role.getRights(window.$gz.type.Review);
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
vm.objectId = window.$gz.util.stringToIntOrNull(vm.$route.params.objectId); vm.objectId = window.$gz.util.stringToIntOrNull(vm.$route.params.objectId);
vm.aType = window.$gz.util.stringToIntOrNull(vm.$route.params.aType); vm.aType = window.$gz.util.stringToIntOrNull(vm.$route.params.aType);
vm.name = vm.$route.params.name;
//OPTIONAL FILTER //OPTIONAL FILTER
if (vm.objectId && vm.objectId != 0 && vm.aType) { if (vm.objectId && vm.objectId != 0 && vm.aType) {
//OBJECTID,AYATYPE //OBJECTID,AYATYPE