This commit is contained in:
2022-01-24 15:41:17 +00:00
parent fd95c60a3b
commit 8b5d2eb8a4

View File

@@ -80,7 +80,7 @@
> >
<v-col <v-col
v-if="form().showMe(this, 'WorkOrderItemTravelStartDate')" v-if="form().showMe(this, 'TravelStartDate')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -113,7 +113,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'WorkOrderItemTravelStopDate')" v-if="form().showMe(this, 'TravelStopDate')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -152,13 +152,7 @@
></gz-date-time-picker> ></gz-date-time-picker>
</v-col> </v-col>
<v-col <v-col cols="12" sm="6" lg="4" xl="3">
v-if="form().showMe(this, 'WorkOrderItemTravelRateQuantity')"
cols="12"
sm="6"
lg="4"
xl="3"
>
<gz-decimal <gz-decimal
:ref=" :ref="
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelRateQuantity` `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelRateQuantity`
@@ -195,13 +189,7 @@
></gz-decimal> ></gz-decimal>
</v-col> </v-col>
<v-col <v-col cols="12" sm="6" lg="4" xl="3">
v-if="form().showMe(this, 'WorkOrderItemTravelDistance')"
cols="12"
sm="6"
lg="4"
xl="3"
>
<gz-decimal <gz-decimal
:ref=" :ref="
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].distance` `Items[${activeWoItemIndex}].travels[${activeItemIndex}].distance`
@@ -238,7 +226,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'WorkOrderItemTravelServiceRateID')" v-if="form().showMe(this, 'TravelRateId')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -275,7 +263,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'WorkOrderItemTravelUserID')" v-if="form().showMe(this, 'TravelUserId')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -300,7 +288,7 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].userId` `Items[${activeWoItemIndex}].travels[${activeItemIndex}].traveluserId`
) )
" "
@input=" @input="
@@ -313,7 +301,7 @@
</v-col> </v-col>
<v-col <v-col
v-if="form().showMe(this, 'WorkOrderItemTravelNoChargeQuantity')" v-if="form().showMe(this, 'TravelNoChargeQuantity')"
cols="12" cols="12"
sm="6" sm="6"
lg="4" lg="4"
@@ -334,7 +322,7 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].noChargeQuantity` `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelnoChargeQuantity`
) )
" "
:rules="[ :rules="[
@@ -357,7 +345,7 @@
<v-col <v-col
v-if=" v-if="
form().showMe(this, 'WorkOrderItemTravelTaxRateSaleID') && form().showMe(this, 'TravelTaxCodeSaleId') &&
!value.userIsRestrictedType !value.userIsRestrictedType
" "
cols="12" cols="12"
@@ -382,7 +370,7 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].taxCodeSaleId` `Items[${activeWoItemIndex}].travels[${activeItemIndex}].traveltaxCodeSaleId`
) )
" "
@input=" @input="
@@ -420,7 +408,7 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].priceOverride` `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelpriceOverride`
) )
" "
:rules="[ :rules="[
@@ -437,10 +425,7 @@
></gz-currency> ></gz-currency>
</v-col> </v-col>
<v-col <v-col v-if="form().showMe(this, 'TravelDetails')" cols="12">
v-if="form().showMe(this, 'WorkOrderItemTravelDetails')"
cols="12"
>
<v-textarea <v-textarea
:ref=" :ref="
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelDetails` `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelDetails`
@@ -519,7 +504,7 @@ export default {
headerList: function() { headerList: function() {
const headers = []; const headers = [];
if (this.form().showMe(this, "WorkOrderItemTravelStartDate")) { if (this.form().showMe(this, "TravelStartDate")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTravelStartDate"), text: this.$ay.t("WorkOrderItemTravelStartDate"),
align: "right", align: "right",
@@ -527,7 +512,7 @@ export default {
}); });
} }
if (this.form().showMe(this, "WorkOrderItemTravelStopDate")) { if (this.form().showMe(this, "TravelStopDate")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTravelStopDate"), text: this.$ay.t("WorkOrderItemTravelStopDate"),
align: "right", align: "right",
@@ -535,7 +520,7 @@ export default {
}); });
} }
if (this.form().showMe(this, "WorkOrderItemTravelRateQuantity")) { if (this.form().showMe(this, "TravelRateQuantity")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTravelRateQuantity"), text: this.$ay.t("WorkOrderItemTravelRateQuantity"),
align: "right", align: "right",
@@ -543,15 +528,13 @@ export default {
}); });
} }
if (this.form().showMe(this, "WorkOrderItemTravelDistance")) { headers.push({
headers.push({ text: this.$ay.t("WorkOrderItemTravelDistance"),
text: this.$ay.t("WorkOrderItemTravelDistance"), align: "right",
align: "right", value: "distance"
value: "distance" });
});
}
if (this.form().showMe(this, "WorkOrderItemTravelServiceRateID")) { if (this.form().showMe(this, "TravelRateId")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTravelServiceRateID"), text: this.$ay.t("WorkOrderItemTravelServiceRateID"),
align: "left", align: "left",
@@ -559,7 +542,7 @@ export default {
}); });
} }
if (this.form().showMe(this, "WorkOrderItemTravelDetails")) { if (this.form().showMe(this, "TravelDetails")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTravelDetails"), text: this.$ay.t("WorkOrderItemTravelDetails"),
align: "left", align: "left",
@@ -567,7 +550,7 @@ export default {
}); });
} }
if (this.form().showMe(this, "WorkOrderItemTravelUserID")) { if (this.form().showMe(this, "TravelUserId")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTravelUserID"), text: this.$ay.t("WorkOrderItemTravelUserID"),
align: "left", align: "left",
@@ -575,7 +558,7 @@ export default {
}); });
} }
if (this.form().showMe(this, "WorkOrderItemTravelNoChargeQuantity")) { if (this.form().showMe(this, "TravelNoChargeQuantity")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemTravelNoChargeQuantity"), text: this.$ay.t("WorkOrderItemTravelNoChargeQuantity"),
align: "right", align: "right",
@@ -637,7 +620,7 @@ export default {
} }
if ( if (
this.form().showMe(this, "WorkOrderItemTravelTaxRateSaleID") && this.form().showMe(this, "TravelTaxCodeSaleId") &&
!this.value.userIsRestrictedType !this.value.userIsRestrictedType
) { ) {
headers.push({ headers.push({