From a28d0135ee42809b2c5863609da37155d3ecba5b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 29 四月 2025 15:11:39 +0800
Subject: [PATCH] feat:增加类型显示
---
pages/loadUnload-page/historyOrder/index.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/pages/loadUnload-page/historyOrder/index.vue b/pages/loadUnload-page/historyOrder/index.vue
index decc13d..0564d64 100644
--- a/pages/loadUnload-page/historyOrder/index.vue
+++ b/pages/loadUnload-page/historyOrder/index.vue
@@ -433,7 +433,7 @@
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);
+ this.tmNum = this.filterList.reduce((x, y) =>new BigNumber(x).plus(new BigNumber(y.number)),0);
let coalTemp,customerTemp,bunnkerTemp = [];
coalTemp = res.data.map(item=>item.tmTaskCoalList.map(val=>{
return {
@@ -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));
@@ -778,7 +785,7 @@
return uni.getStorageSync('userId')
},
bunkerIds(){
- return uni.getStorageSync('bunkerIds')
+ return Array.from(new Set(uni.getStorageSync('bunkerIds').split(',') || [])).join(",")
},
// totalLength(){
// console.log(this.filterList,'filterList')
--
Gitblit v1.9.1