aesthetic changes
This commit is contained in:
@@ -26,7 +26,7 @@ const orderByRouteAndNipRef = ref<Map<string, Map<number, {
|
|||||||
orders: Order[];
|
orders: Order[];
|
||||||
products: OrderProduct[]
|
products: OrderProduct[]
|
||||||
}>>>(new Map<string, Map<number, { orders: Order[]; products: OrderProduct[] }>>)
|
}>>>(new Map<string, Map<number, { orders: Order[]; products: OrderProduct[] }>>)
|
||||||
|
const activeButton = ref(null)
|
||||||
const watchSearchDate = watch(searchDate, async (oldSearchDate, newSeatchDate) => {
|
const watchSearchDate = watch(searchDate, async (oldSearchDate, newSeatchDate) => {
|
||||||
if (oldSearchDate != newSeatchDate) {
|
if (oldSearchDate != newSeatchDate) {
|
||||||
await fetchOrders()
|
await fetchOrders()
|
||||||
@@ -38,7 +38,20 @@ const watchConfirmedOrders = watch(confirmedOrders, async (oldConfirmedOrders, n
|
|||||||
await fetchOrders()
|
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() {
|
async function fetchOrders() {
|
||||||
isLoading.value = true
|
isLoading.value = true
|
||||||
orders.value = await ordersStore.fetchOrdersByDateStartAndEnd(searchDate.value != undefined ? searchDate.value : new Date(Date.now()),
|
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)
|
existingProduct.suma = Number(Number(existingProduct.MZE_TwrIlosc) * Number(existingProduct.MZE_TwrCena)).toFixed(2)
|
||||||
|
|
||||||
} else {
|
} 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)
|
element.suma = Number(Number(element.MZE_TwrIlosc )*Number(element.MZE_TwrCena)).toFixed(2)
|
||||||
entry.products.push(element)
|
entry.products.push(element)
|
||||||
}
|
}
|
||||||
@@ -176,12 +191,29 @@ onBeforeUnmount(async function() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="box mt-3">
|
<div class="box mt-3">
|
||||||
<button class="button is-fullwidth mb-3" @click="isSummed=false; nipGrouped=false">Rozdzielone zamówienia
|
<button
|
||||||
|
class="button is-fullwidth mb-3"
|
||||||
|
:class="{ 'is-active': activeButton === 'separate' }"
|
||||||
|
@click="setActive('separate')"
|
||||||
|
>
|
||||||
|
Rozdzielone zamówienia
|
||||||
</button>
|
</button>
|
||||||
<button class="button is-fullwidth mb-3" @click="isSummed=false; nipGrouped=true">Zamówienia pogrupowane po
|
|
||||||
NIP
|
<button
|
||||||
|
class="button is-fullwidth mb-3"
|
||||||
|
:class="{ 'is-active': activeButton === 'grouped' }"
|
||||||
|
@click="setActive('grouped')"
|
||||||
|
>
|
||||||
|
Zamówienia pogrupowane po NIP
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button
|
||||||
|
class="button is-fullwidth mb-3"
|
||||||
|
:class="{ 'is-active': activeButton === 'summed' }"
|
||||||
|
@click="setActive('summed')"
|
||||||
|
>
|
||||||
|
Zsumowane zamówienia
|
||||||
</button>
|
</button>
|
||||||
<button class="button is-fullwidth mb-3" @click="isSummed=true; nipGrouped=false">Zsumowane zamówienia</button>
|
|
||||||
<button class="button is-fullwidth" v-print="'#printMe'">Drukuj</button>
|
<button class="button is-fullwidth" v-print="'#printMe'">Drukuj</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -231,7 +263,7 @@ onBeforeUnmount(async function() {
|
|||||||
{{ item.orders[0].MZN_PodNazwa1 + item.orders[0].MZN_PodNazwa2 + item.orders[0].MZN_PodNazwa3
|
{{ item.orders[0].MZN_PodNazwa1 + item.orders[0].MZN_PodNazwa2 + item.orders[0].MZN_PodNazwa3
|
||||||
}}</p>
|
}}</p>
|
||||||
<p class="is-size-5 px-2"
|
<p class="is-size-5 px-2"
|
||||||
v-if="orderByRouteAndNipRef.get(route.MZT_Nazwa1)?.get(nip)?.orders?.length">
|
v-if="orderByRouteAndNipRef.get(route.MZT_Nazwa1)?.get(nip)?.orders?.length > 1 ">
|
||||||
ZAMÓWIENIA NR
|
ZAMÓWIENIA NR
|
||||||
<span
|
<span
|
||||||
v-for="(orderByNip, index) in orderByRouteAndNipRef.get(route.MZT_Nazwa1).get(nip).orders">{{ orderByNip.MZN_MZNID
|
v-for="(orderByNip, index) in orderByRouteAndNipRef.get(route.MZT_Nazwa1).get(nip).orders">{{ orderByNip.MZN_MZNID
|
||||||
@@ -240,6 +272,16 @@ onBeforeUnmount(async function() {
|
|||||||
v-if="index !== orderByRouteAndNipRef.get(route.MZT_Nazwa1).get(nip).orders.length - 1">, </span>
|
v-if="index !== orderByRouteAndNipRef.get(route.MZT_Nazwa1).get(nip).orders.length - 1">, </span>
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
|
<p class="is-size-5 px-2"
|
||||||
|
v-else>
|
||||||
|
ZAMÓWIENIE NR
|
||||||
|
<span
|
||||||
|
v-for="(orderByNip, index) in orderByRouteAndNipRef.get(route.MZT_Nazwa1).get(nip).orders">{{ orderByNip.MZN_MZNID
|
||||||
|
}}
|
||||||
|
<span
|
||||||
|
v-if="index !== orderByRouteAndNipRef.get(route.MZT_Nazwa1).get(nip).orders.length - 1">, </span>
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
<DataTable :value="orderByRouteAndNipRef.get(route.MZT_Nazwa1).get(nip).products"
|
<DataTable :value="orderByRouteAndNipRef.get(route.MZT_Nazwa1).get(nip).products"
|
||||||
class="mb-3" style="padding:0" scrollable>
|
class="mb-3" style="padding:0" scrollable>
|
||||||
<Column field="MZE_TwrKod" header="Indeks" frozen></Column>
|
<Column field="MZE_TwrKod" header="Indeks" frozen></Column>
|
||||||
@@ -294,7 +336,10 @@ onBeforeUnmount(async function() {
|
|||||||
--bulma-box-padding: 0.75rem;
|
--bulma-box-padding: 0.75rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.is-active {
|
||||||
|
background-color: #66d1ff;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
.blackBorder {
|
.blackBorder {
|
||||||
--bulma-table-cell-border-color : black;
|
--bulma-table-cell-border-color : black;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user