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
2021-06-11 23:29:53 +00:00
parent c830dcd3b3
commit 9d56cbb05d
8 changed files with 59 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

26
ayanova/src/components/work-order-item-outside-services.vue
View File

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

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

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

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

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

32
ayanova/src/components/work-order-item-tasks.vue
View File

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

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

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

24
ayanova/src/components/work-order-item-units.vue
View File

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

3
ayanova/src/views/svc-workorder.vue
View File

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