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-03-07 15:39:36 +00:00
parent 0125c8b5b9
commit 164eb960e1
3 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ayanova/src/components/percent-control.vue
View File

@@ -39,7 +39,7 @@ export default {
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },
errorMessages: { type: Array, default: null }, errorMessages: { type: Array, default: null },
precision: { type: Number, default: undefined } precision: { type: Number, default: 3 }
}, },
computed: { computed: {
currencyValue() { currencyValue() {

32
ayanova/src/views/acc-tax-code.vue
View File

@@ -26,17 +26,17 @@
xl="3" xl="3"
> >
<gz-decimal <gz-decimal
v-model="obj.taxA" v-model="obj.taxAPct"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('TaxCodeTaxA')" :label="$ay.t('TaxCodeTaxA')"
ref="taxA" ref="taxAPct"
data-cy="taxA" data-cy="taxAPct"
:rules="[ :rules="[
form().decimalValid(this, 'taxA'), form().decimalValid(this, 'taxAPct'),
form().required(this, 'taxA') form().required(this, 'taxAPct')
]" ]"
:error-messages="form().serverErrors(this, 'taxA')" :error-messages="form().serverErrors(this, 'taxAPct')"
@input="fieldValueChanged('taxA')" @input="fieldValueChanged('taxAPct')"
></gz-decimal> ></gz-decimal>
</v-col> </v-col>
@@ -48,17 +48,17 @@
xl="3" xl="3"
> >
<gz-decimal <gz-decimal
v-model="obj.taxB" v-model="obj.taxBPct"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('TaxCodeTaxB')" :label="$ay.t('TaxCodeTaxB')"
ref="taxB" ref="taxBPct"
data-cy="taxB" data-cy="taxBPct"
:rules="[ :rules="[
form().decimalValid(this, 'taxB'), form().decimalValid(this, 'taxBPct'),
form().required(this, 'taxB') form().required(this, 'taxBPct')
]" ]"
:error-messages="form().serverErrors(this, 'taxB')" :error-messages="form().serverErrors(this, 'taxBPct')"
@input="fieldValueChanged('taxB')" @input="fieldValueChanged('taxBPct')"
></gz-decimal> ></gz-decimal>
</v-col> </v-col>
@@ -242,8 +242,8 @@ export default {
wiki: null, wiki: null,
customFields: "{}", customFields: "{}",
tags: [], tags: [],
taxA: 0.05, taxAPct: 0.05,
taxB: 0.0, taxBPct: 0.0,
taxOnTax: false taxOnTax: false
}, },
formState: { formState: {

73
ayanova/src/views/svc-contract.vue
View File

@@ -40,18 +40,17 @@
<v-row> <v-row>
<v-col> <v-col>
<gz-percent <gz-percent
v-model="obj.partsOverride" v-model="obj.partsOverridePct"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('PartList')" :label="$ay.t('PartList')"
ref="partsOverride" ref="partsOverridePct"
data-cy="partsOverride" data-cy="partsOverridePct"
:rules="[ :rules="[
form().decimalValid(this, 'partsOverride'), form().decimalValid(this, 'partsOverridePct'),
form().required(this, 'partsOverride') form().required(this, 'partsOverridePct')
]" ]"
:error-messages="form().serverErrors(this, 'partsOverride')" :error-messages="form().serverErrors(this, 'partsOverridePct')"
@input="fieldValueChanged('partsOverride')" @input="fieldValueChanged('partsOverridePct')"
:precision="5"
></gz-percent> ></gz-percent>
</v-col> </v-col>
@@ -76,19 +75,19 @@
<v-row> <v-row>
<v-col> <v-col>
<gz-percent <gz-percent
v-model="obj.serviceRatesOverride" v-model="obj.serviceRatesOverridePct"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('ServiceRateList')" :label="$ay.t('ServiceRateList')"
ref="serviceRatesOverride" ref="serviceRatesOverridePct"
data-cy="serviceRatesOverride" data-cy="serviceRatesOverridePct"
:rules="[ :rules="[
form().decimalValid(this, 'serviceRatesOverride'), form().decimalValid(this, 'serviceRatesOverridePct'),
form().required(this, 'serviceRatesOverride') form().required(this, 'serviceRatesOverridePct')
]" ]"
:error-messages=" :error-messages="
form().serverErrors(this, 'serviceRatesOverride') form().serverErrors(this, 'serviceRatesOverridePct')
" "
@input="fieldValueChanged('serviceRatesOverride')" @input="fieldValueChanged('serviceRatesOverridePct')"
></gz-percent> ></gz-percent>
</v-col> </v-col>
@@ -116,19 +115,19 @@
<v-row> <v-row>
<v-col> <v-col>
<gz-percent <gz-percent
v-model="obj.travelRatesOverride" v-model="obj.travelRatesOverridePct"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('TravelRateList')" :label="$ay.t('TravelRateList')"
ref="travelRatesOverride" ref="travelRatesOverridePct"
data-cy="travelRatesOverride" data-cy="travelRatesOverridePct"
:rules="[ :rules="[
form().decimalValid(this, 'travelRatesOverride'), form().decimalValid(this, 'travelRatesOverridePct'),
form().required(this, 'travelRatesOverride') form().required(this, 'travelRatesOverridePct')
]" ]"
:error-messages=" :error-messages="
form().serverErrors(this, 'travelRatesOverride') form().serverErrors(this, 'travelRatesOverridePct')
" "
@input="fieldValueChanged('travelRatesOverride')" @input="fieldValueChanged('travelRatesOverridePct')"
></gz-percent> ></gz-percent>
</v-col> </v-col>
@@ -190,7 +189,7 @@
v-for="item in obj.contractPartOverrideItems" v-for="item in obj.contractPartOverrideItems"
:key="item.Id" :key="item.Id"
> >
<td class="text-right">{{ item.override * 100 }}%</td> <td class="text-right">{{ item.overridePct }}%</td>
<td class="text-left"> <td class="text-left">
{{ {{
selectLists.overrideTypes.find( selectLists.overrideTypes.find(
@@ -329,31 +328,31 @@
v-model=" v-model="
obj.contractPartOverrideItems[ obj.contractPartOverrideItems[
editContractPartOverrideItemIndex editContractPartOverrideItemIndex
].override ].overridePct
" "
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('ContractAdjustment')" :label="$ay.t('ContractAdjustment')"
ref="ContractPartOverrideItems.Override" ref="ContractPartOverrideItems.OverridePct"
data-cy="ContractPartOverrideItems.Override" data-cy="ContractPartOverrideItems.OverridePct"
:rules="[ :rules="[
form().decimalValid( form().decimalValid(
this, this,
'ContractPartOverrideItems.Override' 'ContractPartOverrideItems.OverridePct'
), ),
form().required( form().required(
this, this,
'ContractPartOverrideItems.Override' 'ContractPartOverrideItems.OverridePct'
) )
]" ]"
:error-messages=" :error-messages="
form().serverErrors( form().serverErrors(
this, this,
`ContractPartOverrideItems[${editContractPartOverrideItemIndex}].Override` `ContractPartOverrideItems[${editContractPartOverrideItemIndex}].OverridePct`
) )
" "
@input=" @input="
fieldValueChanged( fieldValueChanged(
`ContractPartOverrideItems[${editContractPartOverrideItemIndex}].Override` `ContractPartOverrideItems[${editContractPartOverrideItemIndex}].OverridePct`
) )
" "
></gz-percent> ></gz-percent>
@@ -370,12 +369,12 @@
item-value="id" item-value="id"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('ContractOverrideType')" :label="$ay.t('ContractOverrideType')"
ref="ContractPartOverrideItems.Override" ref="ContractPartOverrideItems.OverrideType"
data-cy="ContractPartOverrideItems.Override" data-cy="ContractPartOverrideItems.OverrideType"
:rules="[ :rules="[
form().integerValid( form().integerValid(
this, this,
'ContractPartOverrideItems.Override' 'ContractPartOverrideItems.OverrideType'
) )
]" ]"
:error-messages=" :error-messages="
@@ -588,11 +587,11 @@ export default {
responseTime: "00:00:00", responseTime: "00:00:00",
contractServiceRatesOnly: false, contractServiceRatesOnly: false,
contractTravelRatesOnly: false, contractTravelRatesOnly: false,
partsOverride: 0, partsOverridePct: 0,
partsOverrideType: 1, partsOverrideType: 1,
serviceRatesOverride: 0, serviceRatesOverridePct: 0,
serviceRatesOverrideType: 1, serviceRatesOverrideType: 1,
travelRatesOverride: 0, travelRatesOverridePct: 0,
travelRatesOverrideType: 1, travelRatesOverrideType: 1,
alertNotes: null, alertNotes: null,
serviceRateItems: [], serviceRateItems: [],
@@ -667,7 +666,7 @@ export default {
this.obj.contractPartOverrideItems.push({ this.obj.contractPartOverrideItems.push({
id: 0, id: 0,
contractId: 0, contractId: 0,
override: 0, overridePct: 0,
overrideType: 1, overrideType: 1,
tags: [] tags: []
}); });