re-factor / cleanup

ayanova/src/components/work-order-header.vue

@@ -2,17 +2,17 @@
   <div>
     <v-row>
       <v-col
+        v-if="value.serial != 0 && canEditSerial"
         cols="12"
         sm="6"
         lg="4"
         xl="3"
-        v-if="value.serial != 0 && canEditSerial"
       >
         <v-text-field
+          ref="serial"
           v-model="value.serial"
           :readonly="formState.readOnly"
           :label="$ay.t('WorkOrderSerialNumber')"
-          ref="serial"
           data-cy="serial"
           :rules="[
             form().integerValid(this, 'serial'),
@@ -24,13 +24,13 @@
       </v-col>
       <v-col cols="12" sm="6" lg="4" xl="3">
         <gz-pick-list
+          ref="customerId"
+          v-model="value.customerId"
           :aya-type="$ay.ayt().Customer"
           :show-edit-icon="!value.userIsRestrictedType"
-          v-model="value.customerId"
           :readonly="formState.readOnly || value.userIsRestrictedType"
           :label="$ay.t('Customer')"
           :can-clear="false"
-          ref="customerId"
           data-cy="customerId"
           :rules="[form().required(this, 'customerId')]"
           :error-messages="form().serverErrors(this, 'customerId')"
@@ -135,14 +135,14 @@
         cols="12"
       >
         <v-textarea
+          ref="notes"
           v-model="value.notes"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('WorkOrderSummary')"
           :error-messages="form().serverErrors(this, 'notes')"
-          ref="notes"
           data-cy="notes"
-          @input="fieldValueChanged('notes')"
           auto-grow
+          @input="fieldValueChanged('notes')"
         ></v-textarea>
       </v-col>
 
@@ -160,10 +160,10 @@
         xl="3"
       >
         <gz-date-time-picker
-          :label="$ay.t('WorkOrderCloseByDate')"
-          v-model="value.completeByDate"
-          :readonly="formState.readOnly || value.userIsTechRestricted"
           ref="completeByDate"
+          v-model="value.completeByDate"
+          :label="$ay.t('WorkOrderCloseByDate')"
+          :readonly="formState.readOnly || value.userIsTechRestricted"
           data-cy="completeByDate"
           :error-messages="form().serverErrors(this, 'completeByDate')"
           @input="fieldValueChanged('completeByDate')"
@@ -184,12 +184,12 @@
         xl="3"
       >
         <gz-pick-list
+          ref="contractId"
+          v-model="value.contractId"
           :aya-type="$ay.ayt().Contract"
           :show-edit-icon="!value.userIsRestrictedType"
-          v-model="value.contractId"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('Contract')"
-          ref="contractId"
           data-cy="contractId"
           :error-messages="form().serverErrors(this, 'contractId')"
           @input="fieldValueChanged('contractId')"
@@ -210,12 +210,12 @@
         xl="3"
       >
         <gz-pick-list
+          ref="projectId"
+          v-model="value.projectId"
           :aya-type="$ay.ayt().Project"
           :show-edit-icon="!value.userIsRestrictedType"
-          v-model="value.projectId"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('Project')"
-          ref="projectId"
           data-cy="projectId"
           :error-messages="form().serverErrors(this, 'projectId')"
           @input="fieldValueChanged('projectId')"
@@ -236,10 +236,10 @@
         xl="3"
       >
         <v-text-field
+          ref="invoiceNumber"
           v-model="value.invoiceNumber"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('WorkOrderInvoiceNumber')"
-          ref="invoiceNumber"
           data-cy="invoiceNumber"
           :error-messages="form().serverErrors(this, 'invoiceNumber')"
           @input="fieldValueChanged('invoiceNumber')"
@@ -260,10 +260,10 @@
         xl="3"
       >
         <gz-date-time-picker
-          :label="$ay.t('WorkOrderServiceDate')"
-          v-model="value.serviceDate"
-          :readonly="formState.readOnly || value.userIsTechRestricted"
           ref="serviceDate"
+          v-model="value.serviceDate"
+          :label="$ay.t('WorkOrderServiceDate')"
+          :readonly="formState.readOnly || value.userIsTechRestricted"
           data-cy="serviceDate"
           :error-messages="form().serverErrors(this, 'serviceDate')"
           @input="fieldValueChanged('serviceDate')"
@@ -278,6 +278,7 @@
         xl="3"
       >
         <v-text-field
+          ref="customerContactName"
           v-model="value.customerContactName"
           :readonly="
             formState.readOnly ||
@@ -286,7 +287,6 @@
               value.userIsSubContractorRestricted
           "
           :label="$ay.t('WorkOrderCustomerContactName')"
-          ref="customerContactName"
           data-cy="customerContactName"
           :error-messages="form().serverErrors(this, 'customerContactName')"
           @input="fieldValueChanged('customerContactName')"
@@ -307,10 +307,10 @@
         xl="3"
       >
         <v-text-field
+          ref="customerReferenceNumber"
           v-model="value.customerReferenceNumber"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('WorkOrderCustomerReferenceNumber')"
-          ref="customerReferenceNumber"
           data-cy="customerReferenceNumber"
           :error-messages="form().serverErrors(this, 'customerReferenceNumber')"
           @input="fieldValueChanged('customerReferenceNumber')"
@@ -331,10 +331,10 @@
         xl="3"
       >
         <v-text-field
+          ref="internalReferenceNumber"
           v-model="value.internalReferenceNumber"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('WorkOrderInternalReferenceNumber')"
-          ref="internalReferenceNumber"
           data-cy="internalReferenceNumber"
           :error-messages="form().serverErrors(this, 'internalReferenceNumber')"
           @input="fieldValueChanged('internalReferenceNumber')"
@@ -355,10 +355,10 @@
         xl="3"
       >
         <v-checkbox
+          ref="onsite"
           v-model="value.onsite"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :label="$ay.t('WorkOrderOnsite')"
-          ref="onsite"
           data-cy="onsite"
           :error-messages="form().serverErrors(this, 'onsite')"
           @change="fieldValueChanged('onsite')"
@@ -376,9 +376,9 @@
         cols="12"
       >
         <gz-tag-picker
+          ref="tags"
           v-model="value.tags"
           :readonly="formState.readOnly || value.userIsTechRestricted"
-          ref="tags"
           data-cy="tags"
           :error-messages="form().serverErrors(this, 'tags')"
           @input="fieldValueChanged('tags')"
@@ -394,12 +394,12 @@
         cols="12"
       >
         <gz-custom-fields
+          ref="customFields"
           v-model="value.customFields"
           :form-key="formCustomTemplateKey"
           :readonly="formState.readOnly || value.userIsTechRestricted"
           :parent-v-m="this"
           key-start-with="WorkOrderCustom"
-          ref="customFields"
           data-cy="customFields"
           :error-messages="form().serverErrors(this, 'customFields')"
           @input="fieldValueChanged('customFields')"
@@ -417,13 +417,13 @@
         cols="12"
       >
         <gz-wiki
-          :aya-type="pvm.ayaType"
-          :aya-id="value.id"
           ref="wiki"
           v-model="value.wiki"
+          :aya-type="pvm.ayaType"
+          :aya-id="value.id"
           :readonly="formState.readOnly || value.userIsTechRestricted"
-          @input="fieldValueChanged('wiki')"
           data-cy="wiki"
+          @input="fieldValueChanged('wiki')"
         ></gz-wiki
       ></v-col>
 
@@ -458,13 +458,6 @@ export default {
     GzWoAddress,
     GzWoSignature
   },
-  data() {
-    return {
-      canEditSerial: window.$gz.role.hasRole([
-        window.$gz.role.AUTHORIZATION_ROLES.BizAdminFull
-      ])
-    };
-  },
 
   props: {
     value: {
@@ -476,6 +469,21 @@ export default {
       type: Object
     }
   },
+  data() {
+    return {
+      canEditSerial: window.$gz.role.hasRole([
+        window.$gz.role.AUTHORIZATION_ROLES.BizAdminFull
+      ])
+    };
+  },
+  computed: {
+    formState: function() {
+      return this.pvm.formState;
+    },
+    formCustomTemplateKey: function() {
+      return this.pvm.formCustomTemplateKey;
+    }
+  },
   methods: {
     form() {
       return window.$gz.form;
@@ -486,14 +494,6 @@ export default {
         window.$gz.form.fieldValueChanged(this.pvm, ref);
       }
     }
-  },
-  computed: {
-    formState: function() {
-      return this.pvm.formState;
-    },
-    formCustomTemplateKey: function() {
-      return this.pvm.formCustomTemplateKey;
-    }
   }
 };
 </script>