This commit is contained in:
2021-06-11 21:27:00 +00:00
parent b801eb3650
commit 8de0df4898
8 changed files with 126 additions and 190 deletions

View File

@@ -180,9 +180,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].labors[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].labors[${activeItemIndex}].serviceRateQuantity`
].serviceRateQuantity`) )
" "
></gz-decimal> ></gz-decimal>
</v-col> </v-col>
@@ -372,9 +372,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].labors[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].labors[${activeItemIndex}].priceOverride`
].priceOverride`) )
" "
></gz-currency> ></gz-currency>
</v-col> </v-col>
@@ -394,21 +394,17 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].labors[ `Items[${activeWoItemIndex}].labors[${activeItemIndex}].serviceDetails`
${activeItemIndex}
].serviceDetails`
) )
" "
:ref=" :ref="
`Items[${activeWoItemIndex}].labors[ `Items[${activeWoItemIndex}].labors[${activeItemIndex}].serviceDetails`
${activeItemIndex}
].serviceDetails`
" "
data-cy="laborserviceDetails" data-cy="laborserviceDetails"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].labors[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].labors[${activeItemIndex}].serviceDetails`
].serviceDetails`) )
" "
auto-grow auto-grow
></v-textarea> ></v-textarea>

View File

@@ -121,32 +121,24 @@
:readonly="formState.readOnly || isDeleted" :readonly="formState.readOnly || isDeleted"
:disabled="isDeleted" :disabled="isDeleted"
:label="$ay.t('WorkOrderItemLoanRate')" :label="$ay.t('WorkOrderItemLoanRate')"
:ref=" :ref="`Items[${activeWoItemIndex}].loans[${activeItemIndex}].rate`"
`Items[${activeWoItemIndex}].loans[
${activeItemIndex}
].rate`
"
data-cy="loanUnitRateUnit" data-cy="loanUnitRateUnit"
:rules="[ :rules="[
form().integerValid( form().integerValid(
this, this,
`Items[${activeWoItemIndex}].loans[ `Items[${activeWoItemIndex}].loans[${activeItemIndex}].rate`
${activeItemIndex}
].rate`
) )
]" ]"
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].loans[ `Items[${activeWoItemIndex}].loans[${activeItemIndex}].rate`
${activeItemIndex}
].rate`
) )
" "
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].loans[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].loans[${activeItemIndex}].rate`
].rate`) )
" "
@change="loanUnitRateUnitChange" @change="loanUnitRateUnitChange"
></v-select> ></v-select>
@@ -187,9 +179,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].loans[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].quantity`
].quantity`) )
" "
></gz-decimal> ></gz-decimal>
</v-col> </v-col>
@@ -358,9 +350,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].loans[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].priceOverride`
].priceOverride`) )
" "
></gz-currency> ></gz-currency>
</v-col> </v-col>
@@ -376,21 +368,17 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].loans[ `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].notes`
${activeItemIndex}
].notes`
) )
" "
:ref=" :ref="
`Items[${activeWoItemIndex}].loans[ `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].notes`
${activeItemIndex}
].notes`
" "
data-cy="loanUnitNotes" data-cy="loanUnitNotes"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].loans[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].notes`
].notes`) )
" "
auto-grow auto-grow
></v-textarea> ></v-textarea>

View File

@@ -161,22 +161,18 @@
:disabled="isDeleted" :disabled="isDeleted"
:label="$ay.t('WorkOrderItemOutsideServiceRMANumber')" :label="$ay.t('WorkOrderItemOutsideServiceRMANumber')"
:ref=" :ref="
`Items[${activeWoItemIndex}].outsideServices[ `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].rmaNumber`
${activeItemIndex}
].rmaNumber`
" "
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].outsideServices[ `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].rmaNumber`
${activeItemIndex}
].rmaNumber`
) )
" "
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].rmaNumber`
].rmaNumber`) )
" "
></v-text-field> ></v-text-field>
</v-col> </v-col>
@@ -213,9 +209,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].repairCost`
].repairCost`) )
" "
></gz-currency> ></gz-currency>
</v-col> </v-col>
@@ -253,9 +249,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].repairPrice`
].repairPrice`) )
" "
></gz-currency> ></gz-currency>
</v-col> </v-col>
@@ -316,22 +312,18 @@
:disabled="isDeleted" :disabled="isDeleted"
:label="$ay.t('WorkOrderItemOutsideServiceTrackingNumber')" :label="$ay.t('WorkOrderItemOutsideServiceTrackingNumber')"
:ref=" :ref="
`Items[${activeWoItemIndex}].outsideServices[ `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].trackingNumber`
${activeItemIndex}
].trackingNumber`
" "
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].outsideServices[ `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].trackingNumber`
${activeItemIndex}
].trackingNumber`
) )
" "
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].trackingNumber`
].trackingNumber`) )
" "
></v-text-field> ></v-text-field>
</v-col> </v-col>
@@ -368,9 +360,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].shippingCost`
].shippingCost`) )
" "
></gz-currency> ></gz-currency>
</v-col> </v-col>
@@ -408,9 +400,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].shippingPrice`
].shippingPrice`) )
" "
></gz-currency> ></gz-currency>
</v-col> </v-col>
@@ -565,21 +557,17 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].outsideServices[ `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].notes`
${activeItemIndex}
].notes`
) )
" "
:ref=" :ref="
`Items[${activeWoItemIndex}].outsideServices[ `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].notes`
${activeItemIndex}
].notes`
" "
data-cy="outsideServiceNotes" data-cy="outsideServiceNotes"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].outsideServices[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].notes`
].notes`) )
" "
auto-grow auto-grow
></v-textarea> ></v-textarea>

View File

@@ -106,9 +106,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].parts[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].quantity`
].quantity`) )
" "
></gz-decimal> ></gz-decimal>
<template <template
@@ -225,9 +225,9 @@
) )
" "
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].parts[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].description`
].description`) )
" "
></v-text-field> ></v-text-field>
</v-col> </v-col>
@@ -301,9 +301,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].parts[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].priceOverride`
].priceOverride`) )
" "
></gz-currency> ></gz-currency>
</v-col> </v-col>
@@ -319,21 +319,17 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].parts[ `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].serials`
${activeItemIndex}
].serials`
) )
" "
:ref=" :ref="
`Items[${activeWoItemIndex}].parts[ `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].serials`
${activeItemIndex}
].serials`
" "
data-cy="partSerials" data-cy="partSerials"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].parts[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].serials`
].serials`) )
" "
auto-grow auto-grow
></v-textarea> ></v-textarea>

View File

@@ -182,9 +182,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].scheduledUsers[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].scheduledUsers[ ${activeItemIndex} ].estimatedQuantity`
].estimatedQuantity`) )
" "
></gz-decimal> ></gz-decimal>
</v-col> </v-col>

View File

@@ -93,30 +93,24 @@
:disabled="isDeleted" :disabled="isDeleted"
:label="$ay.t('Sequence')" :label="$ay.t('Sequence')"
:ref=" :ref="
`Items[${activeWoItemIndex}].tasks[ `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence`
${activeItemIndex}
].sequence`
" "
:rules="[ :rules="[
form().integerValid( form().integerValid(
this, this,
`Items[${activeWoItemIndex}].tasks[ `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence`
${activeItemIndex}
].sequence`
) )
]" ]"
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].tasks[ `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence`
${activeItemIndex}
].sequence`
) )
" "
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].tasks[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence`
].sequence`) )
" "
type="number" type="number"
></v-text-field> ></v-text-field>
@@ -145,31 +139,25 @@
:disabled="isDeleted" :disabled="isDeleted"
:label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')" :label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')"
:ref=" :ref="
`Items[${activeWoItemIndex}].tasks[ `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status`
${activeItemIndex}
].status`
" "
data-cy="usertype" data-cy="usertype"
:rules="[ :rules="[
form().integerValid( form().integerValid(
this, this,
`Items[${activeWoItemIndex}].tasks[ `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status`
${activeItemIndex}
].status`
) )
]" ]"
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].tasks[ `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status`
${activeItemIndex}
].status`
) )
" "
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].tasks[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status`
].status`) )
" "
@change="statusChange" @change="statusChange"
></v-select> ></v-select>
@@ -254,21 +242,17 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].tasks[ `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].task`
${activeItemIndex}
].task`
) )
" "
:ref=" :ref="
`Items[${activeWoItemIndex}].tasks[ `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].task`
${activeItemIndex}
].task`
" "
data-cy="expenseDescription" data-cy="expenseDescription"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].tasks[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].task`
].task`) )
" "
auto-grow auto-grow
></v-textarea> ></v-textarea>

View File

@@ -180,9 +180,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].travels[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelRateQuantity`
].travelRateQuantity`) )
" "
></gz-decimal> ></gz-decimal>
</v-col> </v-col>
@@ -296,9 +296,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].travels[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].noChargeQuantity`
].noChargeQuantity`) )
" "
></gz-decimal> ></gz-decimal>
</v-col> </v-col>
@@ -372,9 +372,9 @@
) )
]" ]"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].travels[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].priceOverride`
].priceOverride`) )
" "
></gz-currency> ></gz-currency>
</v-col> </v-col>
@@ -394,21 +394,17 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].travels[ `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelDetails`
${activeItemIndex}
].travelDetails`
) )
" "
:ref=" :ref="
`Items[${activeWoItemIndex}].travels[ `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelDetails`
${activeItemIndex}
].travelDetails`
" "
data-cy="traveltravelDetails" data-cy="traveltravelDetails"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].travels[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelDetails`
].travelDetails`) )
" "
auto-grow auto-grow
></v-textarea> ></v-textarea>

View File

@@ -126,9 +126,7 @@
) )
" "
:ref=" :ref="
`Items[${activeWoItemIndex}].units[ `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].notes`
${activeItemIndex}
].notes`
" "
data-cy="unitUnitNotes" data-cy="unitUnitNotes"
@input=" @input="
@@ -148,20 +146,16 @@
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].units[ `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].tags`
${activeItemIndex}
].tags`
) )
" "
:ref=" :ref="
`Items[${activeWoItemIndex}].units[ `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].tags`
${activeItemIndex}
].tags`
" "
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].units[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].tags`
].tags`) )
" "
></gz-tag-picker> ></gz-tag-picker>
</v-col> </v-col>
@@ -176,23 +170,19 @@
:parent-v-m="this" :parent-v-m="this"
key-start-with="WorkOrderItemUnitCustom" key-start-with="WorkOrderItemUnitCustom"
:ref=" :ref="
`Items[${activeWoItemIndex}].units[ `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].customFields`
${activeItemIndex}
].customFields`
" "
data-cy="unitCustomFields" data-cy="unitCustomFields"
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`Items[${activeWoItemIndex}].units[ `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].customFields`
${activeItemIndex}
].customFields`
) )
" "
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].units[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].customFields`
].customFields`) )
" "
></gz-custom-fields> ></gz-custom-fields>
</v-col> </v-col>
@@ -202,16 +192,14 @@
:aya-type="$ay.ayt().WorkOrderItem" :aya-type="$ay.ayt().WorkOrderItem"
:aya-id="value.id" :aya-id="value.id"
:ref=" :ref="
`Items[${activeWoItemIndex}].units[ `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].wiki`
${activeItemIndex}
].wiki`
" "
v-model="value.items[activeWoItemIndex].units[activeItemIndex].wiki" v-model="value.items[activeWoItemIndex].units[activeItemIndex].wiki"
:readonly="formState.readOnly" :readonly="formState.readOnly"
@input=" @input="
fieldValueChanged(`Items[${activeWoItemIndex}].units[ fieldValueChanged(
${activeItemIndex} `Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].wiki`
].wiki`) )
" "
></gz-wiki ></gz-wiki
></v-col> ></v-col>
@@ -311,14 +299,14 @@ export default {
this.selectedRow = [{ index: newIndex }]; this.selectedRow = [{ index: newIndex }];
this.activeItemIndex = newIndex; this.activeItemIndex = newIndex;
//trigger rule breaking / validation //trigger rule breaking / validation
this.$nextTick(() => { // this.$nextTick(() => {
this.value.items[this.activeWoItemIndex].units[ this.value.items[this.activeWoItemIndex].units[
this.activeItemIndex this.activeItemIndex
].unitId = null; ].unitId = null;
this.fieldValueChanged( this.fieldValueChanged(
`Items[${this.activeWoItemIndex}].units[${this.activeItemIndex}].unitId` `Items[${this.activeWoItemIndex}].units[${this.activeItemIndex}].unitId`
); );
}); // });
}, },
unDeleteItem() { unDeleteItem() {
this.value.items[this.activeWoItemIndex].units[ this.value.items[this.activeWoItemIndex].units[