diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue index 8d967ed..d1bde58 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/DentalConditionForm.vue @@ -1,6 +1,21 @@ @@ -66,7 +66,7 @@ export default { filtredTooths: [], isEdit: false, component: false, - isShowSecondView: true, + isShowSecondView: false, }; }, props: { @@ -81,6 +81,7 @@ export default { methods: { openEdit() { this.isEdit = true; + this.isShowSecondView = false; }, cancelEdit() { this.isEdit = false; diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaTable.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaTable.vue index 2739ccd..7fb60de 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaTable.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/ToothFormula/ToothFormulaTable.vue @@ -3,7 +3,7 @@ :class="{'rounded-t': config.name === 'upper', 'rounded-b': config.name === 'lower','border-botton-none': config.name === 'upper',}", ) .row.flex.w-full( - v-if="viewType" + v-if="!viewType" v-for="row in config.rowMap", :key="`${config.name}_${row.key}`", :style="{'height': heightRow[row.key]}" @@ -27,17 +27,19 @@ :style="{'width': '6.25%', 'minWidth': '55px'}", ) span.text-smm.font-medium {{cell.tooth_number}} - detailed-tooth-svg( - part-tooth="crown", - :data="data.formula[cell.tooth_number].dental_condition", - :is-edit="isEdit" - ) + .flex.items-center.justify-center( + :style="{'width': '35px', 'height': '35px'}" + ) + detailed-tooth-svg( + part-tooth="crown", + :tooth-config="cell", + :view="data.formula[cell.tooth_number].dental_condition.general === 'ИЗ' ? 'artificial': 'native'", + ) detailed-tooth-svg( part-tooth="general", + :view="data.formula[cell.tooth_number].dental_condition.general === 'ИЗ' ? 'artificial': 'native'", :tooth-config="cell", :jaw-position="config.name", - :data="data.formula[cell.tooth_number].dental_condition", - :is-edit="isEdit" ) diff --git a/src/pages/newMedicalCard/utils/medicalConfig.js b/src/pages/newMedicalCard/utils/medicalConfig.js index 21c2ee7..0ba52ac 100644 --- a/src/pages/newMedicalCard/utils/medicalConfig.js +++ b/src/pages/newMedicalCard/utils/medicalConfig.js @@ -1309,3 +1309,40 @@ export const thermometryResultsMap = [ colorWarning: "var(--border-red-color)", }, ]; + +export const sizesDetailedSvg = { + general: { + native: { + molars: { + width: 37, + height: 56, + }, + "pre-molars": { + width: 38, + height: 59, + }, + incisors: { + width: 43, + height: 63, + }, + fangs: { + width: 38, + height: 59, + }, + }, + artificial: { + width: 43, + height: 63, + }, + }, + crown: { + native: { + width: 41, + height: 40, + }, + artificial: { + width: 20, + height: 20, + }, + }, +};