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 }) => ( ( @@ -147,7 +147,7 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist <>
{permissionToApprove && ( - + )} mark.idMarkType === 1)} />
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} -
Размер: {program?.size}
-
Загружен: {formatDate(program?.uploadDate)}
+
Размер: {formatBytes(program?.size)}
+
Сформирован: {formatDate(program?.uploadDate)}
) : stateId === idStateError ? ( <>