diff --git a/api/httpRequest3.js b/api/httpRequest3.js
index aeec1a3e..49135adb 100644
--- a/api/httpRequest3.js
+++ b/api/httpRequest3.js
@@ -27,15 +27,15 @@ function service(options = {}) {
 							if(res.data.code==0){
 								resolve(res.data);
 							}else {
-								reject("系统:"+res.data.msg)
+								reject("系统异常:"+res.data.msg)
 							}
 							
 						}else {
-							reject("系统:"+ res.data.msg)
+							reject("系统异常:"+ res.data.msg)
 						}
 						
 					} else {
-						reject("系统:"+res.data.msg)
+						reject("系统异常:"+res.data.msg)
 					}
 				};
 				options.fail = (error) => {
@@ -47,7 +47,7 @@ function service(options = {}) {
 					} else if (message.includes('Request failed with status code')) {
 					  message = '接口' + message.substr(message.length - 3) + '异常'
 					}
-					reject("系统:"+message);
+					reject("系统异常:"+message);
 				};
 				uni.request(options);
 			});
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index 1999ba99..3923c217 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -13,7 +13,7 @@
 			<view>
 				<!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
 				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
-					:isShowStdPack="false"></recommend-qty>
+					:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
 				</compare-qty>
@@ -69,6 +69,10 @@
 				type: Boolean,
 				default: false
 			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
 
 			locationTitle: {
 				type: String,
diff --git a/mycomponents/scan/winScanPackAndPosition.vue b/mycomponents/scan/winScanPackAndPosition.vue
index 8ee30ffa..b3dab933 100644
--- a/mycomponents/scan/winScanPackAndPosition.vue
+++ b/mycomponents/scan/winScanPackAndPosition.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<uni-popup ref="popup" @change="change" @maskClick="closeScanPopup()">
+		<uni-popup ref="popup"  @maskClick="closeScanPopup()">
 			<view class="popup_box">
 				<view class="pop_title uni-flex space-between">
 					<view class="" style="font-size: 35rpx;">
@@ -178,24 +178,24 @@
 				this.productionLineName = e[1].label
 				this.workStationName = e[2].label
 			
-				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
-				if (shop != undefined && shop.children != undefined) {
-					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
-					if (prodLine != undefined && prodLine.children != undefined) {
-						let station = prodLine.children.find(r => r.value == this.workStationCode);
-						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
-							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
-							return;
-						} else {
-							this.rawLocationCode = station.rawLocationCode;
-							this.fgLocationCode = station.fgLocationCode;
-						}
-					} else {
-						this.showErrorMessage("生产线-工位基础信息维护错误")
-					}
-				} else {
-					this.showErrorMessage("车间-生产线基础信息维护错误")
-				}
+				// let shop = this.positionList.find(shop => shop.value == this.workshopCode);
+				// if (shop != undefined && shop.children != undefined) {
+				// 	let prodLine = shop.children.find(line => line.value == this.productionLineCode);
+				// 	if (prodLine != undefined && prodLine.children != undefined) {
+				// 		let station = prodLine.children.find(r => r.value == this.workStationCode);
+				// 		if (station.rawLocationCode == '' && station.rawLocationCode == null) {
+				// 			this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
+				// 			return;
+				// 		} else {
+				// 			this.rawLocationCode = station.rawLocationCode;
+				// 			this.fgLocationCode = station.fgLocationCode;
+				// 		}
+				// 	} else {
+				// 		this.showErrorMessage("生产线-工位基础信息维护错误")
+				// 	}
+				// } else {
+				// 	this.showErrorMessage("车间-生产线基础信息维护错误")
+				// }
 			},
 		}
 	}
diff --git a/mycomponents/scan/winScanProdline.vue b/mycomponents/scan/winScanProdline.vue
deleted file mode 100644
index e174fcfd..00000000
--- a/mycomponents/scan/winScanProdline.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-	<uni-popup ref="popup" :maskClick='false'>
-		<view class="popup_box">
-			<view class="pop_title uni-flex space-between">
-				<view class="" style="font-size: 35rpx;">
-					扫描生产线
-				</view>
-				<view>
-					<image class=" icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()">
-					</image>
-				</view>
-			</view>
-			<view class="">
-				<view class="">
-					<win-com-scan ref="scan" @getResultult="getScanResult" placeholder='生产线' :clearResult="false"
-						:boxFocus="true" :isShowHistory="false">
-					</win-com-scan>
-				</view>
-			</view>
-		</view>
-	</uni-popup>
-	<comMessage ref="comMessage"></comMessage>
-</template>
-
-<script>
-	import {
-		getProductionlineByCode,
-	} from '@/api/request.js';
-	import {
-		getListLocationTypeDesc,
-		checkDirectoryItemExist
-	} from '@/common/directory.js';
-	import winComScan from '@/mycomponents/scan/winComScan.vue'
-	import comMessage from '@/mycomponents/common/comMessage.vue'
-	export default {
-		components: {
-			winComScan,
-			comMessage
-		},
-		emits: ["getProdLine"],
-		props: {},
-		data() {
-			return {
-				code: '',
-				prodLine: {}
-			}
-		},
-
-		created() {
-
-		},
-		methods: {
-			openScanPopup() {
-				this.$refs.popup.open('bottom')
-			},
-			closeScanPopup() {
-				this.$refs.popup.close()
-			},
-			scanClick() {
-				this.$refs.scan.clickScanMsg();
-			},
-			cancelClick() {
-				this.$refs.scan.clearScanValue();
-			},
-			getScanResult(result) {
-				uni.showLoading({
-					title: '扫描中...',
-					mask: true
-				});
-				let label = result.label;
-				if (label.barType === 'QRCode') {
-					this.code = label.ProdLineCode;
-				} else if (label.barType === 'BarCode') {
-					this.code = label.Code;
-				}
-				getProductionlineByCode(this.code).then(res => {
-					if (res.data.total > 0) {
-						this.prodLine = res.data.list[0];
-						this.callBack();
-					} else {
-						this.showErrorMessage('未查询到生产线[' + this.code + ']')
-					}
-					uni.hideLoading();
-				}).catch(error => {
-					uni.hideLoading();
-					this.showErrorMessage(error)
-				})
-			},
-			callBack() {
-				this.closeScanPopup();
-				this.$emit("getProdLine", this.prodLine, this.code);
-			},
-			getfocus() {
-				this.$refs.scan.getfocus();
-			},
-			losefocus() {
-				this.$refs.scan.losefocus();
-			},
-			showErrorMessage(message) {
-				setTimeout(r => {
-					this.losefocus();
-					this.$refs.comMessage.showErrorMessage(message, res => {
-						this.code = '';
-						this.getfocus();
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-</style>
diff --git a/pages.json b/pages.json
index 124bc585..20fed244 100644
--- a/pages.json
+++ b/pages.json
@@ -14,7 +14,14 @@
 			"path": "pages/message/index",
 			"style": {
 				"navigationBarTitleText": "消息",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+				
+				
+					]
+				}
 			}
 		},
 
@@ -35,17 +42,12 @@
 				"navigationBarTitleText": "登录",
 				"titleNView": {
 					// "autoBackButton": "true",
-					// "buttons": [
-					// 	// 右边按钮
-					// 	{
-					// 		"float": "right",
-					// 		"fontSize": "52rpx", //按钮上文字的大小
-					// 		"text": "\ue706",
-					// 		"fontSrc": "/static/ali_icon/iconfont.ttf"
-					// 	}
-
-					// ]
+					"buttons": [
+				
+				
+					]
 				}
+				
 			}
 		},
 		{
@@ -1704,7 +1706,14 @@
 			"path": "pages/setter/index",
 			"style": {
 				"navigationBarTitleText": "设置",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+				
+				
+					]
+				}
 			}
 		},
 		{
diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index b5d9c19c..375e14b7 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -288,11 +288,15 @@
 				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
 			},
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.packGetFocus();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.packGetFocus();
+				}
 			},
 
 			getScanResult(result) {
diff --git a/pages/count/record/countRecord.vue b/pages/count/record/countRecord.vue
index 9e6dac39..8f7e4bc7 100644
--- a/pages/count/record/countRecord.vue
+++ b/pages/count/record/countRecord.vue
@@ -116,7 +116,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message );
+					this.showErrorMessage(res.message)
 				}
 			});
 			
@@ -218,11 +218,15 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.packGetFocus();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.packGetFocus();
+				}
 			},
 
 			getScanResult(result) {
diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
index a0e68845..04b46221 100644
--- a/pages/customerReturn/job/returnDetail.vue
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -466,11 +466,15 @@
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.packGetFocus();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.packGetFocus();
+				}
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.packLoseFocus();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.packLoseFocus();
+				}
 			},
 
 			afterCloseMessage() {
diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue
index 02ed207b..e4f854e6 100644
--- a/pages/customerReturn/record/returnRecord.vue
+++ b/pages/customerReturn/record/returnRecord.vue
@@ -218,11 +218,15 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanLocationCode(location, code) {
@@ -388,15 +392,18 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.fromLocationCode = '';
-					this.subList = [];
-					this.detailSource = [];
-					this.toLocationCode = '';
-					this.dataContent = {}
-					this.toWarehouseCode = ""
-
+					this.clearData()
 				})
 			},
+			
+			clearData(){
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
 
 			updateData() {
 				this.calcHandleQty();
diff --git a/pages/customerReturn/request/customerReturnRequest.vue b/pages/customerReturn/request/customerReturnRequest.vue
index fa2d29f1..a85fd3c7 100644
--- a/pages/customerReturn/request/customerReturnRequest.vue
+++ b/pages/customerReturn/request/customerReturnRequest.vue
@@ -33,9 +33,7 @@
 		goHome,
 		updateTitle
 	} from '@/common/basic.js';
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
+	
 	import {
 		getCustomerReturnRequestList,
 	} from '@/api/request2.js';
diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue
index 9a9af942..f4e9945e 100644
--- a/pages/deliver/record/deliverRecord.vue
+++ b/pages/deliver/record/deliverRecord.vue
@@ -251,11 +251,15 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanLocationCode(location, code) {
@@ -423,15 +427,18 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.fromLocationCode = '';
-					this.subList = [];
-					this.detailSource = [];
-					this.toLocationCode = '';
-					this.dataContent = {}
-					this.toWarehouseCode = ""
-
+					this.clearData();
 				})
 			},
+			
+			clearData(){
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
 
 			updateData() {
 				this.calcHandleQty();
diff --git a/pages/deliver/request/deliverRequest.vue b/pages/deliver/request/deliverRequest.vue
index 2554664d..4c0f5792 100644
--- a/pages/deliver/request/deliverRequest.vue
+++ b/pages/deliver/request/deliverRequest.vue
@@ -33,9 +33,6 @@
 		goHome,
 		updateTitle
 	} from '@/common/basic.js';
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
 	import {
 		getDeliverRequestList,
 	} from '@/api/request2.js';
diff --git a/pages/inventoryMove/coms/comMove.vue b/pages/inventoryMove/coms/comMove.vue
index 8e4959a8..976003c0 100644
--- a/pages/inventoryMove/coms/comMove.vue
+++ b/pages/inventoryMove/coms/comMove.vue
@@ -271,15 +271,17 @@
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.fromLocationCode = '';
-					this.subList = [];
-					this.detailSource = [];
-					this.toLocationCode = '';
-					this.dataContent = {}
-					this.toWarehouseCode = ""
-			
+					this.clearData()
 				})
 			},
+			clearData(){
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
 			commit() {
 				
 				if (this.toLocationCode == "") {
diff --git a/pages/issue-按批次推荐/job/issueDetail.vue b/pages/issue-按批次推荐/job/issueDetail.vue
index 5d5578af..14c05d03 100644
--- a/pages/issue-按批次推荐/job/issueDetail.vue
+++ b/pages/issue-按批次推荐/job/issueDetail.vue
@@ -597,10 +597,11 @@
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
-
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index 0a7c68c6..522375cc 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -104,7 +104,7 @@
 					this.toInventoryStatuses = res.toInventoryStatuses
 					this.goScan(true)
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 
diff --git a/pages/issue/request/issueRequest.vue b/pages/issue/request/issueRequest.vue
index 62eda712..8d7793ce 100644
--- a/pages/issue/request/issueRequest.vue
+++ b/pages/issue/request/issueRequest.vue
@@ -36,9 +36,6 @@
 		clearTirmAndWrap
 	} from '@/common/basic.js';
 
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
 	import {
 		getIssueRequestList,
 		issueRequestClose,
diff --git a/pages/login/index.vue b/pages/login/index.vue
index f49e3f31..c2553f96 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -67,7 +67,7 @@
 								style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" />
 						</view> -->
 						<view class="uni-input-wrapper">
-							<input class="" style="height: 80rpx; background-color: #EEEEEE;margin-right: 20rpx;"
+							<input class="" style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;"
 								placeholder="请输入验证码" type="number" v-model="code" />
 						</view>
 						<view class="display: flex; align-items: center; text-center">
@@ -143,6 +143,7 @@
 					url:"/pages/config/config"
 				})
 			} 
+			
 		},
 		onLoad() {
 			getCaptchaImage().then(res => {
diff --git a/pages/package/record/mergePackageRecord.vue b/pages/package/record/mergePackageRecord.vue
index 9cf29be0..5f69eb74 100644
--- a/pages/package/record/mergePackageRecord.vue
+++ b/pages/package/record/mergePackageRecord.vue
@@ -35,7 +35,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>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false">
+		</win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationTypeList="fromlocationTypeList"></win-scan-location>
 		<com-message ref="comMessage"></com-message>
@@ -46,7 +47,7 @@
 	import {
 		goHome
 	} from '@/common/basic.js';
-	
+
 	import {
 		getInventoryStatusDesc,
 		getDirectoryItemArray
@@ -118,7 +119,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 		},
@@ -134,7 +135,7 @@
 		onPullDownRefresh() {},
 
 		mounted() {},
-		
+
 		methods: {
 			scanPopupPack() {
 				this.$refs.scanPopupPack.openScanPopup();
@@ -219,11 +220,15 @@
 
 			},
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanLocationCode(location, code) {
diff --git a/pages/package/record/overPackageRecord.vue b/pages/package/record/overPackageRecord.vue
index eef1d1d0..a0157c9a 100644
--- a/pages/package/record/overPackageRecord.vue
+++ b/pages/package/record/overPackageRecord.vue
@@ -30,7 +30,8 @@
 
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false"></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false">
+		</win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationTypeList="fromlocationTypeList"></win-scan-location>
 		<win-scan-button @goScan='showScanPopupPack'></win-scan-button>
@@ -43,7 +44,7 @@
 	import {
 		goHome
 	} from '@/common/basic.js';
-	
+
 	import {
 		getInventoryStatusDesc,
 		getDirectoryItemArray
@@ -243,11 +244,15 @@
 
 			},
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanLocationCode(location, code) {
diff --git a/pages/package/record/splitPackageRecord.vue b/pages/package/record/splitPackageRecord.vue
index 4c70c950..a343480a 100644
--- a/pages/package/record/splitPackageRecord.vue
+++ b/pages/package/record/splitPackageRecord.vue
@@ -29,7 +29,8 @@
 			</view>
 		</view>
 
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false"></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' allowModifyLocation="false">
+		</win-scan-pack-and-location>
 		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
 			:locationTypeList="fromlocationTypeList"></win-scan-location>
 		<win-scan-button @goScan='showScanPopupPack'></win-scan-button>
@@ -42,7 +43,7 @@
 	import {
 		goHome,
 	} from '@/common/basic.js';
-	
+
 	import {
 		getInventoryStatusDesc,
 		getDirectoryItemArray
@@ -243,11 +244,15 @@
 
 			},
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanLocationCode(location, code) {
diff --git a/pages/pallet/record/bindPalletRecord.vue b/pages/pallet/record/bindPalletRecord.vue
index 6cfafc89..076051be 100644
--- a/pages/pallet/record/bindPalletRecord.vue
+++ b/pages/pallet/record/bindPalletRecord.vue
@@ -111,7 +111,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 		},
diff --git a/pages/pallet/record/unBindPalletRecord.vue b/pages/pallet/record/unBindPalletRecord.vue
index c40b08d9..d99d928a 100644
--- a/pages/pallet/record/unBindPalletRecord.vue
+++ b/pages/pallet/record/unBindPalletRecord.vue
@@ -49,7 +49,7 @@
 	import {
 		goHome
 	} from '@/common/basic.js';
-	
+
 	import {
 		getDirectoryItemArray
 	} from '@/common/directory.js';
@@ -242,15 +242,19 @@
 
 			},
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+					this.$refs.scanPopup.closeScanPopup();
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.losefocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
 			},
 
 
@@ -261,7 +265,7 @@
 				}
 			},
 
-		 
+
 			showMessage(message) {
 				setTimeout(r => {
 					this.scanPopupLoseFocus();
diff --git a/pages/productDismantle/record/productDismantleRecord.vue b/pages/productDismantle/record/productDismantleRecord.vue
index 462309cb..a7a66579 100644
--- a/pages/productDismantle/record/productDismantleRecord.vue
+++ b/pages/productDismantle/record/productDismantleRecord.vue
@@ -119,7 +119,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 		},
@@ -214,11 +214,15 @@
 
 			},
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanLocationCode(location, code) {
diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue
index 99c8ffd8..a148423a 100644
--- a/pages/productPutaway/job/productPutawayDetail.vue
+++ b/pages/productPutaway/job/productPutawayDetail.vue
@@ -39,7 +39,7 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' ></win-scan-pack-and-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 
 		<com-message ref="comMessage"></com-message>
diff --git a/pages/productPutaway/record/productPutawayRecord.vue b/pages/productPutaway/record/productPutawayRecord.vue
index f1dbbdca..1ffe223d 100644
--- a/pages/productPutaway/record/productPutawayRecord.vue
+++ b/pages/productPutaway/record/productPutawayRecord.vue
@@ -18,13 +18,13 @@
 				</scroll-view>
 			</view>
 
-			
+
 
 			<view class="page-footer">
 				<view class="uni-flex u-col-center space-between padding_10"
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
-						<requiredLocation   title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
 							:locationTypeList="tolocationTypeList"></requiredLocation>
 					</view>
 					<view class=" uni-flex uni-row">
@@ -43,7 +43,6 @@
 </template>
 
 <script>
-	
 	import {
 		productPutawayRecordSubmit
 	} from '@/api/request2.js';
@@ -54,12 +53,12 @@
 	import {
 		getPrecisionStrategyList
 	} from '@/common/balance.js';
-	
+
 	import {
 		getInventoryStatusDesc,
 		getDirectoryItemArray
 	} from '@/common/directory.js';
-	
+
 	import {
 		getBusinessType,
 		createItemInfo,
@@ -76,8 +75,8 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
-	
-	
+
+
 	export default {
 		components: {
 			winScanButton,
@@ -105,7 +104,7 @@
 				inInventoryStatus: "", //目标入库库存状态
 				outInventoryStatus: "", //来源出库库存状态
 				businessType: {},
-				managementList:[]
+				managementList: []
 			};
 		},
 		onLoad(option) {
@@ -120,7 +119,7 @@
 					this.showErrorMessage(res.message)
 				}
 			});
-			
+
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -133,8 +132,7 @@
 
 		onPullDownRefresh() {},
 
-		mounted() {
-		},
+		mounted() {},
 		methods: {
 			getScanResult(result) {
 				let balance = result.balance;
@@ -214,11 +212,15 @@
 
 			},
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanLocationCode(location, code) {
@@ -238,7 +240,7 @@
 					this.showMessage("请先选择目标库位")
 					return;
 				}
-				
+
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
 					//查询管理模式
 					uni.showLoading({
@@ -247,37 +249,37 @@
 					});
 					this.managementList = [];
 					var precisionStrategParams = this.setPrecisionStrategParams()
-					
+
 					getPrecisionStrategyList(precisionStrategParams, res => {
 						if (res.success) {
 							this.managementList = res.list;
 							var params = this.setParams()
 							console.log("提交" + JSON.stringify(params))
-								productPutawayRecordSubmit(params).then(res => {
-									uni.hideLoading()
-									if (res.data) {
-										this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
-									} else {
-										this.showErrorMessage("提交失败[" + res.msg + "]")
-									}
-								}).catch(error => {
-									uni.hideLoading()
-									this.showErrorMessage(error)
-								})
-				
+							productPutawayRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成制品上架记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
 						} else {
 							uni.hideLoading();
 							this.showErrorMessage(res.message);
 						}
-				
+
 					})
-				
+
 				} else {
 					this.showErrorMessage("没有要提交的数据,请先扫描")
 				}
 
 			},
-			
+
 			setPrecisionStrategParams() {
 				var itemList = []
 				this.detailSource.forEach(item => {
@@ -298,15 +300,15 @@
 								}
 								itemList.push(result)
 							}
-			
+
 						}
 					})
 				})
 				return itemList;
 			},
-			
+
 			setParams() {
-			
+
 				var subList = []
 				var creator = this.$store.state.user.id
 				this.detailSource.forEach(item => {
@@ -318,21 +320,21 @@
 							detail.itemName = detail.package.itemName;
 							detail.itemDesc1 = detail.package.itemDesc1;
 							detail.itemDesc2 = detail.package.itemDesc2;
-							
+
 							detail.inventoryStatus = detail.inventoryStatus;
-			
+
 							detail.fromPackingNumber = info.packingNumber;
 							detail.toPackingNumber = info.packingNumber;
-			
+
 							detail.fromContainerNumber = detail.containerNumber;
 							detail.toContainerNumber = detail.containerNumber
-			
+
 							detail.fromBatch = info.batch;
 							detail.toBatch = info.batch;
-			
+
 							detail.fromLocationCode = detail.locationCode;
 							detail.toLocationCode = detail.toLocationCode;
-			
+
 							subList.push(detail)
 						}
 					})
@@ -341,7 +343,7 @@
 				this.dataContent.creator = creator;
 				return this.dataContent;
 			},
-		
+
 
 
 			showMessage(message) {
@@ -381,14 +383,16 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.fromLocationCode = '';
-					this.subList = [];
-					this.detailSource = [];
-					this.toLocationCode = '';
-					this.dataContent = {}
-
+					this.clearData();
 				})
 			},
+			clearData(){
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+			},
 
 			updateData() {
 				this.calcHandleQty();
diff --git a/pages/productPutaway/request/putawayRequest.vue b/pages/productPutaway/request/putawayRequest.vue
index ab696cd3..b76a4c2c 100644
--- a/pages/productPutaway/request/putawayRequest.vue
+++ b/pages/productPutaway/request/putawayRequest.vue
@@ -36,9 +36,7 @@
 		updateTitle,
 		clearTirmAndWrap
 	} from '@/common/basic.js';
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
+
 	import {
 		getProductPutawayRequestList,
 		productPutawayRequestClose,
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index 04d280db..7dd8e04c 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -14,8 +14,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
-							@remove="updateData" @updateData="updateData" 
-							:locationTypeList='tolocationTypeList'>
+							@remove="updateData" @updateData="updateData" :locationTypeList='tolocationTypeList'>
 						</comProductDetailCard>
 					</view>
 					<u-line />
@@ -27,8 +26,9 @@
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
-					<requiredLocation title="收货库位" :locationCode="toLocationCode" :isShowEdit="jobContent.allowModifyLocation=='TRUE'"
-						@getLocation='scanLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation>
+					<requiredLocation title="收货库位" :locationCode="toLocationCode"
+						:isShowEdit="jobContent.allowModifyLocation=='TRUE'" @getLocation='scanLocationCode'
+						:locationTypeList="tolocationTypeList"></requiredLocation>
 				</view>
 				<view class=" uni-flex uni-row">
 					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -46,7 +46,7 @@
 	import {
 		getManagementPrecisions
 	} from '@/common/balance.js';
-	
+
 	import {
 		getProductReceiptJobDetail,
 		takeProductReceiptJob,
@@ -58,7 +58,7 @@
 		navigateBack,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
-	
+
 	import {
 		getDirectoryItemArray,
 		getInventoryStatusName
@@ -79,8 +79,8 @@
 	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 	import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
-	
-	
+
+
 	export default {
 		name: 'receipt_detail',
 		components: {
@@ -214,9 +214,9 @@
 					if (itemDetail == undefined) {
 						this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在任务列表中")
 					} else {
-						if(itemDetail.scaned){
+						if (itemDetail.scaned) {
 							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
-						}else {
+						} else {
 							itemDetail.scaned = true;
 							itemDetail.handleQty = Number(result.label.qty);
 							itemDetail.toLocationCode = this.toLocationCode;
@@ -225,7 +225,7 @@
 							this.continueScan()
 							this.$forceUpdate()
 						}
-						
+
 					}
 				}
 			},
@@ -265,19 +265,19 @@
 					})
 				})
 			},
-			
+
 			checkLocation() {
 				var isPass = true;
-				if (this.toLocationCode == ""||this.toLocationCode ==null) {
+				if (this.toLocationCode == "" || this.toLocationCode == null) {
 					this.showMessageHint('请扫描收货库位', callback => {
 						this.$refs.comScanLocation.showLocation();
 					})
-			
+
 					return isPass = false;
 				}
 				return isPass;
 			},
-			
+
 			showMessageHint(hint, callback) {
 				this.$refs.comMessage.showErrorMessage(hint, res => {
 					if (res) {
@@ -286,37 +286,37 @@
 				});
 			},
 
-			 commit() {
+			commit() {
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
 				}
-					//校验库位、
+				//校验库位、
 				if (!this.checkLocation()) {
 					return
 				}
-				
-				
+
+
 				//扫描数量和任务数量相等，直接提交
-				if(this.scanCount == this.subList.length){
+				if (this.scanCount == this.subList.length) {
 					this.submitJob();
-				}else if(this.scanCount <this.subList.length){
+				} else if (this.scanCount < this.subList.length) {
 					//扫描数量小于任务数量，判断是否允许部分提交
-					if(this.jobContent.allowPartialComplete == "TRUE"){
+					if (this.jobContent.allowPartialComplete == "TRUE") {
 						//提交
 						this.submitJob();
-					}else {
+					} else {
 						//不允许部分提交，提示
 						this.showMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount + "]总共[" + this.subList
 							.length +
 							"]");
 					}
 				}
-				
+
 			},
-			
-			submitJob(){
+
+			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -325,11 +325,11 @@
 				this.detailSource.forEach(item => {
 					itemCodes.push(item.itemCode)
 				})
-				getManagementPrecisions(itemCodes,this.toLocationCode, res => {
+				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
 					if (res.success) {
 						this.managementList = res.list;
 						var params = this.setParams();
-						 console.log("提交参数",JSON.stringify(params));
+						console.log("提交参数", JSON.stringify(params));
 						productReceiptJobsubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
@@ -347,37 +347,41 @@
 					}
 				});
 			},
-			
+
 			setParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
-				
+
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
 							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
 								detail.packingNumber, detail.batch);
-								detail.toPackingNumber = info.packingNumber;
-								detail.toBatch = info.batch;
-								detail.toContainerNumber = '';
-								detail.toInventoryStatus =detail.inventoryStatus
-								detail.toLocationCode = this.toLocationCode
+							detail.toPackingNumber = info.packingNumber;
+							detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							detail.toInventoryStatus = detail.inventoryStatus
+							detail.toLocationCode = this.toLocationCode
 							subList.push(detail)
 						}
 					})
 				})
 				this.jobContent.subList = subList
-				this.jobContent.creator =creator;
+				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
 
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.losefocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
 			},
 
 			showMessage(message) {
diff --git a/pages/productReceipt/record/productReceiptRecord.vue b/pages/productReceipt/record/productReceiptRecord.vue
index e427ad99..ef7d4ca4 100644
--- a/pages/productReceipt/record/productReceiptRecord.vue
+++ b/pages/productReceipt/record/productReceiptRecord.vue
@@ -8,8 +8,8 @@
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
-							<com-product-record :dataContent="item" :index="index" 
-								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							<com-product-record :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
 							</com-product-record>
 						</view>
 						<u-line />
@@ -30,7 +30,7 @@
 								<u-select v-model="show" mode="mutil-column-auto" :list="positionList"
 									@confirm="confirmSelect"></u-select>
 							</view>
-						
+
 						</view>
 					</view>
 					<view class=" uni-flex uni-row">
@@ -94,19 +94,19 @@
 				fromLocationTypeList: [],
 				fromLocationCode: "",
 				businessType: {},
-				dataContent:{},
-				managementList:[],
-				show:false,
-				positionInfo:"请选择位置",
-				positionList:[],
-				productionLineCode:'',
-				rawLocationCode:"",
-				fgLocationCode:"",
-				workshopCode :"",
-				workStationCode :"",
-				workShopName :"",
-				productionLineName :"",
-				workStationName  :"",
+				dataContent: {},
+				managementList: [],
+				show: false,
+				positionInfo: "请选择位置",
+				positionList: [],
+				productionLineCode: '',
+				rawLocationCode: "",
+				fgLocationCode: "",
+				workshopCode: "",
+				workStationCode: "",
+				workShopName: "",
+				productionLineName: "",
+				workStationName: "",
 			};
 		},
 		onLoad(option) {
@@ -124,7 +124,7 @@
 			getWorkShopLineStation().then(res => {
 				this.positionList = res.data
 			}).catch(error => {
-			
+
 			})
 		},
 		//返回首页
@@ -229,7 +229,7 @@
 					this.showMessage("请先选择位置")
 					return;
 				}
-				
+
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
 					//查询管理模式
 					uni.showLoading({
@@ -238,24 +238,24 @@
 					});
 					this.managementList = [];
 					var precisionStrategParams = this.setPrecisionStrategParams()
-					
+
 					getPrecisionStrategyList(precisionStrategParams, res => {
 						if (res.success) {
 							this.managementList = res.list;
 							var params = this.setParams()
 							console.log("提交" + JSON.stringify(params))
-								productionReceiptRecordSubmit(params).then(res => {
-									uni.hideLoading()
-									if (res.data) {
-										this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data)
-									} else {
-										this.showErrorMessage("提交失败[" + res.msg + "]")
-									}
-								}).catch(error => {
-									uni.hideLoading()
-									this.showErrorMessage(error)
-								})
-				
+							productionReceiptRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成制品收货记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
+
 						} else {
 							uni.hideLoading();
 							this.showErrorMessage(res.message);
@@ -264,7 +264,7 @@
 				} else {
 					this.showErrorMessage("没有要提交的数据,请先扫描")
 				}
-				
+
 			},
 			setPrecisionStrategParams() {
 				var itemList = []
@@ -286,15 +286,15 @@
 								}
 								itemList.push(result)
 							}
-			
+
 						}
 					})
 				})
 				return itemList;
 			},
-			
+
 			setParams() {
-			
+
 				var subList = []
 				var creator = this.$store.state.user.id
 				this.detailSource.forEach(item => {
@@ -306,24 +306,24 @@
 							detail.itemName = detail.package.itemName;
 							detail.itemDesc1 = detail.package.itemDesc1;
 							detail.itemDesc2 = detail.package.itemDesc2;
-							
+
 							detail.inventoryStatus = detail.inventoryStatus;
-			
+
 							detail.fromPackingNumber = info.packingNumber;
 							detail.toPackingNumber = info.packingNumber;
-			
+
 							detail.fromContainerNumber = detail.containerNumber;
 							detail.toContainerNumber = detail.containerNumber
-			
+
 							detail.fromBatch = info.batch;
 							detail.toBatch = info.batch;
-			
+
 							detail.fromLocationCode = detail.locationCode;
 							detail.toLocationCode = detail.toLocationCode;
-							
+
 							detail.productionlineCode = this.productionLineCode;
 							detail.workStationCode = this.workStationCode;
-							
+
 							subList.push(detail)
 						}
 					})
@@ -362,11 +362,15 @@
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.losefocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
 			},
 
 			afterCloseMessage() {
@@ -379,14 +383,16 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.subList = [];
-					this.detailSource = [];
-					this.toLocationCode = '';
-					this.dataContent = {};
-					this.positionInfo= "请选择位置";
-					this.fgLocationCode =""
+					this.clearData();
 				})
-				
+			},
+			clearData(){
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {};
+				this.positionInfo = "请选择位置";
+				this.fgLocationCode = ""
 			},
 			removePack() {
 				for (var i = 0; i < this.detailSource.length; i++) {
@@ -405,8 +411,8 @@
 				this.calcHandleQty();
 			},
 			showSelect() {
-					this.show = !this.show
-			
+				this.show = !this.show
+
 			},
 			confirmSelect(e) {
 				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
@@ -417,7 +423,7 @@
 				this.workShopName = e[0].label
 				this.productionLineName = e[1].label
 				this.workStationName = e[2].label
-			
+
 				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
 				if (shop != undefined && shop.children != undefined) {
 					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
diff --git a/pages/productionReceipt/record/productionReceiptRecord.vue b/pages/productionReceipt/record/productionReceiptRecord.vue
index 62530bc6..5cbbd23e 100644
--- a/pages/productionReceipt/record/productionReceiptRecord.vue
+++ b/pages/productionReceipt/record/productionReceiptRecord.vue
@@ -48,12 +48,12 @@
 	import {
 		goHome,
 	} from '@/common/basic.js';
-	
+
 	import {
 		getInventoryStatusDesc,
 		getDirectoryItemArray
 	} from '@/common/directory.js';
-	
+
 	import {
 		getBusinessType,
 		createItemInfo,
@@ -73,7 +73,7 @@
 	export default {
 		components: {
 			winScanButton,
-			winScanPack,  
+			winScanPack,
 			requiredLocation,
 			comBlankView,
 			winScanLocation,
@@ -107,7 +107,7 @@
 		},
 		onLoad(option) {
 			var typeCode = "ProductionReceipt"
-			
+
 			getBusinessType(typeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
@@ -115,7 +115,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message );
+					this.showErrorMessage(res.message)
 				}
 			});
 		},
@@ -130,8 +130,7 @@
 
 		onPullDownRefresh() {},
 
-		mounted() {
-		},
+		mounted() {},
 		methods: {
 			getScanResult(result) {
 				let balance = result.balance;
@@ -168,7 +167,7 @@
 				calcHandleQty(this.detailSource);
 			},
 
-			
+
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
@@ -207,11 +206,15 @@
 
 			},
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanLocationCode(location, code) {
diff --git a/pages/productionReturn/coms/comReturn.vue b/pages/productionReturn/coms/comReturn.vue
index a64553a4..911f9571 100644
--- a/pages/productionReturn/coms/comReturn.vue
+++ b/pages/productionReturn/coms/comReturn.vue
@@ -8,8 +8,8 @@
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
-							<comReturnRecord  :dataContent="item" :index="index" 
-								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							<comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
 							</comReturnRecord>
 						</view>
 						<u-line />
@@ -77,8 +77,8 @@
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	
-	
+
+
 	export default {
 		name: 'comReturn',
 		components: {
@@ -140,13 +140,13 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.openScanPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 			getWorkShopLineStation().then(res => {
 				this.positionList = res.data
 			}).catch(error => {
-			
+
 			})
 
 
@@ -374,7 +374,7 @@
 
 							detail.productionlineCode = this.productionLineCode;
 							detail.workStationCode = this.workStationCode;
-							
+
 
 							subList.push(detail)
 						}
@@ -415,24 +415,30 @@
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.losefocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
 			},
 
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.subList = [];
-					this.detailSource = [];
-					this.toLocationCode = '';
-					this.dataContent = {};
-					this.positionInfo = "请选择位置";
-					this.fgLocationCode = ""
+					this.clearData();
 				})
 			},
+			clearData(){
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {};
+				this.positionInfo = "请选择位置";
+				this.fgLocationCode = ""
+			},
 			confirmSelect(e) {
 				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
 				console.log("位置", this.positionInfo)
diff --git a/pages/productionReturn/coms/comReturnCommonRequest.vue b/pages/productionReturn/coms/comReturnCommonRequest.vue
index 2cf2958f..c8798c02 100644
--- a/pages/productionReturn/coms/comReturnCommonRequest.vue
+++ b/pages/productionReturn/coms/comReturnCommonRequest.vue
@@ -30,9 +30,6 @@
 	import requestInfoPopup from '@/pages/productionReturn/coms/requestInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
 
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
 	import {
 		getProductionReturnRequestList,
 		productionReturnRequestHandle,
diff --git a/pages/productionReturn/coms/comReturnRecordTitle.vue b/pages/productionReturn/coms/comReturnRecordTitle.vue
new file mode 100644
index 00000000..c9aa17d2
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRecordTitle.vue
@@ -0,0 +1,51 @@
+<template>
+	<view class="header_job_top">
+		<view class="cen_card">
+			<view class="cell_box uni-flex uni-row">
+				<view class="cell_info">
+					<view class="text_lightblue">车间</view>
+					<view>{{workshopCode}}</view>
+				</view>
+				<view class="cell_info">
+					<view class="text_lightblue">生产线</view>
+					<view>{{productionLineCode}}</view>
+				</view>
+				<view class="cell_info">
+					<view class="text_lightblue">工位</view>
+					<view>{{ workStationCode }}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		watch: {},
+
+		props: {
+			workshopCode: {
+				type: String,
+				default: ""
+			},
+			productionLineCode: {
+				type: String,
+				default: ""
+			},
+			workStationCode: {
+				type: String,
+				default: ""
+			},
+		},
+
+		methods: {}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index 42a8aa97..b5d4910b 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -497,15 +497,17 @@
 			// },
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.losefocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
 			},
 
-
-
 			showQuestionMessage(message, callback) {
 				setTimeout(r => {
 					this.scanPopupLoseFocus();
diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue
index a9c53c1a..44ca7610 100644
--- a/pages/productionReturn/record/returnToHold.vue
+++ b/pages/productionReturn/record/returnToHold.vue
@@ -1,29 +1,468 @@
 <template>
 	<view class="page-wraper">
-		<comReturn businessTypeCode="ReturnToHold" > </comReturn>
+		<view class="">
+			<com-blank-view @goScan='openScanPopup(true)' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-header">
+				<comReturnRecordTitle :workshopCode="workshopCode" :productionLineCode="productionLineCode"
+					:workStationCode="workStationCode"></comReturnRecordTitle>
+			</view>
+			<u-line />
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
+							</comReturnRecord>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup(false)'></win-scan-button>
+		</view>
+		<winScanPackAndPosition ref="scanPopup" @getResult='getScanResult'></winScanPackAndPosition>
+		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
 
 <script>
-	import comReturn from '@/pages/productionReturn/coms/comReturn.vue'
+	import {
+		productionReturnRecordSubmit,
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+
+	import {
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+	} from '@/common/record.js';
+	import {
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
+	} from '@/common/balance.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReturnRecord from '@/pages/productionReturn/coms/comReturnRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import winScanPackAndPosition from "@/mycomponents/scan/winScanPackAndPosition.vue"
+	import comReturnRecordTitle from '@/pages/productionReturn/coms/comReturnRecordTitle.vue'
+
+
 
 	export default {
+		name: 'comReturn',
 		components: {
-			comReturn
+			winScanButton,
+			comReturnRecordTitle,
+			requiredLocation,
+			comBlankView,
+			comMessage,
+			comReturnRecord,
+			winScanPack,
+			winScanPackAndPosition
 		},
-		data() {
 
+		watch: {},
+
+		data() {
 			return {
+				id: '',
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationCode: '',
+				fromLocationTypeList: [],
+				toLocationCode: '',
+				tolocationTypeList: [],
+				businessType: {},
+				inventoryStatus: '',
+				managementList: [],
+				show: false,
+				positionList: [],
+				productionLineCode: '',
+				rawLocationCode: "",
+				fgLocationCode: "",
+				workshopCode: "",
+				workStationCode: "",
+				workShopName: "",
+				productionLineName: "",
+				workStationName: "",
+				businessTypeCode: "ReturnToHold",
+				positionInfo: "",
+				recommendLocationList: [], //推荐库位列表
+
+			};
+		},
+		onLoad() {
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.openScanPopup(true);
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		mounted() {
+
+
+		},
+
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
 			}
 		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
 
-		onLoad(option) {
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh();
 		},
+
 		methods: {
+			openScanPopup(isEditPosition) {
+				this.$refs.scanPopup.openScanPopup(isEditPosition);
+			},
+
+			getScanResult(result, param) {
+				this.positionInfo = param.positionInfo;
+				this.workshopCode = param.workshopCode;
+				this.productionLineCode = param.productionLineCode;
+				this.workStationCode = param.workStationCode;
+
+				let label = result.label;
+				let pack = result.package;
+
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == label.itemCode) {
+						return res
+					}
+				})
+
+				if (item == undefined) {
+					var itemp = this.createItemInfo(label, pack);
+					let newDetail = this.createDetailInfo(label, pack);
+					newDetail.toLocationCode = "HOLD";
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == label.packingNumber &&
+							r.batch == label.batch) {
+							return r;
+						}
+					})
+
+					if (detail == undefined) {
+						let newDetail = this.createDetailInfo(label, pack);
+						newDetail.toLocationCode = "HOLD";
+						item.subList.push(newDetail);
+
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+			createItemInfo(label, pack) {
+				let item = {
+					itemCode: label.itemCode,
+					itemName: pack.itemName,
+					stdPackQty: pack.stdPackQty,
+					stdPackUnit: pack.stdPackUnit,
+					qty: Number(label.qty),
+					handleQty: 0,
+					uom: pack.uom,
+					subList: []
+				}
+				return item;
+			},
+
+			createDetailInfo(label, pack) {
+				let detail = {};
+				Object.assign(detail, label)
+				detail.scaned = true;
+				detail.qty = Number(label.qty);
+				detail.inventoryStatus = "HOLD"
+				detail.stdPackQty = pack.stdPackQty;
+				detail.stdPackUnit = pack.stdPackUnit;
+
+				detail.package = pack;
+				detail.label = label;
+				return detail;
+			},
+
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty += Number(detail.qty)
+						}
+					}
+				}
+				this.scanPopupGetFocus();
+				this.$forceUpdate();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			showSelect() {
+				this.show = !this.show
+			},
+			updateData() {
+				this.calcHandleQty();
+			},
+
+
+			removeData(item) {
+				for (let i = 0; i < this.detailSource.length; i++) {
+					if (this.detailSource[i].itemCode == item.itemCode) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			commit() {
+				if (this.positionInfo == "请选择位置") {
+					this.showMessage("请先选择位置")
+					return;
+				}
+
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					this.managementList = [];
+					var precisionStrategParams = getPrecisionStrategyParams(this.detailSource)
+
+					getPrecisionStrategyList(precisionStrategParams, res => {
+						if (res.success) {
+							this.managementList = res.list;
+							var params = this.setParams()
+							console.log("提交" + JSON.stringify(params))
+							productionReturnRecordSubmit(params).then(res => {
+								uni.hideLoading()
+								if (res.data) {
+									this.showCommitSuccessMessage("提交成功<br>生成退料收货记录<br>" + res.data)
+								} else {
+									this.showErrorMessage("提交失败[" + res.msg + "]")
+								}
+							}).catch(error => {
+								uni.hideLoading()
+								this.showErrorMessage(error)
+							})
 
+						} else {
+							uni.hideLoading();
+							this.showErrorMessage(res.message);
+						}
+					})
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+
+
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							detail.itemCode = detail.itemCode;
+							detail.itemName = detail.package.itemName;
+							detail.itemDesc1 = detail.package.itemDesc1;
+							detail.itemDesc2 = detail.package.itemDesc2;
+
+							detail.inventoryStatus = detail.inventoryStatus;
+
+							detail.fromPackingNumber = info.packingNumber;
+							detail.toPackingNumber = info.packingNumber;
+
+							detail.fromContainerNumber = detail.containerNumber;
+							detail.toContainerNumber = detail.containerNumber
+
+							detail.fromBatch = info.batch;
+							detail.toBatch = info.batch;
+
+							detail.fromLocationCode = detail.locationCode;
+							detail.toLocationCode = detail.toLocationCode;
+
+							detail.productionlineCode = this.productionLineCode;
+							detail.workStationCode = this.workStationCode;
+
+							subList.push(detail)
+						}
+					})
+				})
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.workshopCode = this.workshopCode;
+				this.dataContent.businessType = this.businessTypeCode;
+				return this.dataContent;
+			},
+
+
+
+
+
+			showMessage(message) {
+				this.scanPopupLoseFocus();
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showErrorMessage(message) {
+				this.scanPopupLoseFocus();
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+			clearData(){
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {};
+				this.positionInfo = "请选择位置";
+			}
 		}
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
 </style>
diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue
index b622c772..fb54d4bb 100644
--- a/pages/productionReturn/record/returnToStore.vue
+++ b/pages/productionReturn/record/returnToStore.vue
@@ -1,27 +1,20 @@
 <template>
 	<view class="page-wraper">
 		<view class="">
-			<com-blank-view @goScan='openScanPopup' v-if="detailSource.length==0"></com-blank-view>
+			<com-blank-view @goScan='openScanPopup(true)' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
-		<view class="">
-			<view class="uni-flex uni-row  u-col-center" style="margin: 10rpx;">
-				<text style="font-size: 32rpx;margin-left: 20rpx;">位置 : </text>
-				<view class="uni-flex u-col-center uni-row">
-					<view class="" style="margin-left: 20rpx;font-size: 30rpx;">
-						{{positionInfo}}
-					</view>
-				</view>
-			
+			<view class="page-header">
+				<comReturnRecordTitle :workshopCode="workshopCode" :productionLineCode="productionLineCode"
+					:workStationCode="workStationCode"></comReturnRecordTitle>
 			</view>
 			<u-line />
-		</view>
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
-							<comReturnRecord  :dataContent="item" :index="index" 
-								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							<comReturnRecord :dataContent="item" :index="index" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
 							</comReturnRecord>
 						</view>
 						<u-line />
@@ -39,7 +32,7 @@
 					</view>
 				</view>
 			</view>
-			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+			<win-scan-button @goScan='openScanPopup(false)'></win-scan-button>
 		</view>
 		<winScanPackAndPosition ref="scanPopup" @getResult='getScanResult'></winScanPackAndPosition>
 		<comMessage ref="comMessage"></comMessage>
@@ -49,12 +42,12 @@
 <script>
 	import {
 		productionReturnRecordSubmit,
-		getWorkShopLineStation
+		getPutawayRecommendLocation
 	} from '@/api/request2.js';
 
 	import {
 		goHome,
-		getPackingNumberAndBatchByList
+		getPackingNumberAndBatchByList,
 	} from '@/common/basic.js';
 
 	import {
@@ -63,12 +56,10 @@
 
 	import {
 		getBusinessType,
-		createItemInfo,
-		createDetailInfo,
-		calcHandleQty
 	} from '@/common/record.js';
 	import {
-		getPrecisionStrategyList
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
 	} from '@/common/balance.js';
 
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
@@ -78,13 +69,15 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
 	import winScanPackAndPosition from "@/mycomponents/scan/winScanPackAndPosition.vue"
-	
-	
+	import comReturnRecordTitle from '@/pages/productionReturn/coms/comReturnRecordTitle.vue'
+
+
+
 	export default {
 		name: 'comReturn',
 		components: {
 			winScanButton,
-			// comReturnRecord,
+			comReturnRecordTitle,
 			requiredLocation,
 			comBlankView,
 			comMessage,
@@ -118,8 +111,10 @@
 				workShopName: "",
 				productionLineName: "",
 				workStationName: "",
-				businessTypeCode :"ReturnToStore",
-				positionInfo:""
+				businessTypeCode: "ReturnToStore",
+				positionInfo: "",
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '' //来源仓库
 
 			};
 		},
@@ -129,14 +124,14 @@
 					this.businessType = res.businessType;
 					this.fromlocationTypeList = res.fromlocationTypeList;
 					this.tolocationTypeList = res.tolocationTypeList;
-					this.openScanPopup();
+					this.openScanPopup(true);
 				} else {
 					this.showErrorMessage(res.message)
 				}
 			});
 		},
 		mounted() {
-			
+
 
 		},
 
@@ -154,16 +149,16 @@
 		},
 
 		methods: {
-			openScanPopup() {
-				this.$refs.scanPopup.openScanPopup();
+			openScanPopup(isEditPosition) {
+				this.$refs.scanPopup.openScanPopup(isEditPosition);
 			},
 
-			getScanResult(result,param) {
+			getScanResult(result, param) {
 				this.positionInfo = param.positionInfo;
 				this.workshopCode = param.workshopCode;
 				this.productionLineCode = param.productionLineCode;
-				this.workStationCode = param.workStationCode ;
-				
+				this.workStationCode = param.workStationCode;
+
 				let label = result.label;
 				let pack = result.package;
 
@@ -174,10 +169,20 @@
 				})
 
 				if (item == undefined) {
-					var itemp = this.createItemInfo(label, pack);
-					let newDetail = this.createDetailInfo(label, pack);
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
+
+					// 获取推荐库位
+					this.getRecommendLocation(label, pack, toLocation => {
+						var itemp = this.createItemInfo(label, pack);
+						let newDetail = this.createDetailInfo(label, pack);
+						newDetail.toLocationCode = toLocation.code;
+						newDetail.toWarehouseCode = toLocation.warehouseCode;
+						itemp.subList.push(newDetail);
+						this.detailSource.push(itemp)
+
+					})
+
+
+
 				} else {
 					var detail = item.subList.find(r => {
 						if (r.packingNumber == label.packingNumber &&
@@ -187,8 +192,13 @@
 					})
 
 					if (detail == undefined) {
-						let newDetail = this.createDetailInfo(label, pack);
-						item.subList.push(newDetail);
+						this.getRecommendLocation(label, pack, toLocation => {
+							let newDetail = this.createDetailInfo(label, pack);
+							newDetail.toLocationCode = toLocation.code;
+							newDetail.toWarehouseCode = toLocation.warehouseCode;
+							item.subList.push(newDetail);
+						});
+
 					} else {
 						if (detail.scaned == true) {
 							this.showErrorMessage("箱码[" + label.packingNumber + "批次[" + label.batch + "]已经在列表中")
@@ -258,6 +268,33 @@
 				this.calcHandleQty();
 			},
 
+			//获取推荐库位
+			getRecommendLocation(label, pack, callback) {
+				let recommend = this.recommendLocationList.find(r => r.itemCode == balance.itemCode);
+				if (recommend == undefined) {
+					let param = {
+						itemCode: label.itemCode,
+						batch: label.batch,
+						inventoryStatus: label.inventoryStatus,
+						supplierCode: pack.supplierCode
+					};
+					console.log(JSON.stringify(param))
+					getPutawayRecommendLocation(param).then(res => {
+						this.recommendLocationList.push({
+							itemCode: label.itemCode,
+							locationCode: res.data.code
+						})
+						callback(res.data);
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+
+				} else {
+					callback(recommend);
+				}
+			},
+
 			removeData(item) {
 				for (let i = 0; i < this.detailSource.length; i++) {
 					if (this.detailSource[i].itemCode == item.itemCode) {
@@ -279,7 +316,7 @@
 						mask: true
 					});
 					this.managementList = [];
-					var precisionStrategParams = this.setPrecisionStrategParams()
+					var precisionStrategParams = getPrecisionStrategyParams(this.detailSource)
 
 					getPrecisionStrategyList(precisionStrategParams, res => {
 						if (res.success) {
@@ -315,7 +352,6 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							detail.toLocationCode = this.fgLocationCode;
 							var filterResult = itemList.filter(res => {
 								if (res.itemCode == item.itemCode &&
 									detail.toLocationCode == res.locationCode) {
@@ -367,7 +403,7 @@
 
 							detail.productionlineCode = this.productionLineCode;
 							detail.workStationCode = this.workStationCode;
-							
+
 
 							subList.push(detail)
 						}
@@ -377,13 +413,11 @@
 				this.dataContent.creator = creator;
 				this.dataContent.workshopCode = this.workshopCode;
 				this.dataContent.businessType = this.businessTypeCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
 				return this.dataContent;
 			},
 
 
-
-
-
 			showMessage(message) {
 				this.scanPopupLoseFocus();
 				this.$refs.comMessage.showMessage(message, res => {
@@ -408,53 +442,29 @@
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.losefocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
 			},
 
-
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.subList = [];
-					this.detailSource = [];
-					this.toLocationCode = '';
-					this.dataContent = {};
-					this.positionInfo = "请选择位置";
-					this.fgLocationCode = ""
+					this.clearData();
 				})
 			},
-			confirmSelect(e) {
-				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
-				console.log("位置", this.positionInfo)
-				this.workshopCode = e[0].value
-				this.productionLineCode = e[1].value
-				this.workStationCode = e[2].value
-				this.workShopName = e[0].label
-				this.productionLineName = e[1].label
-				this.workStationName = e[2].label
-
-				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
-				if (shop != undefined && shop.children != undefined) {
-					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
-					if (prodLine != undefined && prodLine.children != undefined) {
-						let station = prodLine.children.find(r => r.value == this.workStationCode);
-						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
-							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
-							return;
-						} else {
-							this.rawLocationCode = station.rawLocationCode;
-							this.fgLocationCode = station.fgLocationCode;
-						}
-					} else {
-						this.showErrorMessage("生产线-工位基础信息维护错误")
-					}
-				} else {
-					this.showErrorMessage("车间-生产线基础信息维护错误")
-				}
-			},
+			clearData(){
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {};
+			}
 		}
 	}
 </script>
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 4443c572..c58955a4 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -421,11 +421,15 @@
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.losefocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
 			},
 
 
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index beb7f379..de1333e6 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -428,7 +428,7 @@
 
 			showCommitSuccessMessage(number) {
 				this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => {
-						navigateBack()
+						navigateBack(1)
 				})
 			}
 		}
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index 88bdeb15..f79ec716 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -108,7 +108,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 		},
diff --git a/pages/purchaseReturn/request/returnRequest.vue b/pages/purchaseReturn/request/returnRequest.vue
index a751475e..0d43048c 100644
--- a/pages/purchaseReturn/request/returnRequest.vue
+++ b/pages/purchaseReturn/request/returnRequest.vue
@@ -30,9 +30,6 @@
 	import requestInfoPopup from '@/pages/purchaseReturn/coms/requestInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
 
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
 	import {
 		goHome,
 		updateTitle,
diff --git a/pages/purchaseReturn/request/returnRequestCreate.vue b/pages/purchaseReturn/request/returnRequestCreate.vue
index 8f37e68e..986c8772 100644
--- a/pages/purchaseReturn/request/returnRequestCreate.vue
+++ b/pages/purchaseReturn/request/returnRequestCreate.vue
@@ -101,7 +101,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 		},
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 0661b87c..93dd25a9 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -273,11 +273,15 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			// scanLocationCode(location, code) {
diff --git a/pages/putaway/request/putawayRequest.vue b/pages/putaway/request/putawayRequest.vue
index 0846c7ed..37a8a6a1 100644
--- a/pages/putaway/request/putawayRequest.vue
+++ b/pages/putaway/request/putawayRequest.vue
@@ -30,10 +30,6 @@
 	import requestInfoPopup from '@/pages/putaway/coms/requestInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
 
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
-
 	import {
 		goHome,
 		updateTitle
diff --git a/pages/query/container.vue b/pages/query/container.vue
index 752cb7a7..0f9847a7 100644
--- a/pages/query/container.vue
+++ b/pages/query/container.vue
@@ -2,16 +2,16 @@
 	<!-- <page-meta root-font-size="18px"></page-meta> -->
 	<view class="">
 		<com-blank-view @goScan='openScanPopup' v-if="containerNumber==''"></com-blank-view>
-		
+
 		<my-paging v-show="containerNumber!=''" ref="paging" v-model="dataList" @query="queryList">
 			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
 			<template #top>
 				<view v-if="containerNumber!=''">
-						<containerInfo :itemDetail="containerInfo" v-if="containerNumber"></containerInfo>
+					<containerInfo :itemDetail="containerInfo" v-if="containerNumber"></containerInfo>
 					<u-line />
 					<z-tabs :list="tabList" @change="tabChange" />
 				</view>
-		
+
 			</template>
 			<view class="" style="padding-bottom: 50rpx;">
 				<view v-if="tabIndex == 0" v-for="(item, index) in dataList">
@@ -22,7 +22,7 @@
 					<comLocationDetailCard :dataContent="item" style='margin: 10rpx;'></comLocationDetailCard>
 				</view>
 			</view>
-		
+
 		</my-paging>
 
 		、
@@ -81,7 +81,7 @@
 				old: {
 					scrollTop: 0
 				},
-				
+
 				detailList: [],
 				summarysList: [],
 				dataList: [],
@@ -95,8 +95,7 @@
 				goHome();
 			}
 		},
-		filters: {
-		},
+		filters: {},
 		mounted() {
 			this.openScanPopup()
 		},
@@ -114,13 +113,13 @@
 				this.occupieds = [];
 				this.getItemInfo(code);
 			},
-			
+
 			getItemInfo(code) {
 				uni.showLoading({
 					title: "正在查询器具信息...",
 					mask: true
 				});
-			
+
 				getContainerByNumber(code).then(res => {
 					uni.hideLoading();
 					if (res.data.list.length > 0) {
@@ -131,7 +130,7 @@
 					} else {
 						this.showMessage('未查找到零件【' + code + '】');
 					}
-			
+
 				}).catch(error => {
 					uni.hideLoading();
 					this.containerNumber = "";
@@ -139,7 +138,7 @@
 				})
 			},
 
-			getSummary(pageNo,pageSize) {
+			getSummary(pageNo, pageSize) {
 				let that = this;
 				uni.showLoading({
 					title: "加载中...",
@@ -154,7 +153,7 @@
 					uni.hideLoading();
 					if (res.data.list.length > 0) {
 						this.summarysList = this.setShowList(res.data.list)
-					this.$refs.paging.complete(this.summarysList);
+						this.$refs.paging.complete(this.summarysList);
 					} else {
 						this.$refs.paging.complete(false);
 						this.showMessage('未查找到器具【' + this.containerNumber + '】');
@@ -167,7 +166,7 @@
 
 			},
 
-			getDetailList(pageNo,pageSize) {
+			getDetailList(pageNo, pageSize) {
 				let that = this;
 				uni.showLoading({
 					title: "加载中...",
@@ -231,17 +230,15 @@
 				return resultlist;
 			},
 
-			getContentByTab(index,pageNo, pageSize) {
+			getContentByTab(index, pageNo, pageSize) {
 				if (index === 0) {
 					this.getSummary(pageNo, pageSize);
 				} else if (index === 1) this.getDetailList(pageNo, pageSize)
-				
-			},
 
-			upper: function(e) {
-			},
-			lower: function(e) {
 			},
+
+			upper: function(e) {},
+			lower: function(e) {},
 			tabChange(index) {
 				this.tabIndex = index;
 				this.$refs.paging.reload(true);
@@ -254,14 +251,16 @@
 				});
 			},
 			afterCloseMessage() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 			queryList(pageNo, pageSize) {
 				console.log("加载", pageNo)
 				if (this.containerNumber != "") {
 					this.getContentByTab(this.tabIndex, pageNo, pageSize)
 				}
-			
+
 			},
 		}
 	};
diff --git a/pages/query/item.vue b/pages/query/item.vue
index 901411c9..3d6a24b2 100644
--- a/pages/query/item.vue
+++ b/pages/query/item.vue
@@ -244,7 +244,9 @@
 				});
 			},
 			afterCloseMessage() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 			tabChange(index) {
 				this.tabIndex = index;
diff --git a/pages/query/item_copy.vue b/pages/query/item_copy.vue
index 64c3925c..726ff0ff 100644
--- a/pages/query/item_copy.vue
+++ b/pages/query/item_copy.vue
@@ -17,26 +17,26 @@
 			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
 				@scroll="scroll">
 				<!-- 汇总 -->
-				<comItemDetailCard v-if="tabIndex == 0" :itemList="summarys" :isShowPack="false"
-					style='margin: 10rpx;'></comItemDetailCard>
+				<comItemDetailCard v-if="tabIndex == 0" :itemList="summarys" :isShowPack="false" style='margin: 10rpx;'>
+				</comItemDetailCard>
 			</scroll-view>
 			<!-- 明细 -->
 			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
 				@scroll="scroll">
-				<comItemDetailCard v-if="tabIndex == 1" :itemList="balances"  style='margin: 10rpx;'>
+				<comItemDetailCard v-if="tabIndex == 1" :itemList="balances" style='margin: 10rpx;'>
 				</comItemDetailCard>
 			</scroll-view>
 			<!-- 预计入 -->
 			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
 				@scroll="scroll">
-				<comItemDetailCard v-if="tabIndex == 2" :itemList="dataIn" 
-				:isShowLocation="false"
-				:isShowBusiness="true"></comItemDetailCard>
+				<comItemDetailCard v-if="tabIndex == 2" :itemList="dataIn" :isShowLocation="false"
+					:isShowBusiness="true"></comItemDetailCard>
 			</scroll-view>
 			<!-- 预计出 -->
 			<scroll-view :scroll-top="scrollTop" scroll-y="true" @scrolltoupper="upper" @scrolltolower="lower"
 				@scroll="scroll">
-				<comItemDetailCard v-if="tabIndex == 3" :itemList="dataOut" :isShowLocation="false" :isShowBusiness="true">
+				<comItemDetailCard v-if="tabIndex == 3" :itemList="dataOut" :isShowLocation="false"
+					:isShowBusiness="true">
 				</comItemDetailCard>
 			</scroll-view>
 		</view>
@@ -204,7 +204,7 @@
 					uni.hideLoading();
 					this.balances = "";
 					this.showMessage(error);
-					
+
 				})
 
 			},
@@ -303,7 +303,9 @@
 				});
 			},
 			afterCloseMessage() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			}
 		}
 	};
diff --git a/pages/query/location.vue b/pages/query/location.vue
index e04f22da..750579d4 100644
--- a/pages/query/location.vue
+++ b/pages/query/location.vue
@@ -2,7 +2,7 @@
 	<!-- <page-meta root-font-size="18px"></page-meta> -->
 	<view class="">
 		<com-blank-view @goScan='openScanPopup' v-if="locationCode==''"></com-blank-view>
-		
+
 		<my-paging v-show="locationCode!=''" ref="paging" v-model="dataList" @query="queryList">
 			<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
 			<template #top>
@@ -11,7 +11,7 @@
 					<u-line />
 					<z-tabs :list="tabList" @change="tabChange" />
 				</view>
-		
+
 			</template>
 			<view class="" style="padding-bottom: 50rpx;">
 				<view v-if="tabIndex == 0" v-for="(item, index) in dataList">
@@ -22,7 +22,7 @@
 					<comLocationDetailCard :dataContent="item" style='margin: 10rpx;'></comLocationDetailCard>
 				</view>
 			</view>
-		
+
 		</my-paging>
 
 		<win-scan-button @goScan='openScanPopup' v-if="locationCode!=''"></win-scan-button>
@@ -35,7 +35,6 @@
 </template>
 
 <script>
-	
 	import {
 		getBalanceByLocationcode,
 		getBalanceByLocationcodeGroup
@@ -50,7 +49,7 @@
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
-	
+
 	import comLocationDetailCard from '@/pages/query/coms/comLocationDetailCard.vue'
 	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
 
@@ -78,7 +77,7 @@
 				// 当前页
 				pageCurrent: 1,
 				// 数据总量
-				
+
 				dataList: [],
 				tabList: ['汇总', '明细'],
 				tabIndex: 0,
@@ -91,7 +90,7 @@
 			}
 		},
 		filters: {
-			 
+
 		},
 		mounted() {
 			this.openScanPopup()
@@ -113,7 +112,7 @@
 				// this.getContentByTab(this.tabIndex);
 			},
 
-			getSummary(pageNo,pageSize) {
+			getSummary(pageNo, pageSize) {
 				let that = this;
 				uni.showLoading({
 					title: "加载中...",
@@ -124,13 +123,13 @@
 					pageNo: pageNo,
 					pageSize: pageSize
 				}
-				
+
 				getBalanceByLocationcodeGroup(params).then(res => {
 					uni.hideLoading();
 					if (res.data.list.length > 0) {
 						this.summarysList = this.setShowList(res.data.list)
 						this.$refs.paging.complete(this.summarysList);
-						
+
 					} else {
 						this.$refs.paging.complete(false);
 						this.showMessage('未查找到库位【' + this.locationCode + '】');
@@ -143,13 +142,13 @@
 
 			},
 
-			getDetailList(pageNo,pageSize) {
+			getDetailList(pageNo, pageSize) {
 				let that = this;
 				uni.showLoading({
 					title: "加载中...",
 					mask: true
 				});
-				
+
 				var params = {
 					locationCode: this.locationCode,
 					pageNo: pageNo,
@@ -159,7 +158,7 @@
 					uni.hideLoading();
 					if (res.data.list.length > 0) {
 						this.detailList = this.setShowList(res.data.list)
-					  this.$refs.paging.complete(this.detailList);
+						this.$refs.paging.complete(this.detailList);
 					} else {
 						this.$refs.paging.complete(false);
 						this.showMessage('未查找到库位w【' + this.locationCode + '】');
@@ -213,7 +212,7 @@
 				this.getContentByTab(this.tabIndex);
 			},
 
-			getContentByTab(index,pageNo, pageSize) {
+			getContentByTab(index, pageNo, pageSize) {
 				if (index === 0) {
 					this.getSummary(pageNo, pageSize);
 				} else if (index === 1) this.getDetailList(pageNo, pageSize)
@@ -232,7 +231,9 @@
 				});
 			},
 			afterCloseMessage() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 			tabChange(index) {
 				this.tabIndex = index;
@@ -243,7 +244,7 @@
 				if (this.locationCode != "") {
 					this.getContentByTab(this.tabIndex, pageNo, pageSize)
 				}
-			
+
 			},
 		}
 	};
diff --git a/pages/query/location_copy.vue b/pages/query/location_copy.vue
index 7fc3e820..3e40c3ee 100644
--- a/pages/query/location_copy.vue
+++ b/pages/query/location_copy.vue
@@ -56,7 +56,6 @@
 </template>
 
 <script>
-	
 	import {
 		getBalanceByLocationcode,
 		getBalanceByLocationcodeGroup
@@ -71,7 +70,7 @@
 	import comBlankView from '@/mycomponents/common/comBlankView.vue'
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
-	
+
 	import comLocationDetailCard from '@/pages/query/coms/comLocationDetailCard.vue'
 	import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
 
@@ -132,7 +131,7 @@
 			}
 		},
 		filters: {
-			 
+
 		},
 		mounted() {
 			this.openScanPopup()
@@ -263,7 +262,9 @@
 				});
 			},
 			afterCloseMessage() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			}
 		}
 	};
diff --git a/pages/repleinsh/record/repleinshRecord.vue b/pages/repleinsh/record/repleinshRecord.vue
index caab0033..6241e262 100644
--- a/pages/repleinsh/record/repleinshRecord.vue
+++ b/pages/repleinsh/record/repleinshRecord.vue
@@ -1,434 +1,438 @@
-<template>
-	<view class="page-wraper">
-		<view class="">
-			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
-		</view>
-		<view class="page-wraper" v-if="detailSource.length>0">
-			<view class="page-main">
-				<scroll-view scroll-y="true" class="page-main-scroll">
-					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-						<view class="">
-							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
-								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
-							</record-com-detail-card>
-						</view>
-						<u-line />
-					</view>
-				</scroll-view>
-			</view>
-
-			<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-				:locationTypeList="tolocationTypeList"></requiredLocation>
-
-			<view class="page-footer">
-				<view class="uni-flex u-col-center space-between padding_10"
-					style="background-color:ghostwhite; width: 100%; ">
-					<view class="">
-					</view>
-					<view class=" uni-flex uni-row">
-						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
-					</view>
-				</view>
-			</view>
-			<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		</view>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
-		<comMessage ref="comMessage"></comMessage>
-		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationTypeList="fromlocationTypeList"></win-scan-location>
-	</view>
-</template>
-
-<script>
-	
-	import {
-		repleinshRequestSubmit,
-		repleinshRecordSubmit
-	} from '@/api/request2.js';
-	
-	import {
-		goHome,
-		updateTitle,
-		
-	} from '@/common/basic.js';
-	
-	import {
-		getInventoryStatusDesc,
-		getDirectoryItemArray
-	} from '@/common/directory.js';
-	
-	import {
-		getDetailOption,
-		getDetailRemoveOption,
-		getDetailEditRemoveOption
-	} from '@/common/array.js';
-	
-	import {
-		getBusinessType,
-		createItemInfo,
-		createDetailInfo,
-		calcHandleQty
-	} from '@/common/record.js';
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import comBlankView from '@/mycomponents/common/comBlankView.vue'
-	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
-	import comMessage from '@/mycomponents/common/comMessage.vue'
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
-	
-	export default {
-		components: {
-			winScanButton,
-			winScanPack,
-			requiredLocation,
-			comBlankView,
-			winScanLocation,
-			comMessage,
-			winScanPackAndLocation,
-			recordComDetailCard
-		},
-		data() {
-			return {
-				id: '',
-				receiptJob: {},
-				received: false,
-				isShowPackingCode: true,
-				scanCount: 0,
-				dataContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				locationTypeList: [],
-				toLocationInfo: {},
-				businessTypeInfo: {},
-				fromLocationInfo: {},
-				fromLocationCode: "",
-				toLocationInfo: {},
-				toLocationCode: "",
-				isShowLocation: false,
-				fromlocationTypeList: [],
-				tolocationTypeList: [],
-				allowModifyLocation: false,
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				businessType: {},
-				fromType: ""
-			};
-		},
-		onLoad(option) {
-			this.fromType = option.fromType
-			if(this.fromType=="requestType"){
				updateTitle("补料申请")
			}else {
				updateTitle("补料记录")
			}
-			var typeCode = "Repleinment"
-			getBusinessType(typeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.fromlocationTypeList = res.fromlocationTypeList;
-					this.tolocationTypeList = res.tolocationTypeList;
-					this.showFromLocationPopup();
-				} else {
-					this.$refs.comMessage.showBreakMessage(res.message );
-				}
-			});
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {},
-
-		onPullDownRefresh() {},
-
-		mounted() {
-		},
-		methods: {
-			getScanResult(result) {
-				let balance = result.balance;
-				let label = result.label;
-				let pack = result.package;
-				var item = this.detailSource.find(res => {
-					if (res.itemCode == balance.itemCode) {
-						return res
-					}
-				})
-				if (item == undefined) {
-					var itemp = createItemInfo(balance, pack);
-					let newDetail = createDetailInfo(balance, pack); //
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.subList.find(r => {
-						if (r.packingNumber == balance.packingNumber &&
-							r.batch == balance.batch &&
-							r.locationCode == balance.locationCode &&
-							r.inventoryStatus == balance.inventoryStatus) {
-							return r;
-						}
-					})
-					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
-						item.subList.push(newDetail);
-					} else {
-						if (detail.scaned == true) {
-							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
-						}
-					}
-				}
-				this.calcHandleQty();
-
-			},
-
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
-			calcHandleQty() {
-				for (let item of this.detailSource) {
-					item.qty = 0;
-					for (let detail of item.subList) {
-						if (detail != undefined) {
-							item.qty += Number(detail.qty)
-						}
-					}
-				}
-				this.$forceUpdate();
-			},
-
-
-			updateData() {
-				this.calcHandleQty();
-			},
-			removeItem(index, item) {
-				this.detailSource.splice(index, 1)
-			},
-			
-			removePack() {
-				for (var i = 0; i < this.detailSource.length; i++) {
-					var item = this.detailSource[i];
-					if (item.subList.length == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-				this.updateData();
-			},
-
-			openScanPopup() {
-				if (this.fromLocationCode == "") {
-					this.showFromLocationPopup();
-					return
-				}
-				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
-			},
-			showFromLocationPopup() {
-				this.$nextTick(() => {
-					this.$refs.scanLocationCode.openScanPopup();
-				})
-
-			},
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
-
-			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
-			},
-
-			scanLocationCode(location, code) {
-				this.toLocationCode = code
-				this.toLocationCode = location;
-
-			},
-
-			commit() {
-				if (this.toLocationCode == "") {
-					this.showMessage("请先选择目标库位")
-					return;
-				}
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-
-			
-				
-				if(this.fromType=="requestType"){
-					var params = this.setRequestParams();
-					console.log("提交" + JSON.stringify(params))
-					
-					// repleinshRequestSubmit(params).then(res => {
-					// 	uni.hideLoading()
-					// 	if (res.data) {
-					// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
-					// 	} else {
-					// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-					// 	}
-					// }).catch(error => {
-					// 	uni.hideLoading()
-					// 	this.showErrorMessage(error)
-					// })
-				}else {
-					// repleinshRecordSubmit(params).then(res => {
-					// 	uni.hideLoading()
-					// 	if (res.data) {
-					// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
-					// 	} else {
-					// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-					// 	}
-					// }).catch(error => {
-					// 	uni.hideLoading()
-					// 	this.showErrorMessage(error)
-					// })
-				}
-				
-
-			},
-
-			setParams() {
-				var subList = []
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-							// 	detail.packingNumber, detail.batch);
-							// 	detail.toPackingNumber =info.packingNumber;
-							// 	detail.toBatch =info.batch;
-							subList.push(detail)
-						}
-					})
-				})
-				return subList;
-			},
-			
-			setRequestParams(){
-				var subList = []
-				var supplierCode=""
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							if(supplierCode==""){
-								supplierCode = detail.package.supplierCode
-							}
-							subList.push(detail)
-						}
-					})
-				})
-				
-				this.dataContent.subList = subList
-				this.dataContent.supplierCode = supplierCode
-				this.dataContent.businessType = "PurchasePutaway"
-				this.dataContent.departmentCode= "研发部门";
-				this.dataContent.status=  1 ;
-				this.dataContent.autoCommit =  "FALSE";
-				this.dataContent.autoAgree = "FALSE";
-				this.dataContent.autoExecute = "FALSE";
-				this.dataContent.directCreateRecord = "FALSE";
-				return this.dataContent;
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {}
-				});
-			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
-
-			showScanMessage(message) {
-				this.$refs.comMessage.showScanMessage(message);
-			},
-
-			afterCloseMessage() {
-				this.scanPopupGetFocus();
-			},
-
-			closeScanMessage() {
-				this.scanPopupGetFocus();
-			},
-			getLocation(location, code) {
-				this.getFromLocationCode(location, code)
-			},
-			getFromLocationCode(location, code) {
-				this.fromLocationInfo = location;
-				this.fromLocationCode = code;
-				this.openScanPopup();
-			},
-			getToLocationCode(location, code) {
-				if (this.fromLocationCode == code) {
-					uni.showToast({
-						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
-						duration: 2000
-					})
-					return
-				}
-				this.ToLocationCodeInfo = location;
-				this.toLocationCode = code;
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.fromLocationCode = '';
-
-				})
-			},
-
-			updateData() {
-				this.calcHandleQty();
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					if (item.qty == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
-
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
-
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
-
-	}
-</style>
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="detailSource.length>0">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="page-main-scroll">
+					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+				:locationTypeList="tolocationTypeList"></requiredLocation>
+
+			<view class="page-footer">
+				<view class="uni-flex u-col-center space-between padding_10"
+					style="background-color:ghostwhite; width: 100%; ">
+					<view class="">
+					</view>
+					<view class=" uni-flex uni-row">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+</template>
+
+<script>
+	import {
+		repleinshRequestSubmit,
+		repleinshRecordSubmit
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		updateTitle,
+
+	} from '@/common/basic.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getDetailOption,
+		getDetailRemoveOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			comMessage,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				received: false,
+				isShowPackingCode: true,
+				scanCount: 0,
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				toLocationInfo: {},
+				toLocationCode: "",
+				isShowLocation: false,
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				allowModifyLocation: false,
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				fromType: ""
+			};
+		},
+		onLoad(option) {
+			this.fromType = option.fromType
+			if (this.fromType == "requestType") {
+				updateTitle("补料申请")
+			} else {
+				updateTitle("补料记录")
+			}
+			var typeCode = "Repleinment"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty += Number(detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+
+			},
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.toLocationCode = code
+				this.toLocationCode = location;
+
+			},
+
+			commit() {
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+
+
+				if (this.fromType == "requestType") {
+					var params = this.setRequestParams();
+					console.log("提交" + JSON.stringify(params))
+
+					// repleinshRequestSubmit(params).then(res => {
+					// 	uni.hideLoading()
+					// 	if (res.data) {
+					// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
+					// 	} else {
+					// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+					// 	}
+					// }).catch(error => {
+					// 	uni.hideLoading()
+					// 	this.showErrorMessage(error)
+					// })
+				} else {
+					// repleinshRecordSubmit(params).then(res => {
+					// 	uni.hideLoading()
+					// 	if (res.data) {
+					// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
+					// 	} else {
+					// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+					// 	}
+					// }).catch(error => {
+					// 	uni.hideLoading()
+					// 	this.showErrorMessage(error)
+					// })
+				}
+
+
+			},
+
+			setParams() {
+				var subList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+							// 	detail.packingNumber, detail.batch);
+							// 	detail.toPackingNumber =info.packingNumber;
+							// 	detail.toBatch =info.batch;
+							subList.push(detail)
+						}
+					})
+				})
+				return subList;
+			},
+
+			setRequestParams() {
+				var subList = []
+				var supplierCode = ""
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							if (supplierCode == "") {
+								supplierCode = detail.package.supplierCode
+							}
+							subList.push(detail)
+						}
+					})
+				})
+
+				this.dataContent.subList = subList
+				this.dataContent.supplierCode = supplierCode
+				this.dataContent.businessType = "PurchasePutaway"
+				this.dataContent.departmentCode = "研发部门";
+				this.dataContent.status = 1;
+				this.dataContent.autoCommit = "FALSE";
+				this.dataContent.autoAgree = "FALSE";
+				this.dataContent.autoExecute = "FALSE";
+				this.dataContent.directCreateRecord = "FALSE";
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationInfo = location;
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				if (this.fromLocationCode == code) {
+					uni.showToast({
+						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+						duration: 2000
+					})
+					return
+				}
+				this.ToLocationCodeInfo = location;
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.fromLocationCode = '';
+
+				})
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/scrap/record/scrapRecord.vue b/pages/scrap/record/scrapRecord.vue
index 9150d69f..6f6a2871 100644
--- a/pages/scrap/record/scrapRecord.vue
+++ b/pages/scrap/record/scrapRecord.vue
@@ -55,7 +55,6 @@
 	
 	import {
 		goHome,
-		updateTitle,
 	} from '@/common/basic.js';
 	
 	import {
@@ -232,17 +231,20 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if(this.$refs.scanPopup!=undefined){
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
-
 			commit() {
 				if(this.reasonText==""){
-					this.showMessage("请先选择报废原因")
+					this.showErrorMessage("请先选择报废原因")
 					return;
 				}
 				//允许部分提交
@@ -302,14 +304,6 @@
 				
 			},
 			
-			
-			
-
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {}
-				});
-			},
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
@@ -339,15 +333,17 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.reasonCode = ""
-					this.reasonText = "";
-					this.detailSource = [];
-					this.subList =[];
-					this.managementList =[];
-					this.dataContent ={}
-
+					this.clearData();
 				})
 			},
+			clearData(){
+				this.reasonCode = ""
+				this.reasonText = "";
+				this.detailSource = [];
+				this.subList =[];
+				this.managementList =[];
+				this.dataContent ={}
+			},
 
 			updateData() {
 				this.calcHandleQty();
diff --git a/pages/scrap/request/scrapRequestCreate.vue b/pages/scrap/request/scrapRequestCreate.vue
index b4c921f4..dfe29d07 100644
--- a/pages/scrap/request/scrapRequestCreate.vue
+++ b/pages/scrap/request/scrapRequestCreate.vue
@@ -128,7 +128,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 
@@ -228,11 +228,15 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 
diff --git a/pages/setter/index.vue b/pages/setter/index.vue
index 973b000d..c27cc6ac 100644
--- a/pages/setter/index.vue
+++ b/pages/setter/index.vue
@@ -20,10 +20,10 @@
 					thumb="/static/icon_personal_password.png"></uni-list-item>
 				<uni-list-item title="" clickable rightText="清除缓存" thumb="/static/icon_personal_name.png"
 					@click="clear"></uni-list-item>
-				<uni-list-item title="修改密码" link to="/pages/setter/passwordpage"
-					thumb="/static/icon_personal_password.png"></uni-list-item>
-				<uni-list-item title="服务器地址" 
+				<uni-list-item rightText="修改密码" link to="/pages/setter/passwordpage"
 					thumb="/static/icon_personal_password.png"></uni-list-item>
+				<!-- <uni-list-item title="服务器地址" 
+					thumb="/static/icon_personal_password.png"></uni-list-item> -->
 				<!-- 	<uni-list-item title="参数设置" link to="/pages/setter/setterDetail"
 					thumb="/static/icon_personal_setting.png"></uni-list-item> -->
 			</uni-list>
@@ -55,12 +55,12 @@
 	import {
 		onLoad
 	} from "@dcloudio/uni-app";
+	
 
 	const userName = ref(store.state.user.name);
 	let test = ref("123");
 	let userInfo = ref(null);
 	onLoad(() => {
-		console.log(11)
 		getUserProfile().then(res => {
 			userInfo.value = res.data
 			// nextTick(()=>{
diff --git a/pages/supplierDeliver/coms/comRecordDetailCard.vue b/pages/supplierDeliver/coms/comRecordDetailCard.vue
index 4081821f..4ec59cc3 100644
--- a/pages/supplierDeliver/coms/comRecordDetailCard.vue
+++ b/pages/supplierDeliver/coms/comRecordDetailCard.vue
@@ -10,7 +10,11 @@
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="detailOptions">
-							<recommend :detail="item"  :isShowFromLocation="false"></recommend>
+							<recommend :detail="item"  :isShowToLocation="true" 
+							:isShowFromLocation="false" 
+							:isShowStatus="false"
+							:isShowPack="false"
+							></recommend>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 					<u-line color="#D8D8D8"></u-line>
diff --git a/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue b/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
index b6450fc9..2961d0ac 100644
--- a/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
+++ b/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
@@ -5,20 +5,19 @@
 				<view class=""
 					style="padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
 					<view class="" style="font-size: 35rpx;">
-						发货单号 :
+						发货单号 :{{dataContent.asnNumber}}
 					</view>
 					<view class="" style="font-size: 35rpx;">
-						<text>供应商 : </text>
+						供应商代码 :{{dataContent.supplierCode}}
 					</view>
 				</view>
 				<u-line />
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comRecordDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
+						<comRecordDetailCard :dataContent="item" :index="index"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail">
 						</comRecordDetailCard>
 					</view>
-					<u-line />
 				</view>
 			</scroll-view>
 		</view>
@@ -80,9 +79,8 @@
 				id: '',
 				receiptJob: {},
 				received: false,
-
 				scanCount: 0,
-				jobContent: {}, //任务内容
+				dataContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
 				locationTypeList: [],
@@ -121,7 +119,7 @@
 						that.showMessage('未获取到详情');
 					} else {
 						if (res.data.subList.length > 0) {
-							that.jobContent = res.data;
+							that.dataContent = res.data;
 							that.subList = res.data.subList;
 							that.subList.forEach(res => {
 								res.packingNumber = res.toPackingNumber
@@ -181,18 +179,6 @@
 				calcHandleQty(this.detailSource);
 			},
 
-			scanLocationCode(location, code) {
-				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
-				})
-			},
-
-
 			showMessage(message) {
 				setTimeout(r => {
 					this.$refs.comMessage.showMessage(message, res => {
diff --git a/pages/transfer/coms/comTransferRecord.vue b/pages/transfer/coms/comTransferRecord.vue
index 667b2558..f547133a 100644
--- a/pages/transfer/coms/comTransferRecord.vue
+++ b/pages/transfer/coms/comTransferRecord.vue
@@ -107,7 +107,7 @@
 				businessType: {},
 				managementList: [],
 				dataContent: {},
-				toWarehouseCode:''
+				toWarehouseCode: ''
 
 			};
 		},
@@ -155,7 +155,7 @@
 				if (item == undefined) {
 					var itemp = createItemInfo(balance, pack);
 					let newDetail = createDetailInfo(balance, pack); //
-					newDetail.inventoryStatus ="OK"
+					newDetail.inventoryStatus = "OK"
 					itemp.subList.push(newDetail);
 					this.detailSource.push(itemp)
 				} else {
@@ -221,11 +221,15 @@
 			},
 
 			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanLocationCode(location, code) {
@@ -241,7 +245,7 @@
 			},
 
 			commit() {
-				
+
 				if (this.toLocationCode == "") {
 					this.showMessage("请先选择目标库位")
 					return;
@@ -254,7 +258,7 @@
 					});
 					this.managementList = [];
 					var precisionStrategParams = this.setPrecisionStrategParams()
-					
+
 					getPrecisionStrategyList(precisionStrategParams, res => {
 						if (res.success) {
 							this.managementList = res.list;
@@ -340,7 +344,7 @@
 							detail.itemName = detail.package.itemName;
 							detail.itemDesc1 = detail.package.itemDesc1;
 							detail.itemDesc2 = detail.package.itemDesc2;
-							
+
 							detail.inventoryStatus = detail.inventoryStatus;
 
 							detail.fromPackingNumber = info.packingNumber;
@@ -399,7 +403,7 @@
 				this.openScanPopup();
 			},
 			getToLocationCode(location, code) {
-				this.toWarehouseCode =location.warehouseCode
+				this.toWarehouseCode = location.warehouseCode
 				// if (this.fromLocationCode == code) {
 				// 	uni.showToast({
 				// 		title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
@@ -412,15 +416,17 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.fromLocationCode = '';
-					this.subList = [];
-					this.detailSource = [];
-					this.toLocationCode = '';
-					this.dataContent = {}
-					this.toWarehouseCode = ""
-
+					this.clearData();
 				})
 			},
+			clearData(){
+				this.fromLocationCode = '';
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
 
 			updateData() {
 				this.calcHandleQty();
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index a8a18ab0..3342d8b5 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -73,7 +73,7 @@
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import comReceiptDetailCard from '@/pages/unPlanned/coms/comReceiptDetailCard.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
-	
+
 	export default {
 		name: 'receipt_detail',
 		components: {
@@ -243,16 +243,16 @@
 				}
 			},
 
-			 commit() {
-				 this.scanCount = getScanCount(this.subList);
-				  if( this.scanCount==0){
-				  	this.showErrorMessage("扫描数为0,请先扫描")
-				  	return;
-				  }
-				 //校验库位、
-				 if (!this.checkLocation()) {
-				 	return
-				 }
+			commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//校验库位、
+				if (!this.checkLocation()) {
+					return
+				}
 				//扫描数量和任务数量相等，直接提交
 				if (this.scanCount == this.subList.length) {
 					this.submitJob();
@@ -273,19 +273,19 @@
 					}
 				}
 			},
-			
+
 			checkLocation() {
 				var isPass = true;
 				if (this.toLocationCode == "" || this.toLocationCode == null) {
 					this.showMessageHint('请扫描目标库位', callback => {
 						this.$refs.comScanLocation.showLocation();
 					})
-			
+
 					return isPass = false;
 				}
 				return isPass;
 			},
-			
+
 			showMessageHint(hint, callback) {
 				this.$refs.comMessage.showErrorMessage(hint, res => {
 					if (res) {
@@ -295,7 +295,7 @@
 			},
 
 
-			 submitJob() {
+			submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
@@ -317,7 +317,7 @@
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}
-							
+
 						}).catch(error => {
 							uni.hideLoading()
 							this.showErrorMessage(error)
@@ -385,11 +385,15 @@
 			},
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.getfocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.losefocus();
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.losefocus();
+				}
 			},
 
 			showCommitSuccessMessage(hint) {
diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue
index c134f140..e5d9b738 100644
--- a/pages/unPlanned/record/issueRecord.vue
+++ b/pages/unPlanned/record/issueRecord.vue
@@ -54,10 +54,6 @@
 		unPlannedIssueRecordSubmit
 	} from '@/api/request2.js';
 
-	import {
-		getBalanceByUniquecode,
-	} from '@/api/request.js';
-
 	import {
 		getBusinessType,
 	} from '@/common/record.js';
@@ -278,13 +274,16 @@
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.reasonCode = ""
-					this.reasonText = "";
-					this.detailSource = [];
-					this.managementList =[];
-					this.dataContent ={}
+					
 				})
 			},
+			clearData(){
+				this.reasonCode = ""
+				this.reasonText = "";
+				this.detailSource = [];
+				this.managementList =[];
+				this.dataContent ={}
+			}
 			
 		}
 	}
diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue
index f56bf620..fc0f6e59 100644
--- a/pages/unPlanned/record/receiptRecord.vue
+++ b/pages/unPlanned/record/receiptRecord.vue
@@ -351,14 +351,17 @@
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.reasonCode = ""
-					this.reasonText = "";
-					this.detailSource = [];
-					this.managementList=[];
-					this.dataContent ={}
-					this.toLocationCode =""
+					this.clearData();
 				})
 			},
+			clearData(){
+				this.reasonCode = ""
+				this.reasonText = "";
+				this.detailSource = [];
+				this.managementList=[];
+				this.dataContent ={}
+				this.toLocationCode =""
+			}
 			
 			
 		}
diff --git a/pages/unPlanned/request/issueRequest.vue b/pages/unPlanned/request/issueRequest.vue
index 4895f0a1..fea2284c 100644
--- a/pages/unPlanned/request/issueRequest.vue
+++ b/pages/unPlanned/request/issueRequest.vue
@@ -36,9 +36,7 @@
 		updateTitle,
 		clearTirmAndWrap
 	} from '@/common/basic.js';
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
+
 	import {
 		getUnPlannedIssueRequestList,
 		unPlannedIssueRequestApprove,
diff --git a/pages/unPlanned/request/issueRequestCreate.vue b/pages/unPlanned/request/issueRequestCreate.vue
index 4e96ea9f..433a0f8f 100644
--- a/pages/unPlanned/request/issueRequestCreate.vue
+++ b/pages/unPlanned/request/issueRequestCreate.vue
@@ -60,10 +60,6 @@
 		unPlannedIssueRequestCreate,
 	} from '@/api/request2.js';
 
-	import {
-		getBalanceByUniquecode,
-	} from '@/api/request.js';
-
 	import {
 		getBusinessType,
 	} from '@/common/record.js';
@@ -128,7 +124,7 @@
 					this.fromLocationTypeArray = res.fromlocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 			
diff --git a/pages/unPlanned/request/receiptRequest.vue b/pages/unPlanned/request/receiptRequest.vue
index 77dacb7a..d304ef4c 100644
--- a/pages/unPlanned/request/receiptRequest.vue
+++ b/pages/unPlanned/request/receiptRequest.vue
@@ -30,9 +30,6 @@
 	import requestRecInfoPopup from '@/pages/unPlanned/coms/requestRecInfoPopup.vue'
 	import requestButton from '@/mycomponents/button/requestButton.vue'
 
-	import {
-		getBusinessType,
-	} from '@/common/record.js';
 	import {
 		goHome,
 		updateTitle,
diff --git a/static/config.json b/static/config.json
index 27efe8bc..7426682e 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.230:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.180:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",
diff --git a/uni_modules/vk-uview-ui/components/u-select/u-select.vue b/uni_modules/vk-uview-ui/components/u-select/u-select.vue
index 41ff6735..ac655b94 100644
--- a/uni_modules/vk-uview-ui/components/u-select/u-select.vue
+++ b/uni_modules/vk-uview-ui/components/u-select/u-select.vue
@@ -17,7 +17,7 @@
 						:style="{ color: cancelColor }"
 						hover-class="u-hover-class"
 						:hover-stay-time="150"
-						@tap="getResult('cancel')"
+						@tap.stop="getResult('cancel')"
 					>
 						{{cancelText}}
 					</view>