diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index be28f54..beacc0b 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -97,4 +97,5 @@
--system-color-green: #21ba72
--gray-background: #e9e9ed
--aqua-color: #2cc3e5
+ --system-color-yellow: #ffB931
diff --git a/src/components/base/BaseModal.vue b/src/components/base/BaseModal.vue
index bae9425..fc89f7b 100644
--- a/src/components/base/BaseModal.vue
+++ b/src/components/base/BaseModal.vue
@@ -6,7 +6,7 @@
ref="dialog"
)
.base-content(
- :class="{'draggable': draggable, 'base-content-default': !defaultPadding, 'base-modal-default': modalPadding}",
+ :class="{'draggable': draggable, 'none-padding': nonePadding, 'base-content-default': !defaultPadding, 'base-modal-default': modalPadding}",
ref="contentRef",
:style="{...contentStyles, height}"
)
@@ -29,6 +29,7 @@ export default {
showCloseIcon: Boolean,
draggable: Boolean,
hideOverlay: Boolean,
+ nonePadding: Boolean,
defaultPadding: Boolean,
modalPadding: Boolean,
hideHeader: Boolean,
@@ -139,6 +140,9 @@ export default {
.base-modal-default
padding: 28px 32px
+.none-padding
+ padding: 0px
+
.base-content
overflow: hidden
width: auto
diff --git a/src/pages/newCalendar/components/HeaderRecordForm.vue b/src/pages/newCalendar/components/HeaderRecordForm.vue
index c4eab3c..9282c79 100644
--- a/src/pages/newCalendar/components/HeaderRecordForm.vue
+++ b/src/pages/newCalendar/components/HeaderRecordForm.vue
@@ -39,7 +39,7 @@
.flex.h-14.gap-x-3.items-center.text-smm
.text.font-semibold Медкарта:
.flex.gap-x-1
- .name.flex.rounded-md.flex-col
+ .name.flex.rounded-md.flex-col(@click="showMedcard")
.flex.items-center.px-4.py-2.gap-x-2(:class="{'medcard': patient}")
.photo.flex.h-10.w-10.items-center.justify-center
img.w-10.h-10.rounded-full(v-if="patient", :src="patient.avatar")
@@ -49,6 +49,8 @@
.grey-color.text-xsx.rounded-md {{patient ? patient.birthday : "Дата"}}
.indicator-default.flex.w-full.h-1
.indicator.flex.h-1(:style="{width: patient ? patient.fill : '0%'}")
+ base-modal(v-model="isShowMedcard", none-padding)
+ medcard-modal(:data="patient")
.change.flex.items-center.rounded-md
q-btn(dense, padding="18px 4px", @click="isShowMedcards = true")
q-icon.icon(name="app:folder", size="20px")
@@ -71,6 +73,7 @@ import { trimName } from "@/pages/newCalendar/utils/calendarFunctions.js";
import * as moment from "moment/moment";
import BaseInput from "@/components/base/BaseInput.vue";
import { v_model } from "@/shared/mixins/v-model";
+import MedcardModal from "./MedcardModal.vue";
export default {
name: "HeaderRecordForm",
@@ -80,6 +83,7 @@ export default {
BaseModal,
BaseTimeModal,
MedcardsModal,
+ MedcardModal,
},
mixins: [v_model],
props: { currentStatus: Object, statuses: Array, choiceStatus: Function },
@@ -89,6 +93,7 @@ export default {
currentDate: moment().clone(),
isShowTime: false,
isShowMedcards: false,
+ isShowMedcard: false,
patients: patientList.find(({ id }) => id === 2).data,
times: "",
data: [
@@ -132,6 +137,9 @@ export default {
this.isShowMedcards = false;
this.patient = medcard;
},
+ showMedcard() {
+ if (this.patient) this.isShowMedcard = true;
+ },
validateTimeString(value = "") {
const [start = "", end = ""] = value.split(" - ");
this.validateTime(start);
diff --git a/src/pages/newCalendar/components/MedcardModal.vue b/src/pages/newCalendar/components/MedcardModal.vue
new file mode 100644
index 0000000..e4e2a58
--- /dev/null
+++ b/src/pages/newCalendar/components/MedcardModal.vue
@@ -0,0 +1,156 @@
+
+ .wrapper.flex.font-medium.flex-col.text-smm
+ .header.flex.flex-col.gap-y-6
+ .grey-color.text-smm.font-semibol {{"Медицинская карта: " + data.medicalNumber}}
+ .flex.gap-x-4.w-full
+ img.h-20.w-20.rounded-full(:src="data?.avatar")
+ .flex.items-center.justify-between.w-full
+ .info.flex.flex-col.gap-y-2
+ .text-5xl.font-bold {{data.last_name + " " + data.first_name + " " + data.patronymic}}
+ .flex.flex-col.text-m
+ span {{data.birthday}}
+ .flex.gap-x-2.items-center
+ span Приоритет:
+ .white-color.flex.grey-color.rounded.items-center.px-3.h-6.w-fit(
+ :class="selectedPriority"
+ ) {{selectedPriorityName}}
+ .circle.flex.rounded-full.items-center.justify-center(
+ :style="{background: choiceFill(data.fill)}"
+ )
+ .flex.flex-col.items-center
+ .text-5xl.font-bold {{data.fill}}
+ .grey-color.text-xsx Заполнено
+ .body.flex.px-8.py-6.flex-col.gap-y-4
+ .flex.gap-x-4.items-center
+ .title.flex.text-m.grey-color Соцсети:
+ .wrap.flex.gap-1
+ .network.flex.h-7.items-center.gap-x-2.cursor-pointer(
+ v-for="network in data.networks"
+ )
+ q-icon.blue-fill(:name="network.icon", size="24px")
+ span {{network.name}}
+ .flex.gap-x-4.items-center
+ .title.flex.text-m.grey-color Телефон:
+ .flex {{data?.phone}}
+ .flex.gap-x-4.items-center
+ .title.flex.text-m.grey-color Email:
+ .flex {{data?.email}}
+ .flex.gap-x-4.items-center
+ .title.flex.text-m.grey-color Страхование:
+ .flex.gap-x-2.items-center
+ span {{data?.company}}
+ .policy.flex.items-center.gap-x-2.pl-3.pr-2.h-7
+ span {{data?.policy}}
+ q-icon.cursor-pointer.grey-fill(
+ @click="copyValue(data.policy)",
+ name="app:copy", size="18px"
+ )
+ .flex.gap-x-4.items-center
+ .title.flex.text-m.grey-color Особые отметки:
+ .wrap.flex.gap-x-1.gap-y-1
+ .flex.h-7.w-fit.items-center.px-3.rounded(
+ v-for="mark in data.marks", :style="{background: mark.color}"
+ ) {{mark.name}}
+ .footer.flex
+
+
+
+
+
diff --git a/src/pages/newCalendar/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js
index 0c47c79..4f9158d 100644
--- a/src/pages/newCalendar/utils/calendarConfig.js
+++ b/src/pages/newCalendar/utils/calendarConfig.js
@@ -111,6 +111,7 @@ export const patientList = [
patronymic: "Александрович",
birthday: "28.03.1980",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -121,7 +122,28 @@ export const patientList = [
email: "gaevaia@yandex.ru",
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
- fill: "90%",
+ fill: "33%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 1,
@@ -130,6 +152,7 @@ export const patientList = [
patronymic: "Олегович",
birthday: "01.03.1975",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -141,6 +164,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "20%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 2,
@@ -149,6 +193,7 @@ export const patientList = [
patronymic: "Васильевич",
birthday: "13.07.1999",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -160,6 +205,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "50%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 3,
@@ -168,6 +234,7 @@ export const patientList = [
patronymic: "Робертович",
birthday: "11.11.1991",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -179,6 +246,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "50%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 4,
@@ -187,6 +275,7 @@ export const patientList = [
patronymic: "Алексеевич",
birthday: "12.03.1989",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -198,6 +287,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "50%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 5,
@@ -206,6 +316,7 @@ export const patientList = [
patronymic: "Васильевич",
birthday: "31.07.1949",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -217,6 +328,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "50%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 6,
@@ -225,6 +357,7 @@ export const patientList = [
patronymic: "Олеговна",
birthday: "12.11.1995",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -236,6 +369,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "50%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 7,
@@ -244,6 +398,7 @@ export const patientList = [
patronymic: "Алексеевич",
birthday: "15.05.1989",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -255,6 +410,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "50%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 8,
@@ -263,6 +439,7 @@ export const patientList = [
patronymic: "Васильевич",
birthday: "13.07.2000",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -274,6 +451,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "50%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 9,
@@ -282,6 +480,7 @@ export const patientList = [
patronymic: "Федорович",
birthday: "12.12.1986",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -293,6 +492,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "50%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
{
id: 10,
@@ -301,6 +521,7 @@ export const patientList = [
patronymic: "Алексеевич",
birthday: "13.03.1979",
avatar: personImage,
+ medicalNumber: "#12314",
check: false,
view: false,
viewDate: "",
@@ -312,6 +533,27 @@ export const patientList = [
company: "ООО «АльфаСтрахование»",
policy: "№ 2131-1331-4142",
fill: "50%",
+ marks: [
+ {
+ id: 0,
+ name: "Неправильный прикус",
+ color: "#D8E3FF",
+ },
+ {
+ id: 1,
+ name: "Нервозность",
+ color: "#CEF1F3",
+ },
+ {
+ id: 2,
+ name: "Парадантит",
+ color: "#EBDBFF",
+ },
+ ],
+ networks: [
+ { id: 0, name: "VK", link: "vk.com/", icon: "app:vk" },
+ { id: 1, name: "Telegram", link: "tg.com/", icon: "app:tg" },
+ ],
},
],
choice: false,
diff --git a/tailwind.config.js b/tailwind.config.js
index e1fd109..8b6975e 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -58,6 +58,7 @@ module.exports = {
"19px": "19px",
"22px": "22px",
"23px": "23px",
+ "25px": "25px",
"27px": "27px",
"29_25px": "29.25px",
"30px": "30px",