Refactor ChangeEquipmentStatus forms to include new fields

- Added a text input for "Номер" in both ChangeEquipmentStatusCreate and ChangeEquipmentStatusEdit components.
- Rearranged the order of fields in the forms for better user experience.
- Included the StatusChangeAttachmentsInput component to handle file attachments in both forms.
This commit is contained in:
Первов Артем
2026-04-21 12:50:55 +03:00
parent 48c61cc2e5
commit ad245db29f
4 changed files with 8 additions and 8 deletions

View File

@@ -8,11 +8,13 @@ import {
TextInput as RaTextInput, TextInput as RaTextInput,
} from 'react-admin'; } from 'react-admin';
import { equipmentStatusChoices, equipmentOptionText } from '../equipment/shared'; import { equipmentStatusChoices, equipmentOptionText } from '../equipment/shared';
import { StatusChangeAttachmentsInput } from './StatusChangeAttachmentsInput';
export function ChangeEquipmentStatusCreate() { export function ChangeEquipmentStatusCreate() {
return ( return (
<Create> <Create>
<SimpleForm> <SimpleForm>
<RaTextInput source="number" label="Номер" />
<ReferenceInput source="equipmentId" reference="equipment"> <ReferenceInput source="equipmentId" reference="equipment">
<AutocompleteInput <AutocompleteInput
label="Оборудование" label="Оборудование"
@@ -20,10 +22,10 @@ export function ChangeEquipmentStatusCreate() {
filterToQuery={(searchText) => ({ q: searchText })} filterToQuery={(searchText) => ({ q: searchText })}
/> />
</ReferenceInput> </ReferenceInput>
<SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} required />
<DateInput source="date" label="Дата" required />
<RaTextInput source="number" label="Номер" />
<RaTextInput source="responsible" label="Ответственный" /> <RaTextInput source="responsible" label="Ответственный" />
<DateInput source="date" label="Дата" required />
<SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} required />
<StatusChangeAttachmentsInput />
</SimpleForm> </SimpleForm>
</Create> </Create>
); );

View File

@@ -14,6 +14,7 @@ export function ChangeEquipmentStatusEdit() {
return ( return (
<Edit> <Edit>
<SimpleForm> <SimpleForm>
<RaTextInput source="number" label="Номер" />
<ReferenceInput source="equipmentId" reference="equipment"> <ReferenceInput source="equipmentId" reference="equipment">
<AutocompleteInput <AutocompleteInput
label="Оборудование" label="Оборудование"
@@ -21,10 +22,9 @@ export function ChangeEquipmentStatusEdit() {
filterToQuery={(searchText) => ({ q: searchText })} filterToQuery={(searchText) => ({ q: searchText })}
/> />
</ReferenceInput> </ReferenceInput>
<SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} />
<DateInput source="date" label="Дата" />
<RaTextInput source="number" label="Номер" />
<RaTextInput source="responsible" label="Ответственный" /> <RaTextInput source="responsible" label="Ответственный" />
<DateInput source="date" label="Дата" />
<SelectInput source="newStatus" label="Новый статус" choices={equipmentStatusChoices} />
<StatusChangeAttachmentsInput /> <StatusChangeAttachmentsInput />
</SimpleForm> </SimpleForm>
</Edit> </Edit>

View File

@@ -32,7 +32,6 @@ export function ChangeEquipmentStatusList() {
return ( return (
<List filters={statusFilters} actions={<ListActions />} sort={{ field: 'date', order: 'DESC' }}> <List filters={statusFilters} actions={<ListActions />} sort={{ field: 'date', order: 'DESC' }}>
<Datagrid rowClick="show"> <Datagrid rowClick="show">
<TextField source="id" />
<ReferenceField source="equipmentId" reference="equipment" link="show"> <ReferenceField source="equipmentId" reference="equipment" link="show">
<TextField source="name" /> <TextField source="name" />
</ReferenceField> </ReferenceField>

View File

@@ -28,7 +28,6 @@ export function EquipmentList() {
return ( return (
<List filters={equipmentFilters} actions={<ListActions />} sort={{ field: 'name', order: 'ASC' }}> <List filters={equipmentFilters} actions={<ListActions />} sort={{ field: 'name', order: 'ASC' }}>
<Datagrid rowClick="show"> <Datagrid rowClick="show">
<TextField source="id" />
<TextField source="name" /> <TextField source="name" />
<TextField source="serialNumber" /> <TextField source="serialNumber" />
<DateField source="dateOfInspection" /> <DateField source="dateOfInspection" />