From 43946aca83334ac3e1c3929a2d6dcba3f2bf6446 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 17 十二月 2024 15:27:59 +0800
Subject: [PATCH] fix:小程序眼镜密码,h5历史收发单

---
 pages/loadUnload-page/historyOrder/index.vue |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pages/loadUnload-page/historyOrder/index.vue b/pages/loadUnload-page/historyOrder/index.vue
index decc13d..dc63a64 100644
--- a/pages/loadUnload-page/historyOrder/index.vue
+++ b/pages/loadUnload-page/historyOrder/index.vue
@@ -553,6 +553,7 @@
 					customerName: this.customerList.filter(v => v.active == true).map(item => item.name),
 					bunkerName:this.bunnkerList.filter(v => v.active == true).map(item => item.name),
 				};
+				console.log(this.coalList,this.bunnkerList,this.customerList,'list')
 
 				const mapping = {
 					productName: validateFn('productName'),
@@ -581,9 +582,9 @@
 						return item;
 					})
 					console.log(tempArr,'temp')
-						this.totalLength = 	tempArr.reduce((x, y) => x + y.carNum,0);
-						this.totalTon = tempArr.reduce((x, y) => new BigNumber(x).plus( y.weight),0).toFixed(2);
-						this.tmNum = tempArr.reduce((x, y) => x + y.number,0);
+						// this.totalLength = 	tempArr.reduce((x, y) => x + y.carNum,0);
+						// this.totalTon = tempArr.reduce((x, y) => new BigNumber(x).plus( y.weight),0).toFixed(2);
+						// this.tmNum = tempArr.reduce((x, y) => x + y.number,0);
 					
 					// this.totalTon = this.filterList.map(v => 
 					// 	v.taskCoalList.reduce((prev, cur) => {
@@ -591,6 +592,12 @@
 					// 		return cleanvalue + prev
 					// 	}, 0)
 					// );
+					this.totalLength = this.filterList.map(v => v.tmTaskCoalList.length).reduce((x, y) => x + y); // 杞︽暟
+					const tonList = this.filterList.map(item=>item.tmTaskCoalList.filter(item=>item.isWeight === 1)).flat(1);
+				    const tmNumList = this.filterList.map(item=>item.tmTaskCoalList.filter(item=>item.isWeight !== 1)).flat(1);
+					this.totalTon = tonList.reduce((x,y)=>new BigNumber(x).plus(new BigNumber(y.clean)).toFixed(2),0)
+					this.tmNum = tmNumList.reduce((x,y)=>new BigNumber(x).plus(new BigNumber(y.productQuantity)),0)
+					console.log(this.filterList,this.totalTon,'totalTon')
 					// this.totalTon = this.filterList.map(item=>)
 					// this.totalTon = this.filterList.map(v=>v.tmTaskCoalList.filter(item=>item.isWeight === 1).reduce((x,y)=>x.weight + y.weight));
 					

--
Gitblit v1.9.1