andrei/visus-plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

починил выдачу линз

Browse Source
This commit is contained in:
Андрей Дувакин 2025-06-01 10:52:44 +05:00
parent 6c4ecc49ac
commit b0e654a367
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web-app/src/Components/Pages/IssuesPage/Components/LensIssueFormModal/LensIssueFormModal.jsx
View File

@ -118,7 +118,11 @@ const LensIssueFormModal = ({visible, onCancel, onSubmit}) => {
); );
}, [lensIssueFormModalUI.blockStepStyle, lensIssueFormModalUI.chooseContainerStyle, lensIssueFormModalUI.handleSetSearchLensString, lensIssueFormModalUI.resetLens, lensIssueFormModalUI.searchInputStyle, lensIssueFormModalUI.searchLensString, lensIssueFormModalUI.selectedLens, lensesItems]); }, [lensIssueFormModalUI.blockStepStyle, lensIssueFormModalUI.chooseContainerStyle, lensIssueFormModalUI.handleSetSearchLensString, lensIssueFormModalUI.resetLens, lensIssueFormModalUI.searchInputStyle, lensIssueFormModalUI.searchLensString, lensIssueFormModalUI.selectedLens, lensesItems]);
const ConfirmStep = () => { const ConfirmStep = useMemo(() => {
if (!lensIssueFormModalUI.selectedPatient || !lensIssueFormModalUI.selectedLens) {
return null;
}
return ( return (
<> <>
<Alert <Alert
@ -175,7 +179,7 @@ const LensIssueFormModal = ({visible, onCancel, onSubmit}) => {
</div> </div>
</> </>
); );
}; }, [lensIssueFormModalUI]);
const steps = [{ const steps = [{
title: 'Выбор пациента', content: SelectPatientStep, title: 'Выбор пациента', content: SelectPatientStep,
@ -185,6 +189,8 @@ const LensIssueFormModal = ({visible, onCancel, onSubmit}) => {
title: 'Подтверждение', content: ConfirmStep, title: 'Подтверждение', content: ConfirmStep,
}]; }];
console.log(steps[lensIssueFormModalUI.currentStep].title)
return ( return (
<Modal <Modal
title="Выдача линзы пациенту" title="Выдача линзы пациенту"

10
web-app/src/Components/Pages/IssuesPage/Components/LensIssueFormModal/useLensIssueForm.js
View File

@ -3,8 +3,14 @@ import {useGetNotIssuedLensesQuery} from "../../../../../Api/lensesApi.js";
const useLensIssueForm = () => { const useLensIssueForm = () => {
const {data: patients = [], isLoading: isLoadingPatients, isError: isErrorPatients} = useGetPatientsQuery(undefined); const {data: patients = [], isLoading: isLoadingPatients, isError: isErrorPatients} = useGetPatientsQuery(undefined, {
const {data: lenses = [], isLoading: isLoadingLenses, isError: isErrorLenses} = useGetNotIssuedLensesQuery(undefined); pollingInterval: 10000,
});
const {data: lenses = [], isLoading: isLoadingLenses, isError: isErrorLenses} = useGetNotIssuedLensesQuery(undefined, {
pollingInterval: 10000,
});
console.log(lenses)
return { return {
patients, patients,

2
web-app/src/Components/Pages/LensesSetsPage/Components/LensesTab/useLensesUI.js
View File

@ -85,7 +85,7 @@ const useLensesUI = (lenses) => {
return textMatch && advancedMatch && (searchParams.issued || lens.issued === false); return textMatch && advancedMatch && (searchParams.issued || lens.issued === false);
}).sort((a, b) => { }).sort((a, b) => {
return a.preset_refraction - b.preset_refraction; return b.id - a.id;
}); });
}, [lenses, searchText, searchParams]); }, [lenses, searchText, searchParams]);