re-factor / cleanup
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
<template>
|
||||
<div>
|
||||
<gz-report-selector ref="reportSelector"></gz-report-selector>
|
||||
<v-form ref="form" v-if="formState.ready">
|
||||
<v-form v-if="formState.ready" ref="form">
|
||||
<v-row>
|
||||
<gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
|
||||
<v-col cols="12">
|
||||
<gz-pick-list
|
||||
readonly
|
||||
v-model="obj.unitId"
|
||||
readonly
|
||||
:aya-type="ayaTypes().Unit"
|
||||
show-edit-icon
|
||||
:label="$ay.t('Unit')"
|
||||
@@ -15,39 +15,39 @@
|
||||
</v-col>
|
||||
<v-col cols="12" sm="6" lg="4" xl="3">
|
||||
<v-text-field
|
||||
ref="meter"
|
||||
v-model="obj.meter"
|
||||
:readonly="formState.readOnly"
|
||||
:clearable="!formState.readOnly"
|
||||
@click:clear="fieldValueChanged('meter')"
|
||||
:label="$ay.t('UnitMeterReadingMeter')"
|
||||
ref="meter"
|
||||
data-cy="meter"
|
||||
:rules="[form().integerValid(this, 'meter')]"
|
||||
:error-messages="form().serverErrors(this, 'meter')"
|
||||
@input="fieldValueChanged('meter')"
|
||||
type="number"
|
||||
@click:clear="fieldValueChanged('meter')"
|
||||
@input="fieldValueChanged('meter')"
|
||||
></v-text-field>
|
||||
</v-col>
|
||||
|
||||
<v-col cols="12" sm="6" lg="4" xl="3">
|
||||
<v-textarea
|
||||
ref="notes"
|
||||
v-model="obj.notes"
|
||||
:readonly="formState.readOnly"
|
||||
:label="$ay.t('UnitMeterReadingDescription')"
|
||||
:error-messages="form().serverErrors(this, 'notes')"
|
||||
ref="notes"
|
||||
data-cy="notes"
|
||||
@input="fieldValueChanged('notes')"
|
||||
auto-grow
|
||||
:clearable="!formState.readOnly"
|
||||
@input="fieldValueChanged('notes')"
|
||||
></v-textarea>
|
||||
</v-col>
|
||||
<v-col cols="12" sm="6" lg="4" xl="3">
|
||||
<gz-date-time-picker
|
||||
:label="$ay.t('UnitMeterReadingMeterDate')"
|
||||
v-model="obj.meterDate"
|
||||
:readonly="formState.readOnly"
|
||||
ref="meterDate"
|
||||
v-model="obj.meterDate"
|
||||
:label="$ay.t('UnitMeterReadingMeterDate')"
|
||||
:readonly="formState.readOnly"
|
||||
data-cy="meterDate"
|
||||
:error-messages="form().serverErrors(this, 'meterDate')"
|
||||
@input="fieldValueChanged('meterDate')"
|
||||
@@ -64,6 +64,51 @@
|
||||
const FORM_KEY = "meter-reading";
|
||||
const API_BASE_URL = "unit/meter-reading/";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
obj: {
|
||||
id: 0,
|
||||
concurrency: 0,
|
||||
notes: null,
|
||||
meter: 0,
|
||||
meterDate: window.$gz.locale.nowUTC8601String(),
|
||||
unitId: undefined,
|
||||
workOrderItemUnitId: undefined
|
||||
},
|
||||
formState: {
|
||||
ready: false,
|
||||
dirty: false,
|
||||
valid: true,
|
||||
readOnly: false,
|
||||
loading: true,
|
||||
errorBoxMessage: null,
|
||||
appError: null,
|
||||
serverError: {}
|
||||
},
|
||||
rights: window.$gz.role.defaultRightsObject(),
|
||||
ayaType: window.$gz.type.UnitMeterReading
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
formState: {
|
||||
handler: function(val) {
|
||||
if (this.formState.loading) {
|
||||
return;
|
||||
}
|
||||
if (val.dirty && val.valid && !val.readOnly) {
|
||||
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
|
||||
} else {
|
||||
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
|
||||
}
|
||||
if (!val.dirty && val.valid && !val.readOnly) {
|
||||
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
|
||||
} else {
|
||||
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
|
||||
}
|
||||
},
|
||||
deep: true
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
const vm = this;
|
||||
try {
|
||||
@@ -120,51 +165,6 @@ export default {
|
||||
beforeDestroy() {
|
||||
window.$gz.eventBus.$off("menu-click", clickHandler);
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
obj: {
|
||||
id: 0,
|
||||
concurrency: 0,
|
||||
notes: null,
|
||||
meter: 0,
|
||||
meterDate: window.$gz.locale.nowUTC8601String(),
|
||||
unitId: undefined,
|
||||
workOrderItemUnitId: undefined
|
||||
},
|
||||
formState: {
|
||||
ready: false,
|
||||
dirty: false,
|
||||
valid: true,
|
||||
readOnly: false,
|
||||
loading: true,
|
||||
errorBoxMessage: null,
|
||||
appError: null,
|
||||
serverError: {}
|
||||
},
|
||||
rights: window.$gz.role.defaultRightsObject(),
|
||||
ayaType: window.$gz.type.UnitMeterReading
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
formState: {
|
||||
handler: function(val) {
|
||||
if (this.formState.loading) {
|
||||
return;
|
||||
}
|
||||
if (val.dirty && val.valid && !val.readOnly) {
|
||||
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
|
||||
} else {
|
||||
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
|
||||
}
|
||||
if (!val.dirty && val.valid && !val.readOnly) {
|
||||
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
|
||||
} else {
|
||||
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
|
||||
}
|
||||
},
|
||||
deep: true
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
canSave: function() {
|
||||
return this.formState.valid && this.formState.dirty;
|
||||
@@ -294,17 +294,19 @@ async function clickHandler(menuItem) {
|
||||
});
|
||||
break;
|
||||
case "report":
|
||||
const res = await m.vm.$refs.reportSelector.open(
|
||||
{
|
||||
AType: window.$gz.type.UnitMeterReading,
|
||||
selectedRowIds: [m.vm.obj.id]
|
||||
},
|
||||
m.id
|
||||
);
|
||||
if (res == null) {
|
||||
return;
|
||||
{
|
||||
const res = await m.vm.$refs.reportSelector.open(
|
||||
{
|
||||
AType: window.$gz.type.UnitMeterReading,
|
||||
selectedRowIds: [m.vm.obj.id]
|
||||
},
|
||||
m.id
|
||||
);
|
||||
if (res == null) {
|
||||
return;
|
||||
}
|
||||
window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
|
||||
}
|
||||
window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
|
||||
break;
|
||||
default:
|
||||
window.$gz.eventBus.$emit(
|
||||
@@ -379,7 +381,7 @@ let JUST_DELETED = false;
|
||||
/////////////////////////////////
|
||||
//
|
||||
//
|
||||
async function initForm(vm) {
|
||||
async function initForm() {
|
||||
await fetchTranslatedText();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user