This commit is contained in:
2021-06-11 23:29:53 +00:00
parent c830dcd3b3
commit 9d56cbb05d
8 changed files with 59 additions and 64 deletions

View File

@@ -180,7 +180,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].quantity`
`Items[${activeWoItemIndex}].loans[${activeItemIndex}].quantity`
)
"
></gz-decimal>
@@ -351,7 +351,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].priceOverride`
`Items[${activeWoItemIndex}].loans[${activeItemIndex}].priceOverride`
)
"
></gz-currency>
@@ -368,16 +368,14 @@
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].notes`
`Items[${activeWoItemIndex}].loans[${activeItemIndex}].notes`
)
"
:ref="
`Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].notes`
"
:ref="`Items[${activeWoItemIndex}].loans[${activeItemIndex}].notes`"
data-cy="loanUnitNotes"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].loans[ ${activeItemIndex} ].notes`
`Items[${activeWoItemIndex}].loans[${activeItemIndex}].notes`
)
"
auto-grow

View File

@@ -161,17 +161,17 @@
:disabled="isDeleted"
:label="$ay.t('WorkOrderItemOutsideServiceRMANumber')"
:ref="
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].rmaNumber`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].rmaNumber`
"
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].rmaNumber`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].rmaNumber`
)
"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].rmaNumber`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].rmaNumber`
)
"
></v-text-field>
@@ -210,7 +210,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].repairCost`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairCost`
)
"
></gz-currency>
@@ -250,7 +250,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].repairPrice`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairPrice`
)
"
></gz-currency>
@@ -312,17 +312,17 @@
:disabled="isDeleted"
:label="$ay.t('WorkOrderItemOutsideServiceTrackingNumber')"
:ref="
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].trackingNumber`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].trackingNumber`
"
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].trackingNumber`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].trackingNumber`
)
"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].trackingNumber`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].trackingNumber`
)
"
></v-text-field>
@@ -361,7 +361,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].shippingCost`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingCost`
)
"
></gz-currency>
@@ -401,7 +401,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].shippingPrice`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingPrice`
)
"
></gz-currency>
@@ -557,16 +557,16 @@
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].notes`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].notes`
)
"
:ref="
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].notes`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].notes`
"
data-cy="outsideServiceNotes"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].outsideServices[ ${activeItemIndex} ].notes`
`Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].notes`
)
"
auto-grow

View File

@@ -107,7 +107,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].quantity`
`Items[${activeWoItemIndex}].parts[${activeItemIndex}].quantity`
)
"
></gz-decimal>
@@ -226,7 +226,7 @@
"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].description`
`Items[${activeWoItemIndex}].parts[${activeItemIndex}].description`
)
"
></v-text-field>
@@ -302,7 +302,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].priceOverride`
`Items[${activeWoItemIndex}].parts[${activeItemIndex}].priceOverride`
)
"
></gz-currency>
@@ -319,16 +319,16 @@
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].serials`
`Items[${activeWoItemIndex}].parts[${activeItemIndex}].serials`
)
"
:ref="
`Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].serials`
`Items[${activeWoItemIndex}].parts[${activeItemIndex}].serials`
"
data-cy="partSerials"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].parts[ ${activeItemIndex} ].serials`
`Items[${activeWoItemIndex}].parts[${activeItemIndex}].serials`
)
"
auto-grow

View File

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

View File

@@ -93,23 +93,23 @@
:disabled="isDeleted"
:label="$ay.t('Sequence')"
:ref="
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].sequence`
"
:rules="[
form().integerValid(
this,
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].sequence`
)
]"
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].sequence`
)
"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].sequence`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].sequence`
)
"
type="number"
@@ -139,24 +139,24 @@
:disabled="isDeleted"
:label="$ay.t('WorkOrderItemTaskWorkOrderItemTaskCompletionType')"
:ref="
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].status`
"
data-cy="usertype"
:rules="[
form().integerValid(
this,
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].status`
)
]"
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].status`
)
"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].status`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].status`
)
"
@change="statusChange"
@@ -242,16 +242,20 @@
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].task`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].task`
)
"
:ref="
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].task`
"
:rules="[
form().required(
this,
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].tasks`
)
]"
:ref="`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].task`"
data-cy="expenseDescription"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].tasks[ ${activeItemIndex} ].task`
`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].task`
)
"
auto-grow
@@ -473,7 +477,7 @@ export default {
const hasError = this.form().childRowHasError(
this,
`Items[${this.activeWoItemIndex}].Expenses[${item.index}].`
`Items[${this.activeWoItemIndex}].Tasks[${item.index}].`
);
if (isDeleted) {

View File

@@ -181,7 +181,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelRateQuantity`
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelRateQuantity`
)
"
></gz-decimal>
@@ -297,7 +297,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].noChargeQuantity`
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].noChargeQuantity`
)
"
></gz-decimal>
@@ -373,7 +373,7 @@
]"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].priceOverride`
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].priceOverride`
)
"
></gz-currency>
@@ -394,16 +394,16 @@
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelDetails`
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelDetails`
)
"
:ref="
`Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelDetails`
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelDetails`
"
data-cy="traveltravelDetails"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].travels[ ${activeItemIndex} ].travelDetails`
`Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelDetails`
)
"
auto-grow

View File

@@ -125,9 +125,7 @@
`Items[${activeWoItemIndex}].units[${activeItemIndex}].notes`
)
"
:ref="
`Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].notes`
"
:ref="`Items[${activeWoItemIndex}].units[${activeItemIndex}].notes`"
data-cy="unitUnitNotes"
@input="
fieldValueChanged(
@@ -146,15 +144,13 @@
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].tags`
`Items[${activeWoItemIndex}].units[${activeItemIndex}].tags`
)
"
:ref="
`Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].tags`
"
:ref="`Items[${activeWoItemIndex}].units[${activeItemIndex}].tags`"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].tags`
`Items[${activeWoItemIndex}].units[${activeItemIndex}].tags`
)
"
></gz-tag-picker>
@@ -170,18 +166,18 @@
:parent-v-m="this"
key-start-with="WorkOrderItemUnitCustom"
:ref="
`Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].customFields`
`Items[${activeWoItemIndex}].units[${activeItemIndex}].customFields`
"
data-cy="unitCustomFields"
:error-messages="
form().serverErrors(
this,
`Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].customFields`
`Items[${activeWoItemIndex}].units[${activeItemIndex}].customFields`
)
"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].customFields`
`Items[${activeWoItemIndex}].units[${activeItemIndex}].customFields`
)
"
></gz-custom-fields>
@@ -191,14 +187,12 @@
<gz-wiki
:aya-type="$ay.ayt().WorkOrderItem"
:aya-id="value.id"
:ref="
`Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].wiki`
"
:ref="`Items[${activeWoItemIndex}].units[${activeItemIndex}].wiki`"
v-model="value.items[activeWoItemIndex].units[activeItemIndex].wiki"
:readonly="formState.readOnly"
@input="
fieldValueChanged(
`Items[${activeWoItemIndex}].units[ ${activeItemIndex} ].wiki`
`Items[${activeWoItemIndex}].units[${activeItemIndex}].wiki`
)
"
></gz-wiki

View File

@@ -1162,7 +1162,6 @@ async function saveParts(vm, woItemIndex) {
}
handleSaveError(vm, {
//todo handle insufficient quantity error 2040
error: res.error,
itemUid: vm.obj.items[woItemIndex].uid,
childKey: "parts",
@@ -1656,7 +1655,7 @@ function formErrorFromSaveResult(vm) {
}
});
//console.log("Returning ret=:", ret);
//console.log("formErrorFromSaveResult Returning ret=:", ret);
return ret;
}