admin/astra-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ASTRA-82' into 'master'

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

See merge request andrusyakka/urban-couscous!371
This commit is contained in:
Daria Golova
2023-05-17 08:23:34 +00:00
parent 83a683ce27 425ba36ef5
commit 4e3e52bfe2
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue
View File

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

2
src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue
View File

@@ -13,7 +13,7 @@
.flex.gap-x-4(:style="{height: item.change || fillInspection ? '300px' : ''}") .flex.gap-x-4(:style="{height: item.change || fillInspection ? '300px' : ''}")
.flex.flex-col.gap-y-1(:class="{'open-textarea': item.change || fillInspection}") .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-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="Введите жалобу...") 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") .filter.flex.flex-col.gap-y-4(v-if="item.change || fillInspection")
.flex.gap-x-2 .flex.gap-x-2