feat:增加类型显示

yangan

昨天 a28d0135ee42809b2c5863609da37155d3ecba5b

 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>
@@ -248,7 +248,7 @@
         return {
            conditionList: [],
            coalList: [],
            proType:['散装','液氣瓶装','罐装','PVC25','PVC80','PVC1150','PVc1200'],
            proType:['散装','液氯瓶装','罐装','PVC25','PVC80','PVC1150','PVc1200'],
            bunnkerList:[],
            typeList: [],
            customerList: [],
@@ -266,6 +266,11 @@
            },
            first: '',
            last: '',
            dateParams:{
               startTime:'',
               endTime:"",

            },
            firstFilter: '',
            lastFilter: '',
            taskList: [],
@@ -305,24 +310,39 @@
         this.getTmTaskCoalData();
      },
      onLoad() {
         this.firstDate();
         this.lastDate();
         
      },
      onPullDownRefresh () {
         //调用获取数据方法
         this.getTmTaskCoalData();	
         //结束下拉刷新
         this.$nextTick(()=>{
            uni.stopPullDownRefresh();
         })
		
		
      },
      methods: {
         firstDate() {
            let y = new Date().getFullYear(); //获取年份
            let m = new Date().getMonth() + 1; //获取月份
            let d = '01';
            m = m < 10 ? '0' + m : m; //月份补 0
            this.first = [y, m, d].join('-');
            this.firstFilter = [y, m, d].join('-');
            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('-') 
         },
         lastDate() {
            let y = new Date().getFullYear(); //获取年份
            let m = new Date().getMonth() + 1; //获取月份
            let d = new Date(y, m, 0).getDate(); //获取当月最后一日
            let d = new Date().getDate();  //获取当月最后一日
            m = m < 10 ? '0' + m : m; //月份补 0
            d = d < 10 ? '0' + d : d; //日数补 0
            this.last = [y, m, d].join('-');
            this.last = [y, m, d].join('-') +' ' +  '23:59:59';
            this.dateParams.endTime = [y, m, d].join('-') ;
            this.lastFilter = [y, m, d].join('-');
         },
         // 筛选条件
@@ -392,16 +412,28 @@
            uni.showLoading({
               title: '加载中'
            });
            this.$reqGet('getHistoryTaskCoalList', { startTime: this.first, endTime: this.last,bunkerIds:this.bunkerIds,userId:this.userId }).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;
               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);
                  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 {
@@ -521,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'),
@@ -549,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) => {
@@ -559,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));
               
@@ -604,8 +643,11 @@
         },
         confirm(e) {
            console.log(e, '日期选择');
            this.first = e.range.before;
            this.last = e.range.after;
            this.first = e.range.before + ' ' + '00:00:00';
            this.dateParams.startTime = e.range.before;
            this.last = e.range.after + ' ' + '23:59:59' ;
            this.dateParams.endTime = e.range.after;
            this.getTmTaskCoalData();
        this.$nextTick(() => {
          this.$refs.calendar.close()
        })
@@ -706,8 +748,8 @@
         // 关闭筛选条件弹窗
         conditinonclose() {
            this.conditinonShow = false;
         }
      },
         },
               },
      computed: {
         roleType() {
            return uni.getStorageSync('roleType');
@@ -716,7 +758,7 @@
            return `${this.firstFilter}至${this.lastFilter}`;
         },
         dateselect() {
            return `${this.first}至${this.last}`;
            return `${this.dateParams.startTime}至${this.dateParams.endTime}`;
         },
         coalTotal() {
            return this.coalList.length;
@@ -743,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')
@@ -769,14 +811,15 @@
         // }
      },
      watch: {
         dateselect(newV, old) {
            let tempDate = `${this.first}至${this.last}`;
            if (newV != old && old != '至') {
               this.first = newV.slice(0, 10);
               this.last = newV.slice(11);
               this.getTmTaskCoalData();
            }
         }
         // dateselect(newV, old) {
         //    console.log(newV,'old')
         //    let tempDate = `${this.first}至${this.last}`;
         //    if (newV != old && old != '至') {
         //       this.first = newV.slice(0, 10);
         //       this.last = newV.slice(11);
         //       // this.getTmTaskCoalData();
         //    }
         // },
      }
   };
</script>