This commit is contained in:
2022-01-25 20:12:54 +00:00
parent 213b84cbf3
commit 3fff9e456a
4 changed files with 149 additions and 121 deletions

View File

@@ -844,8 +844,8 @@ BUILD 8.0.0-beta.0.13 CHANGES OF NOTE
- This update requires a fresh database rebuild - This update requires a fresh database rebuild
- Replaced 5 report templates from FIVERPTSNEEDED_beta.0.12reporttemplates.zip email of 2022-01-21, 5:08 PM - Replaced 5 report templates from FIVERPTSNEEDED_beta.0.12reporttemplates.zip email of 2022-01-21, 5:08 PM
- Fixed issue with wo,quote,pm that prevented form customized Required fields from working - Fixed issue with wo,quote,pm that prevented form customized Required fields from working
- Fixed issue with wo and quote that sometimes would give a index out of range error when editing the header and saving. - Fixed issue with wo and quote that sometimes would give a index out of range error when editing the header and saving
- case 4087 fixed
- case 4092, 4094 fixed - case 4092, 4094 fixed
- case 4095 implemented - case 4095 implemented
- case 4096 updated docs - case 4096 updated docs
@@ -861,6 +861,7 @@ BUILD 8.0.0-beta.0.13 CHANGES OF NOTE
====================== Deck investigation log =================== ====================== Deck investigation log ===================
2022-01-25 08:32:41 sent email from gzmailadmin@gmail.com account to Meicorp (laurie@meicorproperty.com, cc: hillary@meicorproperty.com, jennifer@meicorproperty.com) 2022-01-25 08:32:41 sent email from gzmailadmin@gmail.com account to Meicorp (laurie@meicorproperty.com, cc: hillary@meicorproperty.com, jennifer@meicorproperty.com)

View File

@@ -66,7 +66,7 @@
<v-col <v-col
v-if=" v-if="
form().showMe(this, 'QuoteStatus') && form().showMe(this, 'QuoteQuoteStatusType') &&
!( !(
value.userIsSubContractorFull || value.userIsSubContractorFull ||
value.userIsSubContractorRestricted value.userIsSubContractorRestricted

View File

@@ -61,7 +61,7 @@
</v-col> </v-col>
<v-col <v-col
v-if=" v-if="
form().showMe(this, 'LastStatusId') && form().showMe(this, 'WorkOrderStatus') &&
!( !(
value.userIsSubContractorFull || value.userIsSubContractorFull ||
value.userIsSubContractorRestricted value.userIsSubContractorRestricted
@@ -80,6 +80,7 @@
data-cy="woState" data-cy="woState"
:all-states="pvm.selectLists.wostatus" :all-states="pvm.selectLists.wostatus"
:allowed-states="pvm.selectLists.allowedwostatus" :allowed-states="pvm.selectLists.allowedwostatus"
:error-messages="form().serverErrors(this, 'LastStatusId')"
/> />
</v-col> </v-col>

View File

@@ -1,4 +1,5 @@
<template> <template>
<div>
<div> <div>
<div class="mb-n2 ml-10"> <div class="mb-n2 ml-10">
<span class="text-caption">{{ $ay.t("WorkOrderStatus") }}</span> <span class="text-caption">{{ $ay.t("WorkOrderStatus") }}</span>
@@ -36,11 +37,17 @@
<span>{{ item.timeStamp }}</span> <span>{{ item.timeStamp }}</span>
<span class="ml-3">{{ item.user }}</span> <span class="ml-3">{{ item.user }}</span>
<span class="font-weight-bold ml-3">{{ item.name }}</span> <span class="font-weight-bold ml-3">{{ item.name }}</span>
<v-icon small :color="item.color" class="ml-4">$ayiFlag</v-icon> <v-icon small :color="item.color" class="ml-4"
>$ayiFlag</v-icon
>
<v-icon v-if="item.locked" small color="primary" class="ml-4" <v-icon v-if="item.locked" small color="primary" class="ml-4"
>$ayiLock</v-icon >$ayiLock</v-icon
> >
<v-icon v-if="item.completed" small color="primary" class="ml-4" <v-icon
v-if="item.completed"
small
color="primary"
class="ml-4"
>$ayiCheckCircle</v-icon >$ayiCheckCircle</v-icon
> >
</div> </div>
@@ -55,7 +62,11 @@
<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" <v-icon
v-if="item.locked"
small
color="primary"
class="ml-4"
>$ayiLock</v-icon >$ayiLock</v-icon
> >
<v-icon <v-icon
@@ -133,6 +144,12 @@
</v-card> </v-card>
</v-dialog> </v-dialog>
</v-row> </v-row>
<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>
</div> </div>
</template> </template>
<script> <script>
@@ -157,7 +174,8 @@ export default {
dataCy: { type: String, default: null }, dataCy: { type: String, default: null },
formKey: { type: String, default: "" }, //used to grab template from store formKey: { type: String, default: "" }, //used to grab template from store
readonly: Boolean, readonly: Boolean,
disabled: Boolean disabled: Boolean,
errorMessages: { type: Array, default: null }
}, },
data() { data() {
return { return {
@@ -199,6 +217,14 @@ export default {
return true; return true;
} }
return false; return false;
},
allErrors: function() {
let ret = "";
if (this.errorMessages != null && this.errorMessages.length > 0) {
ret += this.errorMessages.toString();
}
return ret;
} }
}, },