This commit is contained in:
@@ -488,6 +488,12 @@ export default {
|
|||||||
params: { recordid: tid.id }
|
params: { recordid: tid.id }
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
case ayatype.UnitMeterReading:
|
||||||
|
vm.$router.push({
|
||||||
|
name: "meter-reading",
|
||||||
|
params: { recordid: tid.id }
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
window.$gz.eventBus.$emit(
|
window.$gz.eventBus.$emit(
|
||||||
|
|||||||
@@ -91,7 +91,8 @@ export default {
|
|||||||
this.obj = this.$route.params.obj;
|
this.obj = this.$route.params.obj;
|
||||||
window.$gz.form.setFormState({
|
window.$gz.form.setFormState({
|
||||||
vm: vm,
|
vm: vm,
|
||||||
loading: false
|
loading: false,
|
||||||
|
readOnly: true
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
|
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ export default {
|
|||||||
clientCriteria: undefined,
|
clientCriteria: undefined,
|
||||||
preFilterMode: null,
|
preFilterMode: null,
|
||||||
rights: window.$gz.role.defaultRightsObject(),
|
rights: window.$gz.role.defaultRightsObject(),
|
||||||
aType: window.$gz.type.MeterReading,
|
aType: window.$gz.type.UnitMeterReading,
|
||||||
reload: false
|
reload: false
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -72,7 +72,7 @@ async function clickHandler(menuItem) {
|
|||||||
switch (m.key) {
|
switch (m.key) {
|
||||||
case "new":
|
case "new":
|
||||||
m.vm.$router.push({
|
m.vm.$router.push({
|
||||||
name: "unit-note-edit",
|
name: "meter-reading",
|
||||||
params: {
|
params: {
|
||||||
recordid: 0,
|
recordid: 0,
|
||||||
unitid: m.vm.unitId
|
unitid: m.vm.unitId
|
||||||
@@ -85,14 +85,14 @@ async function clickHandler(menuItem) {
|
|||||||
//last report selected is in m.id
|
//last report selected is in m.id
|
||||||
m.vm.$router.push({
|
m.vm.$router.push({
|
||||||
name: "ay-report",
|
name: "ay-report",
|
||||||
params: { recordid: m.id, ayatype: window.$gz.type.MeterReading }
|
params: { recordid: m.id, ayatype: window.$gz.type.UnitMeterReading }
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
//general report selector chosen
|
//general report selector chosen
|
||||||
|
|
||||||
let res = await m.vm.$refs.reportSelector.open(
|
let res = await m.vm.$refs.reportSelector.open(
|
||||||
m.vm.$refs.gzdatatable.getDataListSelection(
|
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...
|
//Now open the report viewer...
|
||||||
m.vm.$router.push({
|
m.vm.$router.push({
|
||||||
name: "ay-report",
|
name: "ay-report",
|
||||||
params: { recordid: res.id, ayatype: window.$gz.type.MeterReading }
|
params: { recordid: res.id, ayatype: window.$gz.type.UnitMeterReading }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -133,7 +133,7 @@ function generateMenu(vm) {
|
|||||||
helpUrl: "svc-meter-readings",
|
helpUrl: "svc-meter-readings",
|
||||||
menuItems: [],
|
menuItems: [],
|
||||||
formData: {
|
formData: {
|
||||||
ayaType: window.$gz.type.MeterReading
|
ayaType: window.$gz.type.UnitMeterReading
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user