admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2022-01-24 01:23:39 +00:00
parent c649107047
commit 5501f98d68
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ayanova/src/components/work-order-item-labors.vue
View File

@@ -205,7 +205,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'ServiceRateID')" v-if="form().showMe(this, 'LaborServiceRateID')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -229,7 +229,7 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].labors[${activeItemIndex}].serviceRateId` `Items[${activeWoItemIndex}].labors[${activeItemIndex}].laborserviceRateId`
) )
" "
@input=" @input="
@@ -242,7 +242,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'UserID')" v-if="form().showMe(this, 'LaborUserID')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -267,7 +267,7 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].labors[${activeItemIndex}].userId` `Items[${activeWoItemIndex}].labors[${activeItemIndex}].laboruserId`
) )
" "
@input=" @input="
@@ -362,7 +362,8 @@
<v-col <v-col
v-if=" v-if="
form().showMe(this, 'PriceOverride') && !value.userIsRestrictedType form().showMe(this, 'LaborPriceOverride') &&
!value.userIsRestrictedType
" "
cols="12" cols="12"
sm="6" sm="6"
@@ -385,7 +386,7 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].labors[${activeItemIndex}].priceOverride` `Items[${activeWoItemIndex}].labors[${activeItemIndex}].laborpriceOverride`
) )
" "
:rules="[ :rules="[
@@ -504,7 +505,7 @@ export default {
}); });
} }
if (this.form().showMe(this, "ServiceRateID")) { if (this.form().showMe(this, "LaborServiceRateID")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemLaborServiceRateID"), text: this.$ay.t("WorkOrderItemLaborServiceRateID"),
align: "left", align: "left",
@@ -520,7 +521,7 @@ export default {
}); });
} }
if (this.form().showMe(this, "UserID")) { if (this.form().showMe(this, "LaborUserID")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemLaborUserID"), text: this.$ay.t("WorkOrderItemLaborUserID"),
align: "left", align: "left",
@@ -568,7 +569,7 @@ export default {
} }
if ( if (
this.form().showMe(this, "PriceOverride") && this.form().showMe(this, "LaborPriceOverride") &&
!this.value.userIsRestrictedType !this.value.userIsRestrictedType
) { ) {
headers.push({ headers.push({

5
ayanova/src/components/work-order-item-parts.vue
View File

@@ -345,7 +345,8 @@
<v-col <v-col
v-if=" v-if="
form().showMe(this, 'PriceOverride') && !value.userIsRestrictedType form().showMe(this, 'PartPriceOverride') &&
!value.userIsRestrictedType
" "
cols="12" cols="12"
sm="6" sm="6"
@@ -655,7 +656,7 @@ export default {
} }
if ( if (
this.form().showMe(this, "PriceOverride") && this.form().showMe(this, "PartPriceOverride") &&
!this.value.userIsRestrictedType !this.value.userIsRestrictedType
) { ) {
headers.push({ headers.push({

12
ayanova/src/components/work-order-item-scheduled-users.vue
View File

@@ -214,7 +214,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'UserID')" v-if="form().showMe(this, 'ScheduledUserID')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -240,7 +240,7 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].userId` `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].scheduleduserId`
) )
" "
@input=" @input="
@@ -253,7 +253,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'ServiceRateID')" v-if="form().showMe(this, 'ScheduledUserServiceRateID')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -279,7 +279,7 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].serviceRateId` `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].scheduleduserserviceRateId`
) )
" "
@input=" @input="
@@ -366,7 +366,7 @@ export default {
value: "estimatedQuantity" value: "estimatedQuantity"
}); });
if (this.form().showMe(this, "UserID")) { if (this.form().showMe(this, "ScheduledUserID")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemScheduledUserUserID"), text: this.$ay.t("WorkOrderItemScheduledUserUserID"),
align: "left", align: "left",
@@ -374,7 +374,7 @@ export default {
}); });
} }
if (this.form().showMe(this, "ServiceRateID")) { if (this.form().showMe(this, "ScheduledUserServiceRateID")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemScheduledUserServiceRateID"), text: this.$ay.t("WorkOrderItemScheduledUserServiceRateID"),
align: "left", align: "left",