yangan
昨天 a28d0135ee42809b2c5863609da37155d3ecba5b
pages/loadUnload-page/historyOrder/index.vue
@@ -330,6 +330,7 @@
            let m = new Date().getMonth() + 1; //获取月份
            let d = new Date().getDate(); //获取当天日期
             m = m < 10 ? '0' + m : m; //月份补 0
             d = d < 10 ? '0' + d : d; //日数补 0
            this.first = [y, m, d].join('-')  + ' ' + '00:00:00';
            this.dateParams.startTime = [y, m, d].join('-') ;
            this.firstFilter = [y, m, d].join('-') 
@@ -411,7 +412,7 @@
            uni.showLoading({
               title: '加载中'
            });
            this.$reqGet('getHistoryTaskCoalList', { startTime: this.first , endTime:this.last ,bunkerIds:this.bunkerIds,productIds:uni.getStorageSync('productIds') }).then(res => {
            this.$reqGet('getHistoryTaskCoalList', { startTime: decodeURIComponent(this.first) , endTime:decodeURIComponent(this.last)  ,bunkerIds:this.bunkerIds,productIds:uni.getStorageSync('productIds') }).then(res => {
               console.log(res.data,'res.data');
               this.filterList = this.taskList = res.data.map(item=>{
                  if(!item.carNum){
@@ -432,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 {
@@ -552,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'),
@@ -580,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) => {
@@ -590,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));
               
@@ -777,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')