diff --git a/ayanova/src/api/open-object-handler.js b/ayanova/src/api/open-object-handler.js index cfba3051..e49dc963 100644 --- a/ayanova/src/api/open-object-handler.js +++ b/ayanova/src/api/open-object-handler.js @@ -488,6 +488,12 @@ export default { params: { recordid: tid.id } }); break; + case ayatype.UnitMeterReading: + vm.$router.push({ + name: "meter-reading", + params: { recordid: tid.id } + }); + break; default: window.$gz.eventBus.$emit( diff --git a/ayanova/src/views/svc-meter-reading.vue b/ayanova/src/views/svc-meter-reading.vue index 4b319b33..c95cb042 100644 --- a/ayanova/src/views/svc-meter-reading.vue +++ b/ayanova/src/views/svc-meter-reading.vue @@ -91,7 +91,8 @@ export default { this.obj = this.$route.params.obj; window.$gz.form.setFormState({ vm: vm, - loading: false + loading: false, + readOnly: true }); } else { await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading diff --git a/ayanova/src/views/svc-meter-readings.vue b/ayanova/src/views/svc-meter-readings.vue index 501f2ed7..6dc2f764 100644 --- a/ayanova/src/views/svc-meter-readings.vue +++ b/ayanova/src/views/svc-meter-readings.vue @@ -49,7 +49,7 @@ export default { clientCriteria: undefined, preFilterMode: null, rights: window.$gz.role.defaultRightsObject(), - aType: window.$gz.type.MeterReading, + aType: window.$gz.type.UnitMeterReading, reload: false }; }, @@ -72,7 +72,7 @@ async function clickHandler(menuItem) { switch (m.key) { case "new": m.vm.$router.push({ - name: "unit-note-edit", + name: "meter-reading", params: { recordid: 0, unitid: m.vm.unitId @@ -85,14 +85,14 @@ async function clickHandler(menuItem) { //last report selected is in m.id m.vm.$router.push({ name: "ay-report", - params: { recordid: m.id, ayatype: window.$gz.type.MeterReading } + params: { recordid: m.id, ayatype: window.$gz.type.UnitMeterReading } }); } else { //general report selector chosen let res = await m.vm.$refs.reportSelector.open( m.vm.$refs.gzdatatable.getDataListSelection( - window.$gz.type.MeterReading + window.$gz.type.UnitMeterReading ) ); @@ -107,7 +107,7 @@ async function clickHandler(menuItem) { //Now open the report viewer... m.vm.$router.push({ name: "ay-report", - params: { recordid: res.id, ayatype: window.$gz.type.MeterReading } + params: { recordid: res.id, ayatype: window.$gz.type.UnitMeterReading } }); } break; @@ -133,7 +133,7 @@ function generateMenu(vm) { helpUrl: "svc-meter-readings", menuItems: [], formData: { - ayaType: window.$gz.type.MeterReading + ayaType: window.$gz.type.UnitMeterReading } };