From a26e834d87b2f03dd7768fddb1c3ba946a08c314 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 18:20:25 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
index a20caa4..7d5f960 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
@@ -46,9 +46,9 @@
stringToJson(item.productDetail)
})
- grossNum.value.quantity = parseFloat(grossNum.value.quantity.toFixed(3))
- grossNum.value.grossArea = parseFloat(grossNum.value.grossArea.toFixed(3))
- grossNum.value.perimeter = parseFloat(grossNum.value.perimeter.toFixed(3))
+ grossNum.value.quantity = parseFloat(grossNum.value.quantity.toFixed(2))
+ grossNum.value.grossArea = parseFloat(grossNum.value.grossArea.toFixed(2))
+ grossNum.value.perimeter = parseFloat(grossNum.value.perimeter.toFixed(2))
})
}
@@ -60,15 +60,16 @@
grossNum.value.grossArea=0
grossNum.value.perimeter=0
data.value= res.data
+
data.value.orderProductDetail.forEach(item => {
grossNum.value.quantity += getQuantity(item.productDetail)
grossNum.value.grossArea += getArea(item.productDetail)
grossNum.value.perimeter += getPerimeter(item.productDetail)
stringToJson(item.productDetail)
})
- grossNum.value.quantity = parseFloat(grossNum.value.quantity.toFixed(3))
- grossNum.value.grossArea = parseFloat(grossNum.value.grossArea.toFixed(3))
- grossNum.value.perimeter = parseFloat(grossNum.value.perimeter.toFixed(3))
+ grossNum.value.quantity = parseFloat(grossNum.value.quantity.toFixed(2))
+ grossNum.value.grossArea = parseFloat(grossNum.value.grossArea.toFixed(2))
+ grossNum.value.perimeter = parseFloat(grossNum.value.perimeter.toFixed(2))
})
@@ -93,16 +94,16 @@
productList.forEach(item => {
quantity += item.quantity
})
- return parseFloat(quantity.toFixed(3))
+ return parseFloat(quantity.toFixed(2))
}
const getArea = (productList) => {
let area = 0
productList.forEach(item => {
- area += item.grossArea
+ area += item.computeGrossArea
})
- return parseFloat(area.toFixed(3))
+ return parseFloat(area.toFixed(2))
}
@@ -111,7 +112,7 @@
productList.forEach(item => {
perimeter += item.perimeter
})
- return parseFloat(perimeter.toFixed(3))
+ return parseFloat(perimeter.toFixed(2))
}
const printSheet = () => {
@@ -189,7 +190,7 @@
<td colspan="2" style="font-size: 15px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
<td colspan="2" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
<td>{{items.quantity}}</td>
- <td>{{items.grossArea}}</td>
+ <td>{{items.grossArea.toFixed(2)}}</td>
<td colspan="2">{{items.processingNote}}</td>
</tr>
<tr class="day-in" >
--
Gitblit v1.8.0