From d772b9f764d36c504f1bd544ff21375ff9ae6625 Mon Sep 17 00:00:00 2001 From: Chika Date: Tue, 8 Sep 2020 16:02:12 +0300 Subject: [PATCH] move elements --- .../Containers/Calculation/Sections/list.js | 97 +++++++++++-------- 1 file changed, 57 insertions(+), 40 deletions(-) diff --git a/src/client/Containers/Calculation/Sections/list.js b/src/client/Containers/Calculation/Sections/list.js index b8052d0..366f766 100644 --- a/src/client/Containers/Calculation/Sections/list.js +++ b/src/client/Containers/Calculation/Sections/list.js @@ -582,11 +582,6 @@ export default [ showSearch: true, }, }, - ], - }, - { - elements: [ - // TODO 3 Rows { title: 'Марка', Component: Select, @@ -615,13 +610,9 @@ export default [ }, }, ], - layout: { newLine: true }, }, - ], - }, - { - blocks: [ { + title: ' ', elements: [ // TODO: Convert to Text { @@ -656,6 +647,24 @@ export default [ }, }, + { + title: 'Срок поставки', + Component: Radio, + props: { + name: 'radioDeliveryTime', + valueName: 'deliveryTime', + showSearch: false, + style: 'button', + }, + }, + ], + }, + ], + }, + { + blocks: [ + { + elements: [ { title: 'Кол-во ПЛ в расчете', Component: InputNumber, @@ -666,7 +675,15 @@ export default [ valueName: 'leaseObjectCount', }, }, - + { + title: 'ПЛ используется для', + Component: Select, + props: { + name: 'selectLeaseObjectUseFor', + valueName: 'leaseObjectUseFor', + showSearch: true, + }, + }, { title: 'Год выпуска', Component: InputNumber, @@ -690,26 +707,6 @@ export default [ }, { elements: [ - { - title: 'Срок поставки', - Component: Radio, - props: { - name: 'radioDeliveryTime', - valueName: 'deliveryTime', - showSearch: false, - style: 'button', - }, - }, - { - title: 'ПЛ используется для', - Component: Select, - props: { - name: 'selectLeaseObjectUseFor', - valueName: 'leaseObjectUseFor', - showSearch: true, - }, - }, - { title: 'Тип двигателя', Component: Select, @@ -741,10 +738,6 @@ export default [ valueName: 'engineVolume', }, }, - ], - }, - { - elements: [ { title: 'Разрешенная макс.масса(кг)', Component: InputNumber, @@ -756,6 +749,10 @@ export default [ valueName: 'maxMass', }, }, + ], + }, + { + elements: [ { title: 'Количество мест', Component: InputNumber, @@ -767,7 +764,7 @@ export default [ }, }, { - title: 'Максимальная конструктивная скорость (при ПСМ)', + title: 'Макс. конструктивная скорость (при ПСМ)', Component: InputNumber, props: { min: '0', @@ -1055,7 +1052,10 @@ export default [ showSearch: true, }, }, - + ], + }, + { + elements: [ { title: 'Год выпуска', Component: InputNumber, @@ -1084,7 +1084,10 @@ export default [ showSearch: false, }, }, - + ], + }, + { + elements: [ { title: 'Мощность, л.с.', Component: InputNumber, @@ -1116,7 +1119,21 @@ export default [ showSearch: true, }, }, - + ], + }, + ], + }, + { + blocks: [ + { + elements: [], + }, + ], + }, + { + blocks: [ + { + elements: [ // { // title: 'Марка GPS', // Component: Select, @@ -1264,7 +1281,7 @@ export default [ { Component: Button, props: { - type: 'primary', + type: 'ghost', name: 'btnDriversApplication', text: 'Заявление на ограничения по водителям', onClick: undefined,