From 34014ee3999f752e308f8914e9d8810af7ba41e4 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Tue, 20 Jun 2023 14:08:14 +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=84=D0=BE=D1=80=D0=BC=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B8=D0=BA=D0=B5=20=D0=BD=D0=B0=20=D0=B8=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D0=BA=D0=B8=20=D1=81=D0=B0=D0=B9=D0=B4=D0=B1=D0=B0?= =?UTF-8?q?=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/sort_word.svg | 5 + .../components/CalendarOpenSidebar.vue | 5 +- .../components/CalendarSidebar.vue | 187 +++++++++++++++++- src/pages/newCalendar/utils/calendarConfig.js | 4 +- tailwind.config.js | 1 + 5 files changed, 192 insertions(+), 10 deletions(-) create mode 100644 src/assets/icons/sort_word.svg diff --git a/src/assets/icons/sort_word.svg b/src/assets/icons/sort_word.svg new file mode 100644 index 0000000..5598095 --- /dev/null +++ b/src/assets/icons/sort_word.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue index 76df06b..1259a10 100644 --- a/src/pages/newCalendar/components/CalendarOpenSidebar.vue +++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue @@ -53,10 +53,11 @@ q-icon(name="app:icon-search", size="16px", style="color: var(--font-grey-color)") q-btn.btn.ml-2( @click="sortPerson(elem.data)", - icon="app:sort-number", + style="color: var(--font-grey-color); background: var(--bg-light-grey)" :style="{width: '32px', height: '32px'}", padding="0" ) + img(:src="sort_word") .flex.items-center.justify-between.font-medium.text-smm.h-10.py-2.cursor-pointer( @click="checkAll(elem.data)" ) @@ -78,6 +79,7 @@ diff --git a/src/pages/newCalendar/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js index fa2c1e7..1bf8acd 100644 --- a/src/pages/newCalendar/utils/calendarConfig.js +++ b/src/pages/newCalendar/utils/calendarConfig.js @@ -192,9 +192,9 @@ export const patientData = { }, ], statuses: [ - { name: "Отказ", icon: rejected, check: false }, { name: "Не принят", icon: not_accepted, check: true }, - { name: "На приеме", icon: reception, check: false }, { name: "Принят", icon: accepted, check: false }, + { name: "Отказ", icon: rejected, check: false }, + { name: "На приеме", icon: reception, check: false }, ], }; diff --git a/tailwind.config.js b/tailwind.config.js index 60c336a..515f369 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -30,6 +30,7 @@ module.exports = { "7xl": ["40px", { lineHeight: "54px" }], }, gap: { + "2px": "2px", "5px": "5px", "6px": "6px", "7px": "7px",