From a073e8863214f9c51b8338ad1a90bd9738bb3223 Mon Sep 17 00:00:00 2001 From: szewczyw Date: Thu, 27 Feb 2025 14:47:19 +0100 Subject: [PATCH] aesthetic changes --- src/components/SummaryComponent.vue | 59 +++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/src/components/SummaryComponent.vue b/src/components/SummaryComponent.vue index 8e70f5b..92601d7 100644 --- a/src/components/SummaryComponent.vue +++ b/src/components/SummaryComponent.vue @@ -26,7 +26,7 @@ const orderByRouteAndNipRef = ref>>(new Map>) - +const activeButton = ref(null) const watchSearchDate = watch(searchDate, async (oldSearchDate, newSeatchDate) => { if (oldSearchDate != newSeatchDate) { await fetchOrders() @@ -38,7 +38,20 @@ const watchConfirmedOrders = watch(confirmedOrders, async (oldConfirmedOrders, n await fetchOrders() } }) +const setActive = (button) => { + activeButton.value = button; + if (button === 'separate') { + isSummed.value = false; + nipGrouped.value = false; + } else if (button === 'grouped') { + isSummed.value = false; + nipGrouped.value = true; + } else if (button === 'summed') { + isSummed.value = true; + nipGrouped.value = false; + } +}; async function fetchOrders() { isLoading.value = true orders.value = await ordersStore.fetchOrdersByDateStartAndEnd(searchDate.value != undefined ? searchDate.value : new Date(Date.now()), @@ -118,6 +131,8 @@ function groupByNip() { existingProduct.suma = Number(Number(existingProduct.MZE_TwrIlosc) * Number(existingProduct.MZE_TwrCena)).toFixed(2) } else { + element.MZE_TwrCena = String(Number(element.MZE_TwrCena).toFixed(2)) + element.MZE_TwrIlosc = String(Number(element.MZE_TwrIlosc).toFixed(2)) element.suma = Number(Number(element.MZE_TwrIlosc )*Number(element.MZE_TwrCena)).toFixed(2) entry.products.push(element) } @@ -176,12 +191,29 @@ onBeforeUnmount(async function() {
- - + + -
@@ -231,7 +263,7 @@ onBeforeUnmount(async function() { {{ item.orders[0].MZN_PodNazwa1 + item.orders[0].MZN_PodNazwa2 + item.orders[0].MZN_PodNazwa3 }}

+ v-if="orderByRouteAndNipRef.get(route.MZT_Nazwa1)?.get(nip)?.orders?.length > 1 "> ZAMÓWIENIA NR {{ orderByNip.MZN_MZNID @@ -240,6 +272,16 @@ onBeforeUnmount(async function() { v-if="index !== orderByRouteAndNipRef.get(route.MZT_Nazwa1).get(nip).orders.length - 1">,

+

+ ZAMÓWIENIE NR + {{ orderByNip.MZN_MZNID + }} + , + +

@@ -294,7 +336,10 @@ onBeforeUnmount(async function() { --bulma-box-padding: 0.75rem; } } - + .is-active { + background-color: #66d1ff; + color: white; + } .blackBorder { --bulma-table-cell-border-color : black; }