ZhiHuiQiCe/FangCangZhiNeng.git

			@@ -53,7 +53,9 @@
			pageNo: 1,
			scrollTop: 0,
			checkTask: false,
			warehouseId: ""
			warehouseId: "",
			hasDataLoaded: false, // æ°æ®æ¯å¦å·²å è½½è¿
			shouldRefreshFromC: false, // ä»Cé¡µé¢è¿åæ¶éè¦å·æ°çæ å¿
			}
			},
			// æ·»å è¿ä¸ªçå½å¨æ
			@@ -64,7 +66,9 @@
			onLoad(res) {
			this.warehouseId = res.warehouseId;
			this.orderNo = res.orderNo;
			if(res.detail&&res.detail.length>0){
			this.allReceivingOrders = res.detail;
			}
			this.page = this.page + "orderNo=" + this.orderNo + "&warehouseId=" + this.warehouseId + "&locationCode=";
			// this.getData();
			},
			@@ -76,26 +80,35 @@
			}
			},
			onShow() {
			// this.checkTask = uni.getStorageSync('checkTask');
			// if (this.checkTask) {
			// uni.removeStorageSync('checkTask');
			// æ£æ¥æ¯å¦éè¦å·æ°
			const needRefresh = uni.getStorageSync('needRefreshCheck');
			if (needRefresh) {
			uni.removeStorageSync('needRefreshCheck');
			this.pageNo = 1;
			this.allReceivingOrders = [];
			// ä»å¶ä»é¡µé¢è¿åæ¶å·æ°
			this.getData();
			// }
			return;
			}

			// å¦æè¿æ²¡æå è½½è¿æ°æ®ï¼å è½½æ°æ®
			if (!this.hasDataLoaded) {
			this.pageNo = 1;
			this.allReceivingOrders = [];
			this.getData();
			this.hasDataLoaded = true;
			}
			},
			onPageScroll(e) {
			this.scrollTop = e.scrollTop;
			},
			methods: {
			// æ·»å å·æ°æ¹æ³ä¾å¶ä»é¡µé¢è°ç¨
			refreshData() {
			console.log('æ¶å°çç¹å·æ°è¯·æ±');
			this.pageNo = 1;
			this.allReceivingOrders = [];
			this.getData();
			},
			// // æ·»å å·æ°æ¹æ³ä¾å¶ä»é¡µé¢è°ç¨
			// refreshData() {
			// console.log('æ¶å°çç¹å·æ°è¯·æ±');
			// this.pageNo = 1;
			// this.allReceivingOrders = [];
			// this.getData();
			// },
			search(res) {
			this.pageNo = 1;
			this.getData();
			@@ -103,8 +116,6 @@
			groupClick() {

			},


			getData() {
			var postData = {
			MainData: {
			@@ -148,11 +159,11 @@
			this.allReceivingOrders = [];
			}

			// çç¹å®ææç¤ºé»è¾
			if (this.allReceivingOrders.length < 1) {
			// ç´æ¥è¿åAé¡µé¢ï¼ä¸éè¦æç¤º
			if (this.allReceivingOrders.length === 0 && this.pageNo === 1) {
			setTimeout(() => {
			uni.navigateBack({
			delta: 1
			delta: 1 // è¿åAé¡µé¢
			});
			}, 300);
			}