From 10dd978bd7549f5588e09865ded7a45ef1977239 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Fri, 28 Apr 2023 17:37:58 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=20=D1=85=D0=B5=D0=B4=D0=B5=D1=80=20=D0=BA=D0=B0=D1=80?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/teeth.svg | 3 ++ src/components/base/BaseSelect.vue | 7 ++++ .../components/MedicalProtocolsList.vue | 35 +++++++++++++++++-- 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 src/assets/icons/teeth.svg diff --git a/src/assets/icons/teeth.svg b/src/assets/icons/teeth.svg new file mode 100644 index 0000000..d681b88 --- /dev/null +++ b/src/assets/icons/teeth.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue index b498f6a..9b78e71 100644 --- a/src/components/base/BaseSelect.vue +++ b/src/components/base/BaseSelect.vue @@ -12,6 +12,7 @@ :bg-color="bgColor", :standout="standout", dense, + :behavior="behavior", emit-value, map-options ) @@ -100,3 +101,9 @@ export default { }, }; + diff --git a/src/pages/newMedicalCard/components/MedicalProtocolsList.vue b/src/pages/newMedicalCard/components/MedicalProtocolsList.vue index 5c07cc4..b026cfa 100644 --- a/src/pages/newMedicalCard/components/MedicalProtocolsList.vue +++ b/src/pages/newMedicalCard/components/MedicalProtocolsList.vue @@ -9,9 +9,11 @@ icon="add", :style="{width: '100%'}" ) - .p-4.rounded.background.h-full.w-full - .flex.w-full - base-select(:style="{flex: 1}") + .p-4.rounded.background.h-full + .flex + base-select( + :style="{flex: 1}", + ) q-btn.ml-2( icon="sort" :style="{width: '40px', height: '40px'}", @@ -19,6 +21,20 @@ :class="sortingClass" @click="invertSorting" ) + .flex.py-4.w-full.color-grey.text-base.justify-center + span.opacity-50 Осмотров: 5 + .flex.gap-y-2 + .w-full.border.rounded.border-grey.p-4 + .flex.justify-between.mb-7 + .flex.flex-col.gap-y-1 + span.text-xl.font-bold.color-blue.line-height 2023 г. + .text-smm.color-grey.flex.items-center.gap-x-6px.line-height + span.align-middle 22.02 + .rounded-full.h-1.w-1.background-grey + span.align-middle 18:30 - 19:30 + .flex.items-center.justify-center.h-6.w-6.rounded.background-grey + img.teeth-icon(src="@/assets/icons/teeth.svg") + .h-10