From a51b2b65080eceed636a3f4d9deb68b5dd54fcda Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Fri, 12 May 2023 18:41:08 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=BF=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Forms/DataForm.vue | 34 +----------------- .../Forms/MedicalFormTag.vue | 34 +----------------- .../MedicalProtocolsInspection.vue | 36 ++++++++++++++++++- 3 files changed, 37 insertions(+), 67 deletions(-) diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue index 346f982..142d287 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/DataForm.vue @@ -103,6 +103,7 @@ export default { name: "DataForm", components: { MedicalFormWrapper, BaseButton, BaseInput }, props: { + abc: Array, data: Object, fillInspection: Boolean, inspection: Boolean, @@ -132,39 +133,6 @@ export default { ], }, selected: [], - abc: [ - "А", - "Б", - "В", - "Г", - "Д", - "Е", - "Ё", - "Ж", - "З", - "И", - "Й", - "К", - "Л", - "М", - "Н", - "О", - "П", - "Р", - "С", - "Т", - "У", - "Ф", - "Х", - "Ц", - "Ч", - "Ш", - "Щ", - "Ы", - "Э", - "Ю", - "Я", - ], docData: [], scanData: [], iconDictionary: { diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue index 3a70262..4f58f9c 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue @@ -57,6 +57,7 @@ export default { name: "MedicalFormTag", components: { BaseButton, BaseInput, MedicalFormWrapper }, props: { + abc: Array, list: Array, fillInspection: Boolean, openCard: Function, @@ -65,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 1e18121..9909de5 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue @@ -25,12 +25,13 @@ medical-form-tag( v-if="inspection || fillInspection", :list="list", + :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", :fill-inspection="fillInspection") + 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") Отменить @@ -102,6 +103,39 @@ export default { ], }, ], + abc: [ + "А", + "Б", + "В", + "Г", + "Д", + "Е", + "Ё", + "Ж", + "З", + "И", + "Й", + "К", + "Л", + "М", + "Н", + "О", + "П", + "Р", + "С", + "Т", + "У", + "Ф", + "Х", + "Ц", + "Ч", + "Ш", + "Щ", + "Ы", + "Э", + "Ю", + "Я", + ], }; }, methods: {