From c612912d4132e4d7b4a58279071fac837891c381 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 27 九月 2024 17:08: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 2291e0b..9e034e6 100644
--- a/pages/loadUnload-page/historyOrder/index.vue
+++ b/pages/loadUnload-page/historyOrder/index.vue
@@ -248,7 +248,7 @@
return {
conditionList: [],
coalList: [],
- proType:['鏁ｈ','娑叉埃鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
+ proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
bunnkerList:[],
typeList: [],
customerList: [],
@@ -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,userId:this.userId,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