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/inboundorderDetail.vue |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue"
index a44312f..1afb4d9 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/PDA/pages/stash/inboundorderDetail.vue"
@@ -7,15 +7,26 @@
 		</u-sticky> -->
 		<uni-list :border="true">
 			<uni-list-item direction="column" clickable @click="groupClick(item.batch_num)" link
-				:to="page+item.batch_num+'&order_qty='+item.order_qty+'&order_Inqty='+item.order_Inqty+'&goods_no='+item.goods_no"
-				v-for="item in allReceivingOrders" :key="item.batch_num">
+				:to="page+item.batch_num+'&order_qty='+item.order_qty+'&order_Inqty='+item.order_Inqty+'&goods_no='+item.goods_no+'&id='+item.id"
+				v-for="item in allReceivingOrders" :key="item.id">
 				<template v-slot:body>
 					<uni-group margin-top="20">
-						<view> 鍗曟嵁缂栧彿:{{orderNo}} </view>
+						<!-- <view> 鍗曟嵁缂栧彿:{{orderNo}} </view>
 						<view> 鎵瑰彿:{{item.batch_num}} </view>
 						<view> 鐗╂枡缂栧彿:{{item.goods_no}} </view>
 						<view> 鍗曟嵁鏁伴噺:{{item.order_qty}} </view>
-						<view> 鍏ュ簱鏁伴噺:{{item.order_Inqty}} </view>
+						<view> 鍏ュ簱鏁伴噺:{{item.order_Inqty}} </view> -->
+						<view> 鐗╂枡鍚嶇О:{{item.materielName || ''}} </view>
+						<view> 鍝佸悕/閫氱敤鍚�:{{item.item || ''}} </view>
+						<view> 鐗╂枡缂栧彿:{{item.goods_no}} </view>
+						<view> 鐗╂枡瑙勬牸:{{item.materielSpec || ''}} </view>
+						<view> 鐢熶骇鍘傚:{{item.factory || ''}} </view>
+						<view> 鍩烘湰鍗曚綅:{{item.materielUnit || ''}} </view>
+						<view> 鏁堟湡:{{item.exp_date || ''}} </view>
+						<view> 鍗曟嵁缂栧彿:{{orderNo}} </view>
+						<view> 鎵瑰彿:{{item.batch_num}} </view>
+						<view> 鍗曟嵁鏁伴噺:{{item.order_qty}} {{item.materielUnit || ''}}</view>
+						<view> 鍏ュ簱鏁伴噺:{{item.order_Inqty}} {{item.materielUnit || ''}}</view>
 					</uni-group>
 				</template>
 			</uni-list-item>
@@ -33,6 +44,7 @@
 			return {
 				page: "/pages/stash/raworderboxing?",
 				loadVisible: false,
+				isIn:false,
 				searchValue: "",
 				status: "more",
 				allReceivingOrders: [],
@@ -48,6 +60,15 @@
 			this.allReceivingOrders=res.detail;
 			this.page = this.page + "orderNo=" + this.orderNo +"&warehouseId=" + this.warehouseId + "&batchNo=";
 			this.getData();
+		},
+		onShow() {
+			this.isIn = uni.getStorageSync('isIn');
+			if (this.isIn) {
+				uni.removeStorageSync('isIn');
+				this.pageNo = 1;
+				// 浠庡叾浠栭〉闈㈣繑鍥炴椂鍒锋柊
+				this.getData();
+			}
 		},
 		onReachBottom() {
 			this.pageNo += 1;
@@ -73,7 +94,7 @@
 				// 	},
 				// }
 				if (this.pageNo == 1) this.allReceivingOrders = [];
-				this.$u.post('/api/CabinOrder/GetCabinOrderDetail?pageNo=' + this.warehouseId + '&orderNo=' + this.orderNo).then((
+				this.$u.post('/api/CabinOrder/GetCabinOrderDetail?pageNo=' + this.pageNo + '&orderNo=' + this.orderNo + '&warehouseId=' + this.warehouseId).then((
 					res) => {
 						if (res.status) {
 							if (res.data.length > 0) {
@@ -97,6 +118,26 @@
 								this.status = 'noMore';
 								//this.allReceivingOrders = [];
 								this.loadVisible = true;
+								if (this.allReceivingOrders.length < 1) {
+									// uni.showModal({
+									// 	title: '鎻愮ず',
+									// 	content: '鍏ュ簱宸插畬鎴愶紝鏄惁杩斿洖鍏ュ簱鍗曪紵',
+									// 	success: (res) => {
+									// 		if (res.confirm) {
+												uni.setStorageSync('isLoaded', true);
+									// 			// 鐢ㄦ埛鐐瑰嚮纭畾
+												setTimeout(() => {
+													uni.navigateBack({
+														delta:1
+													});
+												}, 500);
+									// 		} else {
+									// 			// 鐢ㄦ埛鐐瑰嚮鍙栨秷锛屽彲浠ュ仠鐣欏湪褰撳墠椤甸潰
+									// 			// 鎴栬�呮墽琛屽叾浠栨搷浣�
+									// 		}
+									// 	}
+									// });
+								}
 							}
 						}
 					})

--
Gitblit v1.9.3