From f61c405f0f4c426509f39d7ffc65bfcfd7f69c3b Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Thu, 29 Jun 2023 16:58:33 +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=D0=BC=D0=BE=D0=B6=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5?= =?UTF-8?q?=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=82=D1=8D=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Forms/MedicalFormTag.vue | 11 +- .../Forms/TagCreationForm.vue | 105 +++++++++++++++++- 2 files changed, 108 insertions(+), 8 deletions(-) diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue index ae14168..1ff0c9a 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue @@ -50,8 +50,8 @@ .flex.h-10.w-10.absolute.right-4.bottom-4 q-btn(@click="showModal = true", color="primary", dense, padding="4px 12px") q-icon(name="app:icon-plus", size="17px") - base-modal(v-model="showModal", title="Создание тега") - tag-creation-form + base-modal(v-model="showModal", title="Создание тега", modal-padding) + tag-creation-form(:close-modal="closeModal", :create-tag="createTag") .flex(v-if="data.title === 'Осмотр полости рта' && (fillInspection || change)", :style="{color: 'var(--btn-blue-color)'}") q-btn(no-caps, flat padding="2px 4px") q-icon(left, name="app:plus", size="11px") @@ -111,6 +111,13 @@ export default { closeCard() { this.change = false; }, + closeModal() { + this.showModal = false; + }, + createTag(model) { + this.showModal = false; + this.protocolData[this.data.state].push(model.tag); + }, }, watch: { fillInspection: { diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/TagCreationForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/TagCreationForm.vue index e95ff0a..e8e9fda 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/TagCreationForm.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/TagCreationForm.vue @@ -1,17 +1,48 @@