From 74073d164925eff4962188405355debb367aaf06 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 24 十月 2024 18:13:25 +0800
Subject: [PATCH] feat:小问题修改

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

diff --git a/pages/loadUnload-page/historyOrder/index.vue b/pages/loadUnload-page/historyOrder/index.vue
index 9600088..6ca2393 100644
--- a/pages/loadUnload-page/historyOrder/index.vue
+++ b/pages/loadUnload-page/historyOrder/index.vue
@@ -118,7 +118,7 @@
 										<text>璁″垝閲忥細{{ value.planMeasure  ?value.planMeasure  :'鏆傛棤'}}</text>
 										</view>
 										<view class="productName">
-										<text>瀹為檯閲忥細{{value.realityMeasure ? value.realityMeasure  : '鏆傛棤'}}</text>
+										<text>瀹為檯閲忥細{{value.productQuantity ? value.productQuantity  : '鏆傛棤'}}</text>
 										</view>
 									</view>
 							</view>
@@ -392,13 +392,25 @@
 				uni.showLoading({
 					title: '鍔犺浇涓�'
 				});
-				this.$reqGet('getHistoryTaskCoalList', { startTime: this.first, endTime: this.last,bunkerIds:this.bunkerIds,userId:this.userId }).then(res => {
+				this.$reqGet('getHistoryTaskCoalList', { startTime: this.first, endTime: this.last,bunkerIds:this.bunkerIds,productIds:uni.getStorageSync('productIds') }).then(res => {
 					console.log(res.data,'res.data');
-					this.filterList = this.taskList = res.data;
+					this.filterList = this.taskList = res.data.map(item=>{
+						if(!item.carNum){
+							item.carNum = 0;
+						}
+						if(!item.weight){
+							item.weight = 0;
+						}
+						if(!item.number){
+							item.number = 0;
+						}
+						return item;
+					});
 					// this.totalLength = res.data.carNum;
 					// this.totalTon = res.data.weight;
 					// this.tmNum =  res.data.number;
 					if (this.filterList.length != 0) {
+						console.log(this.filterList,'fis')
 						this.totalLength = 	this.filterList.reduce((x, y) => x + y.carNum,0);
 						this.totalTon = this.filterList.reduce((x, y) => new BigNumber(x).plus( y.weight),0).toFixed(2);
 						this.tmNum = this.filterList.reduce((x, y) => x + y.number,0);

--
Gitblit v1.9.1