diff --git a/src/assets/icons/calendar-grey.svg b/src/assets/icons/calendar-grey.svg
new file mode 100644
index 0000000..d813c8b
--- /dev/null
+++ b/src/assets/icons/calendar-grey.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/assets/icons/folder.svg b/src/assets/icons/folder.svg
new file mode 100644
index 0000000..7325acf
--- /dev/null
+++ b/src/assets/icons/folder.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/assets/icons/noname.svg b/src/assets/icons/noname.svg
new file mode 100644
index 0000000..c9f6868
--- /dev/null
+++ b/src/assets/icons/noname.svg
@@ -0,0 +1,5 @@
+
diff --git a/src/assets/icons/time.svg b/src/assets/icons/time.svg
new file mode 100644
index 0000000..a529182
--- /dev/null
+++ b/src/assets/icons/time.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/components/base/BaseModal.vue b/src/components/base/BaseModal.vue
index 7832c5a..e95635a 100644
--- a/src/components/base/BaseModal.vue
+++ b/src/components/base/BaseModal.vue
@@ -4,7 +4,7 @@
@show="onShow",
@hide="onHide",
ref="dialog"
- )
+ )
.base-content(
:class="{'draggable': draggable, 'base-content-default': !defaultPadding}",
ref="contentRef",
@@ -165,4 +165,6 @@ export default {
@media (min-width: 600px)
.q-dialog__inner--minimized > div
max-width: 100vh !important
+.q-dialog
+ font-feature-settings: 'pnum' on, 'lnum' on
diff --git a/src/pages/newCalendar/TheCalendar.vue b/src/pages/newCalendar/TheCalendar.vue
index 4c98bdf..b3ac0e4 100644
--- a/src/pages/newCalendar/TheCalendar.vue
+++ b/src/pages/newCalendar/TheCalendar.vue
@@ -1,29 +1,40 @@
.w-full.flex
- calendar-sidebar(v-if="!isOpen", :open-sidebar="openSidebar")
- calendar-open-sidebar(v-else, :open-sidebar="openSidebar")
+ calendar-sidebar(v-if="!isOpen", :open-sidebar="openSidebar", :create-form="createForm")
+ calendar-open-sidebar(v-else, :open-sidebar="openSidebar", :create-form="createForm")
calendar-wrapper.ml-2(:open-sidebar="isOpen")
+ record-creation-form(:is-show-form="isShowForm")
diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue
index 1046ee7..76df06b 100644
--- a/src/pages/newCalendar/components/CalendarOpenSidebar.vue
+++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue
@@ -13,6 +13,7 @@
color="primary",
size="16px",
label="Создать запись",
+ @click="createForm",
no-caps,
icon="add",
:style="{width: '100%', height: '40px'}",
@@ -82,7 +83,7 @@ import { patientList } from "@/pages/newCalendar/utils/calendarConfig.js";
export default {
name: "CalendarOpenSidebar",
- props: { openSidebar: Function },
+ props: { openSidebar: Function, createForm: Function },
components: { BaseInput },
data() {
return {
diff --git a/src/pages/newCalendar/components/CalendarSidebar.vue b/src/pages/newCalendar/components/CalendarSidebar.vue
index 1d9443d..0f81b70 100644
--- a/src/pages/newCalendar/components/CalendarSidebar.vue
+++ b/src/pages/newCalendar/components/CalendarSidebar.vue
@@ -9,7 +9,7 @@
)
img(:src="arrow")
.button.flex
- q-btn(color="primary", dense, padding="14px")
+ q-btn(color="primary", dense, padding="14px", @click="createForm")
q-icon(name="app:icon-plus", size="12px")
.button.flex
q-btn(dense, style="color: var(--font-grey-color)", padding="0px")
@@ -30,7 +30,7 @@ import round from "@/assets/icons/status_round.svg";
export default {
name: "CalendarSidebar",
- props: { openSidebar: Function },
+ props: { openSidebar: Function, createForm: Function },
data() {
return { arrow, group, medcard, round };
},
diff --git a/src/pages/newCalendar/components/RecordCreationForm.vue b/src/pages/newCalendar/components/RecordCreationForm.vue
new file mode 100644
index 0000000..72e21c8
--- /dev/null
+++ b/src/pages/newCalendar/components/RecordCreationForm.vue
@@ -0,0 +1,105 @@
+
+ base-modal(v-model="isShowForm", title="Создание записи")
+ .flex.flex-col.pt-6.gap-y-4(:style="{maxWidth: '682px'}")
+ .flex.gap-x-10
+ .flex.flex-col.gap-y-4.text-smm
+ .flex.gap-x-3.items-center
+ .text.font-semibold Статус
+ .flex.gap-x-1
+ .input.flex.items-center.pl-4
+ .text-input.font-medium Не принят
+ q-btn.change.flex.w-7.h-7(dense, padding="4px 4px")
+ img(:src="folder")
+ .flex.gap-x-3.items-center
+ .text.font-semibold Дата:
+ .flex.gap-x-1
+ .input.flex.items-center.pl-4
+ .text-input.font-medium 24 мая 2020
+ q-btn.change.flex.w-7.h-7(dense, padding="4px 4px")
+ img(:src="calendar")
+ .flex.gap-x-3.items-center
+ .text.font-semibold Время:
+ .flex.gap-x-1
+ .input.flex.items-center.pl-4
+ .text-input.font-medium 13:00 - 14:00
+ q-btn.change.flex.w-7.h-7(dense, padding="4px 4px")
+ img(:src="time")
+ .flex.h-14.gap-x-3.items-center.text-smm
+ .text.font-semibold Медкарта:
+ .flex.gap-x-1
+ .name.flex.items-center.px-4.pt-2.pb-1.gap-x-2
+ .photo.flex.h-10.w-10.items-center.justify-center
+ img(:src="noname")
+ .flex.flex-col.font-medium
+ .text-input Имя Фамилия
+ .name-date.text-xsx Дата
+ .change.flex.items-center
+ q-btn(dense, padding="24px 8px")
+ q-icon(name="app:icon-plus", size="12px")
+ .flex.items-center.gap-x-3
+ .text.font-semibold.text-smm Услуги
+ .flex.gap-x-1
+ .services.flex
+ .change.flex.w-7.h-7
+
+
+
+
+