修改发料箱码扫描后关闭

12 months ago · 4939310121
16 changed files with 21 additions and 29 deletions
--- 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", '');
 			},
--- 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>
--- 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>
--- 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>
--- 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>
 		
--- 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>
--- 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() {
--- 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();

 			},
 			
--- 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() {
--- 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();

 			},

--- 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() {
--- 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();

 			},

--- 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() {
--- 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();

 			},

--- 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() {
--- 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();

 			},