Merge branch 'revert-14daddd6' into 'master'
Revert "Merge branch 'ASTRA-51' into 'master'" See merge request andrusyakka/urban-couscous!325
This commit is contained in:
@@ -4,7 +4,6 @@
|
|||||||
q-select(
|
q-select(
|
||||||
v-model="value",
|
v-model="value",
|
||||||
:options="items",
|
:options="items",
|
||||||
:readonly="readonly"
|
|
||||||
:disable="disable",
|
:disable="disable",
|
||||||
:hide-dropdown-icon="hideDropdownIcon"
|
:hide-dropdown-icon="hideDropdownIcon"
|
||||||
:borderless="borderless",
|
:borderless="borderless",
|
||||||
@@ -73,7 +72,6 @@ export default {
|
|||||||
},
|
},
|
||||||
disable: Boolean,
|
disable: Boolean,
|
||||||
label: String,
|
label: String,
|
||||||
readonly: Boolean,
|
|
||||||
},
|
},
|
||||||
emits: ["update:modelValue"],
|
emits: ["update:modelValue"],
|
||||||
data() {
|
data() {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
.label-field.font-sm.text-sm.whitespace-nowrap {{ `Аллерген ${index+1}:` }}
|
.label-field.font-sm.text-sm.whitespace-nowrap {{ `Аллерген ${index+1}:` }}
|
||||||
.flex.min-w-64.gap-2.w-full.items-center
|
.flex.min-w-64.gap-2.w-full.items-center
|
||||||
base-input(
|
base-input(
|
||||||
:readonly="!isEdit"
|
:disabled="!isEdit"
|
||||||
v-model="allergy.name"
|
v-model="allergy.name"
|
||||||
@update:model-value="checkChangeInput"
|
@update:model-value="checkChangeInput"
|
||||||
name="name"
|
name="name"
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
text-color="black"
|
text-color="black"
|
||||||
)
|
)
|
||||||
base-input.w-full(
|
base-input.w-full(
|
||||||
:readonly="!isEdit"
|
:disabled="!isEdit"
|
||||||
v-model="allergy.title"
|
v-model="allergy.title"
|
||||||
@update:model-value="checkChangeInput"
|
@update:model-value="checkChangeInput"
|
||||||
name="title"
|
name="title"
|
||||||
|
|||||||
@@ -29,10 +29,10 @@
|
|||||||
)
|
)
|
||||||
.select(v-else-if="field.type === 'select'")
|
.select(v-else-if="field.type === 'select'")
|
||||||
base-select(
|
base-select(
|
||||||
:readonly="!isEdit"
|
|
||||||
v-model="basic[data.dataKey][field.key]"
|
v-model="basic[data.dataKey][field.key]"
|
||||||
@update:model-value="checkChangeInput"
|
@update:model-value="checkChangeInput"
|
||||||
:hide-dropdown-icon="!isEdit"
|
:hide-dropdown-icon="!isEdit"
|
||||||
|
:disable="!isEdit"
|
||||||
:outlined="isEdit"
|
:outlined="isEdit"
|
||||||
:standout="!isEdit"
|
:standout="!isEdit"
|
||||||
:items="genderOptions"
|
:items="genderOptions"
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
)
|
)
|
||||||
base-input(
|
base-input(
|
||||||
v-else
|
v-else
|
||||||
:readonly="!isEdit"
|
:disabled="!isEdit"
|
||||||
v-model="basic[data.dataKey][field.key]"
|
v-model="basic[data.dataKey][field.key]"
|
||||||
@update:model-value="checkChangeInput"
|
@update:model-value="checkChangeInput"
|
||||||
:type="field.type"
|
:type="field.type"
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
)
|
)
|
||||||
base-input.w-full(
|
base-input.w-full(
|
||||||
v-else
|
v-else
|
||||||
:readonly="!isEdit"
|
:disabled="!isEdit"
|
||||||
v-model="data.username"
|
v-model="data.username"
|
||||||
:name="key"
|
:name="key"
|
||||||
:mask="configData[key].inputMask"
|
:mask="configData[key].inputMask"
|
||||||
|
|||||||
@@ -200,7 +200,6 @@ export const contactsDataForm = {
|
|||||||
export const allergiesConfig = {
|
export const allergiesConfig = {
|
||||||
name: {
|
name: {
|
||||||
title: "Аллерген",
|
title: "Аллерген",
|
||||||
rules: [(val) => ruleMaxLength(val, 100)],
|
|
||||||
error:
|
error:
|
||||||
"Некорректно введен аллерген. Значение должно быть больше 1 и меньше 50 символов",
|
"Некорректно введен аллерген. Значение должно быть больше 1 и меньше 50 символов",
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user