From 6d115888b0b2cf700118fbf6d6bc890827040aed Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 31 十月 2025 18:02:10 +0800
Subject: [PATCH] 优化PDA

---
 新建文件夹/PDA/pages/stash/outboundorderDetail.vue |  118 +++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 94 insertions(+), 24 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
index 650b2f6..30785a2 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/outboundorderDetail.vue"
@@ -40,19 +40,30 @@
 				orderNo: "",
 				pageNo: 1,
 				scrollTop: 0,
+				outTask: false,
 				warehouseId: ""
 			}
 		},
 		onLoad(res) {
 			this.warehouseId = res.warehouseId;
 			this.orderNo = res.orderNo;
-			this.allReceivingOrders=res.detail;
-			this.page = this.page + "orderNo=" + this.orderNo +"&warehouseId=" + this.warehouseId + "&locationCode=";
+			this.allReceivingOrders = res.detail;
+			this.page = this.page + "orderNo=" + this.orderNo + "&warehouseId=" + this.warehouseId + "&locationCode=";
 			this.getData();
 		},
 		onReachBottom() {
 			this.pageNo += 1;
 			this.getData();
+		},
+		onShow() {
+			this.outTask = uni.getStorageSync('outTask');
+			if (this.outTask) {
+				uni.removeStorageSync('outTask');
+				this.pageNo = 1;
+				this.allReceivingOrders = [];
+				// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
+				this.getData();
+			}
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -65,6 +76,45 @@
 			groupClick() {
 
 			},
+			// getData() {
+			// 	var postData = {
+			// 		MainData: {
+			// 			warehouseId: this.warehouseId,
+			// 			locationCode: this.searchValue,
+			// 			orderNo: this.orderNo,
+			// 			pageNo: this.pageNo,
+			// 			isCheck:false,
+			// 		},
+			// 	}
+			// 	if (this.pageNo == 1) this.allReceivingOrders = [];
+			// 	this.$u.post('/api/DeliveryOrder/GetCheckOutTasks',postData).then((
+			// 		res) => {
+			// 			if (res.status) {
+			// 				if (res.data.length > 0) {
+			// 					if (this.searchValue == '') {
+			// 						this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
+			// 						// this.allReceivingOrders = res.data;
+			// 						if (this.allReceivingOrders.length > 3) {
+			// 							this.loadVisible = true;
+			// 						} else {
+			// 							this.loadVisible = false;
+			// 						}
+			// 					} else {
+			// 						this.allReceivingOrders = res.data;
+			// 						if (this.allReceivingOrders.length > 3) {
+			// 							this.loadVisible = true;
+			// 						} else {
+			// 							this.loadVisible = false;
+			// 						}
+			// 					}
+			// 				} else {
+			// 					this.status = 'noMore';
+			// 					//this.allReceivingOrders = [];
+			// 					this.loadVisible = true;
+			// 				}
+			// 			}
+			// 		})
+			// }
 			getData() {
 				var postData = {
 					MainData: {
@@ -72,37 +122,57 @@
 						locationCode: this.searchValue,
 						orderNo: this.orderNo,
 						pageNo: this.pageNo,
-						isCheck:false,
+						isCheck: false,
 					},
 				}
 				if (this.pageNo == 1) this.allReceivingOrders = [];
-				this.$u.post('/api/DeliveryOrder/GetCheckOutTasks',postData).then((
+				this.$u.post('/api/DeliveryOrder/GetCheckOutTasks', postData).then((
 					res) => {
-						if (res.status) {
-							if (res.data.length > 0) {
-								if (this.searchValue == '') {
-									this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
-									// this.allReceivingOrders = res.data;
-									if (this.allReceivingOrders.length > 3) {
-										this.loadVisible = true;
-									} else {
-										this.loadVisible = false;
-									}
+					if (res.status) {
+						if (res.data.length > 0) {
+							if (this.searchValue == '') {
+								this.allReceivingOrders = this.allReceivingOrders.concat(res.data);
+								// this.allReceivingOrders = res.data;
+								if (this.allReceivingOrders.length > 3) {
+									this.loadVisible = true;
 								} else {
-									this.allReceivingOrders = res.data;
-									if (this.allReceivingOrders.length > 3) {
-										this.loadVisible = true;
-									} else {
-										this.loadVisible = false;
-									}
+									this.loadVisible = false;
 								}
 							} else {
-								this.status = 'noMore';
-								//this.allReceivingOrders = [];
-								this.loadVisible = true;
+								this.allReceivingOrders = res.data;
+								if (this.allReceivingOrders.length > 3) {
+									this.loadVisible = true;
+								} else {
+									this.loadVisible = false;
+								}
 							}
+						} else {
+							this.status = 'noMore';
+							//this.allReceivingOrders = [];
+							this.loadVisible = true;
+							// if (this.allReceivingOrders.length < 1) {
+							// 	uni.showModal({
+							// 		title: '鎻愮ず',
+							// 		content: '鍑哄簱宸插畬鎴愶紝鏄惁杩斿洖棣栭〉锛�',
+							// 		success: (res) => {
+							// 			if (res.confirm) {
+											uni.getStorageSync('isout',true)
+							// 				// 鐢ㄦ埛鐐瑰嚮纭畾
+											setTimeout(() => {
+												uni.navigateBack({
+													delta: 1
+												});
+											}, 500);
+							// 			} else {
+							// 				// 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+							// 				// 鎴栬�呮墽琛屽叾浠栨搷浣�
+							// 			}
+							// 		}
+							// 	});
+							// }
 						}
-					})
+					}
+				})
 			}
 		}
 	}

--
Gitblit v1.9.3