diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index 3ac4b5d..b0adb93 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -91,6 +91,8 @@
--bg-chip-yellow-color: #fff0ca
--bg-chip-pink-color: #F7D9FF
--gray-thirdly: #f4f4f6
- --surface-blue-big: #ECF0FE
- --gray-scondary:#DDDDE8
+ --surface-blue-big: #ecf0fe
+ --gray-scondary: #dddde8
+ --system-color-red: #f34549
+ --system-color-green: #21ba72
diff --git a/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue
index 6ad92e0..c1d8093 100644
--- a/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue
+++ b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue
@@ -1,14 +1,130 @@
- medcard-form-wrapper(title="Пациент на приеме", title-link="Медкарта")
+ medcard-form-wrapper(v-if="patient", title="Пациент на приеме", title-link="Медкарта")
+ .flex.flex-col
+ .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")
+ .flex.flex-col.justify-center.gap-y-1
+ .font-bold.text-xll {{patient.last_name + " " + patient.first_name + " " + patient.patronymic}}
+ .grey-color.text-smm {{patient?.birthday}}
+ .flex.flex-col.gap-y-1.text-smm.font-medium
+ .flex.items-center.gap-x-2
+ .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}}
-
+
diff --git a/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
index 1dccefe..4fd7027 100644
--- a/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
+++ b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
@@ -1,15 +1,105 @@
- medcard-form-wrapper(title="Пациенты на сегодня", :quantity="13", title-link="Календарь")
- .flex gwiefujm
+ medcard-form-wrapper.relative(
+ title="Пациенты на сегодня",
+ :quantity="patientsData.length",
+ title-link="Календарь"
+ )
+ .form-wrapper.flex.flex-col.overflow-y-auto(@scroll="scrollTo")
+ .patient.flex.items-center.gap-x-6.p-4(v-for="(patient, index) in patientsData")
+ .flex.text-base.font-medium.gap-x-3
+ img.h-11.w-11.object-cover.rounded-full(:src="patient.avatar")
+ .flex.flex-col.justify-center
+ .name.flex.relative {{trimName(patient.last_name, patient.first_name, patient.patronymic)}}
+ .gradient.flex.absolute
+ .grey-color.text-smm {{patient.birthday}}
+ .flex.flex-col.justify-center
+ .text-m.font-bold {{patient.time.from + " - " + patient.time.to}}
+ .grey-color.font-medium.text-smm(
+ :class="{'red-color': !index}"
+ ) {{index ? "Время посещения" : "Скоро прием" }}
+ .flex
+ .gradient-name.flex.absolute(v-if="isGradient")
-
+
diff --git a/src/pages/newCalendar/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js
index 258ed09..2520152 100644
--- a/src/pages/newCalendar/utils/calendarConfig.js
+++ b/src/pages/newCalendar/utils/calendarConfig.js
@@ -119,6 +119,13 @@ export const patientList = [
birthday: "28.03.1980",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "12:00", to: "23:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 1,
@@ -128,6 +135,13 @@ export const patientList = [
birthday: "01.03.1975",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "11:00", to: "12:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 2,
@@ -137,6 +151,13 @@ export const patientList = [
birthday: "13.07.1999",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "14:00", to: "16:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 3,
@@ -146,6 +167,13 @@ export const patientList = [
birthday: "11.11.1991",
avatar: personImage,
check: false,
+ reception: "27.07.2023",
+ time: { from: "12:00", to: "14:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 4,
@@ -155,6 +183,13 @@ export const patientList = [
birthday: "12.03.1989",
avatar: personImage,
check: false,
+ reception: "27.07.2023",
+ time: { from: "11:00", to: "14:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 5,
@@ -164,6 +199,13 @@ export const patientList = [
birthday: "23.07.1949",
avatar: personImage,
check: false,
+ reception: "28.07.2023",
+ time: { from: "18:00", to: "19:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 6,
@@ -173,6 +215,13 @@ export const patientList = [
birthday: "12.11.1995",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "16:00", to: "17:00" },
+ priority: 0,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 7,
@@ -182,6 +231,13 @@ export const patientList = [
birthday: "15.05.1989",
avatar: personImage,
check: false,
+ reception: "25.07.2023",
+ time: { from: "20:00", to: "21:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 8,
@@ -191,6 +247,13 @@ export const patientList = [
birthday: "13.07.2000",
avatar: personImage,
check: false,
+ reception: "31.06.2023",
+ time: { from: "12:00", to: "14:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 9,
@@ -200,6 +263,13 @@ export const patientList = [
birthday: "12.12.1986",
avatar: personImage,
check: false,
+ reception: "30.07.2023",
+ time: { from: "12:00", to: "14:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
{
id: 10,
@@ -209,6 +279,13 @@ export const patientList = [
birthday: "13.03.1979",
avatar: personImage,
check: false,
+ reception: "27.07.2023",
+ time: { from: "09:00", to: "10:00" },
+ priority: 1,
+ phone: "+7 (910) 623–32–23",
+ email: "gaevaia@yandex.ru",
+ company: "ООО «АльфаСтрахование»",
+ policy: "№ 2131-1331-4142",
},
],
choice: false,
diff --git a/tailwind.config.js b/tailwind.config.js
index 066ab8c..e1fd109 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -21,6 +21,7 @@ module.exports = {
lg: ["18px", { lineHeight: "21px" }],
lgx: ["22px", { lineHeight: "25.83px" }],
xl: ["20px", { lineHeight: "23px" }],
+ xll: ["20px", { lineHeight: "24px" }],
xxl: ["24px", { lineHeight: "26px" }],
"2xl": ["28px", { lineHeight: "33px" }],
"3xl": ["60px", { lineHeight: "70px" }],