Merge branch 'ASTRA-82' into 'master'

WIP Заменила числовой инпут

See merge request andrusyakka/urban-couscous!371
This commit is contained in:
Daria Golova
2023-05-17 08:23:34 +00:00
2 changed files with 11 additions and 7 deletions

View File

@@ -20,13 +20,13 @@
span.text-sm.line-height.blue-color {{ item?.label ? item.label : item }}
.alert-icon.flex.justify-center.items-center.rounded.w-6.h-6(v-if="item?.icon")
q-icon(name="warning_amber", size="13")
base-input(
base-input-number(
v-else,
v-model="modelValue",
outlined,
type="number",
:rule="data?.rules",
step="any",
:step="0.1",
:max="10",
:min="0"
)
.rounded.grey-background.py-3.px-4.blue-color
span.font-bold.text-base.line-height Справка
@@ -40,13 +40,17 @@
<script>
import BaseButton from "@/components/base/BaseButton.vue";
import BaseInput from "@/components/base/BaseInput.vue";
import MedicalFormWrapper from "@/pages/newMedicalCard/components/MedicalFormWrapper.vue";
import { mapState } from "vuex";
import BaseInputNumber from "@/components/base/BaseInputNumber.vue";
export default {
name: "IndexForm",
components: { BaseButton, BaseInput, MedicalFormWrapper },
components: {
BaseButton,
MedicalFormWrapper,
BaseInputNumber,
},
props: {
data: Object,
fillInspection: Boolean,

View File

@@ -13,7 +13,7 @@
.flex.gap-x-4(:style="{height: item.change || fillInspection ? '300px' : ''}")
.flex.flex-col.gap-y-1(:class="{'open-textarea': item.change || fillInspection}")
.tag-wrap.flex.gap-x-1.gap-y-1(v-if="!fillInspection")
.tag.flex.items-center.px-3.cursor-pointer(v-for="tag in item.tags" :key="tag.id") {{tag.label}}
.tag.flex.items-center.px-3.cursor-pointer.text-smm(v-for="tag in item.tags" :key="tag.id") {{tag.label}}
base-input.px-3(v-if="item.change || fillInspection", type="textarea", autogrow, borderless, placeholder="Введите жалобу...")
.filter.flex.flex-col.gap-y-4(v-if="item.change || fillInspection")
.flex.gap-x-2