From 6a5725c1dca9959d072fa040b32f69094408cdb1 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 21 Dec 2023 14:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request2.js                              |   4 +-
 mycomponents/scan/winComScan.vue             |   3 +
 mycomponents/scan/winScanLocation.vue        |   2 +-
 mycomponents/scan/winScanPackAndLocation.vue |   6 +-
 pages/customerReturn/record/returnRecord.vue | 920 ++++++++++---------
 5 files changed, 472 insertions(+), 463 deletions(-)

diff --git a/api/request2.js b/api/request2.js
index 396c52c8..e3119611 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -2011,8 +2011,8 @@ export function customerReturnRequestSubmit(params) {
  */
 export function customerReturnRecordSubmit(params) {
 	return request({
-		url: baseApi + "/wms/purchasereturn-request-main/submit",
-		method: "put",
+		url: baseApi + "/wms/customerreturn-record-main/create",
+		method: "post",
 		data: params,
 	});
 }
diff --git a/mycomponents/scan/winComScan.vue b/mycomponents/scan/winComScan.vue
index 7d041725..e75af61e 100644
--- a/mycomponents/scan/winComScan.vue
+++ b/mycomponents/scan/winComScan.vue
@@ -103,6 +103,9 @@
 			}
 		},
 		mounted() {
+			if(document.querySelector('textarea')!=null){
+				document.querySelector('textarea').setAttribute('inputmode', 'none')
+			}
 			// if (this.$el.querySelector('textarea') != null) {
 			// 	this.$el.querySelector('textarea').setAttribute('inputmode', 'none')
 			// }
diff --git a/mycomponents/scan/winScanLocation.vue b/mycomponents/scan/winScanLocation.vue
index e36ea506..fc17bfd2 100644
--- a/mycomponents/scan/winScanLocation.vue
+++ b/mycomponents/scan/winScanLocation.vue
@@ -12,7 +12,7 @@
 			</view>
 			<view class="">
 				<view class="">
-					<win-com-scan ref="scan" labelType="LocationLabel" @getResult="getScanResult" :placeholder='title' :clearResult="false"
+					<win-com-scan ref="scan"  @getResult="getScanResult" :placeholder='title' :clearResult="false"
 						:boxFocus="true" :isShowHistory="isShowHistory" headerType="HLB">
 					</win-com-scan>
 				</view>
diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index c61dd364..b3313dc6 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -40,7 +40,7 @@
 				<view class="">
 					<view class="">
 						<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
-							:isShowHistory="isShowHistory" :clearResult="true"></win-com-scan>
+							:isShowHistory="isShowHistory" :clearResult="true" :headerType ="headerType"></win-com-scan>
 					</view>
 				</view>
 			</view>
@@ -95,6 +95,10 @@
 				type: Boolean,
 				default: true
 			},
+			headerType: {
+				type: String,
+				default: "HPQ"
+			},
 		},
 		data() {
 			return {
diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue
index 06129558..bd33a5d0 100644
--- a/pages/customerReturn/record/returnRecord.vue
+++ b/pages/customerReturn/record/returnRecord.vue
@@ -1,459 +1,461 @@
-<template>
-	<view class="page-wraper">
-		<view class="">
-			<com-blank-view @goScan='getLocation' 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="jobContent"
-								:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
-								@removePack="removePack">
-							</record-com-detail-card>
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-
-			<requiredLocation v-if="showToLoaction" 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 {
-		getBasicCustomerList,
-		customerReturnRequestSubmit,
-		customerReturnRecordSubmit
-	} from '@/api/request2.js';
-	import {
-		getInventoryStatusDesc,
-		getDirectoryItemArray
-	} from '@/common/directory.js';
-	
-	import {
-		getManagementPrecisions
-	} from '@/common/balance.js';
-	import {
-		goHome,
-		updateTitle,
-		getPackingNumberAndBatch
-	} from '@/common/basic.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 comReturnRecord from '@/pages/customerReturn/coms/comReturnRecord.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,
-			comReturnRecord,
-			requiredLocation,
-			comBlankView,
-			winScanLocation,
-			comMessage,
-			winScanPackAndLocation,
-			recordComDetailCard
-		},
-		data() {
-			return {
-				id: '',
-				receiptJob: {},
-				received: false,
-				isShowPackingCode: true,
-				scanCount: 0,
-				jobContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				locationTypeList: [],
-				toLocationInfo: {},
-				businessType: {},
-				fromLocationInfo: {},
-				fromLocationCode: "",
-				toLocationInfo: {},
-				toLocationCode: "",
-				isShowLocation: false,
-				fromlocationTypeList: [],
-				tolocationTypeList: [],
-				allowModifyLocation: false,
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				fromType :"",
-				showToLoaction:true
-			};
-		},
-		onLoad(option) {
-			this.fromType = option.fromType
-			if(this.fromType=="requestType"){
-				var typeCode = "CustomerreturnRequest"
				updateTitle("客户退货申请")
-				this.showToLoaction = false;
			}else {
-				var typeCode = "CustomerreturnRecord"
-				updateTitle("客户退货记录")
-				this.showToLoaction = true;
			}
-			
-			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 );
-				}
-			});
-
-			getBasicCustomerList().then(res => {
-				if (res.data.length > 0) {
-					var list = res.data;
-					list.forEach(item => {
-						item.text = item.Name
-						item.value = item.Code
-					})
-					this.customerList = list;
-				}
-			}).catch(error => {
-				this.showErrorMessage(error)
-			})
-		},
-		//返回首页
-		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() {
-				calcHandleQty(this.detailSource)
-				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.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
-					this.toLocationCode = code
-					this.detailSource.forEach(item => {
-						item.subList.forEach(detail => {
-							detail.toLocationCode = code
-						})
-					})
-				})
-
-			},
-
-			commit() {
-				if (this.showToLoaction &&this.toLocationCode == "") {
-					this.showMessage("请先选择目标库位")
-					return;
-				}
-				
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-
-				if(this.fromType=="requestType"){
-					var params = this.setParams(false)
-					console.log("提交" + JSON.stringify(params))
-					// putawayRequestSubmit(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 {
-					//记录有目标库位，需要查询管理模式
-					var itemCodes = []
-					this.detailSource.forEach(item => {
-						itemCodes.push(item.itemCode)
-					})
-					//获取管理模式，封装参数
-					getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-						if (res.success) {
-							this.managementList = res.list;
-							var params = this.setParams(true)
-							console.log("提交参数", JSON.stringify(params));
-					
-							// putawayRecordSubmit(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 {
-							uni.hideLoading();
-							this.showErrorMessage(res.message);
-						}
-					});
-				}
-
-			},
-			
-			setParams(queryModel) {
-				var subList = []
-				var creator = this.$store.state.user.id
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							// var subItem = {};
-							// Object.assign(subItem, detail)
-							if (queryModel) {
-								var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-									detail.packingNumber, detail.batch);
-								detail.toPackingNumber = info.packingNumber;;
-								detail.toContainerNumber = detail.containerNumber
-								detail.toBatch = info.batch;
-								detail.toInventoryStatus = detail.inventoryStatus
-								detail.toLocationCode = this.toLocationCode
-							} else {
-								detail.toPackingNumber = detail.packingNumber;
-								detail.toContainerNumber = detail.containerNumber
-								detail.toBatch = detail.toBatch;
-								detail.toInventoryStatus = detail.inventoryStatus
-								detail.toLocationCode = ""
-							}
-			
-							subList.push(detail)
-						}
-					})
-				})
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
-			},
-
-
-			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='getLocation' 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" 
+								:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
+								@removePack="removePack">
+							</record-com-detail-card>
+						</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  title="目标库位" :locationCode="toLocationCode" @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>
+					</view>
+				</view>
+			</view>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ"></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 {
+		getBasicCustomerList,
+		customerReturnRecordSubmit
+	} from '@/api/request2.js';
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+	
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+	import {
+		goHome,
+		updateTitle,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.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 comReturnRecord from '@/pages/customerReturn/coms/comReturnRecord.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,
+			comReturnRecord,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			comMessage,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				receiptJob: {},
+				received: false,
+				isShowPackingCode: true,
+				scanCount: 0,
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				businessType: {},
+				fromLocationCode: "",
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+					managementList: [],
+					toWarehouseCode:''
+			};
+		},
+		onLoad(option) {
+			var typeCode ="CustomerreturnRecord"
+			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 )
+				}
+			});
+
+			getBasicCustomerList().then(res => {
+				if (res.data.length > 0) {
+					var list = res.data;
+					list.forEach(item => {
+						item.text = item.Name
+						item.value = item.Code
+					})
+					this.customerList = list;
+				}
+			}).catch(error => {
+				this.showErrorMessage(error)
+			})
+		},
+		//返回首页
+		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() {
+				calcHandleQty(this.detailSource)
+				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.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+			
+		commit() {
+			
+			if (this.toLocationCode == "") {
+				this.showMessage("请先选择目标库位")
+				return;
+			}
+			if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+				//查询管理模式
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				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))
+							customerReturnRecordSubmit(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) {
+						detail.toLocationCode = this.toLocationCode;
+						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.toInventoryStatus = 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)
+					}
+				})
+			})
+			this.dataContent.subList = subList;
+			this.dataContent.creator = creator;
+			this.dataContent.fromWarehouseCode = this.detailSource[0].subList[0].warehouseCode;
+			this.dataContent.toWarehouseCode = this.toWarehouseCode;
+			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.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.fromLocationCode = '';
+					this.subList = [];
+					this.detailSource = [];
+					this.toLocationCode = '';
+					this.dataContent = {}
+					this.toWarehouseCode = ""
+
+				})
+			},
+
+			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>