diff --git a/web-app/src/Components/Dummies/AppointmentFormModal/AppointmentFormModal.jsx b/web-app/src/Components/Dummies/AppointmentFormModal/AppointmentFormModal.jsx index 7ba5703..a612b90 100644 --- a/web-app/src/Components/Dummies/AppointmentFormModal/AppointmentFormModal.jsx +++ b/web-app/src/Components/Dummies/AppointmentFormModal/AppointmentFormModal.jsx @@ -228,10 +228,9 @@ const AppointmentFormModal = () => { ]); const ConfirmStep = useMemo(() => { - const values = appointmentFormModalUI.form.getFieldsValue(); const formValues = appointmentFormModalUI.formValues; - const patient = appointmentFormModalData.patients.find((p) => p.id === values.patient_id); - const appointmentType = appointmentFormModalData.appointmentTypes.find((t) => t.id === values.type_id); + const patient = appointmentFormModalData.patients.find((p) => p.id === formValues.patient_id); + const appointmentType = appointmentFormModalData.appointmentTypes.find((t) => t.id === formValues.type_id); return (
Время приема:{" "} - {values.appointment_datetime ? dayjs(values.appointment_datetime).format("DD.MM.YYYY HH:mm") : "Не указано"} + {formValues.appointment_datetime ? dayjs(formValues.appointment_datetime).format("DD.MM.YYYY HH:mm") : "Не указано"}
- Дней до следующего приема: {values.days_until_the_next_appointment || "Не указано"} + Дней до следующего приема: {formValues.days_until_the_next_appointment || "Не указано"}
Результаты приема: diff --git a/web-app/src/Components/Dummies/AppointmentFormModal/useAppointmentFormModalUI.js b/web-app/src/Components/Dummies/AppointmentFormModal/useAppointmentFormModalUI.js index 5206740..bf97e7b 100644 --- a/web-app/src/Components/Dummies/AppointmentFormModal/useAppointmentFormModalUI.js +++ b/web-app/src/Components/Dummies/AppointmentFormModal/useAppointmentFormModalUI.js @@ -274,7 +274,7 @@ const useAppointmentFormModalUI = (createAppointment, patients, cancelAppointmen } else if (currentStep === 1) { try { const values = await form.validateFields(); - setFormValues(values); + setFormValues({...values, patient_id: selectedPatient.id}); setCurrentStep(2); } catch (error) { notification.error({ diff --git a/web-app/src/Components/Pages/MailingPage/MailingPage.jsx b/web-app/src/Components/Pages/MailingPage/MailingPage.jsx index 84e7af2..706495d 100644 --- a/web-app/src/Components/Pages/MailingPage/MailingPage.jsx +++ b/web-app/src/Components/Pages/MailingPage/MailingPage.jsx @@ -70,6 +70,7 @@ const MailingPage = () => { value={searchQuery} onChange={handleSearchChange} style={{ marginBottom: 16, width: isMobile ? "100%" : 300 }} + allowClear />