From 1fb4846dbe0e6205feadf2b93e26b2a628009e89 Mon Sep 17 00:00:00 2001 From: goodmice Date: Tue, 16 Aug 2022 15:29:57 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B8=D0=BF=D1=8B=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9=20=D1=81=D1=83=D1=82=D0=BE=D1=87=D0=BD=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D1=80=D0=B0=D0=BF=D0=BE=D1=80=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Reports/DailyReport/ReportEditor.jsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/pages/Reports/DailyReport/ReportEditor.jsx b/src/pages/Reports/DailyReport/ReportEditor.jsx index 30adc5f..4741ba4 100644 --- a/src/pages/Reports/DailyReport/ReportEditor.jsx +++ b/src/pages/Reports/DailyReport/ReportEditor.jsx @@ -84,7 +84,8 @@ const cellData = { ), } -const Name1 = { + +const textCellData = { width: 200, render: (name) => ( @@ -159,12 +160,13 @@ const table6Data = [ r_value: 'actualTimeExtension', }, ] + const table10Columns = [ makeGroupColumn('', [ makeColumn('Бурение с наращиваниями в инт. 2195-2763м', 'l_label', { colSpan: 2, width: 200 }), - makeColumn('', 'l_value', { colSpan: 0, ...Name1 }), + makeColumn('', 'l_value', { colSpan: 0, ...textCellData }), makeColumn('Промывка', 'r_label', { colSpan: 2, width: 200 }), - makeColumn('', 'r_value', { colSpan: 0, ...Name1 }), + makeColumn('', 'r_value', { colSpan: 0, ...textCellData }), ]), ] @@ -187,9 +189,9 @@ const table10Data = [ const table11Columns = [ makeGroupColumn('', [ makeColumn('Подъем КНБК', 'l_label', { colSpan: 2, width: 200 }), - makeColumn('', 'l_value', { colSpan: 0, ...Name1 }), + makeColumn('', 'l_value', { colSpan: 0, ...textCellData }), makeColumn('Спуск КНБК', 'r_label', { colSpan: 2, width: 200 }), - makeColumn('', 'r_value', { colSpan: 0, ...Name1 }), + makeColumn('', 'r_value', { colSpan: 0, ...textCellData }), ]), ] @@ -212,9 +214,9 @@ const table11Data = [ const table12Columns = [ makeGroupColumn('', [ makeColumn('Глубины забоя на окончание отчетного периода', 'l_label', { colSpan: 2, width: 200 }), - makeColumn('', 'l_value', { colSpan: 0, ...cellData }), + makeColumn('', 'l_value', { colSpan: 0, ...textCellData }), makeColumn('Углы на дату окончания отчетного периода', 'r_label', { colSpan: 2, width: 200 }), - makeColumn('', 'r_value', { colSpan: 0, ...cellData }), + makeColumn('', 'r_value', { colSpan: 0, ...textCellData }), ]), ]