Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex

src/mycomponents/query/fifoQuery.vue

@@ -243,10 +243,10 @@
 					return;
 				}
 				
-				if(this.warehouseCode==""){
+				// if(this.warehouseCode==""){
-					this.showErrorMessage("仓库代码为空,请输入仓库代码")
+				// 	this.showErrorMessage("仓库代码为空,请输入仓库代码")
-					return;
+				// 	return;
-				}
+				// }
 				uni.showLoading({
 					title:"查询中",
 					mask:true

src/pages/issue/record/directIssueByBatch.vue

@@ -378,8 +378,8 @@
 			},
 
 			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
+				if (this.$refs.scanPopup) {
-					this.$refs.scanPopup.getfocus();
+					this.$refs.scanPopup.packGetFocus();
 				}
 			},