diff --git a/actions/logsActions.js b/actions/logsActions.js index 6a320e5..4e57f6d 100644 --- a/actions/logsActions.js +++ b/actions/logsActions.js @@ -8,7 +8,7 @@ import { eachSeries } from 'async'; import * as actionTypes from '../constants/actionTypes'; import * as currentState from '../reducers/initialState'; -export const logDocumentAccess = ({ payload }) => +export const logDocumentAccess = (payload) => { const url = `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/logs/track`; diff --git a/components/DealsStatus/SingleDeal.js b/components/DealsStatus/SingleDeal.js index a96f598..17cc191 100644 --- a/components/DealsStatus/SingleDeal.js +++ b/components/DealsStatus/SingleDeal.js @@ -467,7 +467,7 @@ class StatusDecisionMaking extends Step return (
-1 ? "current" : (statuscode_id > this.status[0] && statuscode_id > this.status[1]) ? "done" : "" }`}> -

Сделка { index + 1 }

+

№ { dealSelected }

{ this._renderHeader("Принятие решения по сделке") } @@ -540,14 +540,14 @@ class SigningTypeSelection extends Step title: "К подписанию", key: "signing_plan_contracts", }, - { - title: "Выдано", - key: "issued_contracts", - }, { title: "Подписано", key: "signing_fact_contracts", }, + { + title: "Выдано", + key: "issued_contracts", + }, { title: "Анулировано", key: "annulled_contracts", @@ -630,35 +630,6 @@ class SigningTypeSelection extends Step ) } - _render_issuedContracts = () => - { - const contracts = this.props.contracts['issued_contracts']; - console.log("_render_issuedContracts", { contracts }); - - return ( -
- { contracts.length > 0 ? - contracts.map((contract, index) => ( -
-
- PDF -
-
-

{ contract.name }

-
- { moment(contract.date).format("DD.MM.YYYY") } - { contract.brand_name } - { contract.model_name } -
-
-
- )) : ( -

Нет договоров

- ) } -
- ) - } - _render_signingFactContracts = () => { const contracts = this.props.contracts['signing_fact_contracts']; @@ -680,17 +651,42 @@ class SigningTypeSelection extends Step { contract.model_name }
- { index === 0 && ( -
- +
+
+
+ { contract.statuscode_name }
- ) } - { index === 1 && ( -
- - + +
+
+ )) : ( +

Нет договоров

+ ) } +
+ ) + } + + _render_issuedContracts = () => + { + const contracts = this.props.contracts['issued_contracts']; + console.log("_render_issuedContracts", { contracts }); + + return ( +
+ { contracts.length > 0 ? + contracts.map((contract, index) => ( +
+
+ PDF +
+
+

{ contract.name }

+
+ { moment(contract.date).format("DD.MM.YYYY") } + { contract.brand_name } + { contract.model_name }
- ) } +
)) : (

Нет договоров

@@ -746,16 +742,16 @@ class SigningTypeSelection extends Step return this._render_signingPlanContracts(); } - case "issued_contracts": - { - return this._render_issuedContracts(); - } - case "signing_fact_contracts": { return this._render_signingFactContracts(); } + case "issued_contracts": + { + return this._render_issuedContracts(); + } + case "annulled_contracts": { return this._render_annuledContracts(); diff --git a/css/main/style.css b/css/main/style.css index f9c3e9c..3a18e1c 100644 --- a/css/main/style.css +++ b/css/main/style.css @@ -5985,6 +5985,27 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_ .contractStatus_modal .single_status > div .status_body .documents .document .actions button { white-space: nowrap; } +.contractStatus_modal .single_status > div .status_body .documents .document .actions .status { + display: flex; + align-items: center; + flex-direction: row; + background-color: #2F80ED; + gap: 0px 16px; + padding: 0px 16px; +} +.contractStatus_modal .single_status > div .status_body .documents .document .actions .status .status_icon { + min-width: 24px; + min-height: 24px; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='25' height='24' viewBox='0 0 25 24' fill='none'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M12.9766 21C17.9471 21 21.9766 16.9706 21.9766 12C21.9766 7.02944 17.9471 3 12.9766 3C8.006 3 3.97656 7.02944 3.97656 12C3.97656 16.9706 8.006 21 12.9766 21ZM13.9766 6.5C13.9766 5.94772 13.5288 5.5 12.9766 5.5C12.4243 5.5 11.9766 5.94772 11.9766 6.5V11.75C11.9766 12.4404 12.5362 13 13.2266 13H16.4766C17.0288 13 17.4766 12.5523 17.4766 12C17.4766 11.4477 17.0288 11 16.4766 11H13.9766V6.5Z' fill='white'/%3E%3C/svg%3E"); +} +.contractStatus_modal .single_status > div .status_body .documents .document .actions .status span { + font-weight: 300; + color: #fff; +} +.contractStatus_modal .single_status > div .status_body .documents .document .wide { + justify-content: space-between; + padding-left: 64px; +} .contractStatus_modal .single_status > div .status_body .documents .empty { margin: 12px 0px 15px 0px; color: #8e94a7; diff --git a/css/main/style.less b/css/main/style.less index 503ffe2..9028a88 100644 --- a/css/main/style.less +++ b/css/main/style.less @@ -6862,6 +6862,32 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block { button { white-space: nowrap; } + + .status { + display: flex; + align-items: center; + flex-direction: row; + + background-color: #2F80ED; + gap: 0px 16px; + padding: 0px 16px; + + .status_icon { + min-width: 24px; + min-height: 24px; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='25' height='24' viewBox='0 0 25 24' fill='none'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M12.9766 21C17.9471 21 21.9766 16.9706 21.9766 12C21.9766 7.02944 17.9471 3 12.9766 3C8.006 3 3.97656 7.02944 3.97656 12C3.97656 16.9706 8.006 21 12.9766 21ZM13.9766 6.5C13.9766 5.94772 13.5288 5.5 12.9766 5.5C12.4243 5.5 11.9766 5.94772 11.9766 6.5V11.75C11.9766 12.4404 12.5362 13 13.2266 13H16.4766C17.0288 13 17.4766 12.5523 17.4766 12C17.4766 11.4477 17.0288 11 16.4766 11H13.9766V6.5Z' fill='white'/%3E%3C/svg%3E"); + } + + span { + font-weight: 300; + color: #fff; + } + } + } + + .wide { + justify-content: space-between; + padding-left: 64px; } }