Revert "Merge branch 'ASTRA-51' into 'master'"

This reverts merge request !324
This commit is contained in:
Aleksey Demin
2023-04-20 17:36:21 +00:00
parent 14daddd6c8
commit a61d35d39e
5 changed files with 5 additions and 8 deletions

View File

@@ -4,7 +4,6 @@
q-select(
v-model="value",
:options="items",
:readonly="readonly"
:disable="disable",
:hide-dropdown-icon="hideDropdownIcon"
:borderless="borderless",
@@ -73,7 +72,6 @@ export default {
},
disable: Boolean,
label: String,
readonly: Boolean,
},
emits: ["update:modelValue"],
data() {

View File

@@ -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(
:readonly="!isEdit"
:disabled="!isEdit"
v-model="allergy.name"
@update:model-value="checkChangeInput"
name="name"
@@ -29,7 +29,7 @@
text-color="black"
)
base-input.w-full(
:readonly="!isEdit"
:disabled="!isEdit"
v-model="allergy.title"
@update:model-value="checkChangeInput"
name="title"

View File

@@ -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
:readonly="!isEdit"
:disabled="!isEdit"
v-model="basic[data.dataKey][field.key]"
@update:model-value="checkChangeInput"
:type="field.type"

View File

@@ -42,7 +42,7 @@
)
base-input.w-full(
v-else
:readonly="!isEdit"
:disabled="!isEdit"
v-model="data.username"
:name="key"
:mask="configData[key].inputMask"

View File

@@ -200,7 +200,6 @@ export const contactsDataForm = {
export const allergiesConfig = {
name: {
title: "Аллерген",
rules: [(val) => ruleMaxLength(val, 100)],
error:
"Некорректно введен аллерген. Значение должно быть больше 1 и меньше 50 символов",
},