From a747c1820dfed4ed71bdb03e4a0ff8e87b2288a3 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Wed, 26 Jul 2023 18:26:24 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=9D=D0=B0=D0=B1=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D0=B0=D0=BB=D0=B0=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/sass/variables.sass | 2 +- src/components/base/BaseAddingNetwork.vue | 2 +- src/components/base/BaseSelect.vue | 5 +- .../components/ClientDetailSectionAddress.vue | 3 +- .../components/FormCreateBasicInfo.vue | 3 +- .../FormsAgreementCreate/AgreementCommon.vue | 6 +- .../AgreementServices.vue | 6 +- .../components/TableCreatePackageDoc.vue | 6 +- .../cells/TableCellBodyPriority.vue | 3 +- src/pages/medcards/TheMedcards.vue | 6 +- .../BasicDataForms/CurrentPatientForm.vue | 2 +- .../BasicDataForms/TodaysPatientsForm.vue | 4 +- .../components/MedcardFormWrapper.vue | 2 +- .../medcards/components/MedicalCardList.vue | 17 -- .../medcards/components/MedicalCardSearch.vue | 19 ++ ...Header.vue => MedicalCardSearchHeader.vue} | 4 +- .../components/MedicalCardSearchList.vue | 194 ++++++++++++++++++ .../components/MedicalCardSearchRow.vue | 127 ++++++++++++ src/pages/medcards/utils/medcardsConfig.js | 69 +++++++ .../components/CalendarOpenSidebar.vue | 2 +- .../components/CalendarSidebar.vue | 6 +- .../BasicDataForms/BasicDataForm.vue | 5 +- .../MedicalProtocolsList.vue | 3 +- .../components/CalendarFormAddEvent.vue | 9 +- .../schedule/components/FormChangeShift.vue | 3 +- src/pages/schedule/components/ScheduleBar.vue | 3 +- .../components/ScheduleTableSelect.vue | 3 +- 27 files changed, 461 insertions(+), 53 deletions(-) delete mode 100644 src/pages/medcards/components/MedicalCardList.vue create mode 100644 src/pages/medcards/components/MedicalCardSearch.vue rename src/pages/medcards/components/{MedicalCardListHeader.vue => MedicalCardSearchHeader.vue} (95%) create mode 100644 src/pages/medcards/components/MedicalCardSearchList.vue create mode 100644 src/pages/medcards/components/MedicalCardSearchRow.vue create mode 100644 src/pages/medcards/utils/medcardsConfig.js diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index b0adb93..4e8ae33 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -92,7 +92,7 @@ --bg-chip-pink-color: #F7D9FF --gray-thirdly: #f4f4f6 --surface-blue-big: #ecf0fe - --gray-scondary: #dddde8 + --gray-secondary: #dddde8 --system-color-red: #f34549 --system-color-green: #21ba72 diff --git a/src/components/base/BaseAddingNetwork.vue b/src/components/base/BaseAddingNetwork.vue index a1b94de..527635f 100644 --- a/src/components/base/BaseAddingNetwork.vue +++ b/src/components/base/BaseAddingNetwork.vue @@ -1,6 +1,6 @@ diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue index 659598f..b7a5538 100644 --- a/src/components/base/BaseSelect.vue +++ b/src/components/base/BaseSelect.vue @@ -12,7 +12,8 @@ emit-value, map-options, :clearable="clearable", - dropdown-icon="app:down-arrow" + dropdown-icon="app:down-arrow", + :menu-offset="[0, 8]" ) template(v-slot:selected) span(v-if="!value?.icon", :class="{placeholder: placeholder}") {{ textSelect }} @@ -190,7 +191,7 @@ export default { height: 20px .item - border-bottom: 1px solid var(--gray-scondary) + border-bottom: 1px solid var(--gray-secondary) &:last-child border-bottom: none &:hover diff --git a/src/pages/clients/components/ClientDetailSectionAddress.vue b/src/pages/clients/components/ClientDetailSectionAddress.vue index 26af8a3..48bb6e5 100644 --- a/src/pages/clients/components/ClientDetailSectionAddress.vue +++ b/src/pages/clients/components/ClientDetailSectionAddress.vue @@ -6,7 +6,8 @@ labelStyle="text-xxs", placeholder="Введите город", v-model="dopeAddress.city", - label="Город" + label="Город", + size="S" ) base-input( disabled, diff --git a/src/pages/clients/components/FormCreateBasicInfo.vue b/src/pages/clients/components/FormCreateBasicInfo.vue index a8cf97f..ec7b242 100644 --- a/src/pages/clients/components/FormCreateBasicInfo.vue +++ b/src/pages/clients/components/FormCreateBasicInfo.vue @@ -5,7 +5,8 @@ :items="priorityList", placeholder="Приоритет клиента", v-model="basicInfo.priority", - label="Приоритет" + label="Приоритет", + size="M" ) base-input-date( v-model="basicInfo.birth_date", diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue index 944cf0f..39a45fb 100644 --- a/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue +++ b/src/pages/clients/components/FormsAgreementCreate/AgreementCommon.vue @@ -5,7 +5,8 @@ placeholder="Категория договора", v-model="category", :items="categories", - label="Категория" + label="Категория", + size="M" ) .flex.justify-between.gap-4 base-input( @@ -30,7 +31,8 @@ placeholder="Поручить", v-model="employee", :items="employees", - label="Исполнитель" + label="Исполнитель", + size="M" ) diff --git a/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue b/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue index 9e379ce..fbacc5d 100644 --- a/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue +++ b/src/pages/clients/components/FormsAgreementCreate/AgreementServices.vue @@ -5,7 +5,8 @@ placeholder="Категория договора", v-model="category", :items="categories", - label="Категория" + label="Категория", + size="M" ) .flex.gap-x-4 base-input( @@ -30,7 +31,8 @@ placeholder="Поручить", v-model="employee", :items="employees", - label="Исполнитель" + label="Исполнитель", + size="M" ) diff --git a/src/pages/clients/components/TableCreatePackageDoc.vue b/src/pages/clients/components/TableCreatePackageDoc.vue index a5761a2..5504c56 100644 --- a/src/pages/clients/components/TableCreatePackageDoc.vue +++ b/src/pages/clients/components/TableCreatePackageDoc.vue @@ -23,7 +23,7 @@ .flex.gap-x-4 .flex.flex-col.w-full(class="gap-y-1.5") .counter.font-semibold.text-smm Тип документа - base-select.h-10(placeholder="Выберите тип") + base-select.h-10(placeholder="Выберите тип", size="M") .flex.flex-col(class="gap-y-1.5") .counter.font-semibold.text-smm Дата подписания .input-date.flex.h-10.justify-center @@ -32,7 +32,7 @@ span.font-bold Дополнительное .flex.flex-col.mb-124px(class="gap-y-1.5") .counter.font-semibold.text-smm Риски - base-select.h-10(placeholder="Выберите риски") + base-select.h-10(placeholder="Выберите риски", size="M") .services.flex.flex-col.gap-y-6(v-else) .flex.flex-col.gap-y-6 .flex.flex-col.gap-y-2 @@ -47,7 +47,7 @@ placeholder="Поиск", ) .counter.icon-search - base-select.h-10(placeholder="Вид услуги") + base-select.h-10(placeholder="Вид услуги", size="M") .flex.items-center.px-11px.py-9px( :style="{borderBottom: '1px solid var(--btn-grey-color)'}" ) diff --git a/src/pages/clients/components/cells/TableCellBodyPriority.vue b/src/pages/clients/components/cells/TableCellBodyPriority.vue index 655309d..471b225 100644 --- a/src/pages/clients/components/cells/TableCellBodyPriority.vue +++ b/src/pages/clients/components/cells/TableCellBodyPriority.vue @@ -9,7 +9,8 @@ @click.stop, :items="getPriorityList", v-model="value.priority", - :placeholder="value.priority" + :placeholder="value.priority", + size="M" ) diff --git a/src/pages/medcards/TheMedcards.vue b/src/pages/medcards/TheMedcards.vue index 3e4a59d..057a0a1 100644 --- a/src/pages/medcards/TheMedcards.vue +++ b/src/pages/medcards/TheMedcards.vue @@ -1,15 +1,15 @@ diff --git a/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue index ac656c1..58a342d 100644 --- a/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue +++ b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue @@ -91,7 +91,7 @@ export default { diff --git a/src/pages/medcards/components/MedicalCardSearch.vue b/src/pages/medcards/components/MedicalCardSearch.vue new file mode 100644 index 0000000..7deaec0 --- /dev/null +++ b/src/pages/medcards/components/MedicalCardSearch.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/src/pages/medcards/components/MedicalCardListHeader.vue b/src/pages/medcards/components/MedicalCardSearchHeader.vue similarity index 95% rename from src/pages/medcards/components/MedicalCardListHeader.vue rename to src/pages/medcards/components/MedicalCardSearchHeader.vue index a64bff6..4293ff2 100644 --- a/src/pages/medcards/components/MedicalCardListHeader.vue +++ b/src/pages/medcards/components/MedicalCardSearchHeader.vue @@ -26,7 +26,7 @@ import BaseInput from "@/components/base/BaseInput.vue"; import BaseSelect from "@/components/base/BaseSelect.vue"; import BaseButton from "@/components/base/BaseButton.vue"; export default { - name: "MedicalCardListHeader", + name: "MedicalCardSearchHeader", components: { BaseInput, BaseSelect, BaseButton }, data() { return { @@ -65,7 +65,7 @@ export default { diff --git a/src/pages/medcards/components/MedicalCardSearchRow.vue b/src/pages/medcards/components/MedicalCardSearchRow.vue new file mode 100644 index 0000000..e5cb1ad --- /dev/null +++ b/src/pages/medcards/components/MedicalCardSearchRow.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/pages/medcards/utils/medcardsConfig.js b/src/pages/medcards/utils/medcardsConfig.js new file mode 100644 index 0000000..117547d --- /dev/null +++ b/src/pages/medcards/utils/medcardsConfig.js @@ -0,0 +1,69 @@ +export const searchListConfig = [ + { + title: "ФИО", + width: "518px", + minWidth: "400px", + spareWidth: "550px", + }, + { + title: "Дата рождения", + width: "220px", + minWidth: "160px", + compressedMinWidth: "170px", + }, + { + title: "Приоритет", + width: "220px", + minWidth: "140px", + }, + { + title: "№ медкарты", + width: "280px", + minWidth: "220px", + compressedMinWidth: "194px", + }, + { + title: "Дата создания", + width: "215px", + minWidth: "160px", + compressedMinWidth: "170px", + }, + { + title: "Процент заполнения", + width: "295px", + minWidth: "220px", + compressedMinWidth: "194px", + }, + { + title: "Do", + width: "60px", + minWidth: "60px", + }, +]; + +export const priorityList = [ + { + priority: 1, + id: 1, + text: "Высокий", + color: "var(--system-color-red)", + }, + { + priority: 2, + id: 2, + text: "Средний", + color: "var(--bg-yellow-warning)", + }, + { + priority: 3, + id: 3, + text: "Низкий", + color: "var(--btn-blue-color)", + }, + { + priority: null, + id: 4, + text: "-", + color: "#9294A7", + }, +]; diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue index 88ca660..d73d3d4 100644 --- a/src/pages/newCalendar/components/CalendarOpenSidebar.vue +++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue @@ -234,7 +234,7 @@ export default { font-size: 20px .button-open - border: 1px solid var(--gray-scondary) + border: 1px solid var(--gray-secondary) color: var(--font-grey-color) background: var(--bg-light-grey) diff --git a/src/pages/newCalendar/components/CalendarSidebar.vue b/src/pages/newCalendar/components/CalendarSidebar.vue index 63c1f2b..6af77f4 100644 --- a/src/pages/newCalendar/components/CalendarSidebar.vue +++ b/src/pages/newCalendar/components/CalendarSidebar.vue @@ -88,7 +88,7 @@ ) q-btn.ml-2( @click="sortPerson(patientsData)", - :style="{width: '32px', height: '32px', border: '1px solid var(--gray-scondary)'}", + :style="{width: '32px', height: '32px', border: '1px solid var(--gray-secondary)'}", padding="0", :class="sortingClass" ) @@ -350,14 +350,14 @@ export default { background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, var(--default-white) 100%) .button-open - border: 1px solid var(--gray-scondary) + border: 1px solid var(--gray-secondary) color: var(--font-grey-color) background: var(--bg-light-grey) .sort-icon-default background-color: var(--bg-light-grey) color: var(--font-grey-color) - border: 1px solid var(--gray-scondary) + border: 1px solid var(--gray-secondary) .sort-icon-active background-color: var(--btn-blue-color) diff --git a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue index 676a339..9255343 100644 --- a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue +++ b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue @@ -36,8 +36,9 @@ :outlined="isEdit" :standout="!isEdit" :items="genderOptions" - bg-color="#e9e9f6" - ) + bg-color="#e9e9f6", + size="M" + ) base-input-date( v-else-if="field.type === 'date'", v-model="basic[data.dataKey][field.key]", diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsList.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsList.vue index c6d2e6c..08431db 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsList.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsList.vue @@ -14,7 +14,8 @@ :style="{flex: 1}", :items="sortingYears", v-model="sortingYear", - clearable + clearable, + size="M" ) q-btn.ml-2( icon="app:sort-number", diff --git a/src/pages/oldCalendar/components/CalendarFormAddEvent.vue b/src/pages/oldCalendar/components/CalendarFormAddEvent.vue index 5ddcd39..f88d92c 100644 --- a/src/pages/oldCalendar/components/CalendarFormAddEvent.vue +++ b/src/pages/oldCalendar/components/CalendarFormAddEvent.vue @@ -11,7 +11,8 @@ v-if="selectedEventData.id" v-model="status", :items="statusesList", - label="Статус приема" + label="Статус приема", + size="M" ) base-input( v-else, @@ -24,13 +25,15 @@ :items="ownersList", v-model="employees.employee", placeholder="Выберите сотрудника" - label="Сотрудник" + label="Сотрудник", + size="M" ) base-select( :items="membersList", v-model="members.person", placeholder="Выберите клиента", - label="Клиент" + label="Клиент", + size="M" ) .flex.gap-x-4 base-input( diff --git a/src/pages/schedule/components/FormChangeShift.vue b/src/pages/schedule/components/FormChangeShift.vue index 4ab59e3..87d1c9b 100644 --- a/src/pages/schedule/components/FormChangeShift.vue +++ b/src/pages/schedule/components/FormChangeShift.vue @@ -22,7 +22,8 @@ :items="ownersList", v-model="replacementSheet.replacementEmployee", label="Замена сотрудника", - placeholder="Выберите сотрудника" + placeholder="Выберите сотрудника", + size="M" ) .time-wrapper.flex.justify-center.gap-x-6 base-input( diff --git a/src/pages/schedule/components/ScheduleBar.vue b/src/pages/schedule/components/ScheduleBar.vue index 54f1b37..d59713c 100644 --- a/src/pages/schedule/components/ScheduleBar.vue +++ b/src/pages/schedule/components/ScheduleBar.vue @@ -34,7 +34,8 @@ :items="templateList", v-model="template.item", placeholder="Выберите шаблон" - label="Шаблоны графиков" + label="Шаблоны графиков", + size="M" ) .flex.justify-center.gap-x-6.h-10 q-btn( diff --git a/src/pages/schedule/components/ScheduleTableSelect.vue b/src/pages/schedule/components/ScheduleTableSelect.vue index e72b563..dd612d2 100644 --- a/src/pages/schedule/components/ScheduleTableSelect.vue +++ b/src/pages/schedule/components/ScheduleTableSelect.vue @@ -13,7 +13,8 @@ v-if="!selectEmployee.label", :items="ownersList", v-model="selectEmployee", - placeholder="Добавить сотрудника" + placeholder="Добавить сотрудника", + size="M" ) .flex.justify-center(v-else) {{selectEmployee.label}} .row.flex