diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index 5c40ce0..659598f 100644
--- a/src/components/base/BaseSelect.vue
+++ b/src/components/base/BaseSelect.vue
@@ -1,36 +1,33 @@
.flex.flex-col.gap-y-2
- base-input-container(:label="label", :style="{width: width}")
- q-select(
+ base-input-container(:label="label", :style="{width: width, ...sizeVariable}")
+ q-select.select(
v-model="value",
:options="items",
:readonly="readonly"
- :disable="disable",
- :hide-dropdown-icon="hideDropdownIcon"
- :borderless="borderless",
- :outlined="outlined",
- :bg-color="bgColor",
- :standout="standout",
- dense,
+ :disable="disabled",
+ :hide-dropdown-icon="hideDropdownIcon || disabled || readonly"
+ outlined,
:behavior="behavior",
emit-value,
map-options,
- :clearable="clearable"
+ :clearable="clearable",
+ dropdown-icon="app:down-arrow"
)
template(v-slot:selected)
- span(v-if="!value?.icon") {{ textSelect }}
+ span(v-if="!value?.icon", :class="{placeholder: placeholder}") {{ textSelect }}
q-icon.selected-icon(
v-else,
:name="iconSelect",
size="24px"
)
- template(
- v-slot:option="scope",
- v-if="value?.icon"
- )
- q-item(v-bind="scope.itemProps", style="justify-content: center")
+ template(v-slot:option="scope")
+ q-item(v-bind="scope.itemProps", style="justify-content: center", v-if="value?.icon")
q-item-section(avatar, style="padding: 0px; min-width: 0px")
q-icon.icon(:name="scope.opt.icon", size="24px")
+ q-item.item.px-4.py-2(v-bind="scope.itemProps", style="justify-content: center", v-else)
+ q-item-section
+ q-item-label.text-dark.text-base.font-medium {{ scope.opt.label }}
diff --git a/src/pages/medcards/TheMedcards.vue b/src/pages/medcards/TheMedcards.vue
index 39c4891..3e4a59d 100644
--- a/src/pages/medcards/TheMedcards.vue
+++ b/src/pages/medcards/TheMedcards.vue
@@ -1,15 +1,15 @@
- .medcards-wrapper.flex.flex-col.w-full
+ .medcards-wrapper.flex.flex-col.w-full.gap-y-2.h-full
table-patients
- medical-card-search
+ medical-card-list
diff --git a/src/pages/medcards/components/MedicalCardList.vue b/src/pages/medcards/components/MedicalCardList.vue
new file mode 100644
index 0000000..e903a02
--- /dev/null
+++ b/src/pages/medcards/components/MedicalCardList.vue
@@ -0,0 +1,17 @@
+
+ .medical-wrapper.flex.h-full.rounded.w-full
+ list-header
+
+
+
+
+
diff --git a/src/pages/medcards/components/MedicalCardListHeader.vue b/src/pages/medcards/components/MedicalCardListHeader.vue
new file mode 100644
index 0000000..a64bff6
--- /dev/null
+++ b/src/pages/medcards/components/MedicalCardListHeader.vue
@@ -0,0 +1,78 @@
+
+ .header-wrapper.flex.w-full.justify-between.p-4
+ .flex.items-center.justify-center.gap-x-2
+ base-input.search(
+ :width="438",
+ size="M",
+ placeholder="Найти медкарту",
+ iconLeft
+ )
+ template(v-slot:iconLeft)
+ q-icon.search-icon(name="app:search", size="20px")
+ base-select(
+ width="280px",
+ :items="items",
+ size="M",
+ placeholder="Сортировать по ...",
+ v-model="sortingType"
+ )
+ base-button(width="216px")
+ q-icon.plus.mr-2(name="app:plus", size="24px")
+ span Создать медкарту
+
+
+
+
+
diff --git a/src/pages/medcards/components/MedicalCardSearch.vue b/src/pages/medcards/components/MedicalCardSearch.vue
deleted file mode 100644
index 4807348..0000000
--- a/src/pages/medcards/components/MedicalCardSearch.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-
- .medical-wrapper.flex
-
-
-
-
-