From 295ce2c683abdd7acc6d95a0fc27dcfb51332936 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sat, 2 Jan 2021 01:50:54 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt       | 10 ++++++--
 ayanova/src/views/svc-unit.vue | 42 +++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index dce8030f..a6c0414d 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -63,8 +63,14 @@ todo: actual customer reports so can figure out datalist for bringing other name
 
 
 CURRENTLY DOING: 	
-		Unit - front end
-		
+		Unit - front end	
+			Move unit has own address to address tab obvs.
+			put warranty override in tab of it's own		
+				override warranty checkbox should gray out override terms
+			Look at layout and re-arrange as necessary
+			Report isn't tested yet
+			Migration code
+			
 		
 
 		
diff --git a/ayanova/src/views/svc-unit.vue b/ayanova/src/views/svc-unit.vue
index a19457ed..71525888 100644
--- a/ayanova/src/views/svc-unit.vue
+++ b/ayanova/src/views/svc-unit.vue
@@ -74,6 +74,26 @@
                   ></v-text-field>
                 </v-col>
 
+                <v-col
+                  v-if="form().showMe(this, 'UnitModel')"
+                  cols="12"
+                  sm="6"
+                  lg="4"
+                  xl="3"
+                >
+                  <gz-pick-list
+                    :ayaType="ayaTypes().UnitModel"
+                    :showEditIcon="true"
+                    v-model="obj.unitModelId"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('UnitModel')"
+                    ref="unitModelId"
+                    data-cy="unitModelId"
+                    :error-messages="form().serverErrors(this, 'unitModelId')"
+                    @input="fieldValueChanged('unitModelId')"
+                  ></gz-pick-list>
+                </v-col>
+
                 <v-col
                   v-if="form().showMe(this, 'UnitReplacedByUnitID')"
                   cols="12"
@@ -96,26 +116,6 @@
                   ></gz-pick-list>
                 </v-col>
 
-                <v-col
-                  v-if="form().showMe(this, 'UnitModel')"
-                  cols="12"
-                  sm="6"
-                  lg="4"
-                  xl="3"
-                >
-                  <gz-pick-list
-                    :ayaType="ayaTypes().UnitModel"
-                    :showEditIcon="true"
-                    v-model="obj.unitModelId"
-                    :readonly="formState.readOnly"
-                    :label="$ay.t('UnitModel')"
-                    ref="unitModelId"
-                    data-cy="unitModelId"
-                    :error-messages="form().serverErrors(this, 'unitModelId')"
-                    @input="fieldValueChanged('unitModelId')"
-                  ></gz-pick-list>
-                </v-col>
-
                 <v-col
                   v-if="form().showMe(this, 'UnitParentUnitID')"
                   cols="12"
@@ -1263,7 +1263,7 @@ function generateMenu(vm) {
       ayaType: window.$gz.type.Unit,
       recordId: vm.$route.params.recordid,
       formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
-      recordName: vm.obj.name
+      recordName: vm.obj.serial
     },
     menuItems: []
   };