store/calculation: use boolean validation flag

This commit is contained in:
Chika 2022-10-26 17:49:42 +03:00
parent f02f785fb6
commit e6bb6a4d6f
2 changed files with 5 additions and 5 deletions

View File

@ -510,14 +510,14 @@ export function validationReactions(store: RootStore, apolloClient: ApolloClient
});
$calculation.element('tbxDealerRewardSumm').validate({
invalid: () =>
invalid:
evo_reward_condition?.evo_reward_summ &&
dealerRewardSumm > evo_reward_condition.evo_reward_summ,
message: 'Вознаграждение ЮЛ поставщика указано больше условия по агентскому договору!',
});
$calculation.element('tbxDealerRewardSumm').validate({
invalid: () =>
invalid:
!evo_reward_condition?.evo_reduce_reward &&
evo_reward_condition?.evo_reward_summ &&
dealerRewardSumm < evo_reward_condition.evo_reward_summ,
@ -525,7 +525,7 @@ export function validationReactions(store: RootStore, apolloClient: ApolloClient
});
$calculation.element('tbxDealerRewardSumm').validate({
invalid: () =>
invalid:
evo_reward_condition?.evo_min_reward_summ &&
dealerRewardSumm < evo_reward_condition?.evo_min_reward_summ,
message: 'Вознаграждение ЮЛ поставщика указано меньше условия по агентскому договору!',

View File

@ -11,7 +11,7 @@ import StatusStore from './statuses';
import ValuesStore from './values';
type ValidateParams = {
invalid: () => boolean;
invalid: boolean;
message: string;
};
@ -92,7 +92,7 @@ export default class CalculationStore {
},
validate: ({ invalid, message }: ValidateParams) => {
if (invalid()) {
if (invalid) {
if (!this.$validation[elementName]) {
this.$validation[elementName] = new Validation({
err_key: elementName,