diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index 0f95b13..f2206fc 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -3,14 +3,14 @@
q-input(
v-model="value",
:class="{'circle': circle, 'font-input': true}",
- :input-style="{ color: textColor, width: width + 'px' }",
+ :input-style="{ color: textColor, width: width + 'px' , borderColor: borderColor}",
:borderless="borderless",
:placeholder="placeholder",
:outlined="outlined",
:dense="dense",
:type="type",
:filled="filled",
- :bg-color="filled ? '' : 'white'",
+ :bg-color="filled || standout ? '' : 'white'",
:disable="disabled",
:rules="rule",
:lazy-rules="lazyRule",
@@ -20,6 +20,7 @@
:maxlength="maxLength",
:autogrow="autogrow",
:square="square",
+ :standout="standout"
hide-bottom-space
)
slot.cursor-pointer
@@ -60,10 +61,15 @@ export default {
type: {
default: "text",
},
+ standout: {
+ type: [Boolean, String],
+ default: false,
+ },
mask: String,
width: Number,
maxLength: Number,
textColor: String,
+ borderColor: String,
rule: Array,
lazyRule: [Boolean, String],
noErrorIcon: Boolean,
diff --git a/src/pages/newMedicalCard/components/BasicDataForm.vue b/src/pages/newMedicalCard/components/BasicDataForm.vue
index 61b61ee..0fc2a27 100644
--- a/src/pages/newMedicalCard/components/BasicDataForm.vue
+++ b/src/pages/newMedicalCard/components/BasicDataForm.vue
@@ -1,8 +1,70 @@
+ medical-form-wrapper(title="Основная информация")
+ .form-wrap.gap-24.w-full
+ .data-section.flex.flex-col.gap-4(v-for="data in configData")
+ .font-semibold.text-sm.whitespace-nowrap {{data.dataLabel}}
+ .flex.w-full.justify-between.items-center.gap-4(v-for="field in data.fields")
+ .label-field.font-sm.text-sm.whitespace-nowrap {{`${field.label} :`}}
+ .avatar-field.justify-start(v-if="field.type === 'avatar'")
+ base-avatar(:size="40")
+ base-input(v-else v-model="initData[data.dataKey][field.key]" :type="field.type" :width="300" standout="bg-white" text-color="black")
+
+
diff --git a/src/pages/newMedicalCard/components/MedicalFormWrapper.vue b/src/pages/newMedicalCard/components/MedicalFormWrapper.vue
index 487dc4a..07ff522 100644
--- a/src/pages/newMedicalCard/components/MedicalFormWrapper.vue
+++ b/src/pages/newMedicalCard/components/MedicalFormWrapper.vue
@@ -1,7 +1,7 @@
.form-wrapper.relative.h-fit.rounded
transition(name="medical-form", mode="out-in")
- .loader.absolute.flex.items-center.justify-center.w-full.h-full.rounded(v-if="isLoadingData")
+ .loader.absolute.z-10.flex.items-center.justify-center.w-full.h-full.rounded(v-if="isLoadingData")
base-loader
.flex.flex-col.h-full.gap-25px.p-6
.flex.w-fit.gap-11px.items-center
@@ -48,8 +48,10 @@ export default {