diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/optionsQuery.js b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/optionsQuery.js index 3efa0a3..98f6b14 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/optionsQuery.js +++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/optionsQuery.js @@ -45,6 +45,7 @@ export const mainOptionsQuery = gql` name evo_broker_accountid evo_kpp + evo_inn } selectDealerRewardCondition: evo_reward_conditions( evo_agent_accountid: $dealer_person_accountid diff --git a/src/client/stores/CalculationStore/Effects/reactions/requestReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/requestReactions.ts index 83ee17d..aa2ed31 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/requestReactions.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/requestReactions.ts @@ -567,7 +567,7 @@ export default [ CrmService.crmgqlquery({ query: gql` query($statecode: Int, $salonaccountid: Uuid!) { - account: salon_providers( + selectDealerPerson: salon_providers( statecode: $statecode salonaccountid: $salonaccountid ) { @@ -575,27 +575,27 @@ export default [ name evo_broker_accountid evo_kpp + evo_inn } } `, - toOptions: ['account'], + toOptions: ['selectDealerPerson'], variables: { salonaccountid: dealerId, statecode: 0, }, }).then(({ entities }) => { + // @ts-ignore + const dealerPersons = entities.selectDealerPerson; if ( - entities.account && - Array.isArray(entities.account) && - entities.account.length > 0 + dealerPersons && + Array.isArray(dealerPersons) && + dealerPersons.length > 0 ) { - calculationStore.setOptions( - 'selectDealerPerson', - entities.account, - ); + calculationStore.setOptions('selectDealerPerson', dealerPersons); calculationStore.setValue( 'dealerPerson', - entities.account[0].accountid, + dealerPersons[0].accountid, ); calculationStore.setStatus( 'selectDealerPerson', diff --git a/src/core/services/CrmService/propsMap.ts b/src/core/services/CrmService/propsMap.ts index baee9ab..aee3e70 100644 --- a/src/core/services/CrmService/propsMap.ts +++ b/src/core/services/CrmService/propsMap.ts @@ -7,7 +7,14 @@ const propsMap: TEntities<{ getName?: (entity: TCRMEntity, targetName: string) => string | undefined; }> = { account: { - getName: account => `${account.name} ${account.evo_kpp || ''}`, + getName: (account, targetName) => { + if (['selectDealerPerson'].includes(targetName)) { + return ` + ${account.name} + ${account.evo_inn || '-'} / ${account.evo_kpp || '-'}`; + } + return `${account.name} ${account.evo_kpp || ''}`; + }, value: 'accountid', }, lead: {