From efe1cba12a21d4fb9ae575de41653feabdc52f72 Mon Sep 17 00:00:00 2001
From: goodm2ice <hamel2517@gmail.com>
Date: Mon, 28 Feb 2022 15:53:48 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D1=8F=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=20=D1=81=D0=BE=D0=B3=D0=BB=D0=B0=D1=81=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B8,=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BD?=
 =?UTF-8?q?=D1=84=D1=8B=20=D0=BE=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=BC=D0=B5=20=D0=B1=D1=83=D1=80=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DrillingProgram/CategoryRender.jsx | 6 +++---
 src/pages/DrillingProgram/index.jsx          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/DrillingProgram/CategoryRender.jsx b/src/pages/DrillingProgram/CategoryRender.jsx
index 27e2a8f..8410ea9 100644
--- a/src/pages/DrillingProgram/CategoryRender.jsx
+++ b/src/pages/DrillingProgram/CategoryRender.jsx
@@ -19,7 +19,7 @@ import MarksCard from './MarksCard'
 
 import '@styles/drilling_program.less'
 
-const CommentPrompt = memo((props) => (
+const CommentPrompt = memo(({ isRequired = true, ...props }) => (
     <Poprompt
         buttonProps={{ className: 'mv-5' }}
         {...props}
@@ -27,7 +27,7 @@ const CommentPrompt = memo((props) => (
         <Form.Item
             label={'Комментарий'}
             name={'comment'}
-            rules={[{ required: true, message: 'Пожалуйста, введите комментарий!' }]}
+            rules={isRequired && [{ required: true, message: 'Пожалуйста, введите комментарий!' }]}
         >
             <Input />
         </Form.Item>
@@ -147,7 +147,7 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
                             <>
                                 <div className={'approve_list'}>
                                     {permissionToApprove && (
-                                        <CommentPrompt text={'Согласовать'} title={'Согласование документа'} onDone={onApprove(true)} />
+                                        <CommentPrompt isRequired={false} text={'Согласовать'} title={'Согласование документа'} onDone={onApprove(true)} />
                                     )}
                                     <MarksCard title={'Согласовано'} className={'approve_panel'} marks={file?.fileMarks?.filter((mark) => mark.idMarkType === 1)} />
                                 </div>
diff --git a/src/pages/DrillingProgram/index.jsx b/src/pages/DrillingProgram/index.jsx
index 881688f..450669b 100644
--- a/src/pages/DrillingProgram/index.jsx
+++ b/src/pages/DrillingProgram/index.jsx
@@ -10,7 +10,7 @@ import {
 import { memo, useCallback, useEffect, useState } from 'react'
 
 import LoaderPortal from '@components/LoaderPortal'
-import { downloadFile, invokeWebApiWrapperAsync } from '@components/factory'
+import { downloadFile, formatBytes, invokeWebApiWrapperAsync } from '@components/factory'
 import { arrayOrDefault, formatDate } from '@utils'
 import { DrillingProgramService } from '@api'
 
@@ -117,8 +117,8 @@ export const DrillingProgram = memo(({ idWell }) => {
                 >
                   {program?.name}
                 </Button>
-                <div className={'m-10'}>Размер: {program?.size}</div>
-                <div className={'m-10'}>Загружен: {formatDate(program?.uploadDate)}</div>
+                <div className={'m-10'}>Размер: {formatBytes(program?.size)}</div>
+                <div className={'m-10'}>Сформирован: {formatDate(program?.uploadDate)}</div>
               </>
             ) : stateId === idStateError ? (
               <>