diff --git a/src/mycomponents/balance/handleBalanceBatch.vue b/src/mycomponents/balance/handleBalanceBatch.vue
new file mode 100644
index 00000000..4ab44d8e
--- /dev/null
+++ b/src/mycomponents/balance/handleBalanceBatch.vue
@@ -0,0 +1,85 @@
+<template>
+	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
+		<view class="space_between center">
+			<view style="word-break: break-all;width: 60%;">
+				<pack title='外包装' v-if="detail.parentPackingNumber"
+					:packingCode="detail.parentPackingNumber"></pack>
+				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
+				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
+				<location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
+			</view>
+			<view style="word-break: break-all;">
+				<recommend-qty v-if="detail.record==null || detail.record==undefined" :dataContent="detail"
+					:isShowStatus='isShowStatus' :isShowStdPack="true" :isShowCount='false'></recommend-qty>
+
+				<compare-qty v-else :dataContent="detail" :recommendQty="detail.qty" :handleQty="detail.record.qty"
+					:isShowStatus='isShowStatus' :isShowStdPack="true">
+				</compare-qty>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import pack from '@/mycomponents/balance/pack.vue'
+	import location from '@/mycomponents/balance/location.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+	import compareQty from '@/mycomponents/qty/compareQty.vue'
+
+	export default {
+		components: {
+			pack,
+			location,
+			batch,
+			recommendQty,
+			compareQty
+		},
+
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			detail: {
+				type: Object,
+				default: {}
+			},
+			isShowPack: {
+				type: Boolean,
+				default: true
+			},
+			isShowBatch: {
+				type: Boolean,
+				default: true
+			},
+			isShowLocation: {
+				type: Boolean,
+				default: true
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
+		},
+		watch: {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.recommend {
+		position: absolute;
+		left: 25px;
+		top: 70px;
+		width: 10px;
+		height: 30px;
+		opacity: 1;
+
+	}
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/qty/recommendQty.vue b/src/mycomponents/qty/recommendQty.vue
index 925108d0..8a8b5f00 100644
--- a/src/mycomponents/qty/recommendQty.vue
+++ b/src/mycomponents/qty/recommendQty.vue
@@ -2,7 +2,7 @@
 	<view>
 		<status v-if="isShowStatus" :status='dataContent.inventoryStatus'></status>
 
-		<view class="uni-flex uni-row  center">
+		<view class="uni-flex uni-row  center" v-if="isShowCount" >
 			<view class="text_recommend ">
 				{{Number(dataContent.qty)}}
 			</view>
@@ -77,6 +77,10 @@
 			isShowPackCount: {
 				type: Boolean,
 				default: true
+			},
+			isShowCount: {
+				type: Boolean,
+				default: true
 			}
 		},
 		watch: {
diff --git a/src/pages.json b/src/pages.json
index 02121c75..d173fcf8 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1816,6 +1816,13 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/stockUp/job/stockUpJobDetailBatch",
+			"style": {
+				"navigationBarTitleText": "备货任务详情",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path": "pages/scrap/record/scrapRecord",
 			"style": {
diff --git a/src/pages/repleinsh/coms/comScanReplishPackBatch.vue b/src/pages/repleinsh/coms/comScanReplishPackBatch.vue
index 8587f364..7def153c 100644
--- a/src/pages/repleinsh/coms/comScanReplishPackBatch.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPackBatch.vue
@@ -574,26 +574,11 @@
 			},
 
 			calcBatchHandleQty(balance) {
-				// let handleQty = 0;
-				// batch.Records.forEach(res => {
-				// 	handleQty = calc.add(handleQty, res.qty)
-				// })
-				// batch.handleQty = handleQty;
+			
 				this.dataContent.subList.forEach(item => {
 					if(item.itemCode == balance.itemCode){
 						item.handleQty = balance.qty;
 					}
-					// toLocationCode.Items.forEach(item => {
-					// 	var itemCodeHandleQty = 0;
-					// 	item.Locations.forEach(batch => {
-					// 		batch.Batchs.forEach(batchHandleQty => {
-					// 			itemCodeHandleQty = calc.add(itemCodeHandleQty,
-					// 				batchHandleQty.handleQty)
-					// 		})
-					// 	})
-					// 	item.handleQty = itemCodeHandleQty;
-					// })
-
 				})
 			},
 
diff --git a/src/pages/repleinsh/job/repleinshDetailBatch.vue b/src/pages/repleinsh/job/repleinshDetailBatch.vue
index e5c876f9..43428d8c 100644
--- a/src/pages/repleinsh/job/repleinshDetailBatch.vue
+++ b/src/pages/repleinsh/job/repleinshDetailBatch.vue
@@ -194,11 +194,7 @@
 							that.toLocationCode = that.subList[0].toLocationCode
 
 							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
-							var itemCodes = []
-							res.data.subList.forEach(item => {
-								itemCodes.push(item.itemCode)
-								item.scaned = false
-							})
+							
 							that.detailSource = res.data;
 
 							if (that.scanMessage) {
@@ -252,12 +248,12 @@
 							//防止重复点击
 							this.$throttle(this.submitJob, 2000, this)()
 						} else {
-							// this.scanPopupGetFocus()
+							this.scanPopupGetFocus()
 						}
 					});
 				} else {
 					//防止重复点击
-					// this.$throttle(this.submitJob, 2000, this)()
+					this.$throttle(this.submitJob, 2000, this)()
 				}
 			},
 
@@ -307,28 +303,37 @@
 				// }
 			},
 
-			submitJob() {
+			async submitJob() {
 				uni.showLoading({
 					title: "提交中....",
 					mask: true
 				});
-				var params = this.setParams()
-				console.log("提交参数", params);
-				if (!params.subList || params.subList.length == 0) {
-					uni.hideLoading()
-					this.showErrorMessage("请扫描您需要提交的补料任务")
-					return
-				}
-				repleinshJobSubmit(params).then(res => {
-					uni.hideLoading()
-					if (res.data) {
-						this.showCommitSuccessMessage("提交成功\n生成补料记录\n" + res.data)
-					} else {
-						this.showErrorMessage("提交失败[" + res.msg + "]")
+				var itemCodes = []
+				this.detailSource.subList.forEach(item => {
+					itemCodes.push(item.itemCode)
+				})
+				await getManagementPrecisions(itemCodes, that.toLocationCode, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						var params = this.setParams()
+						console.log("提交参数", params);
+						if (!params.subList || params.subList.length == 0) {
+							uni.hideLoading()
+							this.showErrorMessage("请扫描您需要提交的补料任务")
+							return
+						}
+						repleinshJobSubmit(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)
+						})
 					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
 				})
 			},
 
@@ -336,8 +341,6 @@
 				var commitSubList = []
 				var createTime = getCurrDateTime();
 				var creator = this.$store.state.user.id
-
-				console.log(this.detailSource)
 				this.detailSource.subList.forEach(r => {
 					if(r.scaned){
 						let subItem = {
@@ -370,6 +373,13 @@
 							.packingNumber;
 						record.toPackUnit = r.packUnit;
 						record.toBatch = r.batch;
+						var info = getPackingNumberAndBatch(this.managementList, r.itemCode,r.packingNumber, r.batch);
+						record.toPackingNumber = info.packingNumber;
+						record.packingNumber = info.packingNumber;
+						record.fromPackingNumber = info.packingNumber;
+						subItem.toPackingNumber = info.packingNumber;
+						subItem.packingNumber = info.packingNumber;
+						subItem.fromPackingNumber = info.packingNumber;
 						subItem.recordList.push(record);
 						commitSubList.push(deepCopyData(subItem));
 					}
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 6b0d5da0..a1063cda 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -367,7 +367,6 @@
 								this.managementList = ret.list;
 								this.managementType = this.managementList.some(cur => cur.ManagementPrecision == 'BY_BATCH') ?
 									'BY_BATCH' : ''
-									this.managementType ='BY_BATCH'
 								if (this.managementType == 'BY_BATCH') {
 									uni.navigateTo({
 										url: './repleinshDetailBatch?id=' + result.masterId + '&status=' + result.status +
diff --git a/src/pages/stockUp/coms/comScanStockUpPackBatch.vue b/src/pages/stockUp/coms/comScanStockUpPackBatch.vue
new file mode 100644
index 00000000..38b41f1e
--- /dev/null
+++ b/src/pages/stockUp/coms/comScanStockUpPackBatch.vue
@@ -0,0 +1,508 @@
+<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 {
+		calc
+	} from '@/common/calc.js';
+	import {
+		getWorkShopLineStation
+	} from '@/api/request2.js';
+
+	import {
+		getBalanceByManagementPrecision
+	} from '@/common/balance.js';
+	import {
+		getDirectoryItemArray
+	} from '../../../common/directory.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 item = this.dataContent.subList.find(r => r.toLocationCode == this.toLocationCode);
+				if (item != 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 = ''
+					this.showErrorMessage('发货库位【' + fromlocation + '】不存在')
+				}
+			},
+			onScan(result) {
+				console.log(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);
+								}
+								uni.hideLoading();
+							});
+					}
+				} catch (error) {
+					this.showErrorMessage(error)
+					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
+				that.fromLocationCode = balance.locationCode;
+					if (item.fromLocation!=that.fromLocationCode) {
+						if (item.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);
+											//新增加的批次赋值details
+											if (fromLocation.Batchs.length > 0) {
+												batch.detail = fromLocation.Batchs[0].detail;
+											}
+											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.batch,
+					qty: 0,
+					uom: data.uom,
+					handleQty: Number(data.qty),
+					Records: []
+				}
+				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 = {
+					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
+				}
+				return record;
+			},
+
+			calcBatchHandleQty(batch,label,balance) {
+				console.log(888,batch,balance)
+				console.log(999,this.dataContent)
+				this.dataContent.subList.forEach(item => {
+					if(item.itemCode == balance.itemCode&&item.batch == batch){
+						item.handleQty = label.qty;
+					}
+				})
+			},
+
+			addRecord(batch, label, balance, packageInfo) {
+				// let record = this.creatRecord(label, balance, packageInfo);
+				// batch.Records.push(record);
+				// this.issueRecord.unshift(record)
+				console.log(111,label)
+				console.log(222,packageInfo)
+				this.calcBatchHandleQty(batch,label,balance);
+			},
+
+			getfocus() {
+				if (this.$refs.comscan) {
+					this.$refs.comscan.getfocus();
+				}
+			},
+
+			losefocus() {
+				if (this.$refs.comscan) {
+					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>
\ No newline at end of file
diff --git a/src/pages/stockUp/coms/comStockUpDetailCardBatch.vue b/src/pages/stockUp/coms/comStockUpDetailCardBatch.vue
index cc579071..aba4983b 100644
--- a/src/pages/stockUp/coms/comStockUpDetailCardBatch.vue
+++ b/src/pages/stockUp/coms/comStockUpDetailCardBatch.vue
@@ -3,50 +3,22 @@
 		<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
 			:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
 
-		<view v-for="(item,index) in dataContent.Items">
-			<uni-collapse ref="collapse">
-				<uni-collapse-item :open="true">
-					<template v-slot:title>
-						<!-- 物品 -->
-						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
-					</template>
-					<view class='split_line'></view>
-					<view v-for="(loacation,index) in item.Locations" :key="index">
-						<view>
-							<view class="uni-flex uni-row space-between">
-								<!-- 推荐库位 -->
-								<location :locationCode="loacation.fromLocationCode">
-								</location>
-							</view>
-							<view v-for="(batch,index) in loacation.Batchs" :key="index">
-								<recommend-balance style='margin-left: 20px;' :detail="batch"
-									:isShowLocation="false" :isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
-								</recommend-balance>
-								<view class="uni-flex uni-row" v-if='batch.Records.length>0'>
-									<view class="center " style=" width: 20px; color: #0CC2B6; margin-left: 40px;">
-										实际
-									</view>
-									<view class="uni-flex uni-column" style="width: 100%;">
-										<view v-for="(record,index) in batch.Records" :key="index">
-											<uni-swipe-action ref="swipeAction">
-												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
-													:right-options="settingParam.allowModifyQty=='TRUE'?scanOptions:removeOptions">
-													<handle-balance :detail="record" :isShowLocation="false"
-														:isShowBatch="batch.packingNumber!=null">
-													</handle-balance>
-												</uni-swipe-action-item>
-											</uni-swipe-action>
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</uni-collapse-item>
-			</uni-collapse>
+		<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>
+				<handleBalanceBatch :detail="item" :isShowLocation="false"
+					 :isShowBatch="true" :isShowPack='false'>
+				</handleBalanceBatch>
+				</uni-swipe-action-item>
+			</uni-swipe-action>
 		</view>
 	</view>
-	<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+	<qtyEdit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></qtyEdit>
 	<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 	<comMessage ref="message"></comMessage>
 </template>
@@ -56,17 +28,20 @@
 	import recommend from '@/mycomponents/recommend/recommend.vue'
 	import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
 	import handleBalance from '@/mycomponents/balance/handleBalance.vue'
+	import handleBalanceBatch from '@/mycomponents/balance/handleBalanceBatch.vue'
 	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
 	import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
 	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
 	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+	import qtyEdit from '@/mycomponents/qty/qtyEdit.vue'
 	import location from '@/mycomponents/balance/location.vue'
 	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
 
-	import {
+import {
 		getDetailOption,
-		getEditRemoveOption,
-		getRemoveOption
+		getPurchaseReceiptOption,
+		getRemoveOption,
+		getEditRemoveOption
 	} from '@/common/array.js';
 
 	export default {
@@ -78,9 +53,10 @@
 			handleBalance,
 			recommendQtyEdit,
 			requiredLocation,
-			balanceQtyEdit,
+			qtyEdit,
 			location,
-			detailInfoPopup
+			detailInfoPopup,
+			handleBalanceBatch
 		},
 		props: {
 			dataContent: {
@@ -91,6 +67,10 @@
 				type: Object,
 				default: null
 			},
+			isEdit: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 
@@ -109,9 +89,9 @@
 		},
 
 		mounted() {
-			this.detailOptions = getDetailOption();
-			this.scanOptions = getEditRemoveOption();
-			this.removeOptions = getRemoveOption()
+		
+			this.removeOptions = getRemoveOption();
+			this.editAndRemoveOptions = getEditRemoveOption()
 		},
 
 		methods: {
@@ -126,38 +106,35 @@
 				});
 			},
 
-			swipeClick(e, batch, record, index) {
+			swipeClick(e, item, index) {
 				if (e.content.text == "编辑") {
-					this.edit(batch, record)
+					this.edit(item)
 				} else if (e.content.text == "移除") {
-					this.remove(batch, record, index)
+					this.remove(item, index)
 				}
 			},
 
-			edit(batch, item) {
+			edit(item) {
 				let that = this;
 				that.editItem = item;
-				that.batchItem = batch;
-				item.balance.balanceQty=item.balance.qty;
-				that.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
+				that.$refs.balanceQtyEdit.openEditPopup(item);
 			},
 
 			detail(item) {
 				this.showItem = item;
 				this.$refs.receiptHint.openScanPopup()
 			},
-			remove(batch, record, index) {
+			remove(item, index) {
 				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
 					res => {
 						if (res) {
-							batch.Records.splice(index, 1);
-							this.resizeCollapse();
-							this.$emit('updateData', record)
+							item.handleQty = 0;
+							item.scaned = false ;
 						}
 					});
 			},
 			confirm(val) {
-				this.editItem.qty = val;
+				this.editItem.handleQty = val;
 				this.$emit('updateData', this.editItem)
 				// let qty = 0;
 				// this.batchItem.Records.forEach(r => {
diff --git a/src/pages/stockUp/job/stockUpJob.vue b/src/pages/stockUp/job/stockUpJob.vue
index 0c889b7f..58276213 100644
--- a/src/pages/stockUp/job/stockUpJob.vue
+++ b/src/pages/stockUp/job/stockUpJob.vue
@@ -42,7 +42,9 @@
 		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'
 	import comStockUpJobCard from '@/pages/stockUp/coms/comStockUpJobCard.vue'
@@ -178,10 +180,23 @@
 			},
 
 			openJobDetail(item) {
-				uni.navigateTo({
-					url: './stockUpJobDetail?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' : ''
+							this.managementType ='BY_BATCH'
+						if (this.managementType == 'BY_BATCH') {
+							uni.navigateTo({
+								url: './stockUpJobDetailBatch?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
+							});
+						} else {
+							uni.navigateTo({
+								url: './stockUpJobDetail?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
+							});
+						}
+					}
+				})
 			},
 
 			showItemList(itemList) {
diff --git a/src/pages/stockUp/job/stockUpJobDetailBatch.vue b/src/pages/stockUp/job/stockUpJobDetailBatch.vue
new file mode 100644
index 00000000..84f6f6d2
--- /dev/null
+++ b/src/pages/stockUp/job/stockUpJobDetailBatch.vue
@@ -0,0 +1,458 @@
+<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>
+		</view>
+
+		<view class="page-main">
+			<scroll-view scroll-y="true" class="">
+				<comStockUpDetailCardBatch
+				ref='comIssueDetailCard'
+				 :dataContent="detailSource"
+				  @updateData='updateData'
+				  :settingParam="jobContent"
+				  >
+				</comStockUpDetailCardBatch>
+			</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="">
+					<locationCompare ref='comScanLocation' title="目标库位" :recommendLocationCode="jobToLocationCode"
+						:locationCode="toLocationCode" @getLocation='scanLocationCode'
+						:locationAreaTypeList="toLocationAreaTypeList"></locationCompare>
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
+				</view>
+			</view>
+		</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>
+		<comScanStockUpPackBatch ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
+		</comScanStockUpPackBatch>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		getStockUpJobDetail,
+		takeStockUpJob,
+		cancleTakeStockUpJob,
+		stockUpJobsubmit
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
+
+	import {
+		goHome,
+		navigateBack,
+		getRemoveOption,
+		getCurrDateTime,
+		getDirectoryItemArray,
+		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 comStockUpDetailCardBatch from '@/pages/stockUp/coms/comStockUpDetailCardBatch.vue'
+	import comScanStockUpPackBatch from '@/pages/stockUp/coms/comScanStockUpPackBatch.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
+
+	export default {
+		name: 'issueDetail',
+		components: {
+			jobDetailPopup,
+			winScanButton,
+			comStockUpDetailCardBatch,
+			comScanStockUpPackBatch,
+			jobTop,
+			locationCompare
+		},
+		data() {
+			return {
+				id: '',
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				detailOptions: [],
+				scanOptions: [],
+				status: "",
+				toLocationCode: "",
+				jobStatus: "",
+				toLocationAreaTypeList: [],
+				jobToLocationCode: "",
+			};
+		},
+
+		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") {
+					//取消承接任务	
+					cancleTakeStockUpJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		methods: {
+			//接收
+			receive(callback) {
+				if (this.id != null) {
+					takeStockUpJob(this.id).then(res => {
+						callback();
+					}).catch(error => {
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				getStockUpJobDetail(that.id).then(res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.jobStatus = res.data.status;
+							that.subList = res.data.subList;
+							// that.detailSource = getDataSource(that.detailSource, that.subList)
+							// that.toLocationCode = that.subList[0].toLocationCode
+							that.detailSource = res.data;
+							that.fromLocationCode = that.subList[0].fromLocationCode
+							that.jobToLocationCode = that.subList[0].toLocationCode;
+							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes)
+							that.resizeCollapse();
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+			},
+
+			scanLocationCode(location, code) {
+				this.toLocationCode = code
+				this.detailSource.subList.forEach(item => {
+					item.toLocationCode=code
+				})
+			},
+
+			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.managementList =[{
+								ManagementPrecision: "BY_BATCH",
+								itemCode: "easy_code_test"
+							}]
+							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);
+				// 		}
+				// 	});
+				// }
+			},
+
+			submitJob() {
+				var params = this.setParams()
+				console.log("提交参数",params);
+				return
+				if (!params.subList || params.subList.length == 0) {
+					uni.hideLoading()
+					this.showErrorMessage("请扫描您需要提交的备货任务")
+					return
+				}
+
+				stockUpJobsubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage("提交成功\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.handleQty;
+						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;
+						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();
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			confirm(data) {
+				this.dataContent = data;
+			},
+			confirmResult(result) {
+				this.dataContent = result;
+				this.$forceUpdate();
+			},
+			openScanDetailPopup() {
+				var datacontent = {}
+				//克隆对象，深度克隆，防止双向绑定同一个变量
+				// Object.assign(datacontent, this.detailSource);
+				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