From 8b6eb0401aea4c936fdaf4c570ab2c321b397e3f Mon Sep 17 00:00:00 2001 From: DwCay Date: Fri, 31 Mar 2023 18:28:07 +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=BB=D1=8F=20?= =?UTF-8?q?=D0=9E=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D1=8B=D1=85=20=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseInput.vue | 10 ++- .../components/BasicDataForm.vue | 61 +++++++++++++++ .../components/MedicalFormWrapper.vue | 6 +- .../newMedicalCard/utils/configMedical.js | 75 +++++++++++++++++-- 4 files changed, 143 insertions(+), 9 deletions(-) diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue index 0f95b13..f2206fc 100644 --- a/src/components/base/BaseInput.vue +++ b/src/components/base/BaseInput.vue @@ -3,14 +3,14 @@ q-input( v-model="value", :class="{'circle': circle, 'font-input': true}", - :input-style="{ color: textColor, width: width + 'px' }", + :input-style="{ color: textColor, width: width + 'px' , borderColor: borderColor}", :borderless="borderless", :placeholder="placeholder", :outlined="outlined", :dense="dense", :type="type", :filled="filled", - :bg-color="filled ? '' : 'white'", + :bg-color="filled || standout ? '' : 'white'", :disable="disabled", :rules="rule", :lazy-rules="lazyRule", @@ -20,6 +20,7 @@ :maxlength="maxLength", :autogrow="autogrow", :square="square", + :standout="standout" hide-bottom-space ) slot.cursor-pointer @@ -60,10 +61,15 @@ export default { type: { default: "text", }, + standout: { + type: [Boolean, String], + default: false, + }, mask: String, width: Number, maxLength: Number, textColor: String, + borderColor: String, rule: Array, lazyRule: [Boolean, String], noErrorIcon: Boolean, diff --git a/src/pages/newMedicalCard/components/BasicDataForm.vue b/src/pages/newMedicalCard/components/BasicDataForm.vue index 61b61ee..98fb148 100644 --- a/src/pages/newMedicalCard/components/BasicDataForm.vue +++ b/src/pages/newMedicalCard/components/BasicDataForm.vue @@ -1,8 +1,69 @@ + + diff --git a/src/pages/newMedicalCard/components/MedicalFormWrapper.vue b/src/pages/newMedicalCard/components/MedicalFormWrapper.vue index 487dc4a..07ff522 100644 --- a/src/pages/newMedicalCard/components/MedicalFormWrapper.vue +++ b/src/pages/newMedicalCard/components/MedicalFormWrapper.vue @@ -1,7 +1,7 @@