diff --git a/src/pages.json b/src/pages.json
index d173fcf8..9a1222b7 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1130,6 +1130,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/deliver/job/deliverDetailBatch",
+			"style": {
+				"navigationBarTitleText": "成品发货详情",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/deliver/record/deliverRecord",
 			"style": {
diff --git a/src/pages/deliver/coms/comDeliverDetailCardBatch.vue b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
new file mode 100644
index 00000000..76008fbb
--- /dev/null
+++ b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
@@ -0,0 +1,141 @@
+<template>
+	<view>
+		<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
+			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
+
+		<view v-for="(item,index) in dataContent.subList">
+			<uni-swipe-action ref="swipeAction" :class="item.scaned? 'scan_view':''">
+				<uni-swipe-action-item
+					:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"
+					@click="swipeClick($event,item,index)" style='padding:0px 0px  5px 0px;align-items: center;'>
+					<item-qty :dataContent="item" :handleQty="item.handleQty" :isShowBalanceQty="false"></item-qty>
+					<location :locationCode="item.fromLocationCode"></location>
+					<recommendBalanceBatch style='margin-left: 20px;' :detail="item" :isShowLocation="false"
+						:isShowPack="item.packingNumber"></recommendBalanceBatch>
+
+				</uni-swipe-action-item>
+			</uni-swipe-action>
+		</view>
+	</view>
+	<qtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></qtyEdit>
+	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+	<comMessage ref="message"></comMessage>
+</template>
+
+<script>
+	import itemQty from '@/mycomponents/item/itemQty.vue'
+	import recommend from '@/mycomponents/recommend/recommend.vue'
+	import recommendBalanceBatch from '@/mycomponents/balance/recommendBalanceBatch.vue'
+	import handleBalance from '@/mycomponents/balance/handleBalance.vue'
+	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import qtyEdit from '@/mycomponents/qty/qtyEdit.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+
+import {
+		getDetailOption,
+		getPurchaseReceiptOption,
+		getRemoveOption,
+		getEditRemoveOption
+	} from '@/common/array.js';
+
+	export default {
+		emits: ['updateData'],
+		components: {
+			itemQty,
+			recommend,
+			recommendBalanceBatch,
+			handleBalance,
+			recommendQtyEdit,
+			requiredLocation,
+			qtyEdit,
+			location,
+			detailInfoPopup
+		},
+		props: {
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+			settingParam: {
+				type: Object,
+				default: {}
+			},
+			isEdit: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+
+		},
+
+		data() {
+			return {
+				option: [],
+				showItem: {},
+				editItem: {},
+				batchItem: {},
+				detailOptions: [],
+				scanOptions: []
+			}
+		},
+
+		mounted() {
+			
+			this.removeOptions = getRemoveOption();
+			this.editAndRemoveOptions = getEditRemoveOption()
+		},
+
+		methods: {
+			resizeCollapse() {
+				this.$nextTick(r => {
+					this.$refs.collapse.forEach(r => {
+						r.childrens.forEach(i => {
+							i.init();
+						})
+						r.resize();
+					})
+				});
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+
+			edit(item) {
+				let that = this;
+				that.editItem = item;
+				that.$refs.balanceQtyEdit.openEditPopup(item);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(item, index) {
+				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+						item.handleQty = 0;
+						item.scaned = false ;
+						}
+					});
+			},
+			confirm(val) {
+					console.log(44,this.editItem)
+					this.editItem.handleQty =  Number(val);
+					this.$emit('updateData', this.editItem)
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages/deliver/coms/comScanDeliverPackBatch.vue b/src/pages/deliver/coms/comScanDeliverPackBatch.vue
new file mode 100644
index 00000000..b684c515
--- /dev/null
+++ b/src/pages/deliver/coms/comScanDeliverPackBatch.vue
@@ -0,0 +1,548 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :maskClick='false'>
+			<view class="">
+				<view class="popup_box">
+					<view class="pop_title uni-flex space-between">
+						<view class="" style="font-size: 35rpx;">
+							扫描箱码
+						</view>
+
+						<view class="">
+							<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
+								@click="closeScanPopup()"></image>
+						</view>
+					</view>
+
+					<!-- <view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						padding:20rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center">
+							位置 :
+						</view>
+						<view class="" style="width: 75%;padding: 0rpx">
+							<view class="uni-flex u-col-center uni-row" @click="showSelect">
+								<view class="" style="margin-left: 15rpx;font-size: 30rpx;">
+									{{positionInfo}}
+								</view>
+								<u-select v-model="show" mode="mutil-column-auto" :list="positionList" :defaultValue="defaultValueList"
+									@confirm="confirmSelect"></u-select>
+							</view>
+						</view>
+					</view>
+					<u-line class='line_color'></u-line> -->
+
+					<view class="uni-flex uni-row" style="align-items: center;
+						background-color: #fff; 
+						margin-left: 20rpx;
+						margin-right: 20rpx;
+						margin-top: 8rpx;
+						border-radius: 8rpx;">
+						<view class="uni-center" style="width: 25%; ">
+							来源库位
+						</view>
+						<view class="" style="width: 75%; padding: 8rpx;">
+							<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位"
+								@confirm="fromLocationUpdate"></uni-combox>
+						</view>
+					</view>
+
+					<view class="">
+						<view class="">
+							<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true"
+								:headerType="headerType" :isShowHistory="false">
+							</win-com-scan>
+
+							<view style="width: 100%;">
+								<view style="width: 100%;" v-if="issueRecord.length>0">
+									<view class="uni-flex uni-row space-between u-col-center">
+										<view class="" style="padding: 10rpx;">
+											历史记录
+										</view>
+										<view class="" style="padding-right: 10rpx;">
+											<u-icon :name="expendIcon" size="35rpx" @click="expands()"></u-icon>
+										</view>
+									</view>
+									<u-line class='line_color' style='padding-top: 10rpx;padding-bottom: 20rpx;'>
+									</u-line>
+									<scroll-view scroll-y="true" class="scroll-view"
+										v-if="expand&&issueRecord.length>0">
+										<view class="uni-flex u-col" v-for="(record,index) in issueRecord">
+											<view style="width: 100%;">
+												<uni-swipe-action ref="swipeAction">
+													<uni-swipe-action-item @click="swipeClick($event,record,index)"
+														:right-options="scanOptions">
+														<view style="padding: 0px 10px">
+															<balance :dataContent="record" :isShowLocation="false"
+																:isShowStdPack="false"></balance>
+														</view>
+													</uni-swipe-action-item>
+												</uni-swipe-action>
+												<u-line class='line_color'></u-line>
+											</view>
+										</view>
+									</scroll-view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<comMessage ref="comMessage"></comMessage>
+		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	</view>
+</template>
+
+<script>
+	import winComScan from '@/mycomponents/scan/winComScan.vue'
+	import balance from '@/mycomponents/balance/balance.vue'
+	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+	import {
+		getDetailOption,
+		getDetailEditRemoveOption
+	} from '@/common/array.js';
+
+	import {
+		getDirectoryItemArray,
+	} from '@/common/directory.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+
+	export default {
+		name: 'winScanPack',
+		components: {
+			winComScan,
+			balance,
+			balanceQtyEdit,
+			balanceSelect
+		},
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			headerType: {
+				type: String,
+				default: "HPQ,HMQ"
+			},
+
+
+		},
+		data() {
+			return {
+				dataContent: {},
+				jobContent: {},
+				expendIcon: 'arrow-down',
+				show: false,
+				scanList: [],
+				toLocation: null,
+				toLocationCode: '',
+				fromLocationList: [],
+				fromLocationCode: '',
+				fromLocation: null,
+				issueRecord: [], //发货历史
+				expand: true,
+				scanOptions: {},
+				editItem: {},
+				positionInfo: "请选择位置",
+				positionList: [],
+				defaultValueList: [],
+				label: {},
+				fromInventoryStatuses: [],
+				packageInfo: {}
+			}
+		},
+		created() {
+
+		},
+		watch: {},
+		mounted() {
+			this.detailOptions = getDetailOption();
+			this.scanOptions = getDetailEditRemoveOption();
+		},
+		methods: {
+			openScanPopup(content, jobcontent) {
+				this.issueRecord = [];
+				this.dataContent = content;
+				this.jobContent = jobcontent;
+				this.initData();
+				this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
+					"-" + this.jobContent.subList[0].workStationCode
+				this.$refs.popup.open('bottom')
+				setTimeout(res => {
+					this.getfocus();
+				}, 500)
+			},
+
+			closeScanPopup() {
+				this.losefocus()
+				this.$refs.popup.close();
+				this.$emit("closeScan")
+				//清除数据，恢复默认值
+				// Object.assign(this.$data, this.$options.data());
+			},
+
+			initData() {
+				let that = this;
+				that.fromLocationList = [];
+				if (that.dataContent != null) {
+					that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) 
+					that.toLocation =that.dataContent.subList;
+					that.toLocationCode = that.dataContent.subList[0].toLocationCode;
+					that.fromLocationList = that.getFromLocationList();
+				}
+			},
+
+			showBalanceSelect(items, packageInfo) {
+				this.packageInfo = packageInfo;
+				this.$refs.balanceSelect.openPopup(items);
+			},
+
+			getFromLocationList() {
+				let list = [];
+				let location = this.dataContent.subList.find(r => r.toLocationCode == this.toLocationCode);
+				if (location != undefined) {
+					this.dataContent.subList.forEach(item => {
+						list.push(item.fromLocationCode)
+					})
+					this.fromLocationCode = list[0];
+					return list;
+				} else {
+					this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => {
+						this.toLocationCode = '';
+					});
+				}
+			},
+
+			fromLocationUpdate(fromlocation) {
+				let location = this.fromLocationList.find(r => r == fromlocation)
+				// 成品发货任务--同一物料，可以扫描提交不在任务中的库位
+				// if (location == undefined) {
+					this.fromLocationCode = fromlocation
+				// 	this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
+				// }
+			},
+			onScan(result) {
+				try {
+					let that = this;
+
+					if (that.fromLocationCode == '') {
+						that.showErrorMessage('请选择来源库位', res => {
+							that.$refs.toLocationCombox.onFocus();
+						});
+						return;
+					}
+					let packageInfo = result.package;
+					let itemCode = result.label.itemCode;
+					let packingCode = result.label.packingNumber;
+					let lot = result.label.batch;
+					let item =  that.toLocation.find(r => r.itemCode == itemCode);
+					if (item == undefined) {
+						that.showErrorMessage('未查找到物料【' + itemCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+						return;
+					} else {
+						//查找库存信息
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
+							balanceRes => {
+								if (balanceRes.success) {
+									if (balanceRes.data.list.length == 0) {
+										this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
+											res => {
+												this.packGetFocus();
+											})
+									} else if (balanceRes.data.list.length == 1) {
+										let balance = balanceRes.data.list[0];
+										this.afterGetBalance(result.label, balance, packageInfo);
+									} else {
+										this.label = result.label;
+										this.showBalanceSelect(balanceRes.data.list, packageInfo);
+									}
+								} else {
+									this.showErrorMessage(balanceRes.message.message);
+								}
+								uni.hideLoading();
+							});
+					}
+				} catch (e) {
+					this.showErrorMessage(e.stack)
+					uni.hideLoading();
+				}
+			},
+
+			selectBalanceItem(balance) {
+				this.afterGetBalance(balance, balance, this.packageInfo);
+			},
+
+
+			afterGetBalance(label, balance, packageInfo) {
+				let that = this;
+				try {
+					let itemCode = label.itemCode;
+					let packingCode = label.packingNumber;
+					let lot = label.batch;
+					let item = that.toLocation.find(r => r.itemCode == itemCode);
+					item.scaned =true
+					let fromLocation = that.toLocation.find(l => l.fromLocationCode == that.fromLocationCode);
+					// 成品发货任务--同一物料，可以扫描提交不在任务中的库位
+					if(!fromLocation){
+						fromLocation = {
+							Batchs:[{
+								Recommends:[],
+								Records: [],
+								batch: label.batch,
+								detail:{
+									...packageInfo,
+									fromLocationCode: balance.locationCode,
+									toLocationCode:this.toLocationCode
+								},
+								handleQty: 0,
+								packingNumber: null,
+								// packingNumber: label.packingNumber,
+								qty: label.qty,
+								uom: label.uom
+							}],
+							toLocationCode:this.toLocationCode,
+							fromLocationCode: balance.locationCode,
+							handleQty: 0,
+							qty: label.qty,
+							uom: label.uom
+						}
+						item.Locations.push(fromLocation)
+					}
+					if (fromLocation != undefined) {
+						console.log(34444)
+						let batch = fromLocation.batch;
+						if (batch != undefined) {
+							that.addRecord(item.batch, label, balance, packageInfo)
+						} else {
+							if (this.jobContent.allowModifyBatch == "TRUE") {
+								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
+									'】的发货明细,是否要继续发货?', res => {
+										if (res) {
+											let batch = that.createBatchInfo(label, balance,packageInfo);
+											fromLocation.Batchs.unshift(batch);
+										}
+									})
+							} else {
+								that.showErrorMessage('未查找到批次【' + lot + '】的发货明细',
+									res => {
+										that.getfocus();
+									});
+							}
+						}
+					} else {
+						that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细',
+							res => {
+								that.getfocus();
+							}
+						)
+					}
+				} catch (e) {
+					that.showErrorMessage(e.stack,
+						res => {
+							that.getfocus();
+						}
+					)
+				}
+			},
+
+			createBatchInfo(data, balance, packageInfo) {
+				let batch = {
+					batch: data.lot||data.batch,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: [],
+					detail:{
+						fromLocationCode:this.fromLocationCode, //balance.locationCode
+						toLocationCode:this.toLocationCode,
+						itemCode:data.itemCode,
+						handleQty: Number(data.qty),
+						packingNumber:data.packingNumber,
+						qty: 0,
+						uom:data.uom,
+						itemName:packageInfo.itemName,
+						itemDesc1:packageInfo.itemDesc1,
+						itemDesc2:packageInfo.itemDesc2,
+						singlePrice:balance.singlePrice,
+						amount:balance.amount
+					}
+				}
+				let record = this.creatRecord(data, balance, packageInfo);
+				batch.Records.push(record);
+				this.issueRecord.unshift(record)
+				return batch;
+			},
+
+			creatRecord(label, balance, packageInfo) {
+				balance.packQty = packageInfo.packQty
+				balance.packUnit = packageInfo.packUnit
+				let record = {
+					scaned: true,
+					itemCode: label.itemCode,
+					packingNumber: label.packingNumber,
+					batch: label.batch,
+					qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
+					uom: balance.uom,
+					inventoryStatus: balance.inventoryStatus,
+					balance: balance,
+					toLocationCode: this.toLocationCode,
+					supplierCode: label.supplierCode,
+					packUnit: packageInfo.packUnit,
+					packQty: packageInfo.packQty,
+					singlePrice:balance.singlePrice,
+					amount:balance.amount
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch,label,balance) {
+				this.dataContent.subList.forEach(item => {
+					if(item.itemCode == balance.itemCode&&item.batch == batch){
+						item.handleQty = item.handleQty || 0
+						item.handleQty = calc.add(item.handleQty, label.qty);
+					}
+				})
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				this.calcBatchHandleQty(batch,label,balance);
+				this.getfocus();
+			},
+
+			getfocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan != undefined) {
+					this.$refs.comscan.losefocus();
+				}
+			},
+
+			expands() {
+				this.expand = !this.expand;
+				this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
+			},
+
+			swipeClick(e, item, index) {
+				if (e.content.text == "详情") {
+					this.detail(item)
+				} else if (e.content.text == "编辑") {
+					this.edit(item)
+				} else if (e.content.text == "移除") {
+					this.remove(item, index)
+				}
+			},
+			edit(item) {
+				this.editItem = item;
+				// item.balance.balanceQty = item.balance.qty;
+				item.balance.balanceQty = item.balance.qty;
+				this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+			},
+
+			detail(item) {
+				this.showItem = item;
+				this.$refs.receiptHint.openScanPopup()
+			},
+			remove(record, index) {
+				this.showQuestionMessage("确定移除扫描信息?",
+					res => {
+						if (res) {
+							record.qty = 0;
+							this.issueRecord.splice(index, 1)
+
+							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
+							if (item != undefined) {
+								item.Locations.forEach(l => {
+									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
+										.batch == record.batch);
+									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
+										.packingNumber && r
+										.batch == record.batch);
+									batch.Records.splice(rIndex, 1);
+								})
+							}
+							this.$emit('updateData', item);
+						}
+					});
+			},
+
+			packGetFocus() {
+				this.$refs.comscan.getfocus();
+			},
+			packLoseFocus() {
+				this.$refs.comscan.losefocus();
+			},
+			showMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showMessage(message, callback);
+				})
+			},
+			showErrorMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showErrorMessage(message, callback);
+
+				})
+			},
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.packLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, callback);
+				})
+			},
+			confirm(val) {
+				this.editItem.qty = Number(val);
+				this.$emit('updateData', this.editItem)
+			},
+			cancle() {
+				this.closeScanPopup()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	button {
+		border: none;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.scroll-view {
+		overflow-y: scroll;
+		height: auto;
+		max-height: 300rpx;
+		padding: 10rpx;
+	}
+</style>
diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue
new file mode 100644
index 00000000..0ae33379
--- /dev/null
+++ b/src/pages/deliver/job/deliverDetailBatch.vue
@@ -0,0 +1,480 @@
+<template>
+	<view class="page-wraper">
+		<view class="page-header">
+			<view class="header-view">
+				<view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view>
+				<view class="cen_card" style="padding: 5rpx;">
+					<view class="cell_box uni-flex uni-row">
+						<view class="cell_info">
+							<view class="text_lightblue">发货类型</view>
+							<view>{{jobContent.deliverType}}</view>
+						</view>
+
+						<view class="cell_info">
+							<view class="text_lightblue">客户代码</view>
+							<view>{{jobContent.customerCode}}</view>
+						</view>
+
+						<view class="cell_info">
+							<view class="text_lightblue">目标库位</view>
+							<view>{{toLocationCode}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="page-main-scroll">
+				<view>
+					<comDeliverDetailCardBatch ref='comIssueDetailCard' :dataContent="detailSource" :settingParam="jobContent"
+						@updateData='updateData'>
+					</comDeliverDetailCardBatch>
+				</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="submit()">提交</button>
+				</view>
+			</view>
+		</view>
+
+		<win-scan-button @goScan='openScanDetailPopup'></win-scan-button>
+		<comScanDeliverPackBatch ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</comScanDeliverPackBatch>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getDeliverDetail,
+		takeDeliverJob,
+		cancleTakeDeliverJob,
+		deliverJobSubmit
+	} from '@/api/request2.js';
+
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		navigateBack,
+		getRemoveOption,
+		getCurrDateTime,
+		getPackingNumberAndBatch,
+		deepCopyData
+	} from '@/common/basic.js';
+
+	import {
+		getDataSource
+	} from '@/pages/issue/js/issue.js';
+
+	import {
+		getManagementPrecisions
+	} from '@/common/balance.js';
+
+
+	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comDeliverDetailCardBatch from '@/pages/deliver/coms/comDeliverDetailCardBatch.vue'
+	import comScanDeliverPackBatch from '@/pages/deliver/coms/comScanDeliverPackBatch.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+
+	export default {
+		name: 'issueDetail',
+		components: {
+			jobDetailPopup,
+			winScanButton,
+			comDeliverDetailCardBatch,
+			comScanDeliverPackBatch,
+			jobTop
+		},
+		data() {
+			return {
+				id: '',
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				status: "",
+				toLocationCode: "",
+				jobStatus: ""
+			};
+		},
+
+		props: {
+
+		},
+
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title + '详情'
+			})
+			this.id = option.id;
+			if (this.id != undefined) {
+				//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+			}
+		},
+
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		//拦截返回按钮事件
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakeDeliverJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeDeliverJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getDeliverDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data && res.data.subList.length > 0) {
+						that.jobContent = res.data;
+						that.jobStatus = res.data.status;
+						that.subList = res.data.subList;
+						that.detailSource = res.data;
+						that.toLocationCode = that.subList[0].toLocationCode
+						that.resizeCollapse();
+					} else {
+						that.showMessage('未获取到详情');
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			closeScan() {
+				this.resizeCollapse();
+			},
+
+			resizeCollapse() {
+
+			},
+
+
+
+			submit() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+
+				//目前任务只到一个库位
+				var itemCodes = []
+				let locationCode = this.detailSource.subList[0].toLocationCode
+				this.detailSource.subList.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+				//获取管理模式，封装参数
+				getManagementPrecisions(itemCodes, locationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						this.submitJob();
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				});
+				// //使用在途库，不查询管理模式
+				// if (locationCode == null) {
+				// 	this.submitJob();
+				// } else {
+				// 	//获取管理模式，封装参数
+				// 	getManagementPrecisions(itemCodes, locationCode, res => {
+				// 		if (res.success) {
+				// 			this.managementList = res.list;
+				// 			this.submitJob();
+				// 		} else {
+				// 			uni.hideLoading();
+				// 			this.showErrorMessage(res.message);
+				// 		}
+				// 	});
+				// }
+			},
+
+			checkCount() {
+				let str = ""
+				var taskQty = 0;
+				var totalQty = 0;
+				this.detailSource.subList.forEach(item => {
+					item.taskQty = calc.add(taskQty, item.qty)
+					var hanleQty = item.qty ? item.qty : 0
+					totalQty = calc.add(totalQty, hanleQty)
+					//实际扫描的数量
+					item.totalQty = totalQty
+
+				})
+				//如果允许部分提交任务有扫描记录就可以直接提交；如果不允许部分执行，任务数量和提交数量不一致给出提示
+				this.detailSource.subList.forEach(detail => {
+					if (this.jobContent.allowPartialComplete == "FALSE") {
+						if (item.taskQty != item.totalQty) {
+							str += `物料号【${item.itemCode}】任务数量【${item.taskQty}】与实际提交数量【${item.totalQty}】不一致\n`
+						}
+					}
+				})
+
+				if (str) {
+					str = '不允许提交\n' + str
+					this.showErrorMessage(str)
+				}
+
+				return str ? false : true
+
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数", params);
+				if (params.subList.length == 0) {
+					uni.hideLoading()
+					this.$refs.comMessage.showConfirmMessageModal('请扫描箱码')
+					return
+				}
+
+				if (!this.checkCount()) {
+					uni.hideLoading()
+					return;
+				}
+				deliverJobSubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功\n生成发货记录\n" + res.data)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			setParams() {
+				var subList = []
+				var createTime = getCurrDateTime();
+				var creator = this.$store.state.user.id
+				this.detailSource.subList.forEach(r => {
+					if (r.scaned) {
+						let subItem = {
+							...r
+						}
+						subItem.recordList = []
+						let record = {};
+						record.handleQty = r.qty;
+						record.toContainerNumber = r.ContainerNumber;
+						record.toInventoryStatus = r.inventoryStatus;
+						record.toLocationCode = subItem.toLocationCode;
+						record.supplierCode = r.supplierCode;
+						var info = getPackingNumberAndBatch(this.managementList, r.itemCode, r.packingNumber, r.batch);
+						record.toPackingNumber = info.packingNumber;
+						record.packingNumber = info.packingNumber;
+						record.fromPackingNumber = info.packingNumber;
+						record.toBatch = info.batch;
+						subItem.toPackingNumber = info.packingNumber;
+						subItem.packingNumber = info.packingNumber;
+						subItem.fromPackingNumber = info.packingNumber;
+						// //使用在途库不改变管理模式
+						// if (this.toLocationCode == null) {
+						// 	record.toPackingNumber = r.packingNumber;
+						// 	record.toBatch = r.batch;
+						// } else {
+						// 	var info = getPackingNumberAndBatch(this.managementList, r.itemCode,r.packingNumber, r.batch);
+						// 	record.toPackingNumber = info.packingNumber;
+						// 	record.toBatch = info.batch;
+						// }
+						subItem.recordList.push(record);
+						subList.push(deepCopyData(subItem));
+					}
+				})
+
+				this.jobContent.subList = subList
+				this.jobContent.createTime = createTime;
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			cancel() {
+				let that = this;
+				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {
+					if (res) {
+						that.clearInfo();
+					}
+				});
+			},
+
+			clearInfo() {
+				this.dataContent.itemCodeList.forEach(res => {
+					if (res.recommendList != null) {
+						res.recommendList.forEach(res1 => {
+							if (res1.locationCodeList != null) {
+								res1.locationCodeList.forEach(res2 => {
+									if (res2.packingCodeList != null) {
+										res2.packingCodeList.forEach(res3 => {
+											res3.itemCode = "";
+											res3.qty = 0;
+										})
+									}
+								})
+							}
+
+						})
+					}
+
+				})
+			},
+
+			updateData(record) {
+
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			showCommitSuccess() {
+				this.$refs.comMessage.showCommitSuccess();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+
+			showRescanMessage(message) {
+				this.$refs.comMessage.showRescanMessage(message);
+			},
+
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				console.log(2323)
+				this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
+			},
+			closeScanPopup() {
+				this.updateCommitBtn();
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.uni-numbox__value {
+		width: 40px;
+	}
+
+	button[disabled] {
+		background-color: #3C9CFF;
+		color: #fff;
+		opacity: 0.7;
+	}
+
+
+	// /deep/ .input-value {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item__title-text {
+	// 	font-size: 16px;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 0px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+
+	// /deep/ .uni-collapse-item--border {
+	// 	border-bottom-width: 1px;
+	// 	border-bottom-color: #ebeef5;
+	// }
+</style>
\ No newline at end of file
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index 5547d67f..58d58a70 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -42,6 +42,10 @@
 		getDetailOption,
 		getDetailGiveupOption
 	} from '@/common/array.js';
+	
+		import {
+			getManagementPrecisions
+		} from '@/common/balance.js';
 
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
 	import jobFilter from '@/mycomponents/job/jobFilter.vue'
@@ -192,9 +196,22 @@
 			},
 
 			openJobDetail(item) {
-				uni.navigateTo({
-					url: './deliverDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
-				});
+				getManagementPrecisions([item.itemCode], item.fromLocationCode, ret => {
+					if (ret.success) {
+						this.managementList = ret.list;
+						this.managementType = this.managementList.some(cur => cur.ManagementPrecision == 'BY_BATCH') ?
+							'BY_BATCH' : ''
+						if (this.managementType == 'BY_BATCH') {
+							uni.navigateTo({
+								url: './deliverDetailBatch?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
+							});
+						} else {
+							uni.navigateTo({
+								url: './deliverDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
+							});
+						}
+					}
+				})
 			},
 
 			showItemList(itemList) {
diff --git a/src/pages/purchaseReturn/request/returnRequestCreate.vue b/src/pages/purchaseReturn/request/returnRequestCreate.vue
index f5b4cb11..56e3aa56 100644
--- a/src/pages/purchaseReturn/request/returnRequestCreate.vue
+++ b/src/pages/purchaseReturn/request/returnRequestCreate.vue
@@ -161,7 +161,7 @@
 					this.detailSource.push(itemInfo)
 				} else {
 					var detail = item.subList.find(r => {
-						if (r.packingNumber == balance.packingNumber &&
+						if (
 							r.batch == balance.batch &&
 							r.locationCode == balance.locationCode &&
 							r.inventoryStatus == balance.inventoryStatus &&
@@ -174,7 +174,7 @@
 						let newDetail = createDetailInfo(balance, pack);
 						item.subList.push(newDetail);
 					} else {
-						this.showErrorMessage('箱码[' + balance.packingNumber + "]重复扫描")
+						this.showErrorMessage('批次[' + balance.batch + "]重复扫描")
 					}
 				}
 				calcHandleQty(this.detailSource);
diff --git a/src/pages/stockUp/job/stockUpJobDetailBatch.vue b/src/pages/stockUp/job/stockUpJobDetailBatch.vue
index 84f6f6d2..6fee6406 100644
--- a/src/pages/stockUp/job/stockUpJobDetailBatch.vue
+++ b/src/pages/stockUp/job/stockUpJobDetailBatch.vue
@@ -236,10 +236,6 @@
 				getManagementPrecisions(itemCodes, locationCode, res => {
 						if (res.success) {
 							this.managementList = res.list;
-							this.managementList =[{
-								ManagementPrecision: "BY_BATCH",
-								itemCode: "easy_code_test"
-							}]
 							this.submitJob();
 						} else {
 							uni.hideLoading();
@@ -265,8 +261,6 @@
 
 			submitJob() {
 				var params = this.setParams()
-				console.log("提交参数",params);
-				return
 				if (!params.subList || params.subList.length == 0) {
 					uni.hideLoading()
 					this.showErrorMessage("请扫描您需要提交的备货任务")