From 8ce6fce06cf209f3f384a7810cc178896409cbd1 Mon Sep 17 00:00:00 2001 From: DwCay Date: Thu, 25 May 2023 19:09:43 +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=B7=D1=83=D0=B1?= =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/teeth-2.svg | 4 ++ .../Forms/ToothFormulaForm.vue | 53 +++++++++++++++++++ .../MedicalProtocolsInspection.vue | 3 +- .../components/MedicalFormWrapper.vue | 1 + .../newMedicalCard/utils/medicalConfig.js | 6 +++ src/store/modules/medicalCard.js | 6 +++ tailwind.config.js | 1 + 7 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 src/assets/icons/teeth-2.svg create mode 100644 src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormulaForm.vue diff --git a/src/assets/icons/teeth-2.svg b/src/assets/icons/teeth-2.svg new file mode 100644 index 0000000..6f7811f --- /dev/null +++ b/src/assets/icons/teeth-2.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormulaForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormulaForm.vue new file mode 100644 index 0000000..1b8b201 --- /dev/null +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormulaForm.vue @@ -0,0 +1,53 @@ + + + diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue index b43434f..5982fc2 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/MedicalProtocolsInspection.vue @@ -41,8 +41,8 @@ import DiseaseForm from "@/pages/newMedicalCard/components/InitialInspectionProt import BaseButton from "@/components/base/BaseButton.vue"; import IndexForm from "@/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/IndexForm.vue"; import MainFactorsForm from "@/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MainFactorsForm.vue"; +import ToothFormulaForm from "@/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormulaForm.vue"; import { protocolForms } from "@/pages/newMedicalCard/utils/medicalConfig.js"; - export default { name: "MedicalProtocolsInspection", components: { @@ -52,6 +52,7 @@ export default { BaseButton, IndexForm, MainFactorsForm, + ToothFormulaForm, }, props: { inspection: Boolean, fillInspection: Boolean }, data() { diff --git a/src/pages/newMedicalCard/components/MedicalFormWrapper.vue b/src/pages/newMedicalCard/components/MedicalFormWrapper.vue index de5f76d..7ab2fb9 100644 --- a/src/pages/newMedicalCard/components/MedicalFormWrapper.vue +++ b/src/pages/newMedicalCard/components/MedicalFormWrapper.vue @@ -17,6 +17,7 @@ .flex.w-fit.gap-10px.items-center.delete-button.cursor-pointer(v-if="!isEdit && titleDelete" @click="deleteItem") q-icon(name="app:basket" size="20") span.text-smm.font-medium {{ titleDelete }} + slot(name="right-corner") slot .flex.h-fit.w-fit.gap-2(v-if="isEdit && buttonsPresence") q-btn( diff --git a/src/pages/newMedicalCard/utils/medicalConfig.js b/src/pages/newMedicalCard/utils/medicalConfig.js index 1665106..5334fc9 100644 --- a/src/pages/newMedicalCard/utils/medicalConfig.js +++ b/src/pages/newMedicalCard/utils/medicalConfig.js @@ -928,6 +928,12 @@ export const protocolForms = [ ], }, }, + { + title: "Зубная формула", + component: "ToothFormulaForm", + key: "toothFormula", + state: "toothFormula", + }, { title: "План обследования", component: "MedicalFormTag", diff --git a/src/store/modules/medicalCard.js b/src/store/modules/medicalCard.js index eb3092a..32a422b 100644 --- a/src/store/modules/medicalCard.js +++ b/src/store/modules/medicalCard.js @@ -304,6 +304,9 @@ const getters = { value: 120, }, }, + toothFormula: { + lacticBite: true, + }, }; }, getInitProtocol() { @@ -330,6 +333,9 @@ const getters = { }, }, disease: null, + toothFormula: { + lacticBite: false, + }, }; }, }; diff --git a/tailwind.config.js b/tailwind.config.js index 924be13..2b01caa 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -43,6 +43,7 @@ module.exports = { "2px": "2px", "3px": "3px", "4_75px": "4.75px", + "7px": "7px", "6px": "6px", "9px": "9px", "10px": "10px",