From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index fa5a0e8..ff1c579 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -51,8 +51,12 @@
let totalQuantity1 = 0;
//闈㈢Н
let totalArea = 0;
+ //钀芥灦闈㈢Н
+ let totalArea1 = 0;
//閲嶉噺
let totalWeight = 0;
+ //钀芥灦閲嶉噺
+ let totalWeight1 = 0;
// 瀵规瘡涓泦鍚堜腑鐨� detailList 杩涜璁＄畻
produceList.value[i].detailList.forEach(collection => {
totalQuantity += collection.quantity * 1;
@@ -60,15 +64,22 @@
//姣忎釜搴忓彿闈㈢Н
collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
totalArea += collection.total_area * 1;
+
+ collection.total_area1 = parseFloat((collection.width * collection.height * collection.quantity1 / 1000000).toFixed(2))
+ totalArea1 += collection.total_area1 * 1;
+
totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
+ totalWeight1 += collection.width * collection.height * collection.quantity1 / 1000000 * collection.separation * 2.5 * 1;
//姣忎釜搴忓彿鍛ㄩ暱
collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
});
// 杈撳嚭姣忎釜闆嗗悎涓殑鎬绘暟閲�
produceList.value[i].detail[0].quantity = totalQuantity
- produceList.value[i].detail[0].quantity1 = totalQuantity
+ produceList.value[i].detail[0].quantity1 = totalQuantity1
produceList.value[i].detail[0].gross_area = totalArea
+ produceList.value[i].detail[0].gross_area1 = totalArea1
produceList.value[i].detail[0].weight = totalWeight
+ produceList.value[i].detail[0].weight1 = totalWeight1
}
}
@@ -242,12 +253,16 @@
<td v-for="(itemsum,index) in item.detail" :key="index" colspan="29">
鏁伴噺锛�
<label>{{ itemsum.quantity }}</label>
- 钀藉姞鏁伴噺锛�
+ 钀芥灦鏁伴噺锛�
<label>{{ itemsum.quantity1 }}</label>
闈㈢Н锛�
<label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
+ 钀芥灦闈㈢Н锛�
+ <label>{{ parseFloat(itemsum.gross_area1.toFixed(2)) }}</label>
閲嶉噺锛�
<label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
+ 钀芥灦閲嶉噺锛�
+ <label>{{ parseFloat(itemsum.weight1.toFixed(2)) }}</label>
</td>
</tr>
<tr v-for="(itemtextarea,index) in item.detail" :key="index">
--
Gitblit v1.8.0