ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обязательность комментария при согласовании, форматирование инфы о программе бурения

Browse Source
This commit is contained in:
Александр Сироткин 2022-02-28 15:53:48 +05:00
parent 43e85364b0
commit efe1cba12a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/DrillingProgram/CategoryRender.jsx
View File

@ -19,7 +19,7 @@ import MarksCard from './MarksCard'
import '@styles/drilling_program.less' import '@styles/drilling_program.less'
const CommentPrompt = memo((props) => ( const CommentPrompt = memo(({ isRequired = true, ...props }) => (
<Poprompt <Poprompt
buttonProps={{ className: 'mv-5' }} buttonProps={{ className: 'mv-5' }}
{...props} {...props}
@ -27,7 +27,7 @@ const CommentPrompt = memo((props) => (
<Form.Item <Form.Item
label={'Комментарий'} label={'Комментарий'}
name={'comment'} name={'comment'}
rules={[{ required: true, message: 'Пожалуйста, введите комментарий!' }]} rules={isRequired && [{ required: true, message: 'Пожалуйста, введите комментарий!' }]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
@ -147,7 +147,7 @@ export const CategoryRender = memo(({ idWell, partData, onUpdate, onEdit, onHist
<> <>
<div className={'approve_list'}> <div className={'approve_list'}>
{permissionToApprove && ( {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)} /> <MarksCard title={'Согласовано'} className={'approve_panel'} marks={file?.fileMarks?.filter((mark) => mark.idMarkType === 1)} />
</div> </div>

6
src/pages/DrillingProgram/index.jsx
View File

@ -10,7 +10,7 @@ import {
import { memo, useCallback, useEffect, useState } from 'react' import { memo, useCallback, useEffect, useState } from 'react'
import LoaderPortal from '@components/LoaderPortal' import LoaderPortal from '@components/LoaderPortal'
import { downloadFile, invokeWebApiWrapperAsync } from '@components/factory' import { downloadFile, formatBytes, invokeWebApiWrapperAsync } from '@components/factory'
import { arrayOrDefault, formatDate } from '@utils' import { arrayOrDefault, formatDate } from '@utils'
import { DrillingProgramService } from '@api' import { DrillingProgramService } from '@api'
@ -117,8 +117,8 @@ export const DrillingProgram = memo(({ idWell }) => {
> >
{program?.name} {program?.name}
</Button> </Button>
<div className={'m-10'}>Размер: {program?.size}</div> <div className={'m-10'}>Размер: {formatBytes(program?.size)}</div>
<div className={'m-10'}>Загружен: {formatDate(program?.uploadDate)}</div> <div className={'m-10'}>Сформирован: {formatDate(program?.uploadDate)}</div>
</> </>
) : stateId === idStateError ? ( ) : stateId === idStateError ? (
<> <>