修改下拉更新时搜索条件赋值bug,添加搜索时滚动条自动回滚到顶部

pages/bus/busDataInfo/form.vue

@@ -541,6 +541,9 @@
 					})
 					return;
 				}
+				this.form.bizBusDataDetailVOList.map(item =>{
+					item.isPassengerCountConvert = 0
+				})
 				this.form.bizBusDataBodySaveOrUpdateDTOList = this.form.bizBusDataDetailVOList;
 				console.log(this.form)
 				uni.showModal({
@@ -559,9 +562,9 @@
 					mask: true
 				})
 				console.log(this.form)
-				this.form.bizBusDataBodySaveOrUpdateDTOList.map(item =>{
+				// this.form.bizBusDataBodySaveOrUpdateDTOList.map(item =>{
-					item.isPassengerCountConvert = 0
+				// 	item.isPassengerCountConvert = 0
-				})
+				// })
 				this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/saveOrUpdate', this
 					.form,
 					'POST').then(res => {

pages/bus/busDataInfo/list.vue

@@ -78,7 +78,11 @@
 				timeArray:[],
 				timeName:'',
 				reportPhase:'',
-				
+				query:{
+					reportDateStart:"",
+					reportDateEnd:"",
+					statPeriod:"",
+				}
 			}
 		},
 		onShow() {
@@ -103,10 +107,8 @@
 					let params = {
 						page:this.page,
 						pageSize:this.pageSize,
-						reportDateStart:this.timeRange.length !== 0 ? this.timeRange[0] : '',
-						reportDateEnd:this.timeRange.length !== 0 ? this.timeRange[1] : '',
 						_t:Date.parse(new Date()),
-						statPeriod:this.reportPhase
+						...this.query
 					}
 					this.$request(getApp().globalData.baseUrl + '/api/biz/busdata/list',params,"GET").then(res =>{
 						console.log(res)
@@ -141,6 +143,14 @@
 				this.hasMore = true;
 				this.page = 0;
 				this.listData = [];
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+				this.query = {
+					reportDateStart:this.timeRange.length !== 0 ? this.timeRange[0] : '',
+					reportDateEnd:this.timeRange.length !== 0 ? this.timeRange[1] : '',
+					statPeriod:this.reportPhase
+				}
 				this.$refs.popup.close()
 				this.loadMore()
 			},
@@ -149,11 +159,11 @@
 				this.timeRange = [];
 				this.timeName = '';
 				this.reportPhase = ''
-				this.listData = [];
+				// this.listData = [];
-				this.hasMore = true;
+				// this.hasMore = true;
-				this.page = 0;
+				// this.page = 0;
-				this.$refs.popup.close()
+				// this.$refs.popup.close()
-				this.loadMore();
+				// this.loadMore();
 			},
 			// 选中时段数据
 			bindPickerChange(e){

pages/portShipping/pilotStation/list.vue

@@ -78,6 +78,11 @@
 				timeArray:[],
 				timeName:'',
 				reportPhase:'',
+				query:{
+					reportDateStart:"",
+					reportDateEnd:"",
+					statPeriod:"",
+				},
 			}
 		},
 		onShow() {
@@ -102,10 +107,8 @@
 					let params = {
 						page:this.page,
 						pageSize:this.pageSize,
-						reportDateStart:this.timeRange.length !== 0 ? this.timeRange[0] : '',
-						reportDateEnd:this.timeRange.length !== 0 ? this.timeRange[1] : '',
 						_t:Date.parse(new Date()),
-						statPeriod:this.reportPhase
+						...this.query
 					}
 					this.$request(getApp().globalData.baseUrl + '/api/biz/bizPilotData/list',params,"GET").then(res =>{
 						console.log(res)
@@ -133,6 +136,14 @@
 				this.hasMore = true;
 				this.page = 0;
 				this.listData = [];
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+				this.query = {
+					reportDateStart:this.timeRange.length !== 0 ? this.timeRange[0] : '',
+					reportDateEnd:this.timeRange.length !== 0 ? this.timeRange[1] : '',
+					statPeriod:this.reportPhase
+				}
 				this.$refs.popup.close()
 				this.loadMore()
 			},
@@ -148,11 +159,11 @@
 				this.timeRange = [];
 				this.timeName = '';
 				this.reportPhase = ''
-				this.listData = [];
+				// this.listData = [];
-				this.hasMore = true;
+				// this.hasMore = true;
-				this.page = 0;
+				// this.page = 0;
-				this.$refs.popup.close()
+				// this.$refs.popup.close()
-				this.loadMore();
+				// this.loadMore();
 			},
 			// 选中时段数据
 			bindPickerChange(e){

pages/roadTransport/dataSubmission/list.vue

@@ -90,6 +90,11 @@
 				reportPhase:'',
 				timeArray:[],
 				timeName:'',
+				query:{
+					reportDatetimeStart:"",
+					reportDatetimeEnd:"",
+					statPeriod:""
+				},
 			}
 		},
 		onShow(){
@@ -100,6 +105,7 @@
 			this.loadMore()
 		},
 		onPullDownRefresh() {
+			console.log('下拉===>',this.timeArray)
 			this.page = 0;
 			this.hasMore = true;
 			this.synthData = [];
@@ -116,10 +122,11 @@
 						page:this.page,
 						pageSize:this.pageSize,
 						_t:Date.parse(new Date()),
-						reportDatetimeStart:this.timeRange.length != 0 ? this.timeRange[0] : '',
+						// reportDatetimeStart:this.timeRange.length != 0 ? this.timeRange[0] : '',
-						reportDatetimeEnd:this.timeRange.length != 0 ? this.timeRange[1] : '',
+						// reportDatetimeEnd:this.timeRange.length != 0 ? this.timeRange[1] : '',
 						departmentId:this.unit ? this.unit : '',
-						statPeriod:this.reportPhase
+						// statPeriod:this.reportPhase
+						...this.query
 					}
 					this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/operation/list',params,"GET").then(res =>{
 						console.log(res)
@@ -175,6 +182,14 @@
 				this.hasMore = true;
 				this.page = 0;
 				this.synthData = [];
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+				this.query = {
+					reportDatetimeStart:this.timeRange.length != 0 ? this.timeRange[0] : '',
+					reportDatetimeEnd:this.timeRange.length != 0 ? this.timeRange[1] : '',
+					statPeriod: this.reportPhase
+				}
 				this.$refs.popup.close()
 				this.loadMore()
 			},
@@ -192,11 +207,11 @@
 				this.timeRange = [];
 				this.timeName = '';
 				this.reportPhase = ''
-				this.hasMore = true;
+				// this.hasMore = true;
-				this.synthData = [];
+				// this.synthData = [];
-				this.page = 0;
+				// this.page = 0;
-				this.$refs.popup.close()
+				// this.$refs.popup.close()
-				this.loadMore();
+				// this.loadMore();
 			},
 			// 点击删除按钮
 			deleteItem(row){

pages/roadTransport/transportData/list.vue

@@ -127,6 +127,11 @@
 				timeArray:[],
 				timeName:'',
 				reportPhase:'',
+				query:{
+					statisticalDateStart:"",
+					statisticalDateEnd:"",
+					statPeriod:""
+				}
 			}
 		},
 		onShow(){
@@ -194,7 +199,15 @@
 				this.hasMore = true;
 				this.page = 0;
 				this.listData = [];
-				this.$refs.popup.close()
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+				this.$refs.popup.close();
+				this.query = {
+					statisticalDateStart: this.timeRange.length !== 0 ? this.timeRange[0] : '',
+					statisticalDateEnd:this.timeRange.length !== 0 ? this.timeRange[1] : '',
+					statPeriod:this.reportPhase
+				}
 				this.loadMore()
 			},
 			// 点击筛选弹窗中的重置按钮
@@ -203,11 +216,11 @@
 				this.timeName = '';
 				this.reportPhase = ''
 				this.timeRange = [];
-				this.listData = [];
+				// this.listData = [];
-				this.hasMore = true;
+				// this.hasMore = true;
-				this.page = 0;
+				// this.page = 0;
-				this.$refs.popup.close()
+				// this.$refs.popup.close()
-				this.loadMore();
+				// this.loadMore();
 			},
 			// 获取列表数据
 			loadMore() {
@@ -217,11 +230,10 @@
 					let params = {
 						page:this.page,
 						pageSize:this.size,
-						statisticalDateStart:this.timeRange.length !== 0 ? this.timeRange[0] : '',
-						statisticalDateEnd:this.timeRange.length !== 0 ? this.timeRange[1] : '',
 						_t:Date.parse(new Date()),
-						statPeriod:this.reportPhase
+						...this.query,
 					}
+					console.log('params ===>',params)
 					this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/list',params,"GET").then(res =>{
 						console.log(res)
 						if(res.code == 200){