diff --git a/src/components/base/BaseButton.vue b/src/components/base/BaseButton.vue
index 07c0363..25105e6 100644
--- a/src/components/base/BaseButton.vue
+++ b/src/components/base/BaseButton.vue
@@ -1,7 +1,7 @@
button.base-button.text-base(
:disabled="disabled",
- :class="{'rounded': rounded, 'outlined': outlined, 'outlined-red': outlinedRed, 'secondary': secondary, 'confirm': confirm, 'added': added}"
+ :class="{'rounded': rounded, 'outlined': outlined, 'outlined-red': outlinedRed, 'secondary': secondary, 'confirm': confirm, 'added': added, 'added-border-none': addedBorderNone}"
:style="{height: size + 'px', minWidth: size + 'px'}"
)
.button-container
@@ -27,6 +27,7 @@ export default {
outlined: Boolean,
outlinedRed: Boolean,
added: Boolean,
+ addedBorderNone: Boolean,
rounded: Boolean,
disabled: Boolean,
split: Boolean,
@@ -123,7 +124,17 @@ export default {
border: none
background-color: var(--btn-blue-color)
color: var(--default-white)
-
+.added-border-none
+ border: none
+ width: fit-content
+ background-color: var(--default-white)
+ color: var(--btn-blue-color)
+ padding: 0
+ row-gap: 10px
+ &:hover
+ border: none
+ color: var(--btn-blue-color-hover)
+ background-color: var(--default-white)
.secondary
background-color: var(--btn-blue-sec-color)
border: 1px solid var(--btn-blue-sec-color)
diff --git a/src/pages/newMedicalCard/components/AllergiesForms/AllergiesForm.vue b/src/pages/newMedicalCard/components/AllergiesForms/AllergiesForm.vue
new file mode 100644
index 0000000..d702342
--- /dev/null
+++ b/src/pages/newMedicalCard/components/AllergiesForms/AllergiesForm.vue
@@ -0,0 +1,109 @@
+
+ medical-form-wrapper(
+ title="Аллергии"
+ :is-check-change="isCheckChange"
+ :is-loading-data="isLoadingData"
+ :is-edit="isEdit"
+ :save="saveChange"
+ :cancel="cancelEdit"
+ :open-edit="openEdit"
+ )
+ .flex.flex-col.gap-19px.w-full
+ .flex.flex-col.gap-4
+ .flex.gap-4.items-center(v-for="(allergy, index) in allergies")
+ .label-field.font-sm.text-sm.whitespace-nowrap {{ `Аллерген ${index+1}:` }}
+ .flex.gap-2.w-full.items-center
+ base-input(
+ :disabled="!isEdit"
+ v-model="allergy.name"
+ @update:model-value="checkChangeInput"
+ type="text"
+ :standout="!isEdit"
+ :outlined="isEdit"
+ text-color="black"
+ )
+ base-input.w-full(
+ :disabled="!isEdit"
+ v-model="allergy.title"
+ @update:model-value="checkChangeInput"
+ type="text"
+ :standout="!isEdit"
+ :outlined="isEdit"
+ text-color="black"
+ )
+ .delete-contact.icon-cancel.text-xxs.cursor-pointer(
+ v-if="isEdit"
+ @click="() => deleteAllergy(index)"
+ )
+ base-button(
+ v-if="isEdit"
+ left-icon="icon-plus"
+ added-border-none
+ @click="addNewAllergy"
+ :icon-left-size="12"
+ )
+ span.font-medium.text-base Добавить
+
+
+
+
+
diff --git a/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue
index 561536a..baecd48 100644
--- a/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue
+++ b/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue
@@ -54,17 +54,20 @@
v-if="isEdit"
@click="() => deleteContact(key, index)"
)
- .w-full(v-if="isEdit")
- .add-contact.w-fit.flex.gap-10px.items-center.cursor-pointer(
+ base-button.ml-6px(
+ v-if="isEdit"
+ left-icon="icon-plus"
+ added-border-none
+ :icon-left-size="12"
@click="() => addNewContact(key)"
- )
- .icon-plus
- span.font-medium.text-base Добавить
+ )
+ span.font-medium.text-base Добавить
+
diff --git a/src/pages/newMedicalCard/components/MedicalBaseInfo.vue b/src/pages/newMedicalCard/components/MedicalBaseInfo.vue
index 981acc7..aa68e06 100644
--- a/src/pages/newMedicalCard/components/MedicalBaseInfo.vue
+++ b/src/pages/newMedicalCard/components/MedicalBaseInfo.vue
@@ -10,9 +10,14 @@