diff --git a/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue
index c1d8093..ac656c1 100644
--- a/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue
+++ b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue
@@ -1,6 +1,6 @@
medcard-form-wrapper(v-if="patient", title="Пациент на приеме", title-link="Медкарта")
- .flex.flex-col
+ .flex.flex-col.h-full
.header.flex.px-6.py-5.justify-between
.flex.text-base.font-medium.gap-x-3
img.h-14.w-14.object-cover.rounded-full(:src="patient?.avatar")
@@ -12,16 +12,15 @@
.priority.flex(:class="choiceClass(patient.priority)")
.text-smm(:class="choiceColor(patient.priority)") {{choicePriority(patient.priority)}}
.grey-color.text-smm Приоритет
- .flex
- .data.flex.w-full.h-full(v-for="item in data")
- .flex.flex-col.px-6.py-4.gap-y-6
- .text-m.font-bold {{item.title}}
- .flex.flex-col.text-smm
- .grey-color {{item.text1}}
- .font-medium {{item.first}}
- .flex.flex-col.text-smm
- .grey-color {{item.text2}}
- .font-medium {{item.second}}
+ .flex.h-full
+ .data.flex.w-full.h-full.flex-col.px-6.py-4.gap-y-6.overflow-hidden(v-for="item in data")
+ .text-m.font-bold {{item.title}}
+ .flex.flex-col.text-smm.overflow-hidden.relative.gap-y-1
+ .grey-color {{item.firstLabel}}
+ .insurance.flex.font-medium {{item.firstDescription}}
+ .flex.flex-col.text-smm.gap-y-1
+ .grey-color {{item.secondLabel}}
+ .font-medium {{item.secondDescription}}
-
+
diff --git a/src/pages/medcards/components/MedcardFormWrapper.vue b/src/pages/medcards/components/MedcardFormWrapper.vue
index bae968a..8134e60 100644
--- a/src/pages/medcards/components/MedcardFormWrapper.vue
+++ b/src/pages/medcards/components/MedcardFormWrapper.vue
@@ -1,5 +1,5 @@
- .form-wrapper.flex.flex-col.w-full.rounded
+ .wrapper.flex.flex-col.w-full.rounded
.header.flex.items-center.text-sm.font-bold.justify-between.w-full.px-6.py-5
.left-side.flex.gap-x-2.items-center
span {{title}}
@@ -22,7 +22,7 @@ export default {
+
diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue
index 2a39686..88ca660 100644
--- a/src/pages/newCalendar/components/CalendarOpenSidebar.vue
+++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue
@@ -17,6 +17,7 @@
span Создать запись
.flex.flex-col.gap-y-px
q-expansion-item.expansion.font-bold.text-xm(
+ expand-icon="app:down-arrow",
v-for="(elem, index) in patientList",
expand-separator,
:label="elem.label",
@@ -301,6 +302,10 @@ export default {
.expansion :deep(.q-focus-helper)
display: none
+.expansion
+ &:deep(path)
+ fill: var(--font-dark-blue-color)
+
.person-wrapper
overflow-y: auto
margin-right: -10px
diff --git a/src/pages/newCalendar/components/CalendarRecordCard.vue b/src/pages/newCalendar/components/CalendarRecordCard.vue
index 0a6ebf9..e29b939 100644
--- a/src/pages/newCalendar/components/CalendarRecordCard.vue
+++ b/src/pages/newCalendar/components/CalendarRecordCard.vue
@@ -43,8 +43,7 @@