diff --git a/fe/PDA/mycomponents/wincom/winScanByProductCode.vue b/fe/PDA/mycomponents/wincom/winScanByProductCode.vue
index ef466a30f..83eef63c3 100644
--- a/fe/PDA/mycomponents/wincom/winScanByProductCode.vue
+++ b/fe/PDA/mycomponents/wincom/winScanByProductCode.vue
@@ -59,7 +59,7 @@
 				this.$refs.popup.open('bottom');
 			},
 
-			closeScanPopup(content) {
+			closeScanPopup() {
 				this.$refs.popup.close();
 				this.$emit("close", '');
 			},
diff --git a/fe/PDA/pages/assemble/assembleTransfer.vue b/fe/PDA/pages/assemble/assembleTransfer.vue
index defeea144..540a1beea 100644
--- a/fe/PDA/pages/assemble/assembleTransfer.vue
+++ b/fe/PDA/pages/assemble/assembleTransfer.vue
@@ -67,7 +67,7 @@
 			</view>
 		</div>
 		<win-scan-button @goScan='openScanPopup' v-if="itemList.length>0"></win-scan-button>
-		<winScanByProductCode ref="scanPackPopup" title="产品编码" @getScanResult='getScanResult'></winScanByProductCode>
+		<winScanByProductCode ref="scanPackPopup" title="单件码" @getScanResult='getScanResult'></winScanByProductCode>
 		<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
 		<com-message ref="comMessage" @afterClose='afterCloseMessagg'></com-message>
 	</view>
diff --git a/fe/PDA/pages/cotaing/coatingTransfer.vue b/fe/PDA/pages/cotaing/coatingTransfer.vue
index a23f7252e..69f63b942 100644
--- a/fe/PDA/pages/cotaing/coatingTransfer.vue
+++ b/fe/PDA/pages/cotaing/coatingTransfer.vue
@@ -67,7 +67,7 @@
 			</view>
 		</div>
 		<win-scan-button @goScan='openScanPopup' v-if="itemList.length>0"></win-scan-button>
-		<winScanByProductCode ref="scanPackPopup" title="产品编码" @getScanResult='getScanResult'></winScanByProductCode>
+		<winScanByProductCode ref="scanPackPopup" title="单件码" @getScanResult='getScanResult'></winScanByProductCode>
 		<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
 		<com-message ref="comMessage" @afterClose='afterCloseMessagg'></com-message>
 	</view>
diff --git a/fe/PDA/pages/injection/injectionTransfer.vue b/fe/PDA/pages/injection/injectionTransfer.vue
index 195414e71..75a90c845 100644
--- a/fe/PDA/pages/injection/injectionTransfer.vue
+++ b/fe/PDA/pages/injection/injectionTransfer.vue
@@ -67,7 +67,7 @@
 			</view>
 		</div>
 		<win-scan-button @goScan='openScanPopup' v-if="itemList.length>0"></win-scan-button>
-		<winScanByProductCode ref="scanPackPopup" title="产品编码" @getScanResult='getScanResult'></winScanByProductCode>
+		<winScanByProductCode ref="scanPackPopup" title="单件码" @getScanResult='getScanResult'></winScanByProductCode>
 		<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
 		<com-message ref="comMessage" @afterClose='afterCloseMessagg'></com-message>
 	</view>
diff --git a/fe/PDA/pages/record/completeInventoryTransfer.vue b/fe/PDA/pages/record/completeInventoryTransfer.vue
index daba4ce25..2b422c6b3 100644
--- a/fe/PDA/pages/record/completeInventoryTransfer.vue
+++ b/fe/PDA/pages/record/completeInventoryTransfer.vue
@@ -79,7 +79,7 @@
 			</view>
 		</div>
 		<win-scan-button @goScan='openScanPopup' v-if="itemList.length>0"></win-scan-button>
-		<winScanByProductCode ref="scanPackPopup" title="产品编码" @getScanResult='getScanResult'></winScanByProductCode>
+		<winScanByProductCode ref="scanPackPopup" title="单件码" @getScanResult='getScanResult'></winScanByProductCode>
 		<win-scan-by-code ref="scanFromLocationPopup" title="来源库位" @getScanCode='scanFromLocation'></win-scan-by-code>
 		<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
 		
diff --git a/fe/PDA/pages/spray/sprayCompleteReceive.vue b/fe/PDA/pages/spray/sprayCompleteReceive.vue
index 195414e71..75a90c845 100644
--- a/fe/PDA/pages/spray/sprayCompleteReceive.vue
+++ b/fe/PDA/pages/spray/sprayCompleteReceive.vue
@@ -67,7 +67,7 @@
 			</view>
 		</div>
 		<win-scan-button @goScan='openScanPopup' v-if="itemList.length>0"></win-scan-button>
-		<winScanByProductCode ref="scanPackPopup" title="产品编码" @getScanResult='getScanResult'></winScanByProductCode>
+		<winScanByProductCode ref="scanPackPopup" title="单件码" @getScanResult='getScanResult'></winScanByProductCode>
 		<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance>
 		<com-message ref="comMessage" @afterClose='afterCloseMessagg'></com-message>
 	</view>
diff --git a/fe/PDA/pages/task/assembleIssueJobDetail.vue b/fe/PDA/pages/task/assembleIssueJobDetail.vue
index 72c529bf5..91045f75f 100644
--- a/fe/PDA/pages/task/assembleIssueJobDetail.vue
+++ b/fe/PDA/pages/task/assembleIssueJobDetail.vue
@@ -431,9 +431,9 @@
 									}
 								})
 						}
-
 						this.$forceUpdate()
 					}
+					this.closeScanPopup()
 				});
 
 			},
@@ -581,7 +581,7 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopupForm.closeScanPopup();
+				this.$refs.scanPopupTo.closeScanPopup();
 			},
 
 			closeScanMessage() {
diff --git a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
index 474b40833..8ef6988d6 100644
--- a/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/assembleIssueJobDetailByQty.vue
@@ -364,7 +364,7 @@
 					return;
 				}
 				this.singCode = result.itemCode
-				
+				this.$refs.scanPackPopup.closeScanPopup();
 
 			},
 			
diff --git a/fe/PDA/pages/task/coatingIssuleJobDetail.vue b/fe/PDA/pages/task/coatingIssuleJobDetail.vue
index abe70a75a..e52bc40c2 100644
--- a/fe/PDA/pages/task/coatingIssuleJobDetail.vue
+++ b/fe/PDA/pages/task/coatingIssuleJobDetail.vue
@@ -430,13 +430,11 @@
 										item.handleToPackingCodeLocationCode = balancesItem.locationCode
 									}
 								})
-
 						}
 
-
-
 						this.$forceUpdate()
 					}
+					this.closeScanPopup()
 				});
 
 			},
@@ -584,7 +582,7 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopupForm.closeScanPopup();
+				this.$refs.scanPopupTo.closeScanPopup();
 			},
 
 			closeScanMessage() {
diff --git a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
index cd196887e..08f3f4d42 100644
--- a/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
+++ b/fe/PDA/pages/task/coatingIssuleJobDetailByQty.vue
@@ -366,7 +366,7 @@
 					return;
 				}
 				this.singCode = result.itemCode
-				
+				this.$refs.scanPackPopup.closeScanPopup();
 
 			},
 
diff --git a/fe/PDA/pages/task/injectionIssueJobDetail.vue b/fe/PDA/pages/task/injectionIssueJobDetail.vue
index e8b177b78..ad8541b39 100644
--- a/fe/PDA/pages/task/injectionIssueJobDetail.vue
+++ b/fe/PDA/pages/task/injectionIssueJobDetail.vue
@@ -430,13 +430,11 @@
 										item.handleToPackingCodeLocationCode = balancesItem.locationCode
 									}
 								})
-
 						}
 
-
-
 						this.$forceUpdate()
 					}
+					this.closeScanPopup();
 				});
 
 			},
@@ -584,7 +582,7 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopupForm.closeScanPopup();
+				this.$refs.scanPopupTo.closeScanPopup();
 			},
 
 			closeScanMessage() {
diff --git a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
index 87628229b..acfdcace5 100644
--- a/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/injectionIssueJobDetailByQty.vue
@@ -360,7 +360,7 @@
 					return;
 				}
 				this.singCode = result.itemCode
-				
+				this.$refs.scanPackPopup.closeScanPopup();
 
 			},
 
diff --git a/fe/PDA/pages/task/kittingIssueJobDetail.vue b/fe/PDA/pages/task/kittingIssueJobDetail.vue
index 334fdce8c..bbd7294ba 100644
--- a/fe/PDA/pages/task/kittingIssueJobDetail.vue
+++ b/fe/PDA/pages/task/kittingIssueJobDetail.vue
@@ -430,13 +430,10 @@
 										item.handleToPackingCodeLocationCode = balancesItem.locationCode
 									}
 								})
-
 						}
-
-
-
 						this.$forceUpdate()
 					}
+					this.closeScanPopup()
 				});
 
 			},
@@ -584,7 +581,7 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopupForm.closeScanPopup();
+				this.$refs.scanPopupTo.closeScanPopup();
 			},
 
 			closeScanMessage() {
diff --git a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
index 87628229b..acfdcace5 100644
--- a/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/kittingIssueJobDetailByQty.vue
@@ -360,7 +360,7 @@
 					return;
 				}
 				this.singCode = result.itemCode
-				
+				this.$refs.scanPackPopup.closeScanPopup();
 
 			},
 
diff --git a/fe/PDA/pages/task/sparePartIssueJobDetail.vue b/fe/PDA/pages/task/sparePartIssueJobDetail.vue
index 21df35102..af53f5c5a 100644
--- a/fe/PDA/pages/task/sparePartIssueJobDetail.vue
+++ b/fe/PDA/pages/task/sparePartIssueJobDetail.vue
@@ -433,10 +433,9 @@
 
 						}
 
-
-
 						this.$forceUpdate()
 					}
+					this.closeScanPopup()
 				});
 
 			},
@@ -584,7 +583,7 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopupForm.closeScanPopup();
+				this.$refs.scanPopupTo.closeScanPopup();
 			},
 
 			closeScanMessage() {
diff --git a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
index d0aae3285..c72909be7 100644
--- a/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
+++ b/fe/PDA/pages/task/sparePartIssueJobDetailByQty.vue
@@ -360,7 +360,7 @@
 					return;
 				}
 				this.singCode = result.itemCode
-				
+				this.$refs.scanPackPopup.closeScanPopup();
 
 			},