diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue index 5e5200c..abd7492 100644 --- a/src/components/base/BaseSelect.vue +++ b/src/components/base/BaseSelect.vue @@ -4,6 +4,7 @@ q-select( v-model="value", :options="items", + :readonly="readonly" :disable="disable", :hide-dropdown-icon="hideDropdownIcon" :borderless="borderless", @@ -72,6 +73,7 @@ export default { }, disable: Boolean, label: String, + readonly: Boolean, }, emits: ["update:modelValue"], data() { diff --git a/src/pages/newMedicalCard/components/AllergiesForms/AllergiesForm.vue b/src/pages/newMedicalCard/components/AllergiesForms/AllergiesForm.vue index 2d98d19..50e4e35 100644 --- a/src/pages/newMedicalCard/components/AllergiesForms/AllergiesForm.vue +++ b/src/pages/newMedicalCard/components/AllergiesForms/AllergiesForm.vue @@ -15,7 +15,7 @@ .label-field.font-sm.text-sm.whitespace-nowrap {{ `Аллерген ${index+1}:` }} .flex.min-w-64.gap-2.w-full.items-center base-input( - :disabled="!isEdit" + :readonly="!isEdit" v-model="allergy.name" @update:model-value="checkChangeInput" name="name" @@ -29,7 +29,7 @@ text-color="black" ) base-input.w-full( - :disabled="!isEdit" + :readonly="!isEdit" v-model="allergy.title" @update:model-value="checkChangeInput" name="title" diff --git a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue index d188775..d8c393b 100644 --- a/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue +++ b/src/pages/newMedicalCard/components/BasicDataForms/BasicDataForm.vue @@ -29,10 +29,10 @@ ) .select(v-else-if="field.type === 'select'") base-select( + :readonly="!isEdit" v-model="basic[data.dataKey][field.key]" @update:model-value="checkChangeInput" :hide-dropdown-icon="!isEdit" - :disable="!isEdit" :outlined="isEdit" :standout="!isEdit" :items="genderOptions" @@ -40,7 +40,7 @@ ) base-input( v-else - :disabled="!isEdit" + :readonly="!isEdit" v-model="basic[data.dataKey][field.key]" @update:model-value="checkChangeInput" :type="field.type" diff --git a/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue index b2a10c7..67c5793 100644 --- a/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue +++ b/src/pages/newMedicalCard/components/BasicDataForms/ContactsForm.vue @@ -42,7 +42,7 @@ ) base-input.w-full( v-else - :disabled="!isEdit" + :readonly="!isEdit" v-model="data.username" :name="key" :mask="configData[key].inputMask" diff --git a/src/pages/newMedicalCard/utils/medicalConfig.js b/src/pages/newMedicalCard/utils/medicalConfig.js index 28fb543..2ca07fc 100644 --- a/src/pages/newMedicalCard/utils/medicalConfig.js +++ b/src/pages/newMedicalCard/utils/medicalConfig.js @@ -200,6 +200,7 @@ export const contactsDataForm = { export const allergiesConfig = { name: { title: "Аллерген", + rules: [(val) => ruleMaxLength(val, 100)], error: "Некорректно введен аллерген. Значение должно быть больше 1 и меньше 50 символов", },