diff --git a/src/pages/newCalendar/components/HeaderRecordForm.vue b/src/pages/newCalendar/components/HeaderRecordForm.vue
new file mode 100644
index 0000000..d5116f1
--- /dev/null
+++ b/src/pages/newCalendar/components/HeaderRecordForm.vue
@@ -0,0 +1,125 @@
+
+ .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.gap-x-1.rounded-md
+ img(:src="currentStatus.icon")
+ .dark-blue.font-medium {{currentStatus.name}}
+ q-btn.change.flex.w-7.h-7.rounded-md(dense, padding="4px 4px")
+ img(:src="folder")
+ q-menu
+ .status.flex.items-center.gap-x-1.font-medium.text-smm.rounded.h-7(
+ v-for="status in statuses",
+ @click="choiceStatus(status)",
+ v-close-popup
+ )
+ img(:src="status.icon")
+ span {{status.name}}
+ .flex.gap-x-3.items-center
+ .text.font-semibold Дата:
+ .flex.gap-x-1
+ .input.flex.items-center.pl-4.rounded-md
+ .dark-blue.font-medium {{currentDate.format("DD MMMM YYYY")}}
+ q-btn.change.flex.w-7.h-7.rounded-md(dense, padding="4px 4px")
+ img(:src="calendar")
+ q-menu(
+ transition-show="scale",
+ transition-hide="scale",
+ self="top middle",
+ :offset="[118, 14]",
+ )
+ base-calendar(v-model="currentDate")
+ .flex.gap-x-3.items-center
+ .text.font-semibold Время:
+ .flex.gap-x-1
+ .input.flex.items-center.pl-4.rounded-md
+ .dark-blue.font-medium 13:00 - 14:00
+ q-btn.change.flex.w-7.h-7.rounded-md(@click="isShowTime = true", dense, padding="4px 4px")
+ img(:src="time")
+ base-modal(v-model="isShowTime", title="Время", modal-padding)
+ base-time-modal(:times="times", :close-modal-time="closeModalTime")
+ .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.rounded-md
+ .photo.flex.h-10.w-10.items-center.justify-center
+ img(:src="noname")
+ .flex.flex-col.font-medium
+ .dark-blue Имя Фамилия
+ .grey-color.text-xsx.rounded-md Дата
+ .change.flex.items-center.rounded-md
+ q-btn(dense, padding="24px 8px")
+ q-icon(name="app:icon-plus", size="12px")
+
+
+
+
+
diff --git a/src/pages/newCalendar/components/RecordCreationForm.vue b/src/pages/newCalendar/components/RecordCreationForm.vue
index c1ac2e4..2ac0f0d 100644
--- a/src/pages/newCalendar/components/RecordCreationForm.vue
+++ b/src/pages/newCalendar/components/RecordCreationForm.vue
@@ -1,58 +1,10 @@
.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.gap-x-1.rounded-md
- img(:src="currentStatus.icon")
- .dark-blue.font-medium {{currentStatus.name}}
- q-btn.change.flex.w-7.h-7.rounded-md(dense, padding="4px 4px")
- img(:src="folder")
- q-menu
- .status.flex.items-center.gap-x-1.font-medium.text-smm.rounded.h-7(
- v-for="status in patientData.statuses",
- @click="choiceStatus(status)",
- v-close-popup
- )
- img(:src="status.icon")
- span {{status.name}}
- .flex.gap-x-3.items-center
- .text.font-semibold Дата:
- .flex.gap-x-1
- .input.flex.items-center.pl-4.rounded-md
- .dark-blue.font-medium {{currentDate.format("DD MMMM YYYY")}}
- q-btn.change.flex.w-7.h-7.rounded-md(dense, padding="4px 4px")
- img(:src="calendar")
- q-menu(
- transition-show="scale",
- transition-hide="scale",
- self="top middle",
- :offset="[118, 14]",
- )
- base-calendar(v-model="currentDate")
- .flex.gap-x-3.items-center
- .text.font-semibold Время:
- .flex.gap-x-1
- .input.flex.items-center.pl-4.rounded-md
- .dark-blue.font-medium 13:00 - 14:00
- q-btn.change.flex.w-7.h-7.rounded-md(@click="isShowTime = true", dense, padding="4px 4px")
- img(:src="time")
- base-modal(v-model="isShowTime", title="Время", modal-padding)
- base-time-modal(:times="times", :close-modal-time="closeModalTime")
- .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.rounded-md
- .photo.flex.h-10.w-10.items-center.justify-center
- img(:src="noname")
- .flex.flex-col.font-medium
- .dark-blue Имя Фамилия
- .grey-color.text-xsx.rounded-md Дата
- .change.flex.items-center.rounded-md
- q-btn(dense, padding="24px 8px")
- q-icon(name="app:icon-plus", size="12px")
+ header-record-form(
+ :current-status="currentStatus",
+ :statuses="patientData.statuses",
+ :choice-status="choiceStatus"
+ )
.flex.items-center.gap-x-3.text-smm
.text.font-semibold Услуги:
.flex.gap-x-1
@@ -60,7 +12,7 @@
:class="{'other-serivices': services.length}"
)
.service.flex.gap-x-1.items-center.rounded.relative(
- :style="{ width: color ? '415px' : 'full'}"
+ :style="{ width: otherColor ? '415px' : 'full'}"
)
span(v-if="!services.length") Выберите услуги
.dark-blue.flex.px-4.items-center.rounded.h-7(
@@ -70,11 +22,9 @@
:style="{background: service.color}"
) {{service.name}}
.gradient.flex.absolute(
- :style="{background: `linear-gradient(270deg, ${color} 0%, rgba(247, 217, 255, 0) 100%)`}"
+ :style="{background: `linear-gradient(270deg, ${otherColor} 0%, rgba(247, 217, 255, 0) 100%)`}"
)
- .other.flex.h-7.items-center.justify-center.rounded(
- v-if="services.length > 3"
- ) {{`+${services.length - 3}`}}
+ .other.flex.h-7.items-center.justify-center.rounded(v-if="otherColor") {{`+${otherServices.length}`}}
.price.flex.items-center.items-center.justify-center.rounded-md(v-if="services.length") {{sumService}}
q-btn.change.flex.w-7.h-9.rounded-md(dense, padding="4px 4px")
img(:src="folder")
@@ -123,13 +73,9 @@