Merge branch 'ASTRA-110' into 'master'
Исправил фильтрацию второго отображения формулы See merge request andrusyakka/urban-couscous!439
This commit is contained in:
@@ -21,28 +21,31 @@
|
||||
:form-config="formConfig"
|
||||
)
|
||||
.flex(v-else)
|
||||
.cell.flex.flex-col.gap-y-7px.py-11px.items-center.justify-around(
|
||||
.cell.flex(
|
||||
v-for="cell in config.columns",
|
||||
:class="{'flex-col-reverse': config.name === 'upper'}"
|
||||
:style="{'width': '6.25%', 'minWidth': '55px'}",
|
||||
)
|
||||
span.text-smm.font-medium {{cell.tooth_number}}
|
||||
.flex.items-center.justify-center(
|
||||
:style="{'width': '35px', 'height': '35px'}"
|
||||
)
|
||||
detailed-tooth-svg(
|
||||
part-tooth="crown",
|
||||
:tooth-config="cell",
|
||||
:data="getToothImageConfig(data.formula[cell.tooth_number].dental_condition)"
|
||||
: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="getToothImageConfig(data.formula[cell.tooth_number].dental_condition)"
|
||||
.flex.flex-col.w-full.h-full.gap-y-7px.py-11px.items-center.justify-around(
|
||||
v-if="filtredTooths.includes(cell.tooth_number)",
|
||||
:class="{'flex-col-reverse': config.name === 'upper'}"
|
||||
)
|
||||
span.text-smm.font-medium {{cell.tooth_number}}
|
||||
.flex.items-center.justify-center(
|
||||
:style="{'width': '35px', 'height': '35px'}"
|
||||
)
|
||||
detailed-tooth-svg(
|
||||
part-tooth="crown",
|
||||
:tooth-config="cell",
|
||||
:data="getToothImageConfig(data.formula[cell.tooth_number].dental_condition)"
|
||||
: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="getToothImageConfig(data.formula[cell.tooth_number].dental_condition)"
|
||||
)
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
Reference in New Issue
Block a user