From c192f777d197efd28ec568ae875fed26df7e2078 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Fri, 12 May 2023 18:36:36 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=20=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BE=D0=B1=D1=81=D0=BB=D0=B5=D0=B4=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseInput.vue | 9 +- .../Forms/DataForm.vue | 311 ++++++++++++++++++ .../Forms/MedicalFormData.vue | 40 --- .../Forms/MedicalFormTag.vue | 4 +- .../MedicalProtocolsInspection.vue | 9 +- .../newMedicalCard/utils/medicalConfig.js | 6 + 6 files changed, 330 insertions(+), 49 deletions(-) create mode 100644 src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue delete mode 100644 src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormData.vue 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/MedicalFormData.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormData.vue deleted file mode 100644 index f869b1c..0000000 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormData.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue index 27c62d5..3a70262 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.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 }} @@ -59,7 +58,6 @@ export default { components: { BaseButton, BaseInput, MedicalFormWrapper }, props: { list: Array, - inspection: Boolean, fillInspection: Boolean, openCard: Function, closeCard: Function, diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue index 0d8aea9..f1c587e 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue @@ -17,7 +17,7 @@ ) .button q-btn( - icon="app:basket", + icon="app:basket", size="20px", :style="{width: '40px', height: '40px', color: 'var(--font-grey-color)'}", padding="0" @@ -25,13 +25,12 @@ medical-form-tag( v-if="inspection || fillInspection", :list="list", - :inspection="inspection", :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") .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") Отменить @@ -43,7 +42,7 @@