ral

components/modal.vue

@@ -15,6 +15,7 @@ const lamelle_color = useState<ralTypes>('lamelle_color')
 const section_count = useState('section_count')
 const extra_section = useState('extra_section')
 const total_length = useState('total_length')
+const remove_pillar = useState<boolean>('remove_pillar')
 
 const toggleModal = () => {
     modal_data.phone = undefined
@@ -106,6 +107,7 @@ const total = computed(() => {
     const guides_count = section_count.value
     const guides = guides_count * parseFloat(guide) * lam_count * 115
     return [
+<<<<<<< HEAD
 <<<<<<< HEAD
         `Столб, ${pillar_count} шт. : ${roubleSign.format(pil)}`,
         `Ламели, ${lam_count} шт. : ${roubleSign.format(lam)}`,
@@ -117,6 +119,13 @@ const total = computed(() => {
         `Верхняя планка, ${top_count}: ${top_count} x ${length} x ${bar} = ${roubleSign.format(top)}`,
 >>>>>>> b541bdead72bb5cbf7831e7da77c6540bdb94747
     ]
+=======
+        !remove_pillar.value && `Столб, ${pillar_count}: (${parseFloat(mortgage)} + ${parseFloat(pillar)}) x ${pillar_count} = ${roubleSign.format(pil)}`,
+        `Ламели, ${lam_count}: (${lam_count} x ${length} x ${lamella}) + ${rivets} = ${roubleSign.format(lam)}`,
+        `Направляющая, ${guides_count}: ${guides_count} x ${guide} x ${lam_count} x 115 = ${roubleSign.format(guides)}`,
+        `Верхняя планка, ${top_count}: ${top_count} x ${length} x ${bar} = ${roubleSign.format(top)}`,
+    ].filter(Boolean)
+>>>>>>> c63b1a471f5212c40af99d24c387ae2e2d52d3cd
 })
 </script>
 <template>