added concating orders comments
This commit is contained in:
20
package-lock.json
generated
20
package-lock.json
generated
@@ -40,7 +40,7 @@
|
|||||||
"typescript": "~5.4.0",
|
"typescript": "~5.4.0",
|
||||||
"unplugin-vue-components": "^0.27.3",
|
"unplugin-vue-components": "^0.27.3",
|
||||||
"vite": "^5.4.11",
|
"vite": "^5.4.11",
|
||||||
"vue-tsc": "^2.0.11"
|
"vue-tsc": "2.0.11"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@antfu/utils": {
|
"node_modules/@antfu/utils": {
|
||||||
@@ -1627,12 +1627,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@vue/language-core": {
|
"node_modules/@vue/language-core": {
|
||||||
"version": "2.0.19",
|
"version": "2.0.11",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.19.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.11.tgz",
|
||||||
"integrity": "sha512-A9EGOnvb51jOvnCYoRLnMP+CcoPlbZVxI9gZXE/y2GksRWM6j/PrLEIC++pnosWTN08tFpJgxhSS//E9v/Sg+Q==",
|
"integrity": "sha512-5ivg8Vem/yckzXI3L3n0mdKBPRcHSlsGt6/dpbEx42PcH3MIHAjSAJBYvENXeWJxv2ClQc8BS2mH1Ho2U7jZig==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@volar/language-core": "~2.2.4",
|
"@volar/language-core": "~2.2.0-alpha.6",
|
||||||
"@vue/compiler-dom": "^3.4.0",
|
"@vue/compiler-dom": "^3.4.0",
|
||||||
"@vue/shared": "^3.4.0",
|
"@vue/shared": "^3.4.0",
|
||||||
"computeds": "^0.0.1",
|
"computeds": "^0.0.1",
|
||||||
@@ -4036,13 +4036,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vue-tsc": {
|
"node_modules/vue-tsc": {
|
||||||
"version": "2.0.19",
|
"version": "2.0.11",
|
||||||
"resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.0.19.tgz",
|
"resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.0.11.tgz",
|
||||||
"integrity": "sha512-JWay5Zt2/871iodGF72cELIbcAoPyhJxq56mPPh+M2K7IwI688FMrFKc/+DvB05wDWEuCPexQJ6L10zSwzzapg==",
|
"integrity": "sha512-dl5MEU4VGZdQFGBnKfPpAfV3SQmBDWs9o4YhUPvDmwk+zmb/RprzFJK2sagR6EWazogZhXENvykd3wBXWS9kng==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@volar/typescript": "~2.2.4",
|
"@volar/typescript": "~2.2.0-alpha.6",
|
||||||
"@vue/language-core": "2.0.19",
|
"@vue/language-core": "2.0.11",
|
||||||
"semver": "^7.5.4"
|
"semver": "^7.5.4"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
|||||||
import { useCategoriesStore } from '@/stores/categories.store'
|
import { useCategoriesStore } from '@/stores/categories.store'
|
||||||
import type { Order, OrderProduct, Product } from '@/main'
|
import type { Order, OrderProduct, Product } from '@/main'
|
||||||
import { useRoutesStore } from '@/stores/routes.store'
|
import { useRoutesStore } from '@/stores/routes.store'
|
||||||
|
import { bool } from 'yup'
|
||||||
|
|
||||||
const ordersStore = useOrdersStore()
|
const ordersStore = useOrdersStore()
|
||||||
const categoriesStore = useCategoriesStore()
|
const categoriesStore = useCategoriesStore()
|
||||||
@@ -27,6 +28,7 @@ const orderByRouteAndNipRef = ref<Map<string, Map<number, {
|
|||||||
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 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()
|
||||||
@@ -129,7 +131,6 @@ function groupByNip() {
|
|||||||
Number(Number(existingProduct.MZE_TwrIlosc) + Number(element.MZE_TwrIlosc)).toFixed(2)
|
Number(Number(existingProduct.MZE_TwrIlosc) + Number(element.MZE_TwrIlosc)).toFixed(2)
|
||||||
)
|
)
|
||||||
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_TwrCena = String(Number(element.MZE_TwrCena).toFixed(2))
|
||||||
element.MZE_TwrIlosc = String(Number(element.MZE_TwrIlosc).toFixed(2))
|
element.MZE_TwrIlosc = String(Number(element.MZE_TwrIlosc).toFixed(2))
|
||||||
@@ -162,11 +163,23 @@ onMounted(async () => {
|
|||||||
console.log(ordersByRoute.value)
|
console.log(ordersByRoute.value)
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
onBeforeUnmount(async function() {
|
onBeforeUnmount(async function() {
|
||||||
const siteControlStore = useSiteControlStore();
|
const siteControlStore = useSiteControlStore();
|
||||||
await siteControlStore.newOrder(false);
|
await siteControlStore.newOrder(false);
|
||||||
})
|
})
|
||||||
|
|
||||||
|
function hasNonEmptyUwagi(item: any): boolean {
|
||||||
|
let found = false;
|
||||||
|
item.orders.forEach(order => {
|
||||||
|
if(order.MZN_Uwagi) {
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return found;
|
||||||
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -293,9 +306,9 @@ onBeforeUnmount(async function() {
|
|||||||
<Column field="MZE_TwrCena" header="Cena" />
|
<Column field="MZE_TwrCena" header="Cena" />
|
||||||
<Column field="suma" header="Suma" />
|
<Column field="suma" header="Suma" />
|
||||||
</DataTable>
|
</DataTable>
|
||||||
<div v-if="item.orders[0].MZN_Uwagi != undefined">
|
<div >
|
||||||
<p class="is-size-6 px-2">Uwagi</p>
|
<p v-if="hasNonEmptyUwagi(item)" class="is-size-6 px-2">Uwagi</p>
|
||||||
<p class="is-size-6 px-2">{{ item.orders[0].MZN_Uwagi }}</p>
|
<p v-for="order in item.orders" class="is-size-6 px-2">{{ order.MZN_Uwagi }}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user