优化扫描组件

src/mycomponents/scan/winCheckFgLabel.vue

@@ -102,18 +102,17 @@
 		methods: {
 			//直接扫描
 			openScanPopupForType(customerCode) {
-				
 				this.customerCode = customerCode;
+				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区
+				this.$refs.popup.open('bottom')
+				setTimeout(res => {
 					if (this.fromLocationCode != '') {
 						this.packGetFocus();
 					} else {
 						this.locationGetFocus();
 					}
-				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
-				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区
-				setTimeout(res => {
-					this.$refs.popup.open('bottom')
 				}, 500)
 			},
 
@@ -121,21 +120,24 @@
 			openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) {
 				this.fromLocationCode = fromLocationCode;
 				this.fromLocationList = fromLocationList;
-				if (fromLocationCode != '') {
+				
+				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
+				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					if (this.fromLocationCode != '') {
 						this.packGetFocus();
 					} else {
 						if (this.fromLocationList.length == 0) {
 							this.locationGetFocus();
 						} else {
 							this.fromLocationCode = this.fromLocationList[0];
+							this.packGetFocus();
 						}
 					}
-				setTimeout(res => {
-					this.$refs.popup.open('bottom')
+					
 				}, 500)
-				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
-				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
 			},
 
 			closeScanPopup(content) {

src/mycomponents/scan/winComScan.vue

@@ -5,8 +5,12 @@
 		<view class="pop_tab">
 			<view class="tab_info">
 				<view class="conbox" >
-					<textarea inputmode="none" v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;width: 90%;"
-						:focus="boxfocus" :placeholder="placeholderValue" 
+					<textarea 
+					 v-model="scanMsg" trim="all" maxlength="1000" style="margin-left: 5px;width: 90%;"
+						 :placeholder="placeholderValue" 
+						 :focus="boxfocus"
+						@blur="handleBlur"
+						 @focus="handleFocus" 
 						@input="handelScanMsg" :cursor="cursorIndex" ></textarea>
 					</view>
 
@@ -16,7 +20,7 @@
 					</view> -->
 
 					<view class="uni-flex">
-						<button class="clean_scan_btn" @click="clearScanValue()">清空</button>
+						<button class="clean_scan_btn"  @touchend.prevent="clearScanValue()">清空</button>
 						<button class="scan_btn" @click="clickScanMsg()">扫描</button>
 					</view>
 				</view>
@@ -73,10 +77,10 @@
 				type: Boolean,
 				default: true
 			},
-			boxFocus: {
-				type: Boolean,
-				default: true
-			},
+			// boxFocus: {
+			// 	type: Boolean,
+			// 	default: true
+			// },
 			isShowHistory: {
 				type: Boolean,
 				default: true
@@ -100,41 +104,7 @@
 			}
 		},
 		mounted() {
-			this.boxfocus =true;
-			// uni.hideKeyboard();
-			
-			// #ifdef H5
-			// if (document.querySelector('textarea') != null) {
-			// 	document.querySelector('textarea').setAttribute('inputmode', 'none')
-			// }
-			// #endif 
-			// this.hide()
-			// #ifdef APP-PLUS
-			// 
-			// this.hide()
-			// uni.onKeyboardHeightChange(res => {
-			//   console.log(res.height)
-			//   if(res.height>0){
-			// 	  // uni.hideKeyboard();
-			// 	  plus.key.hideSoftKeybord();
-			//   }
-			// })
-			// 
-			// uni.onWindowResize((res) => {
-			// 	plus.key.hideSoftKeybord()
-			// })
-			// plus.key.hideSoftKeybord();
-			// setInterval(function(){
-			// 	plus.key.hideSoftKeybord();
-			//         // uni.hideKeyboard();//隐藏软键盘
-			//         // plus.key.hideSoftKeybord();
-			//     },60);
 			
-			// #endif 
-
-			// if (this.$el.querySelector('textarea') != null) {
-			// 	this.$el.querySelector('textarea').setAttribute('inputmode', 'none')
-			// }
 		},
 		watch: {
 			placeholder() {
@@ -169,6 +139,7 @@
 			},
 			clearScanValue() {
 				this.scanMsg = ''
+				this.cursorIndex =0
 				this.getfocus();
 			},
 			clickScanMsg() {
@@ -189,7 +160,7 @@
 						 that.losefocus();
 						let content = uni.$u.trim(that.scanMsg)
 						if (content == "") {
-							that.getfocus();
+							// that.getfocus();
 							this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
 								if (res) {
 									that.scanMsg = ""
@@ -212,6 +183,7 @@
 								that.$emit("getResult", scanResult);
 							} else {
 								that.clear();
+								that.losefocus();
 								this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
 									if (res) {
 										that.getfocus();
@@ -222,20 +194,25 @@
 					}, 500);
 				}
 			},
+			
+			handleFocus(){
+			},
+			
+			handleBlur(){
+				// setTimeout(res=>{
+				// 	uni.hideKeyboard();
+				// },200)
+			},
 			getfocus() {
 				let that = this;
 				this.$nextTick(r => {
-					console.log("获取焦点")
 					that.boxfocus = true;
 				});
-				// this.hide()
 			},
 			losefocus() {
 				let that = this;
 				this.$nextTick(r => {
-					console.log("失去焦点")
 					that.boxfocus = false;
-					uni.hideKeyboard();
 				});
 			},
 			clear() {
@@ -289,7 +266,7 @@
 <script module="textarea" lang="renderjs">
 	export default {
 		mounted() {
-			document.querySelector('textarea').setAttribute('inputmode', 'none')
+			// document.querySelector('textarea').setAttribute('inputmode', 'none')
 		},
 	}
 </script>

src/mycomponents/scan/winComScanBalance.vue

@@ -118,6 +118,9 @@
 				this.toLocationAreaTypeList = getDirectoryItemArray(businessType.inAreaTypes)
 				this.itemTypesList = getDirectoryItemArray(businessType.itemTypes)
 				this.$refs.popup.open('bottom')
+				setTimeout(res=>{
+					this.getfocus()
+				},500)
 			},
 
 			getScanResult(result) {

src/mycomponents/scan/winComScanBalanceLocation.vue

@@ -145,28 +145,31 @@
 				this.fromLocationAreaTypeList = getDirectoryItemArray(businessType.outAreaTypes)
 				this.itemTypesList = getDirectoryItemArray(businessType.itemTypes)
 				this.$refs.popup.open('bottom')
+				setTimeout(res=>{
+					this.packGetFocus()
+				},500)
 
 			},
 			
 			openScanPopupForJob(fromLocationCode, fromLocationList, jobContent){
 				this.fromLocationCode = fromLocationCode;
 				this.fromLocationList = fromLocationList;
-				if (fromLocationCode != '') {
+				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
+				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					if (this.fromLocationCode != '') {
 						this.packGetFocus();
 					} else {
 						if (this.fromLocationList.length == 0) {
 							this.locationGetFocus();
 						} else {
 							this.fromLocationCode = this.fromLocationList[0];
+							this.packGetFocus();
 						}
 					}
-				
-				setTimeout(res => {
-					this.$refs.popup.open('bottom')
 				}, 500)
-				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
-				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
 			},
 			
 			//模拟扫描
@@ -294,6 +297,7 @@
 				})
 			},
 			showErrorMessage(message) {
+				this.packLoseFocus();
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 						if(this.$refs.comscan){

src/mycomponents/scan/winComScanFg.vue

@@ -6,12 +6,14 @@
 			<view class="tab_info">
 				<view class="conbox">
 					<textarea inputmode="none" v-model="scanMsg" trim="all" maxlength="1000"
-						style="margin-left: 5px;width: 90%;" :focus="boxfocus" :placeholder="placeholderValue"
-						@focus="getfocus" @blur="losefocus" @input="handelScanMsg" :cursor="cursorIndex"></textarea>
+						style="margin-left: 5px;width: 90%;" 
+						:focus="boxfocus" :placeholder="placeholderValue"
+						  @focus="handleFocus" 
+						  @input="handelScanMsg" :cursor="cursorIndex"></textarea>
 				</view>
 				<view class="uni-flex uni-row space-between u-col-center">
 					<view class="uni-flex">
-						<button class="clean_scan_btn" @click="clearScanValue()">清空</button>
+						<button class="clean_scan_btn" @touchend.prevent="clearScanValue()">清空</button>
 						<button class="scan_btn" @click="clickScanMsg()">扫描</button>
 					</view>
 				</view>
@@ -103,13 +105,11 @@
 			}
 		},
 		mounted() {
-			this.boxfocus = true;
-			// uni.hideKeyboard();
 
 			// #ifdef H5
-			if (document.querySelector('textarea') != null) {
-				document.querySelector('textarea').setAttribute('inputmode', 'none')
-			}
+			// if (document.querySelector('textarea') != null) {
+			// 	document.querySelector('textarea').setAttribute('inputmode', 'none')
+			// }
 			// #endif 
 			// this.hide()
 			// #ifdef APP-PLUS
@@ -125,20 +125,6 @@
 			this.placeholderValue = '请扫描' + this.placeholder;
 		},
 		methods: {
-
-			hide() {
-				// #ifdef APP-PLUS
-				// 只是解决软键盘的闪现
-				var interval = setInterval(function() {
-					uni.hideKeyboard(); //隐藏软键盘
-					console.log('刷新')
-				}, 5);
-				setTimeout(() => {
-					clearInterval(interval);
-					console.log('停止刷新')
-				}, 1000);
-				// #endif 
-			},
 			setItemCodeSimulate(itemCode, scanMsg) {
 				this.itemCode = itemCode;
 				this.scanMsg = scanMsg;
@@ -154,6 +140,7 @@
 				this.scanMsg = val
 			},
 			clearScanValue() {
+				this.cursorIndex=0,
 				this.scanMsg = ''
 				this.getfocus();
 			},
@@ -171,7 +158,6 @@
 						let content = uni.$u.trim(that.scanMsg)
 						// let content = that.scanMsg;
 						if (content == "") {
-							that.getfocus();
 							this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
 								if (res) {
 									that.scanMsg = ""
@@ -235,6 +221,7 @@
 									that.$emit("getResult", scanResult);
 								}
 							} catch (error) {
+								that.losefocus();
 								this.$refs.comMessage.showErrorMessage(error.message, res => {
 									if (res) {
 										that.getfocus();
@@ -243,6 +230,7 @@
 							}
 
 						}).catch(error => {
+							that.losefocus();
 							this.$refs.comMessage.showErrorMessage(error, res => {
 								if (res) {
 									that.scanMsg = ""
@@ -268,6 +256,11 @@
 					that.boxfocus = false;
 				});
 			},
+			// handleBlur(){
+			// 	setTimeout(res=>{
+			// 		uni.hideKeyboard();
+			// 	},200)
+			// },
 			clear() {
 				this.cursorIndex = 0;
 				this.scanMsg = ''

src/mycomponents/scan/winScanAsnNumber.vue

@@ -55,8 +55,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus('bottom')
 				}, 500)
 			},
 			closeScanPopup() {

src/mycomponents/scan/winScanContainer.vue

@@ -54,8 +54,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus()
 				}, 500)
 			},
 			closeScanPopup() {

src/mycomponents/scan/winScanFgLabel.vue

@@ -60,13 +60,13 @@
 				this.$refs.comscansimulate.clickScanMsg();
 			},
 			openScanPopup(itemCode) {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
 					setTimeout(re=>{
 						this.$refs.comscan.setItemCode(itemCode)
 					},500)
-					
-				}, 200)
+					this.getfocus()
+				}, 500)
 			},
 
 			closeScanPopup() {
@@ -91,13 +91,13 @@
 			},
 
 			getfocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan ) {
 					this.$refs.comscan.getfocus();
 				}
 			},
 
 			losefocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan ) {
 					this.$refs.comscan.losefocus();
 				}
 			},

src/mycomponents/scan/winScanItem.vue

@@ -76,8 +76,10 @@
 		},
 		methods: {
 			openScanPopup() {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				var that =this;
+				setTimeout(res => {
+					that.getfocus()
 				}, 500)
 			},
 			closeScanPopup() {

src/mycomponents/scan/winScanJobNumber.vue

@@ -61,8 +61,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus()
 				}, 500)
 			},
 			closeScanPopup() {
@@ -72,7 +73,7 @@
 				this.$refs.popup.close()
 			},
 			getfocus() {
-				if (this.isShow) {
+				if (this.$refs.scan) {
 					this.$refs.scan.getfocus()
 				}
 			},

src/mycomponents/scan/winScanLocation.vue

@@ -65,8 +65,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus()
 				}, 500)
 			},
 			openScanPopupSimulate(location) {

src/mycomponents/scan/winScanPack.vue

@@ -70,9 +70,10 @@
 				})
 			},
 			openScanPopup() {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
-				}, 200)
+				setTimeout(res => {
+					this.getfocus()
+				}, 500)
 			},
 
 			closeScanPopup() {
@@ -103,13 +104,13 @@
 			},
 
 			getfocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.getfocus();
 				}
 			},
 
 			losefocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.losefocus();
 				}
 			},

src/mycomponents/scan/winScanPackAndCont.vue

@@ -61,8 +61,9 @@
 		},
 		methods: {
 			openScanPopup() {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus()
 				}, 500)
 			},
 

src/mycomponents/scan/winScanPackAndLocation.vue

@@ -152,43 +152,44 @@
 			},
 			//直接扫描
 			openScanPopupForType(fromLocationCode, businessType) {
-
 				this.businessType = businessType;
 				this.fromLocationCode = fromLocationCode;
+
+				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.outAreaTypes); //出库库区
+				this.$refs.popup.open('bottom')
+				setTimeout(res => {
 					if (fromLocationCode != '') {
 						this.packGetFocus();
 					} else {
 						this.locationGetFocus();
 					}
-				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
-				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.outAreaTypes); //出库库区
-				if (!this.show) {
-					setTimeout(res => {
-						this.$refs.popup.open('bottom')
 				}, 500)
-				}
 			},
 
 			//在任务中扫描
 			openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) {
 				this.fromLocationCode = fromLocationCode;
 				this.fromLocationList = fromLocationList;
-				if (fromLocationCode != '') {
+				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
+				this.$refs.popup.open('bottom')
+				
+				setTimeout(res => {
+					if (this.fromLocationCode != '') {
 						this.packGetFocus();
 					} else {
 						if (this.fromLocationList.length == 0) {
 							this.locationGetFocus();
 						} else {
 							this.fromLocationCode = this.fromLocationList[0];
+							this.packGetFocus();
 						}
 					}
-				setTimeout(res => {
-					this.$refs.popup.open('bottom')
 				}, 500)
-				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
-				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
+
 			},
 			//模拟扫描
 			openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent, scanMessage) {
@@ -417,7 +418,7 @@
 					balance: datas,
 					fromLocationCode: this.fromLocationCode,
 				}
-				this.packGetFocus();
+				// this.packGetFocus();
 				this.$emit("getResult", data);
 				this.$emit("getCountScanResult", data);
 			},
@@ -433,18 +434,18 @@
 					balance: item,
 					fromLocationCode: this.fromLocationCode,
 				}
-				this.packGetFocus();
+				// this.packGetFocus();
 				this.$emit("getResult", data);
 			},
 
 			packGetFocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.getfocus();
 				}
 			},
 
 			packLoseFocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.losefocus();
 				}
 			},

src/mycomponents/scan/winScanPackAndLocationNoBalance.vue

@@ -131,16 +131,16 @@
 			openScanPopupForType(fromLocationCode, businessType) {
 				this.businessType = businessType;
 				this.fromLocationCode = fromLocationCode;
+				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
+				this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态
+				this.$refs.popup.open('bottom')
+				setTimeout(res => {
 					if (fromLocationCode != '') {
 						this.packGetFocus();
 					} else {
 						this.locationGetFocus();
 					}
-				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
-				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
-				this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态
-				setTimeout(res => {
-					this.$refs.popup.open('bottom')
 				}, 500)
 			},
 
@@ -148,6 +148,12 @@
 			openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) {
 				this.fromLocationCode = fromLocationCode;
 				this.fromLocationList = fromLocationList;
+				
+				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
+				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
+				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
+				this.$refs.popup.open('bottom')
+				setTimeout(res => {
 					if (fromLocationCode != '') {
 						this.packGetFocus();
 					} else {
@@ -155,14 +161,10 @@
 							this.locationGetFocus();
 						} else {
 							this.fromLocationCode = this.fromLocationList[0];
+							this.packGetFocus();
 						}
 					}
-				setTimeout(res => {
-					this.$refs.popup.open('bottom')
 				}, 500)
-				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
-				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
-				this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
 			},
 
 			closeScanPopup(content) {

src/mycomponents/scan/winScanPackAndPosition.vue

@@ -105,9 +105,9 @@
 						this.showErrorMessage(error)
 					})
 				}
-
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus()
 				}, 500)
 			},
 

src/mycomponents/scan/winScanPackJob.vue

@@ -71,6 +71,9 @@
 			// 弹出
 			openScanPopup(){
 				this.$refs.popup.open('bottom')
+				setTimeout(res=>{
+					this.packGetFocus()
+				},500)
 			},
 			// 关闭
 			closeScanPopup(content) {
@@ -83,13 +86,13 @@
 				this.$emit("getResult", result);
 			},
 			packGetFocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.getfocus();
 				}
 			},
 
 			packLoseFocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.losefocus();
 				}
 			},

src/mycomponents/scan/winScanPackLevel.vue

@@ -96,9 +96,10 @@
 				})
 			},
 			openScanPopup() {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
-				}, 200)
+				setTimeout(res => {
+					this.getfocus();
+				}, 500)
 			},
 
 			closeScanPopup() {
@@ -130,13 +131,13 @@
 			},
 
 			getfocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.getfocus();
 				}
 			},
 
 			losefocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.losefocus();
 				}
 			},

src/mycomponents/scan/winScanPackage.vue

@@ -67,18 +67,19 @@
 				this.$refs.comscansimulate.clickScanMsg();
 			},
 			openScanPopup() {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
-				}, 200)
+				setTimeout(res => {
+					this.getfocus()
+				}, 500)
 			},
 
 
 			openScanPopupByBusinessType(businessType) {
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus()
 					this.businessType = businessType;
-
-				}, 200)
+				}, 500)
 			},
 
 
@@ -223,13 +224,13 @@
 			},
 
 			getfocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.getfocus();
 				}
 			},
 
 			losefocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan ) {
 					this.$refs.comscan.losefocus();
 				}
 			},
@@ -240,9 +241,10 @@
 				this.show = e.show
 			},
 			showErrorMessage(message) {
+				this.losefocus()
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						this.getfocus();
 					}
 				});
 			},

src/pages.json

@@ -2297,7 +2297,8 @@
 		// 		"fontSize": "58rpx"
 		// 	}]
 		// },
-		"softinputMode": "adjustPan" //adjustResize
+		//手机软键盘升起不让其将页面头部上推
+		"softinputMode": "adjustResize" //adjustResize
 	},
 	"tabBar": {
 		"color": "#000000",

src/pages/count/job/fuzzyCountDetail.vue

@@ -433,10 +433,12 @@
 			},
 
 			remove(item, index) {
+				this.scanPopupLoseFocus();
 				this.showQuestionMessage("是否要移除扫描信息?", res => {
 					if (res) {
 						this.detailSource.splice(index, 1)
 					}
+					this.scanPopupGetFocus();
 				});
 			},
 
@@ -489,6 +491,7 @@
 
 
 			showMessage(message) {
+				this.scanPopupLoseFocus();
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {
 						this.afterCloseMessage()
@@ -496,6 +499,7 @@
 				});
 			},
 			showErrorMessage(message) {
+				this.scanPopupLoseFocus();
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 						this.afterCloseMessage()

src/pages/deliver/coms/comScanDeliverPack.vue

@@ -184,8 +184,9 @@
 				this.initData();
 				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
 					"-" + this.jobContent.subList[0].workStationCode
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus();
 				}, 500)
 			},
 

src/pages/inventoryMove/coms/comMoveRecord.vue

@@ -300,6 +300,9 @@
 
 			},
 			showErrorMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packLoseFocus()
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 

src/pages/issue/coms/comScanIssuePack.vue

@@ -213,8 +213,9 @@
 				this.initData();
 				// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
 				// 	"-" + this.jobContent.subList[0].workStationCode
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus();
 				}, 500)
 			},
 
@@ -315,7 +316,10 @@
 									"状态 [" + status + "] \n" +
 									"库区 [" + areaType + "] \n" +
 									"未查找到库存余额"
-								this.showErrorMessage(hint)
+								this.showErrorMessage(hint,
+								res => {
+									that.getfocus();
+								})
 							} else if (res.data.length == 1) {
 								result.balance = res.data[0]
 
@@ -332,11 +336,16 @@
 							uni.hideLoading()
 						}).catch(error => {
 							uni.hideLoading()
-							this.showErrorMessage(error)
+							this.showErrorMessage(error,
+							res => {
+								that.getfocus();
+							})
 						})
 					}
 				} catch (e) {
-					this.showErrorMessage(e.stack)
+					this.showErrorMessage(e.stack,res => {
+								that.getfocus();
+							})
 					uni.hideLoading();
 				}
 			},

src/pages/issue/job/issueDetail.vue

@@ -481,6 +481,8 @@
 								'】不一致，是否继续提交', res => {
 									if (res) {
 										this.submit();
+									}else {
+										this.scanPopupGetFocus()
 									}
 								});
 						}
@@ -489,8 +491,8 @@
 			},
 
 			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.getfocus();
+				if (this.$refs.comScanIssuePack) {
+					this.$refs.comScanIssuePack.getfocus();
 				}
 			},
 

src/pages/issue/record/directIssue.vue

@@ -256,8 +256,13 @@
 			},
 
 			showErrorMessage(message) {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.losefocus();
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {}
+					if (res) {
+						this.scanPopupGetFocus()
+					}
 				});
 			},
 

src/pages/issue/request/issueScanRequest.vue

@@ -151,6 +151,9 @@
 				this.$refs.scanPopup.closeScanPopup();
 			},
 			showErrorMessage(message) {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.losefocus();
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 						this.scanPopupGetFocus()
@@ -158,7 +161,7 @@
 				});
 			},
 			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
+				if (this.$refs.scanPopup) {
 					this.$refs.scanPopup.getfocus();
 				}
 			},

src/pages/package/coms/comScanPackagePack.vue

@@ -171,6 +171,7 @@ import { getDirectoryItemArray } from '@/common/directory';
 					let lot = result.label.batch;
 					let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
 					if (item == undefined) {
+						this.packLoseFocus()
 						that.showErrorMessage('未查找到物料【' + itemCode + '】的翻包明细',
 							res => {
 								that.packGetFocus();

src/pages/productPutaway/job/productPutawayJob.vue

@@ -357,8 +357,14 @@
 			},
 
 			showMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packLoseFocus()
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
+						if(this.$refs.scanPopup){
+							this.$refs.scanPopup.packLoseFocus()
+						}
 
 					}
 				});

src/pages/productPutaway/record/productPutawayRecord.vue

@@ -232,7 +232,10 @@
 			},
 
 			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {});
+				this.scanPopupLoseFocus();
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					this.scanPopupGetFocus();
+				});
 			},
 			calcHandleQty() {
 				calcHandleQty(this.detailSource);
@@ -275,6 +278,12 @@
 				}
 			},
 			
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
 			scanLocationCode(location, code) {
 				this.toLocationCode = code
 				this.detailSource.forEach(item => {

src/pages/productReceipt/job/ccProductReceiptJob.vue

@@ -322,9 +322,14 @@
 			},
 
 			showMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packLoseFocus()
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						if(this.$refs.scanPopup){
+							this.$refs.scanPopup.packGetFocus()
+						}
 					}
 				});
 			},

src/pages/productReceipt/job/productReceiptJob.vue

@@ -312,9 +312,14 @@
 			},
 
 			showMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packLoseFocus()
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						if(this.$refs.scanPopup){
+							this.$refs.scanPopup.packGetFocus()
+						}
 					}
 				});
 			},

src/pages/productRecycle/job/productRecycleJobDetail.vue

@@ -442,6 +442,7 @@
 			},
 
 			showMessage(message) {
+				this.scanPopupLoseFocus();
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {
 						this.scanPopupGetFocus()
@@ -450,6 +451,7 @@
 			},
 
 			showErrorMessage(message) {
+				this.scanPopupLoseFocus();
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 						this.scanPopupGetFocus()
@@ -463,6 +465,8 @@
 					this.$refs.comMessage.showQuestionMessage(message, res => {
 						if (res) {
 							callback(res);
+						}else {
+							this.scanPopupGetFocus()
 						}
 					});
 				})

src/pages/productionReceipt/job/productionReceiptJob.vue

@@ -347,9 +347,14 @@
 			},
 
 			showMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packLoseFocus()
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						if(this.$refs.scanPopup){
+							this.$refs.scanPopup.packGetFocus()
+						}
 					}
 				});
 			},

src/pages/productionReturn/coms/comScanReturnPack.vue

@@ -159,8 +159,6 @@
 			this.scanOptions = getDetailEditRemoveOption();
 		},
 		methods: {
-
-
 			openScanPopup(content, jobcontent) {
 				this.issueRecord = [];
 				this.dataContent = content;
@@ -168,8 +166,9 @@
 				this.initData();
 				// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
 				// 	"-" + this.jobContent.subList[0].workStationCode
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					that.getfocus();
 				}, 500)
 			},
 

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -373,7 +373,7 @@
 								})
 								if (itemDetail.scaned && scanedLength == itemDetail
 									.packList.length) {
-									isExit.scanDate = new Date();
+									itemDetail.scanDate = new Date();
 									this.showMessage("箱码【" + packingNumber + "】已经扫描")
 								} else {
 									itemDetail.scaned = true;
@@ -712,6 +712,9 @@
 
 
 			showMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.losefocus();
+				}
 				setTimeout(r => {
 					this.$refs.comMessage.showMessage(message, res => {
 						if (res) {
@@ -722,6 +725,9 @@
 			},
 
 			showErrorMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.losefocus();
+				}
 				setTimeout(r => {
 					this.$refs.comMessage.showErrorMessage(message, res => {
 						if (res) {

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -350,9 +350,11 @@
 			},
 
 			showMessage(message) {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.packLoseFocus()
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-					
 						if (this.$refs.scanPopup) {
 							this.$refs.scanPopup.packGetFocus()
 						}

src/pages/purchaseReturn/job/returnDetail.vue

@@ -458,15 +458,21 @@
 			},
 
 			closeScanPopup() {
+				if(this.$refs.scanPopup){
 					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
+				if(this.$refs.scanPopup){
 					this.$refs.scanPopup.packGetFocus();
+				}
 			},
 
 			scanPopupLoseFocus() {
+				if(this.$refs.scanPopup){
 					this.$refs.scanPopup.packLoseFocus();
+				}
 			},
 
 			openDetail(item) {
@@ -474,6 +480,7 @@
 			},
 
 			showMessage(message) {
+				this.scanPopupLoseFocus();
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {
 						this.scanPopupGetFocus()
@@ -482,6 +489,7 @@
 			},
 
 			showErrorMessage(message) {
+				this.scanPopupLoseFocus();
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 						this.scanPopupGetFocus()

src/pages/purchaseReturn/record/returnRecord.vue

@@ -211,6 +211,7 @@
 					}
 				}
 				calcHandleQty(this.detailSource);
+				this.scanPopupGetFocus()
 			},
 
 			updateData() {

src/pages/putaway/job/putawayDetail.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header">
-			<veiw class="header-view">
+			<view class="header-view">
 				<view class="header_job_top">
 					<job-top :dataContent="jobContent"></job-top>
 				</view>
 				<view class="header_item">
 					申请单号 : {{jobContent.requestNumber}}
 				</view>
-			</veiw>
+			</view>
 		</view>
 
 		<view class="page-main">
@@ -364,6 +364,7 @@
 								}
 							}
 							calcTreeHandleQty(this.detailSource);
+							this.continueScan()
 							this.$forceUpdate()
 						} else {
 							var scanedLength = 0;

src/pages/putaway/job/putawayJob.vue

@@ -308,9 +308,14 @@
 
 
 			showMessage(message) {
+				if(this.$refs.scanPopup){
+					this.$refs.scanPopup.packLoseFocus()
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
+						if(this.$refs.scanPopup){
+							this.$refs.scanPopup.packGetFocus()
+						}
 					}
 				});
 			},

src/pages/query/pack.vue

@@ -119,6 +119,7 @@
 					return;
 				}
 				this.packingNumber =result.label.packingNumber ;
+				this.closeScanPopup();
 				this.tabChange(0)
 			},
 			getItemInfo(code) {
@@ -402,6 +403,9 @@
 			},
 
 			showMessage(message) {
+				if (this.$refs.scanPopup ) {
+					this.$refs.scanPopup.losefocus();
+				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
 						this.afterCloseMessage()
@@ -409,7 +413,7 @@
 				});
 			},
 			afterCloseMessage() {
-				if (this.$refs.scanPopup != undefined) {
+				if (this.$refs.scanPopup ) {
 					this.$refs.scanPopup.getfocus();
 				}
 			},

src/pages/repleinsh/coms/comScanReplishPack.vue

@@ -161,8 +161,9 @@
 				this.dataContent = content;
 				this.jobContent = jobcontent;
 				this.initData();
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus();
 				}, 500)
 			},
 
@@ -230,7 +231,9 @@
 				let location = this.fromLocationList.find(r => r == fromlocation)
 				if (location == undefined) {
 					this.fromLocationCode = ''
-					this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
+					this.showErrorMessage('发料库位【' + fromlocation + '】不存在',res=>{
+						this.getfocus();
+					})
 				}
 			},
 
@@ -246,7 +249,10 @@
 				if (this.toLocation && result.package.packUnit) {
 					let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode);
 					if (!item) {
-						this.showErrorMessage('扫描物料代码不属于该任务');
+						this.showErrorMessage('扫描物料代码不属于该任务',
+						res => {
+							this.getfocus();
+						});
 						return
 					}
 					if (result.package.packUnit !== item.packUnit) {
@@ -310,14 +316,20 @@
 				getBalanceByFilter(params).then(res => {
 					uni.hideLoading()
 					if (res.data.list.length > 0) {
-						this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额");
+						this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额",
+							res => {
+								this.getfocus();
+							});
 					} else {
 						this.queryBalance(result);
 					}
 					// callback(res.data)
 				}).catch(err => {
 					uni.hideLoading()
-					this.showErrorMessage(err.message);
+					this.showErrorMessage(err.message,
+						res => {
+							this.getfocus();
+						});
 				})
 			},
 
@@ -368,7 +380,10 @@
 									"状态 [" + status + "] \n" +
 									"库区 [" + areaType + "] \n" +
 									"未查找到库存余额"
-								this.showErrorMessage(hint)
+								this.showErrorMessage(hint,
+									res => {
+										this.getfocus();
+									})
 							} else if (res.data.length == 1) {
 								result.balance = res.data[0]
 
@@ -385,12 +400,19 @@
 							uni.hideLoading()
 						}).catch(error => {
 							uni.hideLoading()
-							this.showErrorMessage(error)
+							this.showErrorMessage(error,
+								res => {
+									this.getfocus();
+								})
 						})
 					}
 				} catch (e) {
-					this.showErrorMessage(e.stack)
 					uni.hideLoading();
+					this.showErrorMessage(e.stack,
+						res => {
+							this.getfocus();
+						})
+					
 				}
 			},
 

src/pages/scrap/job/scrapJobDetail.vue

@@ -214,7 +214,8 @@
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
 								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
 									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
-										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+										this.scanPopupLoseFocus();
+										this.$refs.comMessage.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
 											itemStatus +
 											']不一致,是否继续出库?', res => {
 												if (res) {
@@ -231,7 +232,8 @@
 												}
 											});
 									} else {
-										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+										this.scanPopupLoseFocus();
+										this.$refs.comMessage.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
 											itemStatus +
 											']不一致,不允许转移!', res => {
 												this.scanPopupGetFocus();
@@ -297,6 +299,7 @@
 				})
 				if (str) {
 					str += '，是否确认提交?'
+					
 					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
 						if (res) {
 							this.submitJob()

src/pages/stockUp/coms/comScanStockUpPack.vue

@@ -182,8 +182,9 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 				this.initData();
 				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
 					"-" + this.jobContent.subList[0].workStationCode
-				setTimeout(res => {
 				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus()
 				}, 500)
 			},
 
@@ -420,17 +421,16 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				this.calcBatchHandleQty(batch);
-				this.getfocus();
 			},
 
 			getfocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan ) {
 					this.$refs.comscan.getfocus();
 				}
 			},
 
 			losefocus() {
-				if (this.$refs.comscan != undefined) {
+				if (this.$refs.comscan) {
 					this.$refs.comscan.losefocus();
 				}
 			},