diff --git a/.env.development b/.env.development
index ff5732c2..6bffb490 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,7 @@
-VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
-VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
+#VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
+#VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
+
+VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
 
# 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
 
 # 是否是测试环境
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index ddcce89c..42490f0c 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -3,16 +3,16 @@
 		<uni-collapse ref="collapse1" @change="">
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
-					<uni-swipe-action ref="swipeAction">
+					<uni-swipe-action >
 						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
+							<item-qty :dataContent="dataContent" 
 								:isShowBalance="true" :isShowBalanceQty="isShowBalanceQty"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</template>
-				<!-- <view class='split_line'></view> -->
-				<view class="" v-for="(detail,index) in dataContent.subList">
-					<uni-swipe-action ref="swipeAction">
+				<view class='split_line'></view>
+				<view class="" v-for="(detail,index) in dataContent.subList" :key="index">
+					<uni-swipe-action >
 						<uni-swipe-action-item @click="swipeClick($event,detail,index)"
 							:right-options="detail.scaned?scanOptions:detailOptions">
 							<balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="true"
diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue
index e4fc279a..d2c61ed3 100644
--- a/src/pages/productRecycle/job/productRecycleJobDetail.vue
+++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue
@@ -236,39 +236,42 @@
 					if (detail == undefined) {
 						this.showMessage("物料号【" + itemCode + "】不在列表中")
 					} else {
-						//箱码、批次、库位、
+						let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+						//箱码、批次、库位、状态 都相等
 						itemDetail = detail.subList.find(r => {
 							return r.packingNumber == packingNumber &&
 								r.batch == batch &&
-								r.fromLocationCode == result.fromLocationCode
+								r.fromLocationCode == result.fromLocationCode&&
+								r.inventoryStatus == result.balance.inventoryStatus
+								
 						})
-						let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-						//不存在提示
-						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
-								.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
-							return;
-						} else {
+						if(itemDetail){
+							// 箱码、批次、库位、状态一致
+							if (itemDetail.scaned) {
+								this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
+									.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
+								return;
+							} else {
+								itemDetail.scaned = true;
+								itemDetail.handleQty = Number(result.balance.qty);
+								itemDetail.toInventoryStatus = result.balance.inventoryStatus;
+								itemDetail.inventoryStatus =result.balance.inventoryStatus;
+								itemDetail.balance = result.balance;
+								itemDetail.balance.balanceQty = Number(result.balance.qty);
+								itemDetail.balance.packQty = Number(result.package.packQty)
+								itemDetail.balance.packUnit = result.package.packUnit
+								this.calcHandleQty();
+							}
+						}else {
+							//箱码、批次、库位相等
 							itemDetail = detail.subList.find(r => {
 								return r.packingNumber == packingNumber &&
 									r.batch == batch &&
-									r.fromLocationCode == result.fromLocationCode &&
-									r.inventoryStatus == result.balance.inventoryStatus
+									r.fromLocationCode == result.fromLocationCode
 							})
-							//箱码、批次、库位、状态不一致
-							if (itemDetail == undefined) {
-								itemDetail = detail.subList.find(r => {
-									return r.packingNumber == packingNumber &&
-										r.batch == batch &&
-										r.fromLocationCode == result.fromLocationCode
-								})
-								if (itemDetail.scaned) {
-									this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
-										.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
-									return;
-								}
-
-								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+							
+							if(itemDetail){
+								//箱码、批次、库位相等，状态不相等
 								if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
 									this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 										']不一致,是否继续退货?', res => {
@@ -293,27 +296,11 @@
 											this.scanPopupGetFocus();
 										});
 								}
-
-
-							} else {
-								// 箱码、批次、库位、状态一致
-								if (itemDetail.scaned) {
-									this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
-										.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>已经扫描")
-									return;
-								} else {
-									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.balance.qty);
-									itemDetail.toInventoryStatus = result.balance.inventoryStatus;
-									itemDetail.inventoryStatus =result.balance.inventoryStatus;
-									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.packUnit = result.package.packUnit
-									this.calcHandleQty();
-								}
+							}else {
+								this.showErrorMessage("箱码【" + packingNumber + "】<br>批次【" + batch + "】<br>库位【" + result
+									.fromLocationCode + "】<br>状态【" + balanceStatus + "】<br>不在任务列表中")
 							}
-
+							
 						}
 
 					}
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index 9a67134d..290d759b 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -9,16 +9,16 @@
 				<view class="header_item">
 					来源库位 : {{fromLocationCode}}
 				</view>
-				<view class='split_line'></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="">
-							<recordDetailCard :dataContent="item" :index="index" :settingParam="dataContent"
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
 								@updateData="updateData" @removePack="removePack">
-							</recordDetailCard>
+							</record-com-detail-card>
 						</view>
 
 					</view>
@@ -30,7 +30,7 @@
 					style="background-color:ghostwhite; width: 100%; ">
 					<view class="">
 						<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
-							@getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation> -->
+							@getLocation='getToLocationCode' :locationTypeList="tolocationTypeList"></requiredLocation> -->
 					</view>
 					<view class=" uni-flex uni-row">
 						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@@ -57,6 +57,7 @@
 
 	import {
 		goHome,
+		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatchByList,
 		deepCopyData
@@ -75,7 +76,7 @@
 		getBusinessType,
 		createItemInfo,
 		createDetailInfo,
-		calcTreeHandleQty
+		calcHandleQty
 	} from '@/common/record.js';
 
 	import {
@@ -91,8 +92,7 @@
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
-	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
-	
+
 	export default {
 		components: {
 			winScanButton,
@@ -101,8 +101,7 @@
 			comBlankView,
 			winScanLocation,
 			winScanPackAndLocation,
-			recordComDetailCard,
-			recordDetailCard
+			recordComDetailCard
 		},
 		data() {
 			return {
@@ -118,12 +117,12 @@
 				businessType: {},
 				showToLoaction: true,
 				recommendLocationList: [], //推荐库位列表
-				fromWarehouseCode: '' ,//来源仓库
-				businessTypeCode:"PurchasePutaway"
+				fromWarehouseCode: '', //来源仓库
+				businessTypeCode: "PurchasePutaway"
 			};
 		},
 		onLoad(option) {
-			this.clearData();
+			this.clear();
 			getBusinessType(this.businessTypeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
@@ -166,32 +165,37 @@
 					this.getRecommendLocation(balance, pack, toLocation => {
 						var itemp = createItemInfo(balance, pack);
 						let newDetail = createDetailInfo(balance, pack); //
-						newDetail.toLocationCode = toLocation.code;
-						newDetail.toWarehouseCode = toLocation.warehouseCode;
+						newDetail.toLocationCode = toLocation.locationCode;
+						newDetail.toWarehouseCode = toLocation.toWarehouseCode;
 						itemp.subList.push(newDetail);
-						var dataList = pack.subList
 						this.detailSource.push(itemp)
-						this.detailSource.forEach(res=>{
-							res.subList.forEach(pack=>{
-								pack.packList = dataList.filter(c=>c.parentNumber==pack.packingNumber)
-								pack.packList.forEach(pac=>{
-									pac.parentPackingNumber =pac.parentNumber;
-									pac.packingNumber =pac.number;
-									pac.inventoryStatus="OK";
-									pac.scaned=true;
-								})
-							})
-						})
+						calcHandleQty(this.detailSource);
 					})
 
 				} else {
-					var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
-						balance.batch);
-						if(itemDetail!=undefined){
+					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) {
+						this.getRecommendLocation(balance, pack, toLocation => {
+							let newDetail = createDetailInfo(balance, pack);
+							newDetail.toLocationCode = toLocation.locationCode;
+							newDetail.toWarehouseCode = toLocation.toWarehouseCode;
+							item.subList.push(newDetail);
+							calcHandleQty(this.detailSource);
+						});
+					} else {
+						if (detail.scaned == true) {
 							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
 						}
+					}
 				}
-				// calcTreeHandleQty(this.detailSource);
+				
 			},
 
 			//获取推荐库位
@@ -207,20 +211,25 @@
 						batch: balance.batch,
 						inventoryStatus: balance.inventoryStatus,
 						supplierCode: pack.supplierCode,
-						businessCode:this.businessTypeCode
+						businessCode: this.businessTypeCode
 					};
 					console.log(JSON.stringify(param))
 					getPutawayRecommendLocation(param).then(res => {
 						this.recommendLocationList.push({
 							itemCode: balance.itemCode,
-							locationCode: res.data.code
+							locationCode: res.data.code,
+							toWarehouseCode:res.data.toWarehouseCode
 						})
-						callback(res.data);
+						
+						var result = {
+							locationCode: res.data.code,
+							toWarehouseCode:res.data.toWarehouseCode
+						}
+						callback(result);
 						uni.hideLoading();
 					}).catch(error => {
 						uni.hideLoading()
 						this.showErrorMessage(error);
-						uni.hideLoading();
 					})
 
 				} else {
@@ -234,24 +243,22 @@
 				});
 			},
 
-			calcTreeHandleQty() {
-				for (let item of this.detailSource) {
-					item.qty = 0;
-					for (let detail of item.subList) {
-						if (detail != undefined) {
-							item.qty = calc.add(item.qty,detail.qty)
-						}
+
+			updateData() {
+				calcHandleQty(this.detailSource);
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
 					}
 				}
 				this.$forceUpdate();
-			},
-
-			updateData() {
-				this.calcTreeHandleQty();
+				
 			},
 
 			removeItem(index, item) {
 				this.detailSource.splice(index, 1)
+				this.updateData();
 			},
 
 			removePack() {
@@ -383,7 +390,7 @@
 
 							// detail.toInventoryStatus = detail.inventoryStatus
 							// detail.toLocationCode = detail.toLocationCode
-							submitItem.qty = detail.handleQty ;
+							submitItem.qty = detail.handleQty;
 							submitItem.package = "";
 							subList.push(submitItem)
 						}
@@ -403,13 +410,6 @@
 					if (res) {}
 				});
 			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
 
 			showScanMessage(message) {
 				this.$refs.comMessage.showScanMessage(message);
@@ -443,21 +443,11 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.clearData();
+					this.clear();
 				})
 			},
 
-			updateData() {
-				// this.calcTreeHandleQty();
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					if (item.qty == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-			},
-
-			clearData() {
+			clear() {
 				this.fromLocationInfo = {};
 				this.fromLocationCode = '';
 				this.fromWarehouseCode = '';
@@ -503,4 +493,4 @@
 		background: #e0e0e0;
 
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/putaway/record/putawayRecord_bat.vue b/src/pages/putaway/record/putawayRecord_bat.vue
new file mode 100644
index 00000000..9a67134d
--- /dev/null
+++ b/src/pages/putaway/record/putawayRecord_bat.vue
@@ -0,0 +1,506 @@
+<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-header">
+				<view class="header_item">
+					来源库位 : {{fromLocationCode}}
+				</view>
+				<view class='split_line'></view>
+			</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="">
+							<recordDetailCard :dataContent="item" :index="index" :settingParam="dataContent"
+								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
+							</recordDetailCard>
+						</view>
+
+					</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="">
+						<!-- <requiredLocation v-if="showToLoaction" title="目标库位" :locationCode="toLocationCode"
+							@getLocation='getToLocationCode' :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation> -->
+					</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' :allowModifyLocation='false'>
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+	</view>
+</template>
+
+<script>
+	import {
+		putawayRequestSubmit,
+		putawayRecordSubmit,
+		validateItemAndLocation,
+		getPutawayRecommendLocation
+	} from '@/api/request2.js';
+
+	import {
+		goHome,
+		getCurrDateTime,
+		getPackingNumberAndBatchByList,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcTreeHandleQty
+	} from '@/common/record.js';
+
+	import {
+		getManagementPrecisions,
+		getPrecisionStrategyList,
+		getPrecisionStrategyParams
+	} from '@/common/balance.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 winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
+	
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			winScanPackAndLocation,
+			recordComDetailCard,
+			recordDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				dataContent: {}, //内容
+				detailSource: [], //绑定在页面上的数据源
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				fromLocationAreaTypeList: [],
+				toLocationAreaTypeList: [],
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				showToLoaction: true,
+				recommendLocationList: [], //推荐库位列表
+				fromWarehouseCode: '' ,//来源仓库
+				businessTypeCode:"PurchasePutaway"
+			};
+		},
+		onLoad(option) {
+			this.clearData();
+			getBusinessType(this.businessTypeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
+					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
+					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 (this.fromWarehouseCode == '') {
+					this.fromWarehouseCode = balance.warehouseCode;
+				}
+				if (item == undefined) {
+					// 获取推荐库位
+					this.getRecommendLocation(balance, pack, toLocation => {
+						var itemp = createItemInfo(balance, pack);
+						let newDetail = createDetailInfo(balance, pack); //
+						newDetail.toLocationCode = toLocation.code;
+						newDetail.toWarehouseCode = toLocation.warehouseCode;
+						itemp.subList.push(newDetail);
+						var dataList = pack.subList
+						this.detailSource.push(itemp)
+						this.detailSource.forEach(res=>{
+							res.subList.forEach(pack=>{
+								pack.packList = dataList.filter(c=>c.parentNumber==pack.packingNumber)
+								pack.packList.forEach(pac=>{
+									pac.parentPackingNumber =pac.parentNumber;
+									pac.packingNumber =pac.number;
+									pac.inventoryStatus="OK";
+									pac.scaned=true;
+								})
+							})
+						})
+					})
+
+				} else {
+					var itemDetail = item.subList.find(r => r.packingNumber == balance.packingNumber && r.batch ==
+						balance.batch);
+						if(itemDetail!=undefined){
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+				}
+				// calcTreeHandleQty(this.detailSource);
+			},
+
+			//获取推荐库位
+			getRecommendLocation(balance, pack, callback) {
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				})
+				let recommend = this.recommendLocationList.find(r => r.itemCode == balance.itemCode);
+				if (recommend == undefined) {
+					let param = {
+						itemCode: balance.itemCode,
+						batch: balance.batch,
+						inventoryStatus: balance.inventoryStatus,
+						supplierCode: pack.supplierCode,
+						businessCode:this.businessTypeCode
+					};
+					console.log(JSON.stringify(param))
+					getPutawayRecommendLocation(param).then(res => {
+						this.recommendLocationList.push({
+							itemCode: balance.itemCode,
+							locationCode: res.data.code
+						})
+						callback(res.data);
+						uni.hideLoading();
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error);
+						uni.hideLoading();
+					})
+
+				} else {
+					callback(recommend);
+				}
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {}
+				});
+			},
+
+			calcTreeHandleQty() {
+				for (let item of this.detailSource) {
+					item.qty = 0;
+					for (let detail of item.subList) {
+						if (detail != undefined) {
+							item.qty = calc.add(item.qty,detail.qty)
+						}
+					}
+				}
+				this.$forceUpdate();
+			},
+
+			updateData() {
+				this.calcTreeHandleQty();
+			},
+
+			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() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			// scanLocationCode(location, code) {
+			// 	this.toLocationCode = code
+			// 	this.toLocationCode = location;
+
+			// },
+
+			commit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//记录有目标库位，需要查询管理模式
+				let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
+				//2:获取管理模式，封装参数
+				getPrecisionStrategyList(precisionStrategyParams, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setRecordParams()
+						console.log("提交参数", JSON.stringify(params));
+
+						putawayRecordSubmit(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);
+					}
+				});
+			},
+
+
+			getItemAndLocationRelations() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									res.locationCode == detail.toLocationCode &&
+									res.batch == detail.batch &&
+									res.inventoryStatus == detail.inventoryStatus) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode,
+									batch: detail.batch,
+									inventoryStatus: detail.inventoryStatus,
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setRecordParams() {
+				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);
+							var submitItem = deepCopyData(detail)
+							submitItem.toPackingNumber = info.packingNumber;
+							submitItem.toBatch = info.batch;
+							submitItem.toContainerNumber = detail.containerNumber;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.fromBatch = info.batch;
+							submitItem.fromContainerNumber = detail.containerNumber;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+
+							// detail.toInventoryStatus = detail.inventoryStatus
+							// detail.toLocationCode = detail.toLocationCode
+							submitItem.qty = detail.handleQty ;
+							submitItem.package = "";
+							subList.push(submitItem)
+						}
+					})
+				})
+				if (subList.length > 0) {
+					this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
+				}
+				this.dataContent.subList = subList
+				this.dataContent.creator = creator;
+				this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
+				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.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData();
+				})
+			},
+
+			updateData() {
+				// this.calcTreeHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			clearData() {
+				this.fromLocationInfo = {};
+				this.fromLocationCode = '';
+				this.fromWarehouseCode = '';
+				this.toWarehouseCode = '';
+				this.detailSource = [];
+			}
+		}
+	}
+</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>