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/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js
index 2520152..056faef 100644
--- a/src/pages/newCalendar/utils/calendarConfig.js
+++ b/src/pages/newCalendar/utils/calendarConfig.js
@@ -119,8 +119,10 @@ export const patientList = [
birthday: "28.03.1980",
avatar: personImage,
check: false,
- reception: "25.07.2023",
- time: { from: "12:00", to: "23:00" },
+ view: false,
+ viewDate: "",
+ reception: "26.07.2023",
+ time: { from: "11:00", to: "18:00" },
priority: 1,
phone: "+7 (910) 623–32–23",
email: "gaevaia@yandex.ru",
@@ -135,8 +137,10 @@ export const patientList = [
birthday: "01.03.1975",
avatar: personImage,
check: false,
- reception: "25.07.2023",
- time: { from: "11:00", to: "12:00" },
+ view: false,
+ viewDate: "",
+ reception: "26.07.2023",
+ time: { from: "05:00", to: "06:00" },
priority: 1,
phone: "+7 (910) 623–32–23",
email: "gaevaia@yandex.ru",
@@ -151,8 +155,10 @@ export const patientList = [
birthday: "13.07.1999",
avatar: personImage,
check: false,
- reception: "25.07.2023",
- time: { from: "14:00", to: "16:00" },
+ view: false,
+ viewDate: "",
+ reception: "26.07.2023",
+ time: { from: "18:00", to: "19:00" },
priority: 1,
phone: "+7 (910) 623–32–23",
email: "gaevaia@yandex.ru",
@@ -161,14 +167,16 @@ export const patientList = [
},
{
id: 3,
- first_name: "Самвел",
+ first_name: "Самвелиуслим",
last_name: "Акопян",
patronymic: "Робертович",
birthday: "11.11.1991",
avatar: personImage,
check: false,
- reception: "27.07.2023",
- time: { from: "12:00", to: "14:00" },
+ view: false,
+ viewDate: "",
+ reception: "26.07.2023",
+ time: { from: "19:00", to: "20:00" },
priority: 1,
phone: "+7 (910) 623–32–23",
email: "gaevaia@yandex.ru",
@@ -183,6 +191,8 @@ export const patientList = [
birthday: "12.03.1989",
avatar: personImage,
check: false,
+ view: false,
+ viewDate: "",
reception: "27.07.2023",
time: { from: "11:00", to: "14:00" },
priority: 1,
@@ -199,6 +209,8 @@ export const patientList = [
birthday: "23.07.1949",
avatar: personImage,
check: false,
+ view: false,
+ viewDate: "",
reception: "28.07.2023",
time: { from: "18:00", to: "19:00" },
priority: 1,
@@ -215,7 +227,9 @@ export const patientList = [
birthday: "12.11.1995",
avatar: personImage,
check: false,
- reception: "25.07.2023",
+ view: false,
+ viewDate: "",
+ reception: "26.07.2023",
time: { from: "16:00", to: "17:00" },
priority: 0,
phone: "+7 (910) 623–32–23",
@@ -231,7 +245,9 @@ export const patientList = [
birthday: "15.05.1989",
avatar: personImage,
check: false,
- reception: "25.07.2023",
+ view: false,
+ viewDate: "",
+ reception: "26.07.2023",
time: { from: "20:00", to: "21:00" },
priority: 1,
phone: "+7 (910) 623–32–23",
@@ -247,8 +263,10 @@ export const patientList = [
birthday: "13.07.2000",
avatar: personImage,
check: false,
- reception: "31.06.2023",
- time: { from: "12:00", to: "14:00" },
+ view: false,
+ viewDate: "",
+ reception: "26.06.2023",
+ time: { from: "22:00", to: "23:00" },
priority: 1,
phone: "+7 (910) 623–32–23",
email: "gaevaia@yandex.ru",
@@ -263,8 +281,10 @@ export const patientList = [
birthday: "12.12.1986",
avatar: personImage,
check: false,
- reception: "30.07.2023",
- time: { from: "12:00", to: "14:00" },
+ view: false,
+ viewDate: "",
+ reception: "25.07.2023",
+ time: { from: "22:00", to: "23:00" },
priority: 1,
phone: "+7 (910) 623–32–23",
email: "gaevaia@yandex.ru",
@@ -279,6 +299,8 @@ export const patientList = [
birthday: "13.03.1979",
avatar: personImage,
check: false,
+ view: false,
+ viewDate: "",
reception: "27.07.2023",
time: { from: "09:00", to: "10:00" },
priority: 1,