From da410bd94c561c697ad950dfe939ffb70220ac2a Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Fri, 26 May 2023 14:31:31 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=D0=B0=D0=B9=D0=B4=D0=B1=D1=80=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=BE=D0=BC=20?= =?UTF-8?q?=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/icon_ok.svg | 3 + src/assets/icons/medcard_filled.svg | 4 + src/assets/icons/medcard_not_filled.svg | 3 + src/assets/icons/medcard_partially_filled.svg | 4 + src/assets/icons/status_accepted.svg | 4 + src/assets/icons/status_not_accepted.svg | 3 + src/assets/icons/status_reception.svg | 5 + src/assets/icons/status_rejected.svg | 4 + .../components/CalendarOpenSidebar.vue | 146 ++++++++++++++++-- 9 files changed, 160 insertions(+), 16 deletions(-) create mode 100644 src/assets/icons/icon_ok.svg create mode 100644 src/assets/icons/medcard_filled.svg create mode 100644 src/assets/icons/medcard_not_filled.svg create mode 100644 src/assets/icons/medcard_partially_filled.svg create mode 100644 src/assets/icons/status_accepted.svg create mode 100644 src/assets/icons/status_not_accepted.svg create mode 100644 src/assets/icons/status_reception.svg create mode 100644 src/assets/icons/status_rejected.svg diff --git a/src/assets/icons/icon_ok.svg b/src/assets/icons/icon_ok.svg new file mode 100644 index 0000000..b8eab33 --- /dev/null +++ b/src/assets/icons/icon_ok.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/medcard_filled.svg b/src/assets/icons/medcard_filled.svg new file mode 100644 index 0000000..6639e05 --- /dev/null +++ b/src/assets/icons/medcard_filled.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/medcard_not_filled.svg b/src/assets/icons/medcard_not_filled.svg new file mode 100644 index 0000000..724fd6f --- /dev/null +++ b/src/assets/icons/medcard_not_filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/medcard_partially_filled.svg b/src/assets/icons/medcard_partially_filled.svg new file mode 100644 index 0000000..016b7ba --- /dev/null +++ b/src/assets/icons/medcard_partially_filled.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/status_accepted.svg b/src/assets/icons/status_accepted.svg new file mode 100644 index 0000000..accc53a --- /dev/null +++ b/src/assets/icons/status_accepted.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/status_not_accepted.svg b/src/assets/icons/status_not_accepted.svg new file mode 100644 index 0000000..edacfe1 --- /dev/null +++ b/src/assets/icons/status_not_accepted.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/status_reception.svg b/src/assets/icons/status_reception.svg new file mode 100644 index 0000000..7f50989 --- /dev/null +++ b/src/assets/icons/status_reception.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/icons/status_rejected.svg b/src/assets/icons/status_rejected.svg new file mode 100644 index 0000000..00bb1ba --- /dev/null +++ b/src/assets/icons/status_rejected.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue index e1fbbcc..9f7dd0d 100644 --- a/src/pages/newCalendar/components/CalendarOpenSidebar.vue +++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue @@ -18,33 +18,116 @@ :style="{width: '100%', height: '40px'}", padding="0" ) - .flex.flex-col.gap-y-1 + .flex.flex-col.gap-y-1(v-for="elem in list") q-expansion-item.expansion.font-bold.text-xm( expand-separator - label="Статус приема" - ) - .flex.flex-col.font-medium.text-smm.p-4.pt-2 - .flex Не принят - .flex Принят - .flex Отказ - .flex На приеме - q-expansion-item.expansion.font-bold.text-xm( - expand-separator - label="Первичная медкарта" - ) - q-expansion-item.expansion.font-bold.text-xm( - expand-separator - label="Пациенты" + :label="elem.label" ) + .flex.flex-col.font-medium.text-smm.px-4.pt-2( + v-if="elem.label !== 'Пациенты'", + v-for="item in elem.data" + ) + .status.flex.items-center.gap-x-1.px-2 + img(:src="item.icon") + span {{item.name}} + .flex.flex-col.p-4(v-else) + .flex.h-8.w-full.items-center.justify-between + base-input( + id="input", + placeholder="Найти пациента...", + outlined, + :width="160", + iconLeft, + fontSize="12px", + lineHeight="16px", + textColor="var(--font-grey-color)" + ) + q-icon(name="app:icon-search", size="16px", style="color: var(--font-grey-color)") + q-btn.sort.ml-2( + icon="app:sort-number", + :style="{width: '32px', height: '32px'}", + padding="0" + ) + .flex.items-center.justify-between.font-medium.text-smm + span Все + img(:src="icon_ok") @@ -62,4 +145,35 @@ export default { background: var(--default-white) border-radius: 4px color: var(--font-dark-blue-color) + +.status + border-radius: 4px + height: 28px + &:hover + background: var(--bg-light-grey) + cursor: pointer + +.q-expansion-item + border-radius: 0 + +.q-expansion-item :deep(.q-separator) + display: none + +.q-expansion-item :deep(.q-expansion-item__content) + padding-bottom: 16px + +.sort + background-color: var(--bg-light-grey) + color: var(--font-grey-color) + +#input :deep(.q-field__control) + height: 32px + .q-field__prepend + height: 32px + +.q-expansion-item :deep(.q-item__section--main ~ .q-item__section--side) + padding-left: 0px + +.q-expansion-item :deep(.q-item__label) + line-height: 135% !important