diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue index 5603dab..efce6e6 100644 --- a/src/components/base/BaseInput.vue +++ b/src/components/base/BaseInput.vue @@ -3,7 +3,7 @@ q-input( v-model="value", :name="name", - :class="{'circle': circle, 'font-input': true}", + :class="{'circle': circle, 'font-input': true, 'doc': doc}", :input-style="{ color: textColor, borderColor: borderColor, resize: resize}", :borderless="borderless", :placeholder="placeholder", @@ -40,6 +40,7 @@ export default { components: { BaseInputContainer }, props: { circle: Boolean, + doc: Boolean, dense: { type: Boolean, default: true, @@ -129,6 +130,12 @@ export default { z-index: 5 opacity: 0 cursor: pointer +.doc + width: 100% + height: 100% + z-index: 5 + opacity: 0 + cursor: pointer diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue index d5828ad..a1b4f43 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue @@ -50,9 +50,6 @@ export default { changeEdit(value) { this.isEdit = value; }, - changeModelValue(value, key) { - if (value) this.modelValue = key; - }, }, }; diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTagWrapper.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue similarity index 89% rename from src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTagWrapper.vue rename to src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue index ff9cb42..4f58f9c 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTagWrapper.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue @@ -43,8 +43,7 @@ dense, v-model="selected", :val="name?.label", - :style="{border: 'none', width: '16px', height: '16px'}", - + :style="{border: 'none', width: '16px', height: '16px'}" ) .name.flex.items-center.font-medium.text-smm {{ name?.label }} @@ -55,11 +54,11 @@ import BaseInput from "@/components/base/BaseInput.vue"; import MedicalFormWrapper from "@/pages/newMedicalCard/components/MedicalFormWrapper.vue"; export default { - name: "MedicalFormTagWrapper", + name: "MedicalFormTag", components: { BaseButton, BaseInput, MedicalFormWrapper }, props: { + abc: Array, list: Array, - inspection: Boolean, fillInspection: Boolean, openCard: Function, closeCard: Function, @@ -67,39 +66,6 @@ export default { data() { return { selected: [], - abc: [ - "А", - "Б", - "В", - "Г", - "Д", - "Е", - "Ё", - "Ж", - "З", - "И", - "Й", - "К", - "Л", - "М", - "Н", - "О", - "П", - "Р", - "С", - "Т", - "У", - "Ф", - "Х", - "Ц", - "Ч", - "Ш", - "Щ", - "Ы", - "Э", - "Ю", - "Я", - ], }; }, methods: { diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue index 845224c..9909de5 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue @@ -17,21 +17,21 @@ ) .button q-btn( - icon="app:basket", + icon="app:basket", size="20px", :style="{width: '40px', height: '40px', color: 'var(--font-grey-color)'}", padding="0" ) - medical-form-tag-wrapper( + medical-form-tag( v-if="inspection || fillInspection", :list="list", - :inspection="inspection", + :abc="abc", :fill-inspection="fillInspection" :open-card="openCard", :close-card="closeCard" ) div(v-for="form in protocolForms", :key="form.key") - component(v-bind:is="form.component", :data="form") + component(v-bind:is="form.component", :data="form", :fill-inspection="fillInspection", :abc="abc") .protocol.flex.justify-between.p-6(v-if="fillInspection") .flex.h-fit.w-fit.gap-2 base-button.text-base.font-semibold(outlined, :size="40") Отменить @@ -42,7 +42,8 @@