From c7aedc53d60f0df17c1a241352043952b41d8ef5 Mon Sep 17 00:00:00 2001 From: DwCay Date: Wed, 31 May 2023 17:47:29 +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=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D0=BE=D1=8F=D0=BD=D0=B8=D1=8F=20=D0=B7=D1=83=D0=B1=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ToothFormula/DentalConditionForm.vue | 66 ++ .../Forms/ToothFormula/ToothFormulaCell.vue | 23 +- .../Forms/ToothFormula/ToothFormulaForm.vue | 2 +- .../Forms/ToothFormula/ToothFormulaTable.vue | 4 +- .../newMedicalCard/utils/gettersObjects.js | 8 +- .../newMedicalCard/utils/medicalConfig.js | 98 ++- src/store/modules/toothFormula.js | 608 +----------------- tailwind.config.js | 3 + 8 files changed, 205 insertions(+), 607 deletions(-) create mode 100644 src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue new file mode 100644 index 0000000..c182114 --- /dev/null +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaCell.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaCell.vue index 1805ba4..6c973f6 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaCell.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaCell.vue @@ -43,19 +43,19 @@ v-model="isOpenConditionsInfo", :general="value[rowKey].general", :conditions="getFiiledConditions(value[rowKey])" - :config="toothConfig.conditions" + :config="conditionConfig" ) span.text-smm.font-medium( v-if="rowKey === 'tooth_mobility' && !isEditCondition", :class="{'cell-info': isEdit}" - ) {{ toothConfig.mobility.find((el) => el.id === value[rowKey])?.label || null }} + ) {{ mobilityConfig.find((el) => el.id === value[rowKey])?.label || null }} q-menu( v-if="isEdit", v-model="isEditCondition", ) .flex.flex-col.p-4(v-if="rowKey === 'tooth_mobility'") .mobility-item.flex.justify-between.items-center.py-7px.pl-7px.pr-15px.rounded.w-143px.cursor-pointer( - v-for="mobility in toothConfig.mobility", + v-for="mobility in mobilityConfig", @click="()=>chooseMobility(mobility.id)" ) span.text-smm.font-medium {{ `${mobility.label} степень` }} @@ -63,21 +63,34 @@ name="check", size="12px" ) + dental-condition-form( + v-if="rowKey === 'dental_condition'", + :data="value.dental_condition" + :cell-config="config", + :form-config="formConfig" + )