diff --git a/ayanova/src/views/svc-contract.vue b/ayanova/src/views/svc-contract.vue index b6c529ad..579f726a 100644 --- a/ayanova/src/views/svc-contract.vue +++ b/ayanova/src/views/svc-contract.vue @@ -166,8 +166,6 @@ > $ayiPlus - @@ -220,16 +218,12 @@ - - - + {{ $ay.t("ServiceRateList") }} $ayiPlus - @@ -282,9 +276,64 @@ - + + + {{ $ay.t("TravelRateList") }} + $ayiPlus + + + + + + + {{ $ay.t("ContractAdjustment") }} + + + {{ $ay.t("ContractOverrideType") }} + + + {{ $ay.t("Tags") }} + + + + + + + + + {{ item.overridePct }}% + + {{ + selectLists.overrideTypes.find( + z => z.id == item.overrideType + ).name + }} + + + {{ $ay.util().formatTags(item.tags) }} + + + + + $ayiEdit + + + + + + + + + {{ $ay.t("ContractRateList") }} @@ -379,9 +428,9 @@ :size="60" > - - - + + + @@ -564,6 +613,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $ay.t("Delete") }} + + {{ $ay.t("Close") }} + + {{ $ay.t("New") }} + + {{ $ay.t("OK") }} + + + + + {{ $ay.t("OK") }} + {{ $ay.t("New") }} + + {{ $ay.t("Delete") }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $ay.t("Delete") }} + + {{ $ay.t("Close") }} + + {{ $ay.t("New") }} + + {{ $ay.t("OK") }} + + + + + {{ $ay.t("OK") }} + {{ $ay.t("New") }} + + {{ $ay.t("Delete") }} + + + + + + + @@ -682,7 +1109,11 @@ export default { overrideTypes: [] }, editContractPartOverrideItemDialog: false, - editContractPartOverrideItemIndex: 0 + editContractPartOverrideItemIndex: 0, + editContractServiceRateOverrideItemDialog: false, + editContractServiceRateOverrideItemIndex: 0, + editContractTravelRateOverrideItemDialog: false, + editContractTravelRateOverrideItemIndex: 0 }; }, //WATCHERS @@ -751,6 +1182,71 @@ export default { this.editContractPartOverrideItemIndex = 0; this.formState.dirty = true; }, + + editContractServiceRateOverrideItem: function(item) { + this.editContractServiceRateOverrideItemIndex = this.obj.contractServiceRateOverrideItems.findIndex( + z => z.id == item.id + ); + if (this.editContractServiceRateOverrideItemIndex != -1) { + this.editContractServiceRateOverrideItemDialog = true; + } + }, + addContractServiceRateOverrideItem: function() { + this.obj.contractServiceRateOverrideItems.push({ + id: 0, + contractId: 0, + overridePct: 0, + overrideType: 1, + tags: [] + }); + + this.editContractServiceRateOverrideItemIndex = + this.obj.contractServiceRateOverrideItems.length - 1; + this.editContractServiceRateOverrideItemDialog = true; + this.formState.dirty = true; + }, + deleteContractServiceRateOverrideItem: function() { + this.editContractServiceRateOverrideItemDialog = false; + this.obj.contractServiceRateOverrideItems.splice( + this.editContractServiceRateOverrideItemIndex, + 1 + ); + this.editContractServiceRateOverrideItemIndex = 0; + this.formState.dirty = true; + }, + + editContractTravelRateOverrideItem: function(item) { + this.editContractTravelRateOverrideItemIndex = this.obj.contractTravelRateOverrideItems.findIndex( + z => z.id == item.id + ); + if (this.editContractTravelRateOverrideItemIndex != -1) { + this.editContractTravelRateOverrideItemDialog = true; + } + }, + addContractTravelRateOverrideItem: function() { + this.obj.contractTravelRateOverrideItems.push({ + id: 0, + contractId: 0, + overridePct: 0, + overrideType: 1, + tags: [] + }); + + this.editContractTravelRateOverrideItemIndex = + this.obj.contractTravelRateOverrideItems.length - 1; + this.editContractTravelRateOverrideItemDialog = true; + this.formState.dirty = true; + }, + deleteContractTravelRateOverrideItem: function() { + this.editContractTravelRateOverrideItemDialog = false; + this.obj.contractTravelRateOverrideItems.splice( + this.editContractTravelRateOverrideItemIndex, + 1 + ); + this.editContractTravelRateOverrideItemIndex = 0; + this.formState.dirty = true; + }, + canSave: function() { return this.formState.valid && this.formState.dirty; },