From 563b53a409870aa81c1e1579431d8864bbf0ed0b Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Tue, 1 Aug 2023 17:26:05 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5?= =?UTF-8?q?=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=B5=D0=B4=D0=BA=D0=B0=D1=80=D1=82=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D0=B5=20=D1=81=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/HeaderRecordForm.vue | 31 +++- .../newCalendar/components/MedcardsModal.vue | 141 ++++++++++++++++++ 2 files changed, 167 insertions(+), 5 deletions(-) create mode 100644 src/pages/newCalendar/components/MedcardsModal.vue diff --git a/src/pages/newCalendar/components/HeaderRecordForm.vue b/src/pages/newCalendar/components/HeaderRecordForm.vue index f815467..26a4c91 100644 --- a/src/pages/newCalendar/components/HeaderRecordForm.vue +++ b/src/pages/newCalendar/components/HeaderRecordForm.vue @@ -46,13 +46,20 @@ .flex.gap-x-1 .name.flex.items-center.px-4.pt-2.pb-1.gap-x-2.rounded-md .photo.flex.h-10.w-10.items-center.justify-center - q-icon.icon(name="app:noname", size="24px") + img.w-10.h-10.rounded-full(v-if="patient", :src="patient.avatar") + q-icon.icon(v-else, name="app:noname", size="24px") .flex.flex-col.font-medium - .dark-blue Имя Фамилия - .grey-color.text-xsx.rounded-md Дата + .dark-blue {{patient ? trimPatientName(patient.last_name, patient.first_name, patient.patronymic) : "Имя Фамилия"}} + .grey-color.text-xsx.rounded-md {{patient ? patient.birthday : "Дата"}} .change.flex.items-center.rounded-md - q-btn(dense, padding="18px 4px") + q-btn(dense, padding="18px 4px", @click="isShowMedcards = true") q-icon.icon(name="app:folder", size="20px") + base-modal(v-model="isShowMedcards", title="Медкарты", modal-padding) + medcards-modal( + :save-medcard="saveMedcard", + :close-medcards="closeModalMedcards", + :patients="patients" + ) diff --git a/src/pages/newCalendar/components/MedcardsModal.vue b/src/pages/newCalendar/components/MedcardsModal.vue new file mode 100644 index 0000000..a4932b8 --- /dev/null +++ b/src/pages/newCalendar/components/MedcardsModal.vue @@ -0,0 +1,141 @@ + + + + +