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

@@ -358,6 +358,11 @@
         </v-card-actions>
       </v-card>
     </v-dialog>
+    <div class="v-messages theme--light error--text mt-6" role="alert">
+      <div class="v-messages__wrapper">
+        <div class="v-messages__message">{{ allErrors }}</div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -374,7 +379,8 @@ export default {
     dataCy: { type: String, default: null },
     formKey: { type: String, default: "" }, //used to grab template from store
     readonly: Boolean,
-    disabled: Boolean
+    disabled: Boolean,
+    errorMessages: { type: Array, default: null }
   },
   data() {
     return {
@@ -393,6 +399,14 @@ export default {
     },
     displayServiceAddress() {
       return formatAddress(this.value).physical;
+    },
+    allErrors: function() {
+      let ret = "";
+
+      if (this.errorMessages != null && this.errorMessages.length > 0) {
+        ret += this.errorMessages.toString();
+      }
+      return ret;
     }
   },
 

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

@@ -99,6 +99,7 @@
           :readonly="formState.readOnly || value.userIsRestrictedType"
           :pvm="pvm"
           data-cy="woAddress"
+          :error-messages="form().serverErrors(this, 'Address')"
         />
       </v-col>
 

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

@@ -1,5 +1,4 @@
 <template>
-  <div>
   <div>
     <div class="mb-n2 ml-10">
       <span class="text-caption">{{ $ay.t("WorkOrderStatus") }}</span>
@@ -37,17 +36,11 @@
                 <span>{{ item.timeStamp }}</span>
                 <span class="ml-3">{{ item.user }}</span>
                 <span class="font-weight-bold ml-3">{{ item.name }}</span>
-                  <v-icon small :color="item.color" class="ml-4"
+                <v-icon small :color="item.color" class="ml-4">$ayiFlag</v-icon>
-                    >$ayiFlag</v-icon
-                  >
                 <v-icon v-if="item.locked" small color="primary" class="ml-4"
                   >$ayiLock</v-icon
                 >
-                  <v-icon
+                <v-icon v-if="item.completed" small color="primary" class="ml-4"
-                    v-if="item.completed"
-                    small
-                    color="primary"
-                    class="ml-4"
                   >$ayiCheckCircle</v-icon
                 >
               </div>
@@ -62,11 +55,7 @@
                   <v-icon small :color="item.color" class="ml-4"
                     >$ayiFlag</v-icon
                   >
-                    <v-icon
+                  <v-icon v-if="item.locked" small color="primary" class="ml-4"
-                      v-if="item.locked"
-                      small
-                      color="primary"
-                      class="ml-4"
                     >$ayiLock</v-icon
                   >
                   <v-icon
@@ -150,7 +139,6 @@
       </div>
     </div>
   </div>
-  </div>
 </template>
 <script>
 export default {