diff --git a/fe/PDA/pages/putaway/purchasePutaway.vue b/fe/PDA/pages/putaway/purchasePutaway.vue
index b0c9fd07e..16ec07c44 100644
--- a/fe/PDA/pages/putaway/purchasePutaway.vue
+++ b/fe/PDA/pages/putaway/purchasePutaway.vue
@@ -246,18 +246,21 @@
 					let infoList = await getPurchaseDetailAsyncNew(balanceItem
 						.packingCode)
 					if (infoList) {
-						var fromTopPackingCode=""
+						var fromTopPackingCode = ""
 						for (var i = 0; i < infoList.length; i++) {
-							if(infoList[i].fromPackingCode==balanceItem.packingCode){
-								fromTopPackingCode=infoList[i].fromTopPackingCode
+							if (infoList[i].toPackingCode == balanceItem.packingCode) {
+								fromTopPackingCode = infoList[i].fromTopPackingCode
 								break
 							}
+
 						}
-						
+
 						this.poNumber = infoList[0].purchaseInfo_PoNumber
-						this.showPopList=[]
-						infoList.forEach(res=>{
-							this.showPopList.push(res.fromTopPackingCode)
+						this.showPopList = []
+						infoList.forEach(res => {
+							if (res.oprType == 0) {
+								this.showPopList.push(res.fromTopPackingCode)
+							}
 						})
 					}
 
diff --git a/fe/PDA/pages/record/productionReturn.vue b/fe/PDA/pages/record/productionReturn.vue
index 5ca2b1047..e5a201f2e 100644
--- a/fe/PDA/pages/record/productionReturn.vue
+++ b/fe/PDA/pages/record/productionReturn.vue
@@ -3,7 +3,7 @@
 	<view class="">
 		<win-blank-view @goScan='openScanPopup' v-if="allDataList.length==0"></win-blank-view>
 		<scroll-view scroll-y class="scroll-detail" style="margin-top: 10rpx;padding-bottom:100px"  >
-			<view class="detail-list " v-for="(item, index) in showList" :key="index">
+			<view class="detail-list " v-for="(item, index) in allDataList" :key="index">
 				<view class="detail-content">
 					<view class="" style="">
 						<view class="uni-flex uni-row u-col-center">
@@ -53,8 +53,7 @@
 			</view>
 
 		</scroll-view>
-		<uni-load-more :status="loadingType" v-if="showList.length>0" />
-		<div class="new_bot_box" v-show="showList.length>0">
+		<div class="new_bot_box" v-show="allDataList.length>0">
 			<win-collapse-location scanTitle='扫描目标库位' ref='comCollapseLocation' @getLocationCode='getDefaultToLocation'
 				@clear='clearDefaultLocation'>
 			</win-collapse-location>
@@ -63,7 +62,7 @@
 				<button class="new_save_btn btn_double" @click="submit()">提交</button>
 			</view>
 		</div>
-		<win-scan-button @goScan='openScanPopup' v-if="showList.length>0"></win-scan-button>
+		<win-scan-button @goScan='openScanPopup' v-if="allDataList.length>0"></win-scan-button>
 		<winScanByProductCode ref="scanPackPopup" title="单件码" @getScanResult='getScanResult'></winScanByProductCode>
 		<com-message ref="comMessage" @afterCloseScanMessage='closeScanMessage' @afterRescanMessage='afterRescan'
 			@afterCloseCommitMessage='closeCommitMessage'>
@@ -120,14 +119,11 @@
 			return {
 				options: [],
 				currentItem: {},
-				showList: [],
 				toLocationInfo:{},
 				toLocationCode: "",
 				allCount: 0,
 				allDataList: [],
 				loadingType: "",
-				pageNo: 0,
-				pageSize: 5,
 				scrollTop: 60,
 				old: {
 					scrollTop: 0
@@ -143,29 +139,8 @@
 			})
 		},
 		onPullDownRefresh() {
-			this.pageNo = 1;
-			this.showList=[]
-			this.loadingType = "";
-			this.showList = this.getDataPage(this.pageNo, this.pageSize)
 			uni.stopPullDownRefresh()
 		},
-		onReachBottom() {
-			console.log("底部")
-			if (this.loadingType == 'nomore') {
-				console.log("没有更多了")
-				return;
-			}
-			this.pageNo++;
-			var list = this.getDataPage(this.pageNo, this.pageSize)
-			if (list.length > 0) {
-				console.log("加载更多了")
-				// this.showList=list
-				this.showList = this.showList.concat(list)
-			} else {
-				//没有更多了
-				this.loadingType = "nomore";
-			}
-		},
 
 
 		onNavigationBarButtonTap(e) {
@@ -181,15 +156,6 @@
 
 		methods: {
 			
-			getDataPage(pageNo, pageSize) {
-				//计算总页数
-				var totalPages = Math.ceil(this.allCount / pageSize);
-				//当前页起始索引
-				const start = (pageNo - 1) * pageSize;
-				const end = start + pageSize; //当前页结束索引
-				return this.allDataList.slice(start, end)
-
-			},
 			qtyChanged(value, item, index) {
 				if (value <= 0) {
 					this.showMessage('退货数量必须大于0')
@@ -202,8 +168,9 @@
 					if (res) {
 						this.allDataList.splice(index, 1);
 						this.allCount = this.allDataList.length;
+						var title =this.allCount>0?"客户退货"+"("+this.allCount+")":"客户退货"
 						uni.setNavigationBarTitle({
-							title: "客户退货"+"("+this.allCount+")"
+							title: title
 						})
 						this.$forceUpdate()
 					}
@@ -232,10 +199,6 @@
 				}
 				this.allDataList.unshift(item)
 				this.allCount = this.allDataList.length;
-				this.pageNo = 1;
-				this.showList = []
-				this.loadingType = "";
-				this.showList = this.getDataPage(this.pageNo, this.pageSize)
 				uni.setNavigationBarTitle({
 					title: "客户退货"+"("+this.allCount+")"
 				})
@@ -356,7 +319,7 @@
 					details: []
 				}
 
-				that.showList.forEach(i => {
+				that.allDataList.forEach(i => {
 					let balanceItem = i.balanceItem;
 					i.labelList.forEach(l => {
 						let detail = {};
@@ -441,15 +404,14 @@
 
 			clearInfo() {
 				this.allDataList = [];
-				this.showList = [];
 				this.toLocationInfo={}
 				this.toLocationCode = "";
 				this.allCount = 0;
 				this.loadingType = ""
-				this.pageNo = 0
 				uni.setNavigationBarTitle({
 					title: "客户退货"
 				})
+				this.$refs.comCollapseLocation.clearLocation();
 			},
 
 			openScanPopup() {
diff --git a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
index 8ef6988d6..0a77310da 100644
--- a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
@@ -389,10 +389,10 @@
 					uni.hideLoading()
 					if (res.length > 0) {
 						var list = [];
-						list = res.Result;
-						list.forEach(res => {
-							res.label = res.PLAN_NO;
-							res.value = res.SHIFT_CODE
+						list = res;
+						list.forEach(item => {
+							item.label = item.PLAN_NO;
+							item.value = item.SHIFT_CODE
 						})
 						this.$refs.selectPopup.openScanPopup(list)
 					} 
diff --git a/fe/PDA/pages/task/coatingIssuleJob.vue b/fe/PDA/pages/task/coatingIssuleJob.vue
index d3baf022f..066ad3173 100644
--- a/fe/PDA/pages/task/coatingIssuleJob.vue
+++ b/fe/PDA/pages/task/coatingIssuleJob.vue
@@ -91,7 +91,7 @@
 				value: false
 			}
 		},
-		mounted() {
+		onShow() {
 			this.getList('refresh');
 		},
 		methods: {
diff --git a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
index 08f3f4d42..0a388795b 100644
--- a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
+++ b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
@@ -423,10 +423,10 @@
 					uni.hideLoading()
 					if (res.length > 0) {
 						var list = [];
-						list = res.Result;
-						list.forEach(res => {
-							res.label = res.PLAN_NO;
-							res.value = res.SHIFT_CODE
+						list = res;
+						list.forEach(item => {
+							item.label = item.PLAN_NO;
+							item.value = item.SHIFT_CODE
 						})
 						this.$refs.selectPopup.openScanPopup(list)
 					} 
diff --git a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
index acfdcace5..7ae00ccfe 100644
--- a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
@@ -385,10 +385,10 @@
 					uni.hideLoading()
 					if (res.length > 0) {
 						var list = [];
-						list = res.Result;
-						list.forEach(res => {
-							res.label = res.PLAN_NO;
-							res.value = res.SHIFT_CODE
+						list = res;
+						list.forEach(item => {
+							item.label = item.PLAN_NO;
+							item.value = item.SHIFT_CODE
 						})
 						this.$refs.selectPopup.openScanPopup(list)
 					} 
diff --git a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
index acfdcace5..7ae00ccfe 100644
--- a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
@@ -385,10 +385,10 @@
 					uni.hideLoading()
 					if (res.length > 0) {
 						var list = [];
-						list = res.Result;
-						list.forEach(res => {
-							res.label = res.PLAN_NO;
-							res.value = res.SHIFT_CODE
+						list = res;
+						list.forEach(item => {
+							item.label = item.PLAN_NO;
+							item.value = item.SHIFT_CODE
 						})
 						this.$refs.selectPopup.openScanPopup(list)
 					} 
diff --git a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
index c72909be7..f4e517616 100644
--- a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
@@ -385,10 +385,10 @@
 					uni.hideLoading()
 					if (res.length > 0) {
 						var list = [];
-						list = res.Result;
-						list.forEach(res => {
-							res.label = res.PLAN_NO;
-							res.value = res.SHIFT_CODE
+						list = res;
+						list.forEach(item => {
+							item.label = item.PLAN_NO;
+							item.value = item.SHIFT_CODE
 						})
 						this.$refs.selectPopup.openScanPopup(list)
 					} 
diff --git a/fe/PDA/pages/task/thirdLocationDetail.vue b/fe/PDA/pages/task/thirdLocationDetail.vue
index 2f44726dc..ef6123a43 100644
--- a/fe/PDA/pages/task/thirdLocationDetail.vue
+++ b/fe/PDA/pages/task/thirdLocationDetail.vue
@@ -11,7 +11,7 @@
 		<scroll-view scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower" @scroll="scroll"
 			class="scroll-detail">
 			<view class="" v-for="(item, index) in details" :key="index">
-				<view class="detail-list margin_top">
+				<view class="detail-list margin_top" style="margin-bottom: 150rpx;" >
 					<!-- 单选卡片 -->
 					<view class="detail-content">
 						<view class="choose_main">
@@ -256,12 +256,12 @@
 			},
 			qtyChanged(value, item, index) {
 				if (value <= 0) {
-					this.showMessage('收货数量必须大于0')
+					this.showMessage('收货货数量必须大于0')
 					item.qty = item.handledQty
 					this.$refs['comNumberBox_' + index][0].setValue(item.qty);
 				} else {
 					if (value > item.recommendQty) {
-						this.showMessage("收货数量[" + value + "]不能大于申请数量[" + item.recommendQty + "]");
+						this.showMessage("收货货数量[" + value + "]不能大于申请数量[" + item.recommendQty + "]");
 						item.handledQty = item.recommendQty
 						this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
 					}