From 4bc144a35fd725b4b5eee435f9694e07cdba4ff0 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 4 Apr 2023 17:37:20 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=98=D0=BD=D1=82=D0=B5=D0=B3=D1=80?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=D0=B0=20=D0=BA=D0=B0=D1=80?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BA=D1=83=20=D1=81=20=D0=B1=D1=8D=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/MedicalCardHeader.vue | 75 +++++++++++++------ 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/src/pages/newMedicalCard/components/MedicalCardHeader.vue b/src/pages/newMedicalCard/components/MedicalCardHeader.vue index 09b36e6..30bd0df 100644 --- a/src/pages/newMedicalCard/components/MedicalCardHeader.vue +++ b/src/pages/newMedicalCard/components/MedicalCardHeader.vue @@ -9,7 +9,7 @@ color="grey", ) q-breadcrumbs-el(label="Календарь") - q-breadcrumbs-el(label="Медкарта #13019319") + q-breadcrumbs-el(:label="`Медкарта #${medicalCardData?.number}`") q-btn( flat, text-color="grey", @@ -21,23 +21,24 @@ span Удалить медкарту .ml-6.flex.gap-x-4 q-avatar(size="80px", :style="{'background-color': 'var(--border-light-grey-color)', color: 'var(--font-dark-blue-color)'}") - img(v-if="patient?.avatar", :src="patient?.avatar") + img(v-if="patientData?.photo", :src="url + patientData?.photo") span.text-2xl(v-else) {{patientAvatar}} .flex.gap-y-1.flex-col .flex.items-center span.text-xxl.font-bold.mr-3( :style="{color: 'var(--font-dark-blue-color)', 'line-height': '135%'}", - ) {{`${patient?.first_name} ${patient?.last_name} ${patient?.patronimic}`}} + ) {{patientName}} q-chip( square, text-color="white", - :style="{height: '20px', background: priority.color, padding: '2px 8px'}", - :label="priority.text" + :style="{height: '20px', background: priority?.color, padding: '2px 8px'}", + :label="priority?.text" ) q-btn-dropdown( + v-if="allergiesList?.length > 0" :style="{background: 'var(--border-red-color)', height: '20px'}", text-color="white", - :label="`+${patient?.allergy?.length}`" + :label="`+${allergiesList?.length}`" icon="pan_tool" size="10px", padding="2px 8px", @@ -48,14 +49,14 @@ q-list.w-56(:style="{padding: '16px', color: 'var(--font-dark-blue-color)'}") q-item.text-smm( v-close-popup, - v-for="allergy in patient?.allergy", + v-for="allergy in allergiesList", :style="{padding: 0, 'min-height': '32px'}" ) q-item-section.cursor-pointer {{allergy}} span.text-smm.label-color Добавлен в систему: - span.date-color {{ patient?.addedDate}} + span.date-color {{ createdDate }} span.text-smm.label-color Последнее обновление: - span.date-color {{patient?.updatedDate}} + span.date-color {{ updatedDate }} .flex.justify-between.pt-4 .flex .menu-item.px-6.py-10px.cursor-pointer.text-base( @@ -81,6 +82,7 @@