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 | 81 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/pages/loadUnload-page/historyOrder/index.vue b/pages/loadUnload-page/historyOrder/index.vue
index 6ca2393..0564d64 100644
--- a/pages/loadUnload-page/historyOrder/index.vue
+++ b/pages/loadUnload-page/historyOrder/index.vue
@@ -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,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){
@@ -413,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 {
@@ -533,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'),
@@ -561,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) => {
@@ -571,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));
@@ -616,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()
})
@@ -718,8 +748,8 @@
// 鍏抽棴绛涢�夋潯浠跺脊绐�
conditinonclose() {
this.conditinonShow = false;
- }
- },
+ },
+ },
computed: {
roleType() {
return uni.getStorageSync('roleType');
@@ -728,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;
@@ -755,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')
@@ -781,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>
--
Gitblit v1.9.1