直接翻包--缓存库位功能

src/api/httpRequest3.js

@@ -36,6 +36,7 @@ function service(options = {}) {
 							}else {
 								if(res.data.code==401){
 									uni.clearStorageSync()
+									uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位
 									removeToken();
 									uni.reLaunch({
 										url: '/pages/login/index'

src/mycomponents/scan/winScanLocation.vue

@@ -19,6 +19,8 @@
 			</view>
 		</view>
 	</uni-popup>
+	<!-- 模拟扫描功能 -->
+	<win-com-scan  v-show="false" ref="comscansimulate" @getResult="getScanResult" :clearResult="true" :boxFocus="true" :isShowHistory="false" headerType=""></win-com-scan>
 	<comMessage ref="comMessage"></comMessage>
 </template>
 
@@ -67,8 +69,15 @@
 					this.$refs.popup.open('bottom')
 				}, 500)
 			},
+			openScanPopupSimulate(location) {
+				this.$refs.comscansimulate.setItemCodeSimulate(location)
+				this.$refs.comscansimulate.clickScanMsg();
+			},
 			closeScanPopup() {
-				this.$refs.popup.close()
+				if(this.$refs.popup){
+					this.$refs.popup.close()
+				}
+				
 			},
 			scanClick() {
 				this.$refs.scan.clickScanMsg();
@@ -77,6 +86,7 @@
 				this.$refs.scan.clearScanValue();
 			},
 			getScanResult(result) {
+				
 				uni.showLoading({
 					title: '扫描中...',
 					mask: true
@@ -94,6 +104,7 @@
 				}
 				
 				getBasicLocationByCode(this.code).then(res => {
+					
 					uni.hideLoading();
 					if (res.data.total > 0) {
 						let result = res.data.list[0];
@@ -142,10 +153,14 @@
 				return isPass
 			},
 			getfocus() {
-				this.$refs.scan.getfocus();
+				if(this.$refs.scan){
+					this.$refs.scan.getfocus();
+				}
 			},
 			losefocus() {
-				this.$refs.scan.losefocus();
+				if(this.$refs.scan){
+					this.$refs.scan.losefocus();
+				}
 			},
 			showErrorMessage(message) {
 				setTimeout(r => {

src/mycomponents/scan/winScanPackAndLocation.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-popup ref="popup" @change="change" :mask-click="false">
+		<uni-popup ref="popup" @change="change" :mask-click="false" >
 			<view class="popup_box">
 				<view class="pop_title uni-flex space-between">
 					<view class="" style="font-size: 35rpx;">
@@ -28,7 +28,7 @@
 
 						<view v-if='allowModifyLocation'>
 							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请扫描来源库位"
-								@confirm="" style='height: 30rpx;border:1px solid #fff ;'></uni-combox>
+								@confirm="handleConfirm" style='height: 30rpx;border:1px solid #fff ;'></uni-combox>
 						</view>
 						<view v-else>
 							<text style="padding: 5px">
@@ -47,7 +47,8 @@
 		</uni-popup>
 		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
 		<!-- 模拟扫描功能 -->
-		<win-com-scan v-show="false" ref="comscansimulate"  @getResult="getScanResult" :headerType="headerType" :isShowHistory="false" :clearResult="true"></win-com-scan>
+		<win-com-scan v-show="false" ref="comscansimulate" @getResult="getScanResult" :headerType="headerType"
+			:isShowHistory="false" :clearResult="true"></win-com-scan>
 
 	</view>
 	<comMessage ref="comMessage"></comMessage>
@@ -73,7 +74,7 @@
 	} from '@/common/directory.js';
 	export default {
 		name: 'winScanPack',
-		emits: ["getResult", "close", "getCountScanResult"],
+		emits: ["getResult", "close", "getCountScanResult", "confirm"],
 		components: {
 			winComScan,
 			balanceSelect
@@ -109,7 +110,7 @@
 				type: Boolean,
 				default: true
 			},
-			balanceFromInventoryStatuses:{//是否传fromInventoryStatuses
+			balanceFromInventoryStatuses: { //是否传fromInventoryStatuses
 				type: Boolean,
 				default: true
 			}
@@ -131,15 +132,20 @@
 				inventoryStatus: [],
 				managementPrecision: '',
 				fromInventoryStatuses: "",
-				isCheck: false
+				isCheck: false,
 			}
 		},
 		created() {
 
 		},
 		methods: {
+			
+			handleConfirm() {
+				this.$emit('confirm', this.fromLocationCode)
+			},
 			//直接扫描
 			openScanPopupForType(fromLocationCode, businessType) {
+
 				this.businessType = businessType;
 				this.fromLocationCode = fromLocationCode;
 				if (fromLocationCode != '') {
@@ -150,9 +156,11 @@
 				this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
 				this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
 				this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.fromLocationAreaTypeList); //出库库区
-				setTimeout(res => {
+				if (!this.show) {
-					this.$refs.popup.open('bottom')
+					setTimeout(res => {
-				}, 500)
+						this.$refs.popup.open('bottom')
+					}, 500)
+				}
 			},
 
 			//在任务中扫描
@@ -176,7 +184,7 @@
 				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
 			},
 			//模拟扫描
-			openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent,item) {
+			openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent, item) {
 				this.fromLocationCode = fromLocationCode;
 				this.fromLocationList = fromLocationList;
 				if (fromLocationCode != '') {
@@ -197,12 +205,12 @@
 				this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
 				this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
 				this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
-				 let timer = setTimeout(res => {
+				let timer = setTimeout(res => {
-					 if(timer){
+					if (timer) {
-						 clearTimeout(timer)
+						clearTimeout(timer)
-					 }
+					}
-					 this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
+					this.$refs.comscansimulate.setItemCodeSimulate(item.copyContent)
-					 this.$refs.comscansimulate.clickScanMsg();
+					this.$refs.comscansimulate.clickScanMsg();
 				}, 500)
 
 
@@ -295,7 +303,8 @@
 						// 	mask: true
 						// })
 						// 采购上架任务--大哥让去掉 fromInventoryStatuses
-						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.balanceFromInventoryStatuses?this.fromInventoryStatuses:undefined,
+						getBalanceByManagementPrecision(result.label, this.fromLocationCode, this
+							.balanceFromInventoryStatuses ? this.fromInventoryStatuses : undefined,
 							res => {
 								uni.hideLoading();
 								if (res.success) {
@@ -319,9 +328,9 @@
 				if (this.allowNullBalance) {
 					this.allowNoneBalance(datas);
 				} else if (this.noShowBalanceMessage) {
-					if(Array.isArray(datas)){
+					if (Array.isArray(datas)) {
 						this.countCallBack(datas[0]);
-					}else{
+					} else {
 						this.countCallBack(datas);
 					}
 				} else {
@@ -385,7 +394,7 @@
 
 			//盘点回调
 			countCallBack(datas) {
-				if(this.$refs.comscan){
+				if (this.$refs.comscan) {
 					this.$refs.comscan.clear();
 				}
 				//返回标签信息、库存信息和管理模式
@@ -401,7 +410,7 @@
 			},
 
 			packCallBack(item) {
-				if(this.$refs.comscan){
+				if (this.$refs.comscan) {
 					this.$refs.comscan.clear();
 				}
 				//返回标签信息、库存信息和管理模式

src/pages/package/record/overPackageRecord.vue

@@ -60,8 +60,8 @@
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false">
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="true" @confirm="handleConfirm">
-		</win-scan-pack-and-location>
+		</win-scan-pack-and-location >
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
 		<comMessage ref="comMessage"></comMessage>
@@ -139,7 +139,7 @@
 				itemCode: ""
 			};
 		},
-		onLoad(option) {
+		onShow(){
 			var typeCode = "OverPackage"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
@@ -209,7 +209,10 @@
 				this.toPackQty = pack.packQty;
 				this.toPackUnitShow = e[0].label
 			},
-
+			//修改库位
+			handleConfirm(fromLocationCode){
+				this.$refs.scanLocationCode.openScanPopupSimulate(fromLocationCode)
+			},
 			getScanResult(result) {
 				let balance = result.balance;
 				let label = result.label;
@@ -289,7 +292,13 @@
 			},
 			showFromLocationPopup() {
 				this.$nextTick(() => {
-					this.$refs.scanLocationCode.openScanPopup();
+					let overPackageRecord = uni.getStorageSync('overPackageRecord')
+					
+					if(overPackageRecord){
+						this.$refs.scanLocationCode.openScanPopupSimulate(overPackageRecord)
+					}else{
+						this.$refs.scanLocationCode.openScanPopup();
+					}
 				})
 
 			},
@@ -429,6 +438,9 @@
 				this.scanPopupGetFocus();
 			},
 			getLocation(location, code) {
+				if(code){
+					uni.setStorageSync('overPackageRecord', code)
+				}
 				this.getFromLocationCode(location, code)
 			},
 			getFromLocationCode(location, code) {

src/store/modules/user.js

@@ -118,6 +118,7 @@ const user = {
 					commit('SET_ID',[])
 					storage.removeStorage(storage.constant.token)
 					storage.clearStorage()
+					uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位
 					resolve()
 				}).catch(error => {
 					reject(error)