re-factor / cleanup

ayanova/src/views/svc-workorders.vue

@@ -2,11 +2,11 @@
   <div>
     <v-row justify="center">
       <v-dialog
-        @keydown.esc="openDialog = false"
-        @keydown.enter="openWo()"
         v-model="openDialog"
         persistent
         max-width="600px"
+        @keydown.esc="openDialog = false"
+        @keydown.enter="openWo()"
       >
         <v-card>
           <v-card-title>
@@ -29,8 +29,8 @@
             <v-btn
               color="blue darken-1"
               text
-              @click="openWo()"
               :disabled="!openWoNumber"
+              @click="openWo()"
               >{{ $ay.t("OK") }}</v-btn
             >
           </v-card-actions>
@@ -39,9 +39,9 @@
     </v-row>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <gz-extensions
+      ref="extensions"
       :aya-type="aType"
       :selected-items="selectedItems"
-      ref="extensions"
     >
     </gz-extensions>
 
@@ -51,10 +51,10 @@
       data-list-key="WorkOrderDataList"
       :show-select="rights.read"
       :reload="reload"
-      @selection-change="handleSelected"
       data-cy="workordersTable"
       :client-criteria="clientCriteria"
       :pre-filter-mode="preFilterMode"
+      @selection-change="handleSelected"
       @clear-pre-filter="clearPreFilter"
     >
     </gz-data-table>
@@ -63,6 +63,21 @@
 <script>
 const FORM_KEY = "workorder-list";
 export default {
+  data() {
+    return {
+      rights: window.$gz.role.defaultRightsObject(),
+      aType: window.$gz.type.WorkOrder,
+      selectedItems: [],
+      reload: false,
+      openDialog: false,
+      openWoNumber: null,
+      clientCriteria: undefined,
+      preFilterMode: null,
+      objectId: null,
+      aForType: null,
+      name: null
+    };
+  },
   async created() {
     this.rights = window.$gz.role.getRights(window.$gz.type.WorkOrder);
     window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -94,21 +109,6 @@ export default {
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
-  data() {
-    return {
-      rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.WorkOrder,
-      selectedItems: [],
-      reload: false,
-      openDialog: false,
-      openWoNumber: null,
-      clientCriteria: undefined,
-      preFilterMode: null,
-      objectId: null,
-      aForType: null,
-      name: null
-    };
-  },
   methods: {
     handleSelected(selected) {
       this.selectedItems = selected;
@@ -160,11 +160,15 @@ async function clickHandler(menuItem) {
         });
         break;
       case "extensions":
-        const res = await m.vm.$refs.extensions.open(
-          m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.WorkOrder)
-        );
-        if (res && res.refresh == true) {
-          m.vm.reload = !m.vm.reload;
+        {
+          const res = await m.vm.$refs.extensions.open(
+            m.vm.$refs.gzdatatable.getDataListSelection(
+              window.$gz.type.WorkOrder
+            )
+          );
+          if (res && res.refresh == true) {
+            m.vm.reload = !m.vm.reload;
+          }
         }
         break;
       case "report":