From 2b49f7643d15b74889d190f216630559006ed93a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 01 十二月 2025 09:48:43 +0800
Subject: [PATCH] pad和后端的优化

---
 新建文件夹/PDA/pages/stash/outboundorder.vue |   91 +++++++++++++++++++++++++--------------------
 1 files changed, 51 insertions(+), 40 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorder.vue"
index b5b05e4..c80414a 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorder.vue"
@@ -55,7 +55,7 @@
 				pageNo: 1,
 				scrollTop: 0,
 				warehouseId: "",
-				isout:false
+				isout:false,
 			}
 		},
 		onLoad(res) {
@@ -64,9 +64,11 @@
 			// this.getData();
 		},
 		onReachBottom() {
-			this.pageNo += 1;
+			if (this.status === 'more') {
+			    this.pageNo += 1;
 			this.getData();
 			this.isout=true;
+			}
 		},
 		onShow() {
 			// this.isout = uni.getStorageSync('isout');
@@ -83,54 +85,63 @@
 		},
 		methods: {
 			search(res) {
+				this.pageNo = 1; // 鎼滅储鏃堕噸缃负绗竴椤�
 				this.getData();
 			},
 			groupClick() {
 
 			},
-			getData() {
-				var postData = {
-					MainData: {
-						warehouseId: this.warehouseId,
-						orderNo: this.searchValue,
-						pageNo: this.pageNo
-					},
-				}
+		getData() {
+		var postData = {
+			MainData: {
+			warehouseId: this.warehouseId,
+			orderNo: this.searchValue,
+			pageNo: this.pageNo
+			},
+		}
+  
+		// 濡傛灉鏄涓�椤垫垨鎼滅储锛屾竻绌烘暟鎹�
+		if (this.pageNo === 1 || this.searchValue !== '') {
+			this.allReceivingOrders = [];
+			this.status = "more";
+		}
 				this.$u.post('/api/DeliveryOrder/GetDeliveryOrders', postData).then((res) => {
 					if (res.status) {
-						if (res.data.length > 0) {
-							if (this.searchValue == '') {
-								this.allReceivingOrders = res.data.map(i => ({
-									...i,
-									InboundOrderStatus: i.outStatus.label,
-									SumQty: i.details.map(item => item.order_qty).reduce((prev, next) => prev + next, 0),
-									OverQty: i.details.map(item => item.order_Outqty).reduce((prev, next) => prev + next, 0)
-								}));
-								// this.allReceivingOrders = res.data;
-								if (this.allReceivingOrders.length > 3) {
-									this.loadVisible = true;
-								} else {
-									this.loadVisible = false;
-								}
-							} else {
-								this.allReceivingOrders = res.data.map(i => ({
-									...i,
-									InboundOrderStatus: i.outStatus.label,
-									SumQty: i.details.map(item => item.order_qty).reduce((prev, next) => prev + next, 0),
-									OverQty: i.details.map(item => item.order_Outqty).reduce((prev, next) => prev + next, 0)
-								}));
-								if (this.allReceivingOrders.length > 3) {
-									this.loadVisible = true;
-								} else {
-									this.loadVisible = false;
-								}
-							}
+					if (res.data && res.data.length > 0) {
+						const newData = res.data.map(i => ({
+						...i,
+						InboundOrderStatus: i.outStatus.label,
+						SumQty: i.details.map(item => item.order_qty).reduce((prev, next) => prev + next, 0),
+						OverQty: i.details.map(item => item.order_Outqty).reduce((prev, next) => prev + next, 0)
+						}));
+						
+						// 鍏抽敭淇敼锛氳拷鍔犳暟鎹�屼笉鏄浛鎹�
+						this.allReceivingOrders = [...this.allReceivingOrders, ...newData];
+						
+						// 濡傛灉杩斿洖鐨勬暟鎹皯浜�5鏉★紝璇存槑娌℃湁鏇村鏁版嵁浜�
+						if (res.data.length < 5) {
+						this.status = 'noMore';
 						} else {
-							this.status = 'noMore';
-							//this.allReceivingOrders = [];
-							this.loadVisible = true;
+						this.status = 'more';
+						}
+						
+						// 鎺у埗鍔犺浇鎻愮ず鏄剧ず
+						this.loadVisible = this.allReceivingOrders.length > 0;
+						
+					} else {
+						// 娌℃湁鏁版嵁
+						this.status = 'noMore';
+						this.loadVisible = this.allReceivingOrders.length > 0;
+						
+						// 濡傛灉鏄涓�椤典笖娌℃湁鏁版嵁锛屾樉绀虹┖鐘舵��
+						if (this.pageNo === 1) {
+						this.allReceivingOrders = [];
 						}
 					}
+					}
+				}).catch(err => {
+					console.error('璇锋眰澶辫触:', err);
+					this.status = 'noMore';
 				})
 			}
 		}

--
Gitblit v1.9.3