diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index 6838156e..dd644cb2 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -47,7 +47,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
 
@@ -164,7 +163,6 @@
 							that.fromLocationCode = that.jobContent.locationCode;
 							that.detailList = res.data.subList;
 							that.detailSource = that.getDataSource(that.detailList)
-						   updateTitle(that.jobContent.number);
 						} else {
 							that.showErrorMessage('列表数据为0');
 						}
diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue
index 332f094e..4efcecff 100644
--- a/pages/customerReturn/job/returnDetail.vue
+++ b/pages/customerReturn/job/returnDetail.vue
@@ -52,7 +52,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
@@ -181,7 +180,6 @@
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 
 							that.getLocationInfo(that.toLocationCode);
-							updateTitle(that.jobContent.number)
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue
index b382d19a..2508b889 100644
--- a/pages/customerReturn/record/returnRecord.vue
+++ b/pages/customerReturn/record/returnRecord.vue
@@ -1,441 +1,440 @@
-<!-- 收货任务详情 -->
-<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 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
-	} from '@/api/request2.js';
-	import {
-		getInventoryStatusDesc,
-		getDirectoryItemArray
-	} from '@/common/directory.js';
-	import {
-		goHome
-	} 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: {}, //任务内容
-				detailList: [], //接口返回的任务details
-				detailSource: [], //绑定在页面上的数据源
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
-				locationTypeList: [],
-				toLocationInfo: {},
-				businessType: {},
-				fromLocationInfo: {},
-				fromLocationCode: "",
-				toLocationInfo: {},
-				toLocationCode: "",
-				isShowLocation: false,
-				fromlocationTypeList: [],
-				tolocationTypeList: [],
-				allowModifyLocation: false,
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				fromType :""
-			};
-		},
-		onLoad(option) {
-			this.fromType = option.fromType
-			var typeCode = "Customerreturn"
-			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.details.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.details.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.details.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.details.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
-				});
-
-				var params = this.setParams();
-				console.log("提交" + JSON.stringify(params))
-				// (this.id, params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.data) {
-				// 		var hint = res.data.Number;
-				// 		this.showCommitSuccessMessage("提交成功" + hint, )
-
-				// 	} else {
-				// 		this.showErrorMessage("提交失败")
-				// 	}
-				// }).catch(error => {
-				// 	uni.hideLoading()
-				// 	this.showErrorMessage(error)
-				// })
-
-			},
-
-			setParams() {
-				var params = {
-					requestNumber: this.jobContent.requestNumber,
-					jobNumber: "",
-					asnNumber: this.jobContent.asnNumber,
-					ppNumber: this.jobContent.ppNumber,
-					supplierCode: this.jobContent.supplierCode,
-					ReceiptDock: this.jobContent.ReceiptDock,
-					carrierCode: this.jobContent.carrierCode,
-					transferMode: this.jobContent.transferMode,
-					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
-					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
-					toWarehouseCode: this.toLocationInfo.WarehouseCode,
-					OutTransaction: this.businessType.OutTransactionType, //出库事务类型
-					InTransaction: this.businessType.InTransactionType, //入库事务类型
-					executeTime: "2023-08-4 16:30:11", //执行时间
-					activeDate: "2023-08-4 16:30:11", //生效时间
-					available: "1", //是否可用 0不可用,1可用
-					requestTime: this.jobContent.requestTime,
-					dueTime: "2023-08-4 16:30:11", //截止时间
-					departmentCode: this.jobContent.departmentCode,
-					UserPositionCode: "", //岗位
-					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
-					Number: this.jobContent.Number,
-					businessType: this.jobContent.businessType,
-					remark: this.jobContent.remark,
-					creationTime: this.jobContent.creationTime,
-					Creatorld: this.jobContent.Creatorld,
-					creatorName: this.jobContent.creatorName,
-					extraProperties: this.jobContent.extraProperties,
-					Siteld: this.jobContent.Siteld,
-					Code: "",
-					details: [
-
-					],
-				}
-
-				this.detailSource.forEach(res => {
-					res.details.forEach(res1 => {
-						if (res1.scaned) {
-							res1.record.FromLocationGroupCode = "";
-							res1.record.FromAreaCode = "";
-							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
-							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
-							res1.record.VisualInspectResult = ""; //目检结果
-							res1.record.VisualInspectPhotos = ""; //目检照片
-							res1.record.FailedReason = ""; //不合格原因
-							res1.record.MassDefect = ""; //质量缺陷
-							res1.record.SinglePrice = ""; //单价
-							res1.record.Amount = ""; //金额
-							res1.record.Code = "";
-							res1.record.JobDetailID = res1.record.id;
-							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
-							params.details.push(res1.record)
-						}
-					})
-				})
-
-				return params;
-			},
-
-			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" :settingParam="jobContent"
+								:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
+								@removePack="removePack">
+							</record-com-detail-card>
+						</view>
+					</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 {
+		getBasicCustomerList
+	} from '@/api/request2.js';
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+	import {
+		goHome,
+		updateTitle
+	} 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: {}, //任务内容
+				detailList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+				scrollTop: 0,
+				locationTypeList: [],
+				toLocationInfo: {},
+				businessType: {},
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				toLocationInfo: {},
+				toLocationCode: "",
+				isShowLocation: false,
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				allowModifyLocation: false,
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				fromType :""
+			};
+		},
+		onLoad(option) {
+			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("客户退货申请")
			}else {
				updateTitle("客户退货记录")
			}
+			var typeCode = "Customerreturn"
+			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.details.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.details.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.details.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.details.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
+				});
+
+				var params = this.setParams();
+				console.log("提交" + JSON.stringify(params))
+				// (this.id, params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		var hint = res.data.Number;
+				// 		this.showCommitSuccessMessage("提交成功" + hint, )
+
+				// 	} else {
+				// 		this.showErrorMessage("提交失败")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
+
+			},
+
+			setParams() {
+				var params = {
+					requestNumber: this.jobContent.requestNumber,
+					jobNumber: "",
+					asnNumber: this.jobContent.asnNumber,
+					ppNumber: this.jobContent.ppNumber,
+					supplierCode: this.jobContent.supplierCode,
+					ReceiptDock: this.jobContent.ReceiptDock,
+					carrierCode: this.jobContent.carrierCode,
+					transferMode: this.jobContent.transferMode,
+					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
+					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
+					toWarehouseCode: this.toLocationInfo.WarehouseCode,
+					OutTransaction: this.businessType.OutTransactionType, //出库事务类型
+					InTransaction: this.businessType.InTransactionType, //入库事务类型
+					executeTime: "2023-08-4 16:30:11", //执行时间
+					activeDate: "2023-08-4 16:30:11", //生效时间
+					available: "1", //是否可用 0不可用,1可用
+					requestTime: this.jobContent.requestTime,
+					dueTime: "2023-08-4 16:30:11", //截止时间
+					departmentCode: this.jobContent.departmentCode,
+					UserPositionCode: "", //岗位
+					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
+					Number: this.jobContent.Number,
+					businessType: this.jobContent.businessType,
+					remark: this.jobContent.remark,
+					creationTime: this.jobContent.creationTime,
+					Creatorld: this.jobContent.Creatorld,
+					creatorName: this.jobContent.creatorName,
+					extraProperties: this.jobContent.extraProperties,
+					Siteld: this.jobContent.Siteld,
+					Code: "",
+					details: [
+
+					],
+				}
+
+				this.detailSource.forEach(res => {
+					res.details.forEach(res1 => {
+						if (res1.scaned) {
+							res1.record.FromLocationGroupCode = "";
+							res1.record.FromAreaCode = "";
+							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
+							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
+							res1.record.VisualInspectResult = ""; //目检结果
+							res1.record.VisualInspectPhotos = ""; //目检照片
+							res1.record.FailedReason = ""; //不合格原因
+							res1.record.MassDefect = ""; //质量缺陷
+							res1.record.SinglePrice = ""; //单价
+							res1.record.Amount = ""; //金额
+							res1.record.Code = "";
+							res1.record.JobDetailID = res1.record.id;
+							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
+							params.details.push(res1.record)
+						}
+					})
+				})
+
+				return params;
+			},
+
+			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/customerReturn/request/customerReturnRequestDetail.vue b/pages/customerReturn/request/customerReturnRequestDetail.vue
index 20fb057b..d617d953 100644
--- a/pages/customerReturn/request/customerReturnRequestDetail.vue
+++ b/pages/customerReturn/request/customerReturnRequestDetail.vue
@@ -26,7 +26,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -88,7 +87,6 @@
 						that.requestContent = res.data;
 						that.detailList = res.data.subList;
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}
diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue
index f0dde792..a8b542a1 100644
--- a/pages/deliver/job/deliverDetail.vue
+++ b/pages/deliver/job/deliverDetail.vue
@@ -58,7 +58,6 @@
 	
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
@@ -180,7 +179,6 @@
 							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.detailList)
 							that.getLocationInfo(that.toLocationCode);
-							updateTitle(that.jobContent.number)
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue
index 5f8994a2..9e44541e 100644
--- a/pages/deliver/record/deliverRecord.vue
+++ b/pages/deliver/record/deliverRecord.vue
@@ -1,451 +1,450 @@
-<!-- 收货任务详情 -->
-<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>
-						<u-line />
-					</view>
-				</scroll-view>
-			</view>
-
-			<view class="uni-flex uni-row u-col-center" style="width: 100%;">
-				<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 10rpx;">
-					客户 :
-				</view>
-				<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
-					class='uni-data-picker' placeholder="请选择客户" popup-title="选择客户" :localdata="customerList"
-					v-model="customer">
-				</uni-data-picker>
-			</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'></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
-	} from '@/api/request2.js';
-	import {
-		goHome,
-		getInventoryStatusDesc,
-		getDirectoryItemArray
-	} 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 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,
-				jobContent: {}, //任务内容
-				detailList: [], //接口返回的任务details
-				detailSource: [], //绑定在页面上的数据源
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
-				locationTypeList: [],
-				toLocationInfo: {},
-				businessTypeInfo: {},
-				fromLocationInfo: {},
-				fromLocationCode: "",
-				toLocationInfo: {},
-				toLocationCode: "",
-				isShowLocation: false,
-				fromlocationTypeList: [],
-				tolocationTypeList: [],
-				allowModifyLocation: false,
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				businessType: {},
-				customerList: [],
-				customer: "",
-				fromType:""
-			};
-		},
-		onLoad(option) {
-			this.fromType = option.fromType
-			var typeCode = "Deliver"
-			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.details.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.details.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.details.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.details.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.customer == "") {
-					this.showMessage("请先选择客户")
-					return;
-				}
-				console.log("客户", this.customer)
-				if (this.toLocationCode == "") {
-					this.showMessage("请先选择目标库位")
-					return;
-				}
-				//允许部分提交
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-
-				var params = this.setParams();
-				console.log("提交" + JSON.stringify(params))
-				// (this.id, params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.data) {
-				// 		var hint = res.data.Number;
-				// 		this.showCommitSuccessMessage("提交成功" + hint, )
-
-				// 	} else {
-				// 		this.showErrorMessage("提交失败")
-				// 	}
-				// }).catch(error => {
-				// 	uni.hideLoading()
-				// 	this.showErrorMessage(error)
-				// })
-
-			},
-
-			setParams() {
-				var params = {
-					requestNumber: this.jobContent.requestNumber,
-					jobNumber: "",
-					asnNumber: this.jobContent.asnNumber,
-					ppNumber: this.jobContent.ppNumber,
-					supplierCode: this.jobContent.supplierCode,
-					receiptDock: this.jobContent.receiptDock,
-					carrierCode: this.jobContent.carrierCode,
-					transferMode: this.jobContent.transferMode,
-					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
-					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
-					toWarehouseCode: this.toLocationInfo.WarehouseCode,
-					OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
-					InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
-					executeTime: "2023-08-4 16:30:11", //执行时间
-					activeDate: "2023-08-4 16:30:11", //生效时间
-					available: "1", //是否可用 0不可用,1可用
-					requestTime: this.jobContent.requestTime,
-					dueTime: "2023-08-4 16:30:11", //截止时间
-					departmentCode: this.jobContent.departmentCode,
-					UserPositionCode: "", //岗位
-					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
-					Number: this.jobContent.Number,
-					businessType: this.jobContent.businessType,
-					remark: this.jobContent.remark,
-					creationTime: this.jobContent.creationTime,
-					Creatorld: this.jobContent.Creatorld,
-					creatorName: this.jobContent.creatorName,
-					extraProperties: this.jobContent.extraProperties,
-					Siteld: this.jobContent.Siteld,
-					Code: "",
-					details: [
-
-					],
-				}
-
-				this.detailSource.forEach(res => {
-					res.details.forEach(res1 => {
-						if (res1.scaned) {
-							res1.record.FromLocationGroupCode = "";
-							res1.record.FromAreaCode = "";
-							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
-							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
-							res1.record.VisualInspectResult = ""; //目检结果
-							res1.record.VisualInspectPhotos = ""; //目检照片
-							res1.record.FailedReason = ""; //不合格原因
-							res1.record.MassDefect = ""; //质量缺陷
-							res1.record.SinglePrice = ""; //单价
-							res1.record.Amount = ""; //金额
-							res1.record.Code = "";
-							res1.record.JobDetailID = res1.record.id;
-							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
-							params.details.push(res1.record)
-						}
-					})
-				})
-
-				return params;
-			},
-
-			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" :settingParam="jobContent"
+								:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
+								@removePack="removePack">
+							</record-com-detail-card>
+						</view>
+						<u-line />
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="uni-flex uni-row u-col-center" style="width: 100%;">
+				<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 10rpx;">
+					客户 :
+				</view>
+				<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
+					class='uni-data-picker' placeholder="请选择客户" popup-title="选择客户" :localdata="customerList"
+					v-model="customer">
+				</uni-data-picker>
+			</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'></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
+	} from '@/api/request2.js';
+	import {
+		goHome,
+		updateTitle,
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} 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 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,
+				jobContent: {}, //任务内容
+				detailList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+				scrollTop: 0,
+				locationTypeList: [],
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				toLocationInfo: {},
+				toLocationCode: "",
+				isShowLocation: false,
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				allowModifyLocation: false,
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				customerList: [],
+				customer: "",
+				fromType:""
+			};
+		},
+		onLoad(option) {
+			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("制品发货申请")
			}else {
				updateTitle("制品发货记录")
			}
+			var typeCode = "Deliver"
+			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.details.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.details.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.details.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.details.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.customer == "") {
+					this.showMessage("请先选择客户")
+					return;
+				}
+				console.log("客户", this.customer)
+				if (this.toLocationCode == "") {
+					this.showMessage("请先选择目标库位")
+					return;
+				}
+				//允许部分提交
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setParams();
+				console.log("提交" + JSON.stringify(params))
+				// (this.id, params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		var hint = res.data.Number;
+				// 		this.showCommitSuccessMessage("提交成功" + hint, )
+
+				// 	} else {
+				// 		this.showErrorMessage("提交失败")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
+
+			},
+
+			setParams() {
+				var params = {
+					requestNumber: this.jobContent.requestNumber,
+					jobNumber: "",
+					asnNumber: this.jobContent.asnNumber,
+					ppNumber: this.jobContent.ppNumber,
+					supplierCode: this.jobContent.supplierCode,
+					receiptDock: this.jobContent.receiptDock,
+					carrierCode: this.jobContent.carrierCode,
+					transferMode: this.jobContent.transferMode,
+					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
+					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
+					toWarehouseCode: this.toLocationInfo.WarehouseCode,
+					OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
+					InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
+					executeTime: "2023-08-4 16:30:11", //执行时间
+					activeDate: "2023-08-4 16:30:11", //生效时间
+					available: "1", //是否可用 0不可用,1可用
+					requestTime: this.jobContent.requestTime,
+					dueTime: "2023-08-4 16:30:11", //截止时间
+					departmentCode: this.jobContent.departmentCode,
+					UserPositionCode: "", //岗位
+					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
+					Number: this.jobContent.Number,
+					businessType: this.jobContent.businessType,
+					remark: this.jobContent.remark,
+					creationTime: this.jobContent.creationTime,
+					Creatorld: this.jobContent.Creatorld,
+					creatorName: this.jobContent.creatorName,
+					extraProperties: this.jobContent.extraProperties,
+					Siteld: this.jobContent.Siteld,
+					Code: "",
+					details: [
+
+					],
+				}
+
+				this.detailSource.forEach(res => {
+					res.details.forEach(res1 => {
+						if (res1.scaned) {
+							res1.record.FromLocationGroupCode = "";
+							res1.record.FromAreaCode = "";
+							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
+							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
+							res1.record.VisualInspectResult = ""; //目检结果
+							res1.record.VisualInspectPhotos = ""; //目检照片
+							res1.record.FailedReason = ""; //不合格原因
+							res1.record.MassDefect = ""; //质量缺陷
+							res1.record.SinglePrice = ""; //单价
+							res1.record.Amount = ""; //金额
+							res1.record.Code = "";
+							res1.record.JobDetailID = res1.record.id;
+							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
+							params.details.push(res1.record)
+						}
+					})
+				})
+
+				return params;
+			},
+
+			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/deliver/request/deliverRequestDetail.vue b/pages/deliver/request/deliverRequestDetail.vue
index 49f0ff4a..f4b8f315 100644
--- a/pages/deliver/request/deliverRequestDetail.vue
+++ b/pages/deliver/request/deliverRequestDetail.vue
@@ -25,7 +25,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -90,7 +89,6 @@
 								res.fromLocationCode = res.toLocationCode
 							})
 							that.detailSource = getDataSource(that.detailList);
-							updateTitle(this.requestContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/inspect/coms/inspectComDetailCard.vue b/pages/inspect/coms/inspectComDetailCard.vue
index 51abfc00..b7c47d0b 100644
--- a/pages/inspect/coms/inspectComDetailCard.vue
+++ b/pages/inspect/coms/inspectComDetailCard.vue
@@ -16,7 +16,7 @@
 							:right-options="item.scaned?scanOptions:detailOptions">
 							<recommend :detail="item" :record="item.record" :isShowPack="isShowPack"
 								:isShowBatch="isShowBatch" :isShowLocation="isShowLocation"></recommend>
-								<view :class="item.scaned?'scan_view':''" style="font-size: 32rpx;padding-left: 3rpx;">
+								<view v-if="item.failedQty>0||item.crackQty>0" :class="item.scaned?'scan_view':''" style="font-size: 32rpx;padding-left: 3rpx;">
 									<view class="" >
 										不合格数量 ：{{item.failedQty}}
 									</view>
@@ -149,6 +149,7 @@
 							item.notPassedQty = 0;
 							item.inspectResult =""
 							item.failedReason =""
+							item.photos =""
 							this.$forceUpdate()
 							this.$emit('remove', item)
 						}
@@ -159,6 +160,11 @@
 			},
 			getInspectResult(result){
 				this.dataContent.details[this.editIndex]= result;
+				if (this.$refs.collapse1 != undefined) {
+					this.$nextTick(res => {
+						this.$refs.collapse1.resize()
+					})
+				}
 				this.$emit('updateData',)
 			}
 			
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index 3bb140da..c94b806b 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -83,10 +83,6 @@
 				jobContent: {}, //任务内容
 				detailList: [], //接口返回的任务details
 				detailSource: [], //绑定在页面上的数据源
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
 				toLocationInfo: {},
 				businessTypeInfo: {},
 				locationTypeList: [],
@@ -177,13 +173,14 @@
 							that.jobContent = res.data;
 							that.detailList = res.data.subList;
 							that.detailList.forEach(res => {
+								res.batch =that.jobContent.batch
 								res.goodQty = 0;
 								res.failedQty = 0;
 								res.crackQty = 0;
 								res.sampleQty = 0;
 								res.notPassedQty = 0;
 								res.failedReason ="";
-								res.photos=""
+								res.photos = ""
 								res.inspectResult =""
 							})
 							that.detailSource = getDataSource(that.detailList);
@@ -401,11 +398,6 @@
 			},
 
 
-			scroll: function(e) {
-				// console.log(e)
-				this.old.scrollTop = e.datacontent.scrollTop;
-			},
-
 			closeCommitMessage() {
 				setTimeout(() => {
 					uni.navigateTo({
diff --git a/pages/inspect/request/inspectRequest.vue b/pages/inspect/request/inspectRequest.vue
index 4f4b601c..2eb51254 100644
--- a/pages/inspect/request/inspectRequest.vue
+++ b/pages/inspect/request/inspectRequest.vue
@@ -180,6 +180,7 @@
 						uni.stopPullDownRefresh();
 					}
 					this.loadingType = "";
+					updateTitle("检验单申请");
 					uni.hideLoading();
 					that.showMessage(error)
 				})
diff --git a/pages/inspect/request/inspectRequestDetail.vue b/pages/inspect/request/inspectRequestDetail.vue
index e199c93a..73d9cd70 100644
--- a/pages/inspect/request/inspectRequestDetail.vue
+++ b/pages/inspect/request/inspectRequestDetail.vue
@@ -36,7 +36,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -102,7 +101,6 @@
 						// 	res.packingNumber =res.toPackingNumber
 						// 	res.batch =res.fromBatch
 						// })
-						updateTitle(this.jobContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}
diff --git a/pages/inventoryMove/job/inventoryMoveJob.vue b/pages/inventoryMove/job/inventoryMoveJob.vue
index 156ca7ab..b8e41af4 100644
--- a/pages/inventoryMove/job/inventoryMoveJob.vue
+++ b/pages/inventoryMove/job/inventoryMoveJob.vue
@@ -159,6 +159,7 @@
 						uni.stopPullDownRefresh();
 					}
 					this.loadingType = "";
+					updateTitle("库存转移");
 					uni.hideLoading();
 					that.showMessage(error)
 				})
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index 2c4882b6..54144848 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -1,178 +1,178 @@
-<template>
-	<view class="page-wraper">
-		<view class="" v-if='detailSource.length==0'>
-			<com-blank-view @goScan='goScan()'></com-blank-view>
-		</view>
-		<view v-else class="page-wraper">
-			<view class="page-main">
-				<scroll-view scroll-y="true" class="">
-					<view v-for="(toLocation, index) in detailSource">
-						<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
-							@updateData='updateData'>
-						</com-issue-detail-card>
-					</view>
-				</scroll-view>
-				<button class="btn_add" @click="goScan()">+去添加</button>
-			</view>
-
-			<div class="btn_bottom">
-				<view class="" style="display: flex;flex-direction: row;">
-					<view class="">
-						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
-					</view>
-				</view>
-			</div>
-
-			<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
-			<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScanPopup' @updateData='updateData'>
-			</com-scan-issue-pack>
-			<comMessage ref="comMessage"></comMessage>
-		</view>
-	</view>
-	<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm'></com-issue-request-popup>
-</template>
-
-<script>
-	// import {
-	// 	getIssueJobDetail,
-	// } from '@/api/request.js';
-
-	import {
-		goHome,
-		getRemoveOption,
-		getISODateTime
-	} from '@/common/basic.js';
-
-	import {
-		getDataSource
-	} from '@/pages/issue/js/issue.js';
-
-	import comBlankView from '@/mycomponents/common/comBlankView.vue'
-	import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
-	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
-	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
-	import comMessage from '@/mycomponents/common/comMessage.vue'
-
-	export default {
-		name: 'issueDetail',
-		components: {
-			comBlankView,
-			comIssueRequestPopup,
-			jobDetailPopup,
-			winScanButton,
-			comIssueDetailCard,
-			comScanIssuePack,
-			comMessage
-		},
-		data() {
-			return {
-				id: '1689889453461090304',
-				jobContent: {}, //任务内容
-				detailList: [], //接口返回的任务details
-				detailSource: [], //绑定在页面上的数据源
-				detailOptions: [],
-				scanOptions: [],
-				requestList: [] ,//需求信息
-				fromType:""
-			}
-		},
-		mounted() {
-			this.goScan()
-		},
-		onLoad(option) {
-			debugger
-			this.fromType = option.fromType
-		},
-		methods: {
-			goScan() {
-				this.$refs.comIssueRequestPopup.openRequestPopup(this.detailSource[0]);
-			},
-
-			//确定需求信息
-			requestConfirm(action, item) {
-				//调用接口查询推荐信息
-				this.getDetail(action, item);
-			},
-
-			getDetail(action, item) {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				getIssueJobDetail(this.id).then(res => {
-					if (res.data[0].details.length > 0) {
-						that.detailList = res.data[0].details;
-						if (action == 'update') //更新需求信息,将原来的零件节点删除
-						{
-							let index = that.detailSource[0].Items.findIndex(r => r.itemCode == item.itemCode);
-							if (index >= 0) {
-								that.detailSource[0].Items.splice(index, 1);
-							}
-						}
-						that.detailSource = getDataSource(that.detailSource, that.detailList)
-						that.resizeCollapse();
-					}
-					uni.hideLoading();
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-
-			updateData(record) {
-				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
-				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
-				let itemHandleQty = 0;
-				if (item != undefined) {
-					item.Locations.forEach(l => {
-						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
-								.packingNumber == '') && b.batch ==
-							record.batch);
-
-						let handleQty = 0;
-						batch.Records.forEach(res => {
-							handleQty += Number(res.qty)
-						})
-						batch.handleQty = handleQty;
-						itemHandleQty += handleQty;
-					})
-				}
-				// item.handleQty=itemHandleQty;
-			},
-
-			openScanDetailPopup() {
-				var datacontent = {}
-				//克隆对象，深度克隆，防止双向绑定同一个变量
-				// Object.assign(datacontent, this.detailSource);
-				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
-			},
-
-			closeScanPopup() {
-				this.resizeCollapse();
-			},
-
-			resizeCollapse() {
-				this.$nextTick(r => {
-					this.$refs.comIssueDetailCard.forEach(r => {
-						r.resizeCollapse();
-					})
-				});
-			},
-			submit(){
-				if(this.fromType=="requestType"){
-					
-				}else {
-					
-				}
-				
-			}
-		}
-	}
-</script>
-
-<style>
-</style>
+<template>
+	<view class="page-wraper">
+		<view class="" v-if='detailSource.length==0'>
+			<com-blank-view @goScan='goScan()'></com-blank-view>
+		</view>
+		<view v-else class="page-wraper">
+			<view class="page-main">
+				<scroll-view scroll-y="true" class="">
+					<view v-for="(toLocation, index) in detailSource">
+						<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
+							@updateData='updateData'>
+						</com-issue-detail-card>
+					</view>
+				</scroll-view>
+				<button class="btn_add" @click="goScan()">+去添加</button>
+			</view>
+
+			<div class="btn_bottom">
+				<view class="" style="display: flex;flex-direction: row;">
+					<view class="">
+						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+					</view>
+				</view>
+			</div>
+
+			<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+			<com-scan-issue-pack ref="comScanIssuePack" @closeScan='closeScanPopup' @updateData='updateData'>
+			</com-scan-issue-pack>
+			<comMessage ref="comMessage"></comMessage>
+		</view>
+	</view>
+	<com-issue-request-popup ref="comIssueRequestPopup" @confirm='requestConfirm'></com-issue-request-popup>
+</template>
+
+<script>
+	// import {
+	// 	getIssueJobDetail,
+	// } from '@/api/request.js';
+
+	import {
+		goHome,
+		getRemoveOption,
+		getISODateTime
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comIssueRequestPopup from '@/pages/issue/coms/comIssueRequestPopup.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+	import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+
+	export default {
+		name: 'issueDetail',
+		components: {
+			comBlankView,
+			comIssueRequestPopup,
+			jobDetailPopup,
+			winScanButton,
+			comIssueDetailCard,
+			comScanIssuePack,
+			comMessage
+		},
+		data() {
+			return {
+				id: '1689889453461090304',
+				jobContent: {}, //任务内容
+				detailList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				requestList: [] ,//需求信息
+				fromType:""
+			}
+		},
+		mounted() {
+			this.goScan()
+		},
+		onLoad(option) {
+			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("发料申请")
			}else {
				updateTitle("发料记录")
			}
+		},
+		methods: {
+			goScan() {
+				this.$refs.comIssueRequestPopup.openRequestPopup(this.detailSource[0]);
+			},
+
+			//确定需求信息
+			requestConfirm(action, item) {
+				//调用接口查询推荐信息
+				this.getDetail(action, item);
+			},
+
+			getDetail(action, item) {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getIssueJobDetail(this.id).then(res => {
+					if (res.data[0].details.length > 0) {
+						that.detailList = res.data[0].details;
+						if (action == 'update') //更新需求信息,将原来的零件节点删除
+						{
+							let index = that.detailSource[0].Items.findIndex(r => r.itemCode == item.itemCode);
+							if (index >= 0) {
+								that.detailSource[0].Items.splice(index, 1);
+							}
+						}
+						that.detailSource = getDataSource(that.detailSource, that.detailList)
+						that.resizeCollapse();
+					}
+					uni.hideLoading();
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+
+			updateData(record) {
+				let requestLocation = this.detailSource.find(r => r.toLocationCode == record.toLocationCode);
+				let item = requestLocation.Items.find(r => r.itemCode == record.itemCode);
+				let itemHandleQty = 0;
+				if (item != undefined) {
+					item.Locations.forEach(l => {
+						let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+								.packingNumber == '') && b.batch ==
+							record.batch);
+
+						let handleQty = 0;
+						batch.Records.forEach(res => {
+							handleQty += Number(res.qty)
+						})
+						batch.handleQty = handleQty;
+						itemHandleQty += handleQty;
+					})
+				}
+				// item.handleQty=itemHandleQty;
+			},
+
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			},
+
+			closeScanPopup() {
+				this.resizeCollapse();
+			},
+
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.comIssueDetailCard.forEach(r => {
+						r.resizeCollapse();
+					})
+				});
+			},
+			submit(){
+				if(this.fromType=="requestType"){
+					
+				}else {
+					
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/productPutaway/job/productPutawayDetail.vue b/pages/productPutaway/job/productPutawayDetail.vue
index acd47844..54737b3d 100644
--- a/pages/productPutaway/job/productPutawayDetail.vue
+++ b/pages/productPutaway/job/productPutawayDetail.vue
@@ -54,7 +54,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
@@ -179,7 +178,6 @@
 							that.tolocationTypeList = getLocationTypeArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.detailList)
 							that.getLocationInfo(that.toLocationCode);
-							updateTitle(that.jobContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/productPutaway/request/putawayRequestDetail.vue b/pages/productPutaway/request/putawayRequestDetail.vue
index 129e86f2..81692a52 100644
--- a/pages/productPutaway/request/putawayRequestDetail.vue
+++ b/pages/productPutaway/request/putawayRequestDetail.vue
@@ -25,7 +25,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -87,7 +86,6 @@
 							that.requestContent = res.data;
 							that.detailList = res.data.subList;
 							that.detailSource = getDataSource(that.detailList);
-							updateTitle(this.requestContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index 719e4e81..9048d2ad 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -48,7 +48,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
@@ -181,7 +180,6 @@
 							that.fromLocationTypeList = getDirectoryItemArray(that.jobContent.fromLocationTypes);
 							that.locationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 							that.detailSource = getDataSource(that.detailList)
-						    updateTitle(that.jobContent.number)
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/productionReturn/job/returnDetail.vue b/pages/productionReturn/job/returnDetail.vue
index aff93d54..9d4f9376 100644
--- a/pages/productionReturn/job/returnDetail.vue
+++ b/pages/productionReturn/job/returnDetail.vue
@@ -45,7 +45,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch
 	} from '@/common/basic.js';
@@ -184,7 +183,6 @@
 							that.fromLocationCode = that.detailList[0].fromLocationCode
 							that.toLocationCode = that.detailList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
-						    updateTitle(that.jobContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/productionReturn/request/requestDetail.vue b/pages/productionReturn/request/requestDetail.vue
index b0084486..fc40881f 100644
--- a/pages/productionReturn/request/requestDetail.vue
+++ b/pages/productionReturn/request/requestDetail.vue
@@ -24,7 +24,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -86,7 +85,6 @@
 							that.requestContent = res.data;
 							that.detailList = res.data.subList;
 							that.detailSource = getDataSource(that.detailList);
-							updateTitle(this.requestContent.number);
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/purchaseReceipt/job/receiptDetail.vue b/pages/purchaseReceipt/job/receiptDetail.vue
index 1f9a1481..ed2ce4e5 100644
--- a/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/pages/purchaseReceipt/job/receiptDetail.vue
@@ -46,7 +46,6 @@
 
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index c34e5798..ad4668e1 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -54,7 +54,6 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
-		updateTitle
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusName
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index 91d098fe..2ae80399 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -45,6 +45,7 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
+		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -97,6 +98,11 @@
 		
 		onLoad(option) {
 			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
+				updateTitle("采购退货申请")
+			}else {
+				updateTitle("采购退货记录")
+			}
 			var typeCode = "PurchaseReturn"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
diff --git a/pages/purchaseReturn/request/returnRequestDetail.vue b/pages/purchaseReturn/request/returnRequestDetail.vue
index 5cfdc65b..34e566ea 100644
--- a/pages/purchaseReturn/request/returnRequestDetail.vue
+++ b/pages/purchaseReturn/request/returnRequestDetail.vue
@@ -25,7 +25,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -90,7 +89,6 @@
 							res.fromLocationCode = res.toLocationCode
 						})
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index 4e49355c..b21696d4 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -51,7 +51,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 	} from '@/common/basic.js';
@@ -181,7 +180,6 @@
 							that.toLocationCode = that.detailList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
 							that.getLocationInfo(that.toLocationCode);
-							updateTitle(this.jobContent.number);
 							
 						} else {
 							that.showMessage('列表数据为0');
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 8558b7b5..8fb27f37 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -1,438 +1,437 @@
-<!-- 收货任务详情 -->
-<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="jobContent"
-								@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 {
-		goHome,
-	} 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,
-				jobContent: {}, //任务内容
-				detailList: [], //接口返回的任务details
-				detailSource: [], //绑定在页面上的数据源
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
-				locationTypeList: [],
-				toLocationInfo: {},
-				businessTypeInfo: {},
-				fromLocationInfo: {},
-				fromLocationCode: "",
-				toLocationInfo: {},
-				toLocationCode: "",
-				isShowLocation: false,
-				fromlocationTypeList: [],
-				tolocationTypeList: [],
-				allowModifyLocation: false,
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				businessType: {},
-				fromType: ""
-			};
-		},
-		onLoad(option) {
-			this.fromType = option.fromType
-			var typeCode = "PurchasePutaway"
-			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.details.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.details.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.details.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.details) {
-						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.details.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
-				});
-
-				var params = this.setParams();
-				console.log("提交" + JSON.stringify(params))
-				if(this.fromType=="requestType"){
-					
-				}else {
-					
-				}
-				// (this.id, params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.data) {
-				// 		var hint = res.data.Number;
-				// 		this.showCommitSuccessMessage("提交成功" + hint, )
-
-				// 	} else {
-				// 		this.showErrorMessage("提交失败")
-				// 	}
-				// }).catch(error => {
-				// 	uni.hideLoading()
-				// 	this.showErrorMessage(error)
-				// })
-
-			},
-
-			setParams() {
-				var params = {
-					requestNumber: this.jobContent.requestNumber,
-					jobNumber: "",
-					asnNumber: this.jobContent.asnNumber,
-					ppNumber: this.jobContent.ppNumber,
-					supplierCode: this.jobContent.supplierCode,
-					ReceiptDock: this.jobContent.ReceiptDock,
-					carrierCode: this.jobContent.carrierCode,
-					transferMode: this.jobContent.transferMode,
-					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
-					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
-					toWarehouseCode: this.toLocationInfo.WarehouseCode,
-					OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
-					InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
-					executeTime: "2023-08-4 16:30:11", //执行时间
-					activeDate: "2023-08-4 16:30:11", //生效时间
-					available: "1", //是否可用 0不可用,1可用
-					requestTime: this.jobContent.requestTime,
-					dueTime: "2023-08-4 16:30:11", //截止时间
-					departmentCode: this.jobContent.departmentCode,
-					UserPositionCode: "", //岗位
-					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
-					Number: this.jobContent.Number,
-					businessType: this.jobContent.businessType,
-					remark: this.jobContent.remark,
-					creationTime: this.jobContent.creationTime,
-					Creatorld: this.jobContent.Creatorld,
-					creatorName: this.jobContent.creatorName,
-					extraProperties: this.jobContent.extraProperties,
-					Siteld: this.jobContent.Siteld,
-					Code: "",
-					details: [
-
-					],
-				}
-
-				this.detailSource.forEach(res => {
-					res.details.forEach(res1 => {
-						if (res1.scaned) {
-							res1.record.FromLocationGroupCode = "";
-							res1.record.FromAreaCode = "";
-							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
-							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
-							res1.record.VisualInspectResult = ""; //目检结果
-							res1.record.VisualInspectPhotos = ""; //目检照片
-							res1.record.FailedReason = ""; //不合格原因
-							res1.record.MassDefect = ""; //质量缺陷
-							res1.record.SinglePrice = ""; //单价
-							res1.record.Amount = ""; //金额
-							res1.record.Code = "";
-							res1.record.JobDetailID = res1.record.id;
-							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
-							params.details.push(res1.record)
-						}
-					})
-				})
-
-				return params;
-			},
-
-			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="jobContent"
+								@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 {
+		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,
+				jobContent: {}, //任务内容
+				detailList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+				scrollTop: 0,
+				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 = "PurchasePutaway"
+			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.details.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.details.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.details.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.details) {
+						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.details.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
+				});
+
+				var params = this.setParams();
+				console.log("提交" + JSON.stringify(params))
+				if(this.fromType=="requestType"){
+					
+				}else {
+					
+				}
+				// (this.id, params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		var hint = res.data.Number;
+				// 		this.showCommitSuccessMessage("提交成功" + hint, )
+
+				// 	} else {
+				// 		this.showErrorMessage("提交失败")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
+
+			},
+
+			setParams() {
+				var params = {
+					requestNumber: this.jobContent.requestNumber,
+					jobNumber: "",
+					asnNumber: this.jobContent.asnNumber,
+					ppNumber: this.jobContent.ppNumber,
+					supplierCode: this.jobContent.supplierCode,
+					ReceiptDock: this.jobContent.ReceiptDock,
+					carrierCode: this.jobContent.carrierCode,
+					transferMode: this.jobContent.transferMode,
+					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
+					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
+					toWarehouseCode: this.toLocationInfo.WarehouseCode,
+					OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
+					InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
+					executeTime: "2023-08-4 16:30:11", //执行时间
+					activeDate: "2023-08-4 16:30:11", //生效时间
+					available: "1", //是否可用 0不可用,1可用
+					requestTime: this.jobContent.requestTime,
+					dueTime: "2023-08-4 16:30:11", //截止时间
+					departmentCode: this.jobContent.departmentCode,
+					UserPositionCode: "", //岗位
+					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
+					Number: this.jobContent.Number,
+					businessType: this.jobContent.businessType,
+					remark: this.jobContent.remark,
+					creationTime: this.jobContent.creationTime,
+					Creatorld: this.jobContent.Creatorld,
+					creatorName: this.jobContent.creatorName,
+					extraProperties: this.jobContent.extraProperties,
+					Siteld: this.jobContent.Siteld,
+					Code: "",
+					details: [
+
+					],
+				}
+
+				this.detailSource.forEach(res => {
+					res.details.forEach(res1 => {
+						if (res1.scaned) {
+							res1.record.FromLocationGroupCode = "";
+							res1.record.FromAreaCode = "";
+							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
+							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
+							res1.record.VisualInspectResult = ""; //目检结果
+							res1.record.VisualInspectPhotos = ""; //目检照片
+							res1.record.FailedReason = ""; //不合格原因
+							res1.record.MassDefect = ""; //质量缺陷
+							res1.record.SinglePrice = ""; //单价
+							res1.record.Amount = ""; //金额
+							res1.record.Code = "";
+							res1.record.JobDetailID = res1.record.id;
+							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
+							params.details.push(res1.record)
+						}
+					})
+				})
+
+				return params;
+			},
+
+			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/putaway/request/putawayRequestDetail.vue b/pages/putaway/request/putawayRequestDetail.vue
index bc3c63d6..abc38a5b 100644
--- a/pages/putaway/request/putawayRequestDetail.vue
+++ b/pages/putaway/request/putawayRequestDetail.vue
@@ -26,7 +26,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -88,7 +87,6 @@
 						that.requestContent = res.data;
 						that.detailList = res.data.subList;
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}
diff --git a/pages/repleinsh/job/repleinshDetail.vue b/pages/repleinsh/job/repleinshDetail.vue
index 3290e54e..1297f63c 100644
--- a/pages/repleinsh/job/repleinshDetail.vue
+++ b/pages/repleinsh/job/repleinshDetail.vue
@@ -52,7 +52,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName,
@@ -178,7 +177,6 @@
 							that.fromLocationCode = that.detailList[0].fromLocationCode
 							that.toLocationCode = that.detailList[0].toLocationCode
 							that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
-							updateTitle(that.jobContent.number);
 							that.getLocationInfo(that.toLocationCode);
 
 						} else {
diff --git a/pages/repleinsh/record/repleinshRecord.vue b/pages/repleinsh/record/repleinshRecord.vue
index 3414aaf3..97a897b4 100644
--- a/pages/repleinsh/record/repleinshRecord.vue
+++ b/pages/repleinsh/record/repleinshRecord.vue
@@ -1,435 +1,434 @@
-<!-- 收货任务详情 -->
-<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="jobContent"
-								@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 {
-		goHome,
-		getInventoryStatusDesc,
-		getDirectoryItemArray
-	} from '@/common/basic.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,
-				jobContent: {}, //任务内容
-				detailList: [], //接口返回的任务details
-				detailSource: [], //绑定在页面上的数据源
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
-				locationTypeList: [],
-				toLocationInfo: {},
-				businessTypeInfo: {},
-				fromLocationInfo: {},
-				fromLocationCode: "",
-				toLocationInfo: {},
-				toLocationCode: "",
-				isShowLocation: false,
-				fromlocationTypeList: [],
-				tolocationTypeList: [],
-				allowModifyLocation: false,
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				businessType: {},
-				fromType: ""
-			};
-		},
-		onLoad(option) {
-			this.fromType = option.fromType
-			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.details.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.details.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.details.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.details) {
-						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.details.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
-				});
-
-				var params = this.setParams();
-				console.log("提交" + JSON.stringify(params))
-				if(this.fromType=="requestType"){
-					
-				}else {
-					
-				}
-				// (this.id, params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.data) {
-				// 		var hint = res.data.Number;
-				// 		this.showCommitSuccessMessage("提交成功" + hint, )
-
-				// 	} else {
-				// 		this.showErrorMessage("提交失败")
-				// 	}
-				// }).catch(error => {
-				// 	uni.hideLoading()
-				// 	this.showErrorMessage(error)
-				// })
-
-			},
-
-			setParams() {
-				var params = {
-					requestNumber: this.jobContent.requestNumber,
-					jobNumber: "",
-					asnNumber: this.jobContent.asnNumber,
-					ppNumber: this.jobContent.ppNumber,
-					supplierCode: this.jobContent.supplierCode,
-					ReceiptDock: this.jobContent.ReceiptDock,
-					carrierCode: this.jobContent.carrierCode,
-					transferMode: this.jobContent.transferMode,
-					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
-					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
-					toWarehouseCode: this.toLocationInfo.WarehouseCode,
-					OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
-					InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
-					executeTime: "2023-08-4 16:30:11", //执行时间
-					activeDate: "2023-08-4 16:30:11", //生效时间
-					available: "1", //是否可用 0不可用,1可用
-					requestTime: this.jobContent.requestTime,
-					dueTime: "2023-08-4 16:30:11", //截止时间
-					departmentCode: this.jobContent.departmentCode,
-					UserPositionCode: "", //岗位
-					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
-					Number: this.jobContent.Number,
-					businessType: this.jobContent.businessType,
-					remark: this.jobContent.remark,
-					creationTime: this.jobContent.creationTime,
-					Creatorld: this.jobContent.Creatorld,
-					creatorName: this.jobContent.creatorName,
-					extraProperties: this.jobContent.extraProperties,
-					Siteld: this.jobContent.Siteld,
-					Code: "",
-					details: [
-
-					],
-				}
-
-				this.detailSource.forEach(res => {
-					res.details.forEach(res1 => {
-						if (res1.scaned) {
-							res1.record.FromLocationGroupCode = "";
-							res1.record.FromAreaCode = "";
-							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
-							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
-							res1.record.VisualInspectResult = ""; //目检结果
-							res1.record.VisualInspectPhotos = ""; //目检照片
-							res1.record.FailedReason = ""; //不合格原因
-							res1.record.MassDefect = ""; //质量缺陷
-							res1.record.SinglePrice = ""; //单价
-							res1.record.Amount = ""; //金额
-							res1.record.Code = "";
-							res1.record.JobDetailID = res1.record.id;
-							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
-							params.details.push(res1.record)
-						}
-					})
-				})
-
-				return params;
-			},
-
-			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="jobContent"
+								@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 {
+		goHome,
+		updateTitle,
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/basic.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,
+				jobContent: {}, //任务内容
+				detailList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+				scrollTop: 0,
+				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.details.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.details.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.details.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.details) {
+						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.details.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
+				});
+
+				var params = this.setParams();
+				console.log("提交" + JSON.stringify(params))
+				if(this.fromType=="requestType"){
+					
+				}else {
+					
+				}
+				// (this.id, params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		var hint = res.data.Number;
+				// 		this.showCommitSuccessMessage("提交成功" + hint, )
+
+				// 	} else {
+				// 		this.showErrorMessage("提交失败")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
+
+			},
+
+			setParams() {
+				var params = {
+					requestNumber: this.jobContent.requestNumber,
+					jobNumber: "",
+					asnNumber: this.jobContent.asnNumber,
+					ppNumber: this.jobContent.ppNumber,
+					supplierCode: this.jobContent.supplierCode,
+					ReceiptDock: this.jobContent.ReceiptDock,
+					carrierCode: this.jobContent.carrierCode,
+					transferMode: this.jobContent.transferMode,
+					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
+					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
+					toWarehouseCode: this.toLocationInfo.WarehouseCode,
+					OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
+					InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
+					executeTime: "2023-08-4 16:30:11", //执行时间
+					activeDate: "2023-08-4 16:30:11", //生效时间
+					available: "1", //是否可用 0不可用,1可用
+					requestTime: this.jobContent.requestTime,
+					dueTime: "2023-08-4 16:30:11", //截止时间
+					departmentCode: this.jobContent.departmentCode,
+					UserPositionCode: "", //岗位
+					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
+					Number: this.jobContent.Number,
+					businessType: this.jobContent.businessType,
+					remark: this.jobContent.remark,
+					creationTime: this.jobContent.creationTime,
+					Creatorld: this.jobContent.Creatorld,
+					creatorName: this.jobContent.creatorName,
+					extraProperties: this.jobContent.extraProperties,
+					Siteld: this.jobContent.Siteld,
+					Code: "",
+					details: [
+
+					],
+				}
+
+				this.detailSource.forEach(res => {
+					res.details.forEach(res1 => {
+						if (res1.scaned) {
+							res1.record.FromLocationGroupCode = "";
+							res1.record.FromAreaCode = "";
+							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
+							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
+							res1.record.VisualInspectResult = ""; //目检结果
+							res1.record.VisualInspectPhotos = ""; //目检照片
+							res1.record.FailedReason = ""; //不合格原因
+							res1.record.MassDefect = ""; //质量缺陷
+							res1.record.SinglePrice = ""; //单价
+							res1.record.Amount = ""; //金额
+							res1.record.Code = "";
+							res1.record.JobDetailID = res1.record.id;
+							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
+							params.details.push(res1.record)
+						}
+					})
+				})
+
+				return params;
+			},
+
+			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 8e1b6489..a0294c96 100644
--- a/pages/scrap/record/scrapRecord.vue
+++ b/pages/scrap/record/scrapRecord.vue
@@ -1,428 +1,427 @@
-<!-- 收货任务详情 -->
-<template>
-	<view class="page-wraper">
-		<view class="">
-			<com-blank-view @goScan='getLocation' v-if="fromLocationCode==''"></com-blank-view>
-		</view>
-		<view class="page-wraper" v-if="fromLocationCode!=''">
-			<view class="uni-flex uni-row u-col-center" style="width: 100%;" v-if="detailSource.length>0">
-				<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;">
-					报废原因 :
-				</view>
-				<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
-					class='uni-data-picker' placeholder="请选择原因" popup-title="选择报废原因" :localdata="reasonList"
-					v-model="reason">
-				</uni-data-picker>
-			</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="">
-							<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>
-						<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'></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 {
-		goHome,
-		getInventoryStatusDesc,
-		getDirectoryItemArray,
-		getScarpReasonList
-	} 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 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,
-				jobContent: {}, //任务内容
-				detailList: [], //接口返回的任务details
-				detailSource: [], //绑定在页面上的数据源
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				},
-				locationTypeList: [],
-				toLocationInfo: {},
-				businessTypeInfo: {},
-				fromLocationInfo: {},
-				fromLocationCode: "",
-				isShowLocation: false,
-				fromlocationTypeList: [],
-				tolocationTypeList: [],
-				allowModifyLocation: false,
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				businessType: {},
-				reasonList: [],
-				reason: "",
-				fromType:""
-			};
-		},
-		onLoad(option) {
-			this.fromType = option.fromType
-			this.reasonList = getScarpReasonList();
-			var typeCode = "Scrap"
-			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.details.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.details.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.details.push(newDetail);
-					} else {
-						if (detail.scaned == true) {
-							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
-						}
-					}
-				}
-				this.calcHandleQty();
-
-			},
-
-			createItemInfo(balance, pack) {
-				let item = {
-					itemCode: balance.itemCode,
-					itemName: pack.itemName,
-					stdPackQty: pack.stdPackQty,
-					stdPackUnit: pack.stdPackUnit,
-					qty: Number(balance.qty),
-					handleQty: 0,
-					uom: pack.uom,
-					details: []
-				}
-				return item;
-			},
-
-			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.details.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();
-			},
-
-
-			commit() {
-				if(this.reason==""){
-					this.showMessage("请先选择报废原因")
-					return;
-				}
-				//允许部分提交
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-
-				var params = this.setParams();
-				console.log("提交" + JSON.stringify(params))
-				// (this.id, params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.data) {
-				// 		var hint = res.data.Number;
-				// 		this.showCommitSuccessMessage("提交成功" + hint, )
-
-				// 	} else {
-				// 		this.showErrorMessage("提交失败")
-				// 	}
-				// }).catch(error => {
-				// 	uni.hideLoading()
-				// 	this.showErrorMessage(error)
-				// })
-
-			},
-
-			setParams() {
-				var params = {
-					requestNumber: this.jobContent.requestNumber,
-					jobNumber: "",
-					asnNumber: this.jobContent.asnNumber,
-					ppNumber: this.jobContent.ppNumber,
-					supplierCode: this.jobContent.supplierCode,
-					ReceiptDock: this.jobContent.ReceiptDock,
-					carrierCode: this.jobContent.carrierCode,
-					transferMode: this.jobContent.transferMode,
-					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
-					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
-					toWarehouseCode: this.toLocationInfo.WarehouseCode,
-					OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
-					InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
-					executeTime: "2023-08-4 16:30:11", //执行时间
-					activeDate: "2023-08-4 16:30:11", //生效时间
-					available: "1", //是否可用 0不可用,1可用
-					requestTime: this.jobContent.requestTime,
-					dueTime: "2023-08-4 16:30:11", //截止时间
-					departmentCode: this.jobContent.departmentCode,
-					UserPositionCode: "", //岗位
-					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
-					Number: this.jobContent.Number,
-					businessType: this.jobContent.businessType,
-					remark: this.jobContent.remark,
-					creationTime: this.jobContent.creationTime,
-					Creatorld: this.jobContent.Creatorld,
-					creatorName: this.jobContent.creatorName,
-					extraProperties: this.jobContent.extraProperties,
-					Siteld: this.jobContent.Siteld,
-					Code: "",
-					details: [
-
-					],
-				}
-
-				this.detailSource.forEach(res => {
-					res.details.forEach(res1 => {
-						if (res1.scaned) {
-							res1.record.FromLocationGroupCode = "";
-							res1.record.FromAreaCode = "";
-							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
-							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
-							res1.record.VisualInspectResult = ""; //目检结果
-							res1.record.VisualInspectPhotos = ""; //目检照片
-							res1.record.FailedReason = ""; //不合格原因
-							res1.record.MassDefect = ""; //质量缺陷
-							res1.record.SinglePrice = ""; //单价
-							res1.record.Amount = ""; //金额
-							res1.record.Code = "";
-							res1.record.JobDetailID = res1.record.id;
-							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
-							params.details.push(res1.record)
-						}
-					})
-				})
-
-				return params;
-			},
-
-			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();
-			},
-
-			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="fromLocationCode==''"></com-blank-view>
+		</view>
+		<view class="page-wraper" v-if="fromLocationCode!=''">
+			<view class="uni-flex uni-row u-col-center" style="width: 100%;" v-if="detailSource.length>0">
+				<view class="" style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;">
+					报废原因 :
+				</view>
+				<uni-data-picker v-if="detailSource.length>0" style="padding: 20rpx; background-color:#fff;"
+					class='uni-data-picker' placeholder="请选择原因" popup-title="选择报废原因" :localdata="reasonList"
+					v-model="reason">
+				</uni-data-picker>
+			</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="">
+							<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>
+						<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'></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 {
+		goHome,
+		updateTitle,
+		getInventoryStatusDesc,
+		getDirectoryItemArray,
+		getScarpReasonList
+	} 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 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,
+				jobContent: {}, //任务内容
+				detailList: [], //接口返回的任务details
+				detailSource: [], //绑定在页面上的数据源
+				scrollTop: 0,
+				locationTypeList: [],
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				fromLocationInfo: {},
+				fromLocationCode: "",
+				isShowLocation: false,
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				allowModifyLocation: false,
+				inInventoryStatus: "", //目标入库库存状态
+				outInventoryStatus: "", //来源出库库存状态
+				businessType: {},
+				reasonList: [],
+				reason: "",
+				fromType:""
+			};
+		},
+		onLoad(option) {
+			this.fromType = option.fromType
+			if(this.fromType=="requestType"){
				updateTitle("报废申请")
			}else {
				updateTitle("报废记录")
			}
+			this.reasonList = getScarpReasonList();
+			var typeCode = "Scrap"
+			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.details.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.details.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.details.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+
+			},
+
+			createItemInfo(balance, pack) {
+				let item = {
+					itemCode: balance.itemCode,
+					itemName: pack.itemName,
+					stdPackQty: pack.stdPackQty,
+					stdPackUnit: pack.stdPackUnit,
+					qty: Number(balance.qty),
+					handleQty: 0,
+					uom: pack.uom,
+					details: []
+				}
+				return item;
+			},
+
+			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.details.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();
+			},
+
+
+			commit() {
+				if(this.reason==""){
+					this.showMessage("请先选择报废原因")
+					return;
+				}
+				//允许部分提交
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				var params = this.setParams();
+				console.log("提交" + JSON.stringify(params))
+				// (this.id, params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		var hint = res.data.Number;
+				// 		this.showCommitSuccessMessage("提交成功" + hint, )
+
+				// 	} else {
+				// 		this.showErrorMessage("提交失败")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
+
+			},
+
+			setParams() {
+				var params = {
+					requestNumber: this.jobContent.requestNumber,
+					jobNumber: "",
+					asnNumber: this.jobContent.asnNumber,
+					ppNumber: this.jobContent.ppNumber,
+					supplierCode: this.jobContent.supplierCode,
+					ReceiptDock: this.jobContent.ReceiptDock,
+					carrierCode: this.jobContent.carrierCode,
+					transferMode: this.jobContent.transferMode,
+					vehiclePlateNumber: this.jobContent.vehiclePlateNumber,
+					fromWarehouseCode: this.toLocationInfo.WarehouseCode,
+					toWarehouseCode: this.toLocationInfo.WarehouseCode,
+					OutTransaction: this.businessTypeInfo.OutTransactionType, //出库事务类型
+					InTransaction: this.businessTypeInfo.InTransactionType, //入库事务类型
+					executeTime: "2023-08-4 16:30:11", //执行时间
+					activeDate: "2023-08-4 16:30:11", //生效时间
+					available: "1", //是否可用 0不可用,1可用
+					requestTime: this.jobContent.requestTime,
+					dueTime: "2023-08-4 16:30:11", //截止时间
+					departmentCode: this.jobContent.departmentCode,
+					UserPositionCode: "", //岗位
+					interfaceType: "jklxPURCHASE_RECEIPT", //接口类型
+					Number: this.jobContent.Number,
+					businessType: this.jobContent.businessType,
+					remark: this.jobContent.remark,
+					creationTime: this.jobContent.creationTime,
+					Creatorld: this.jobContent.Creatorld,
+					creatorName: this.jobContent.creatorName,
+					extraProperties: this.jobContent.extraProperties,
+					Siteld: this.jobContent.Siteld,
+					Code: "",
+					details: [
+
+					],
+				}
+
+				this.detailSource.forEach(res => {
+					res.details.forEach(res1 => {
+						if (res1.scaned) {
+							res1.record.FromLocationGroupCode = "";
+							res1.record.FromAreaCode = "";
+							res1.record.ToLocationGroupCode = this.toLocationInfo.LocationGroupCode;
+							res1.record.ToAreaCode = this.toLocationInfo.AreaCode;
+							res1.record.VisualInspectResult = ""; //目检结果
+							res1.record.VisualInspectPhotos = ""; //目检照片
+							res1.record.FailedReason = ""; //不合格原因
+							res1.record.MassDefect = ""; //质量缺陷
+							res1.record.SinglePrice = ""; //单价
+							res1.record.Amount = ""; //金额
+							res1.record.Code = "";
+							res1.record.JobDetailID = res1.record.id;
+							res1.record.interfaceType = "jklxPURCHASE_RECEIPT";
+							params.details.push(res1.record)
+						}
+					})
+				})
+
+				return params;
+			},
+
+			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();
+			},
+
+			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/request/scrapRequestDetail.vue b/pages/scrap/request/scrapRequestDetail.vue
index ec7f8845..f1fbb825 100644
--- a/pages/scrap/request/scrapRequestDetail.vue
+++ b/pages/scrap/request/scrapRequestDetail.vue
@@ -26,7 +26,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -87,7 +86,6 @@
 						that.requestContent = res.data;
 						that.detailList = res.data.subList;
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}}
diff --git a/pages/transfer/job/transferDetail.vue b/pages/transfer/job/transferDetail.vue
index 4d84271f..63f326ea 100644
--- a/pages/transfer/job/transferDetail.vue
+++ b/pages/transfer/job/transferDetail.vue
@@ -41,7 +41,6 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
 		getInventoryStatusName
@@ -166,7 +165,6 @@
 						that.jobContent = res.data[0];
 						that.detailList = res.data[0].details;
 						that.detailSource = that.getDataSource(that.detailList)
-					    updateTitle(this.jobContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}
diff --git a/pages/unPlanned/job/receiptJobDetail.vue b/pages/unPlanned/job/receiptJobDetail.vue
index 6a9b90bf..5269f823 100644
--- a/pages/unPlanned/job/receiptJobDetail.vue
+++ b/pages/unPlanned/job/receiptJobDetail.vue
@@ -45,7 +45,6 @@
 	import {
 		goHome,
 		getCurrDateTime,
-		updateTitle,
 		getPackingNumberAndBatch,
 		getDirectoryItemArray
 	} from '@/common/basic.js';
@@ -155,7 +154,6 @@
 							that.locationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes);
 							that.detailList = res.data.subList;
 							that.detailSource = that.getDataSource(that.detailList)
-						    updateTitle(this.jobContent.number);
 						} else {
 							that.showErrorMessage('列表数据为0');
 						}
diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue
index faa460e5..9ff2af40 100644
--- a/pages/unPlanned/record/issueRecord.vue
+++ b/pages/unPlanned/record/issueRecord.vue
@@ -66,6 +66,11 @@
 		createDetailInfo,
 		calcHandleQty
 	} from '@/common/record.js';
+	
+	import {
+		goHome,
+		updateTitle
+	} from '@/common/basic.js';
 
 	export default {
 		components: {
@@ -109,6 +114,11 @@
 
 		onLoad(option) {
 		this.fromType = option.fromType
+		if (this.fromType == "requestType") {
+			updateTitle("计划外出库申请")
+		} else {
+			updateTitle("计划外出库记录")
+		}
 		},
 
 		methods: {
diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue
index cbc3a5cc..d36dc5a1 100644
--- a/pages/unPlanned/record/receiptRecord.vue
+++ b/pages/unPlanned/record/receiptRecord.vue
@@ -59,10 +59,15 @@
 		getDirectoryItemArray,
 		getUnPlannedReceiptReasonList
 	} from '@/common/directory.js';
-	
+
 	import {
 		getBusinessType,
 	} from '@/common/record.js';
+	import {
+		goHome,
+		updateTitle,
+	} from '@/common/basic.js';
+
 
 	export default {
 		components: {
@@ -88,7 +93,7 @@
 				businessTypeCode: "UnplannedReceipt",
 				reason: "",
 				reasonList: [],
-				fromType:""
+				fromType: ""
 			}
 		},
 
@@ -101,13 +106,18 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.openScanPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message );
+					this.$refs.comMessage.showBreakMessage(res.message);
 				}
 			});
 		},
 
 		onLoad(option) {
-		this.fromType = option.fromType
+			this.fromType = option.fromType
+			if (this.fromType == "requestType") {
+				updateTitle("计划外入库申请")
+			} else {
+				updateTitle("计划外入库记录")
+			}
 		},
 
 		methods: {
@@ -175,7 +185,7 @@
 				detail.inventoryStatus = "kcztOK"
 				detail.stdPackQty = pack.stdPackQty;
 				detail.stdPackUnit = pack.stdPackUnit;
-				label.inventoryStatus="kcztOK";
+				label.inventoryStatus = "kcztOK";
 				detail.package = pack;
 				detail.label = label;
 				return detail;
diff --git a/pages/unPlanned/request/issueRequestDetail.vue b/pages/unPlanned/request/issueRequestDetail.vue
index b8765a95..b645d71d 100644
--- a/pages/unPlanned/request/issueRequestDetail.vue
+++ b/pages/unPlanned/request/issueRequestDetail.vue
@@ -25,7 +25,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -87,7 +86,6 @@
 							that.requestContent = res.data;
 							that.detailList = res.data.subList;
 							that.detailSource = getDataSource(that.detailList);
-							updateTitle(this.requestContent.number);
 						}else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/unPlanned/request/receiptRequestDetail.vue b/pages/unPlanned/request/receiptRequestDetail.vue
index 169a4231..d46c0ce1 100644
--- a/pages/unPlanned/request/receiptRequestDetail.vue
+++ b/pages/unPlanned/request/receiptRequestDetail.vue
@@ -26,7 +26,6 @@
 
 	import {
 		goHome,
-		updateTitle
 	} from '@/common/basic.js';
 
 	import {
@@ -91,7 +90,6 @@
 							res.fromLocationCode = res.toLocationCode
 						})
 						that.detailSource = getDataSource(that.detailList);
-						updateTitle(this.requestContent.number);
 					} else {
 						that.showMessage('列表数据为0');
 					}