diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue
index 319ef2b9..a4dde10c 100644
--- a/src/mycomponents/qty/balanceQtyEdit.vue
+++ b/src/mycomponents/qty/balanceQtyEdit.vue
@@ -124,6 +124,11 @@
 				type: Boolean,
 				default: true
 			},
+			// 是否校验扫描数量大于库存数量
+			isTestBalance: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch:{
 			'allQty'(newVal){
@@ -188,7 +193,7 @@
 							this.allQty = balanceQty;
 						})
 				}else {
-					if (this.allQty > balanceQty) {
+					if (this.allQty > balanceQty && this.isTestBalance) {
 						this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']',
 							res => {
 								this.allQty = balanceQty;
diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
index 2f379ad2..c6300cc8 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -22,7 +22,7 @@
 			</uni-collapse-item>
 		</uni-collapse>
 		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" :allowEditQty="allowEditQty" @confirm="confirm"
-			:allowEditStatus="true"></balance-qty-edit>
+			:allowEditStatus="true" :isTestBalance='isTestBalance'></balance-qty-edit>
 		<win-scan-location ref="scanLocationCode" :locationAreaTypeList="locationAreaTypeList" title="目标库位" @getLocation='getLocation'></win-scan-location>
 		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 		<comMessage ref="message"></comMessage>
@@ -80,7 +80,12 @@
 			locationAreaTypeList: {
 				type: Array,
 				default: []
-			}
+			},
+			// 是否校验扫描数量大于库存数量
+			isTestBalance: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 			dataContent: {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index c1ef964e..9709c6e2 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -1,817 +1,836 @@
-<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="page-main-scroll">
-				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-					<view class="">
-						<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
-							@updateData='updateData' :locationAreaTypeList="toLocationAreaTypeList"
-							:allowEditQty="jobContent.allowModifyQty=='TRUE'?true:false" @openDetail="openDetail">
-						</comInventoryDetailCard>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-
-		<view class="page-footer">
-			<view class="uni-flex u-col-center space-between padding_10"
-				style="background-color:ghostwhite; width: 100%; ">
-				<view class="">
-					<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"
-						@getLocation='scanLocationCode' :locationAreaTypeList="toLocationAreaTypeList" v-if="businessTypeCode == 'OkToHold'">
-					</locationCompare>
-				</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>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
-		<detailInfoPopup ref="jobDetailPopup"></detailInfoPopup>
-		<dept ref="deptPopup" @dutyConfirm='dutyConfirm'></dept>
-		<comMessage ref="comMessage"></comMessage>
-		
-	</view>
-</template>
-
-<script>
-	import {
-		getInventoryMoveJobDetail,
-		takeInventoryMoveJob,
-		cancleTakeInventoryMoveJob,
-		inventoryMoveSubmit
-	} from '@/api/request2.js';
-	import {
-		getManagementPrecisions,
-		getPrecisionStrategyList
-	} from '@/common/balance.js';
-
-	import {
-		getDataSource,
-		getScanCount,
-		calcHandleQty
-	} from '@/common/detail.js';
-	import {
-		getDirectoryItemArray,
-	} from '@/common/directory.js';
-
-	import {
-		goHome,
-		navigateBack,
-		getCurrDateTime,
-		getPackingNumberAndBatchByList,
-		getInventoryStatusName,
-	} from '@/common/basic.js';
-	import {
-		calc
-	} from '@/common/calc.js';
-
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue'
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
-	import jobTop from '@/mycomponents/job/jobTop.vue'
-	import locationCompare from '@/mycomponents/location/locationCompare.vue'
-	import dept from '@/mycomponents/dept/dept.vue'
-
-
-	export default {
-		name: 'inventoryMoveDetail',
-		components: {
-			winScanButton,
-			winScanPack,
-			comInventoryDetailCard,
-			winScanPackAndLocation,
-			detailInfoPopup,
-			jobTop,
-			locationCompare,
-			dept
-		},
-		data() {
-			return {
-				id: '',
-				scanCount: 0,
-				jobContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				toLocationInfo: {},
-				businessTypeInfo: {},
-				managementList: [],
-				managementType: '',
-				businessTypeCode: '',
-				toLocationCode: '',
-				toInventoryStatus: '',
-				jobStatus: "",
-				title: '',
-				toLocationAreaTypeList: [],
-				jobToLocationCode:'',
-				deptObj:{}
-			};
-		},
-		props: {
-
-		},
-		onLoad(option) {
-			this.title = option.title
-			this.id = option.id;
-			this.businessTypeCode = option.businessTypeCode;
-			if (this.id != undefined) {
-				// 	//新建的任务自动接收
-				if (option.status == "1") {
-					this.receive((callback => {
-						this.getDetail();
-					}));
-				} else {
-					this.getDetail();
-				}
-				this.initData();
-			}
-			
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-
-		onBackPress(e) {
-			//已经接收但是没提交任务
-			if (e.from == 'backbutton') {
-				if (this.jobStatus == "2") {
-					//取消承接任务	
-					cancleTakeInventoryMoveJob(this.id).then(res => {
-						uni.navigateBack();
-					}).catch(error => {
-						uni.navigateBack();
-					})
-				} else {
-					uni.navigateBack();
-				}
-
-				return true;
-			}
-
-		},
-
-		onPullDownRefresh() {
-			this.getDetail();
-			uni.stopPullDownRefresh();
-		},
-
-		mounted() {
-
-		},
-		methods: {
-			initData() {
-				var name = ""
-				if (this.businessTypeCode == "Move") {
-					name = "库存转移";
-				} else if (this.businessTypeCode == "HoldToOk") {
-					name = "隔离转合格";
-					this.toLocationCode = '';
-					this.toInventoryStatus = 'OK';
-				} else if (this.businessTypeCode == "HoldToWip") {
-					name = "隔离转线边";
-					this.toLocationCode = '';
-					this.toInventoryStatus = 'OK';
-				} else if (this.businessTypeCode == "HoldToScrap") {
-					name = "隔离转报废";
-					this.toLocationCode = 'SCRAP';
-					this.toInventoryStatus = 'SCRAP';
-				} else if (this.businessTypeCode == "OkToHold") {
-					name = "合格转隔离";
-					this.toLocationCode = 'HOLD';
-					this.toInventoryStatus = 'HOLD';
-				} else if (this.businessTypeCode == "NokToHold") {
-					name = "不合格转隔离";
-					this.toLocationCode = 'HOLD';
-					this.toInventoryStatus = 'HOLD';
-				} else if (this.businessTypeCode == "OktoScrap") {
-					name = "合格转报废";
-					this.toLocationCode = 'SCRAP';
-					this.toInventoryStatus = 'SCRAP';
-				} else if (this.businessTypeCode == "ScrapToHold") {
-					name = "报废转隔离";
-					this.toLocationCode = 'HOLD';
-					this.toInventoryStatus = 'HOLD';
-				}
-
-				uni.setNavigationBarTitle({
-					title: this.title + '详情'
-				})
-			},
-
-
-			//接收
-			receive(callback) {
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				if (this.id != null) {
-					takeInventoryMoveJob(this.id).then(res => {
-						uni.hideLoading();
-						callback();
-					}).catch(error => {
-						uni.hideLoading();
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			getDetail() {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-
-				getInventoryMoveJobDetail(that.id).then(async res => {
-					uni.hideLoading();
-					if (res.data == null) {
-						that.showMessage('未获取到详情');
-					} else {
-						if (res.data.subList.length > 0) {
-							that.jobContent = res.data;
-							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes);
-							that.jobStatus = res.data.status
-							that.subList = res.data.subList;
-							that.jobToLocationCode = that.subList[0].toLocationCode
-							that.detailSource = await getDataSource(that.subList)
-							//获取管理模式，封装参数
-							var itemCodes = []
-							this.detailSource.forEach(item => {
-								itemCodes.push(item.itemCode)
-								item.scaned = false
-							})
-							this.toLocationCode = that.subList[0].toLocationCode
-							getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-								if (res.success) {
-									this.managementList = res.list;
-									this.managementType = this.managementList.some(item => item
-										.ManagementPrecision ==
-										'BY_BATCH') ? 'BY_BATCH' : ''
-								}
-							})
-						} else {
-							that.showMessage('列表数据为0');
-						}
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-
-			},
-
-			//继续扫描
-			continueScan() {
-				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == this.subList.length) {
-					this.closeScanPopup();
-				} else {
-					this.scanPopupGetFocus();
-				}
-			},
-
-			openDetail(item) {
-				this.$refs.jobDetailPopup.openPopup(item)
-			},
-
-			updateData() {
-				this.calcHandleQty();
-			},
-
-			calcHandleQty() {
-				calcHandleQty(this.detailSource)
-				console.log(this.detailSource)
-				this.continueScan()
-				this.$forceUpdate();
-			},
-
-			openScanPopup() {
-				let fromlocationCode = '';
-				let fromlocationList = [];
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					item.subList.forEach(l => {
-						//重复的库位不往里面插入
-						var location = fromlocationList.find(res => res == l.fromLocationCode)
-						if (location == undefined) {
-							fromlocationList.push(l.fromLocationCode);
-						}
-						//来源库位赋默认值
-						if (fromlocationCode == '') {
-							if (!l.scaned) {
-								fromlocationCode = l.fromLocationCode;
-							}
-						}
-					})
-				}
-				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
-			},
-
-
-			getScanResult(result, managementPrecision) {
-				this.managementType = managementPrecision
-				if (managementPrecision == 'BY_BATCH' || managementPrecision == 'BY_QUANTITY') {
-					this.setDataBatch(result, managementPrecision)
-				} else {
-					this.setData(result, managementPrecision)
-				}
-
-			},
-			setDataBatch(result, managementPrecision) {
-				console.log(877, result)
-				try {
-					var packingNumber = result.label.packingNumber;
-					var batch = result.label.batch;
-					var qty = result.label.qty;
-					var itemCode = result.label.itemCode;
-					var detail = this.detailSource.find(r => r.itemCode == itemCode);
-					if (detail == undefined) {
-						this.showMessage("物料号【" + itemCode + "】不在列表中")
-					} else {
-						var itemDetail = ''
-						if (managementPrecision == 'BY_QUANTITY') {
-							itemDetail = detail.subList.find(r => {
-								return result.fromLocationCode == r.fromLocationCode
-							})
-						} else {
-							itemDetail = detail.subList.find(r => {
-								return r.batch == batch && result.fromLocationCode == r.fromLocationCode
-							})
-						}
-
-						if (itemDetail == undefined && managementPrecision != 'BY_QUANTITY') {
-							this.showErrorMessage("批次[" + batch + "]不在列表中")
-						} else {
-							if (itemDetail.scaned) {
-								// this.showMessage("批次【" + batch + "】已经扫描")
-								itemDetail.handleQty = calc.add(itemDetail.handleQty, Number(result.label.qty));
-								this.calcHandleQty();
-							} else {
-								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
-										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
-											itemStatus +
-											']不一致,是否继续转移?', res => {
-												if (res) {
-													itemDetail.scaned = true;
-													itemDetail.handleQty = Number(result.label.qty);
-													itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
-													itemDetail.balance = result.balance;
-													itemDetail.balance.balanceQty = Number(result.balance.qty);
-													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.packUnit = result.package.packUnit
-													this.calcHandleQty();
-												} else {
-													this.scanPopupGetFocus();
-												}
-											});
-									} else {
-										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
-											itemStatus +
-											']不一致,不允许转移!', res => {
-												this.scanPopupGetFocus();
-											});
-									}
-								} else {
-									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty);
-									itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
-									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.packUnit = result.package.packUnit
-									this.calcHandleQty();
-								}
-							}
-						}
-					}
-					this.scanPopupGetFocus();
-				} catch (e) {
-					this.showErrorMessage(e.message);
-				}
-			},
-
-			setData(result, managementPrecision) {
-				try {
-					var packingNumber = result.label.packingNumber;
-					var batch = result.label.batch;
-					var qty = result.label.qty;
-					var itemCode = result.label.itemCode;
-					var detail = this.detailSource.find(r => r.itemCode == itemCode);
-					if (detail == undefined) {
-						this.showMessage("物料号【" + itemCode + "】不在列表中")
-					} else {
-						var itemDetail = ''
-						if (managementPrecision == 'BY_QUANTITY') {
-							itemDetail = detail.subList.find(r => {
-								return r.itemCode == result.label.itemCode
-							})
-						} else {
-							itemDetail = detail.subList.find(r => {
-								return r.batch == batch
-							})
-						}
-
-						if (itemDetail == undefined && managementPrecision != 'BY_QUANTITY') {
-							this.showErrorMessage("批次[" + batch + "]不在列表中")
-						} else {
-							if (itemDetail.scaned) {
-								this.showMessage("批次【" + batch + "】已经扫描")
-							} else {
-								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
-								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
-								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
-										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
-											itemStatus +
-											']不一致,是否继续转移?', res => {
-												if (res) {
-													itemDetail.scaned = true;
-													itemDetail.handleQty = Number(result.balance.qty);
-													itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
-													itemDetail.balance = result.balance;
-													itemDetail.balance.balanceQty = Number(result.balance.qty);
-													itemDetail.balance.packQty = Number(result.package.packQty)
-													itemDetail.balance.packUnit = result.package.packUnit
-													this.calcHandleQty();
-												} else {
-													this.scanPopupGetFocus();
-												}
-											});
-									} else {
-										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
-											itemStatus +
-											']不一致,不允许转移!', res => {
-												this.scanPopupGetFocus();
-											});
-									}
-								} else {
-									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.balance.qty);
-									itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
-									itemDetail.balance = result.balance;
-									itemDetail.balance.balanceQty = Number(result.balance.qty);
-									itemDetail.balance.packQty = Number(result.package.packQty)
-									itemDetail.balance.packUnit = result.package.packUnit
-									this.calcHandleQty();
-								}
-							}
-						}
-					}
-					this.scanPopupGetFocus();
-				} catch (e) {
-					this.showErrorMessage(e.message);
-				}
-			},
-
-			async commit() {
-				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == 0) {
-					this.showErrorMessage("扫描数为0,请先扫描")
-					return;
-				}
-				//查询管理模式
-				this.managementList = [];
-				var precisionStrategParams = this.setPrecisionStrategParams()
-				await getPrecisionStrategyList(precisionStrategParams, res => {
-					if (res.success) {
-						this.managementList = res.list;
-						this.managementType = this.managementList && this.managementList[0] && this
-							.managementList[0].ManagementPrecision ? this.managementList[0]
-							.ManagementPrecision : 'BY_PACKAGING'
-						console.log(11, this.managementType)
-					} else {
-						uni.hideLoading();
-						this.showErrorMessage(res.message);
-					}
-				})
-				//允许部分提交
-				//扫描数量和任务数量相等，直接提交
-				if (this.scanCount == this.subList.length) {
-					if (this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY') {
-						this.checkCountBatch();
-					} else {
-						this.checkCount();
-					}
-				} else if (this.scanCount < this.subList.length) {
-					//扫描数量小于任务数量，判断是否允许部分提交
-					if (this.jobContent.allowPartialComplete == "TRUE") {
-						//提交
-						if (this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY') {
-							this.checkCountBatch();
-						} else {
-							this.checkCount();
-						}
-					} else {
-						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
-							if (res) {
-								this.openScanPopup();
-							}
-						});
-					}
-				}
-			},
-			checkCount() {
-				// 提交的数量和任务数量不一致提示
-				let str = ''
-				this.detailSource.forEach((item) => {
-					item.subList.forEach(cur => {
-						if (cur.qty != cur.handleQty) {
-							var tempHandleQty = 0
-							if (cur.handleQty) {
-								tempHandleQty = cur.handleQty
-							} else {
-								tempHandleQty = 0
-							}
-							str +=
-								`包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
-						}
-					})
-				})
-				if (str) {
-					str = '任务明细未全部完成,是否提交?\n' + str
-					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
-						if (res) {
-							// this.submitJob()
-						}
-					});
-				} else {
-					// this.submitJob()
-				}
-			},
-			checkCountBatch() {
-				// 提交的数量和任务数量不一致提示
-				let str = ''
-				let str1 = ''
-				this.detailSource.forEach((item) => {
-					item.subList.forEach(cur => {
-
-						if (cur.scaned) {
-							if (cur.qty != cur.handleQty) {
-								var tempHandleQty = 0
-								if (cur.handleQty) {
-									tempHandleQty = cur.handleQty
-								} else {
-									tempHandleQty = 0
-								}
-								var batchHint = cur.batch ? `批次【${cur.batch}】` : ``
-								str += `物料号【${item.itemCode}】` + `${batchHint}` +
-									`提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
-								if (cur.handleQty > cur.balance.balanceQty) {
-									str1 += `物料号【${item.itemCode}】` + `${batchHint}` +
-										`提交数量【${ cur.handleQty}】不可以大于库存数量【${cur.balance.balanceQty}】`
-								}
-							}
-						} else {
-							var batchHint = cur.batch ? `批次【${cur.batch}】` : ``
-							str += `物料号【${item.itemCode}】` + `${batchHint}` +
-								`提交数量【0】与任务物料数量【${cur.qty}】不一致\n`
-						}
-					})
-				})
-				if (str1) {
-					this.$refs.comMessage.showConfirmWarningModal(str1)
-					return
-				}
-				if (str) {
-					str = '任务明细未全部完成,是否提交?\n' + str
-					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
-						if (res) {
-							// 2025-04-16号修改物料隔离去掉明细弹窗
							// // 物料隔离
							// if(this.businessTypeCode == "OkToHold"){
							// 	this.$refs.deptPopup.deptShow = true
							// 	this.$refs.deptPopup.chooseDutyItem={}
							// 	this.$refs.deptPopup.chooseDeptItem={}
							// 	this.$refs.deptPopup.chooseDetailItem={}
							// }else{
							// 	this.submitJob()
							// }
-							this.submitJob()
-						}
-					});
-				} else {
-					// 2025-04-16号修改物料隔离去掉明细弹窗
-					// // 物料隔离
-					// if(this.businessTypeCode == "OkToHold"){
-					// 	this.$refs.deptPopup.deptShow = true
-					// 	this.$refs.deptPopup.chooseDutyItem={}
-					// 	this.$refs.deptPopup.chooseDeptItem={}
-					// 	this.$refs.deptPopup.chooseDetailItem={}
-					// }else{
-					// 	this.submitJob()
-					// }
-					this.submitJob()
-				}
-			},
-			submitJob() {
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-				var params = this.setParams()
-				params = {
-					...params,
-					...this.deptObj
-				}
-				console.log("提交",params)
-				inventoryMoveSubmit(params).then(res => {
-					uni.hideLoading()
-					if (res.data) {
-						let showTitle = this.title
-						if (this.title.indexOf('任务') == this.title.length - 2) {
-							showTitle = this.title.replace('任务', '')
-						}
-						this.showCommitSuccessMessage("提交成功\n生成" + showTitle + "记录\n" + res.data)
-					} else {
-						this.showErrorMessage("提交失败[" + res.msg + "]")
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			setPrecisionStrategParams() {
-				var itemList = []
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							var filterResult = itemList.filter(res => {
-								if (res.itemCode == item.itemCode &&
-									res.locationCode == detail.toLocationCode) {
-									return res
-								}
-							})
-							//去掉重复元素
-							if (filterResult.length == 0) {
-								var result = {
-									itemCode: item.itemCode,
-									locationCode: detail.toLocationCode
-								}
-								itemList.push(result)
-							}
-
-						}
-					})
-				})
-				return itemList;
-			},
-
-			setParams() {
-				var subList = []
-				var creator = this.$store.state.user.id
-
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.toLocationCode, detail.batch);
-							detail.toPackingNumber = info.packingNumber;
-							detail.packingNumber = info.packingNumber;
-							detail.fromPackingNumber = info.packingNumber;
-							// detail.toBatch = info.batch;
-							detail.toContainerNumber = '';
-							// detail.toLocationCode = this.toLocationCode;
-							// 隔离转合格
-							if (this.businessTypeCode == "HoldToOk") {
-								detail.toInventoryStatus = detail.toInventoryStatus;
-							}else  if (this.businessTypeCode == "Move") {
-								detail.toInventoryStatus = detail.inventoryStatus;
-							} else {
-								detail.toInventoryStatus = this.toInventoryStatus;
-							}
-							subList.push(detail)
-						}
-					})
-				})
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {
-						this.afterCloseMessage()
-					}
-				});
-			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-						this.afterCloseMessage()
-					}
-				});
-			},
-
-			showQuestionMessage(message, callback) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showQuestionMessage(message, res => {
-						if (res) {
-							callback(res);
-						}
-					});
-				})
-			},
-
-
-			scanPopupGetFocus() {
-				this.$refs.scanPopup.packGetFocus();
-			},
-
-			scanPopupLoseFocus() {
-				this.$refs.scanPopup.packLoseFocus();
-			},
-
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
-
-			afterCloseMessage() {
-				this.scanPopupGetFocus();
-			},
-
-			closeScanMessage() {
-				this.scanPopupGetFocus();
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					navigateBack(1)
-				})
-			},
-			scanLocationCode(location, code) {
-				if (this.jobContent.allowModifyLocation == 'TRUE') {
-					// this.toLocationCode = code;
-					this.jobToLocationCode= code
-					this.toWarehouseCode= location.warehouseCode
-				} else {
-					if (code == this.jobToLocationCode) {
-						this.jobToLocationCode = code;
-					} else {
-						this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【" + code + "】与推荐的库位【" + this.jobToLocationCode + "】不一致")
-					}
-				}
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						detail.toLocationCode = code
-					})
-				})
-			},
-			dutyConfirm(obj){
-				this.deptObj = obj
-				this.submitJob()
-			}
-		}
-	}
-</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;
-
-	}
+<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="page-main-scroll">
+				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+					<view class="">
+						<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
+							@updateData='updateData' :locationAreaTypeList="toLocationAreaTypeList"
+							:allowEditQty="jobContent.allowModifyQty=='TRUE'?true:false" @openDetail="openDetail" :isTestBalance='isTestBalance'>
+						</comInventoryDetailCard>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="page-footer">
+			<view class="uni-flex u-col-center space-between padding_10"
+				style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<locationCompare ref="locationCompare" title="目标库位" :recommendLocationCode="jobToLocationCode"
+						@getLocation='scanLocationCode' :locationAreaTypeList="toLocationAreaTypeList" v-if="businessTypeCode == 'OkToHold'">
+					</locationCompare>
+				</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>
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+		<detailInfoPopup ref="jobDetailPopup"></detailInfoPopup>
+		<dept ref="deptPopup" @dutyConfirm='dutyConfirm'></dept>
+		<comMessage ref="comMessage"></comMessage>
+		
+	</view>
+</template>
+
+<script>
+	import {
+		getInventoryMoveJobDetail,
+		takeInventoryMoveJob,
+		cancleTakeInventoryMoveJob,
+		inventoryMoveSubmit
+	} from '@/api/request2.js';
+	import {
+		getManagementPrecisions,
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+
+	import {
+		getDataSource,
+		getScanCount,
+		calcHandleQty
+	} from '@/common/detail.js';
+	import {
+		getDirectoryItemArray,
+	} from '@/common/directory.js';
+
+	import {
+		goHome,
+		navigateBack,
+		getCurrDateTime,
+		getPackingNumberAndBatchByList,
+		getInventoryStatusName,
+	} from '@/common/basic.js';
+	import {
+		calc
+	} from '@/common/calc.js';
+
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import comInventoryDetailCard from '@/pages/inventoryMove/coms/comInventoryDetailCard.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import detailInfoPopup from '@/pages/inventoryMove/coms/detailInfoPopup.vue'
+	import jobTop from '@/mycomponents/job/jobTop.vue'
+	import locationCompare from '@/mycomponents/location/locationCompare.vue'
+	import dept from '@/mycomponents/dept/dept.vue'
+
+
+	export default {
+		name: 'inventoryMoveDetail',
+		components: {
+			winScanButton,
+			winScanPack,
+			comInventoryDetailCard,
+			winScanPackAndLocation,
+			detailInfoPopup,
+			jobTop,
+			locationCompare,
+			dept
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				jobContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				toLocationInfo: {},
+				businessTypeInfo: {},
+				managementList: [],
+				managementType: '',
+				businessTypeCode: '',
+				toLocationCode: '',
+				toInventoryStatus: '',
+				jobStatus: "",
+				title: '',
+				toLocationAreaTypeList: [],
+				jobToLocationCode:'',
+				deptObj:{},
+				areaType:'',
+				isTestBalance:'true'
+			};
+		},
+		props: {
+
+		},
+		onLoad(option) {
+			this.title = option.title
+			this.id = option.id;
+			this.businessTypeCode = option.businessTypeCode;
+			if (this.id != undefined) {
+				// 	//新建的任务自动接收
+				if (option.status == "1") {
+					this.receive((callback => {
+						this.getDetail();
+					}));
+				} else {
+					this.getDetail();
+				}
+				this.initData();
+			}
+			
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+
+		onBackPress(e) {
+			//已经接收但是没提交任务
+			if (e.from == 'backbutton') {
+				if (this.jobStatus == "2") {
+					//取消承接任务	
+					cancleTakeInventoryMoveJob(this.id).then(res => {
+						uni.navigateBack();
+					}).catch(error => {
+						uni.navigateBack();
+					})
+				} else {
+					uni.navigateBack();
+				}
+
+				return true;
+			}
+
+		},
+
+		onPullDownRefresh() {
+			this.getDetail();
+			uni.stopPullDownRefresh();
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			initData() {
+				var name = ""
+				if (this.businessTypeCode == "Move") {
+					name = "库存转移";
+				} else if (this.businessTypeCode == "HoldToOk") {
+					name = "隔离转合格";
+					this.toLocationCode = '';
+					this.toInventoryStatus = 'OK';
+				} else if (this.businessTypeCode == "HoldToWip") {
+					name = "隔离转线边";
+					this.toLocationCode = '';
+					this.toInventoryStatus = 'OK';
+				} else if (this.businessTypeCode == "HoldToScrap") {
+					name = "隔离转报废";
+					this.toLocationCode = 'SCRAP';
+					this.toInventoryStatus = 'SCRAP';
+				} else if (this.businessTypeCode == "OkToHold") {
+					name = "合格转隔离";
+					this.toLocationCode = 'HOLD';
+					this.toInventoryStatus = 'HOLD';
+					this.isTestBalance = false
+				} else if (this.businessTypeCode == "NokToHold") {
+					name = "不合格转隔离";
+					this.toLocationCode = 'HOLD';
+					this.toInventoryStatus = 'HOLD';
+				} else if (this.businessTypeCode == "OktoScrap") {
+					name = "合格转报废";
+					this.toLocationCode = 'SCRAP';
+					this.toInventoryStatus = 'SCRAP';
+				} else if (this.businessTypeCode == "ScrapToHold") {
+					name = "报废转隔离";
+					this.toLocationCode = 'HOLD';
+					this.toInventoryStatus = 'HOLD';
+				}
+
+				uni.setNavigationBarTitle({
+					title: this.title + '详情'
+				})
+			},
+
+
+			//接收
+			receive(callback) {
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+				if (this.id != null) {
+					takeInventoryMoveJob(this.id).then(res => {
+						uni.hideLoading();
+						callback();
+					}).catch(error => {
+						uni.hideLoading();
+						this.showErrorMessage(error)
+					})
+				}
+			},
+
+			getDetail() {
+				var that = this;
+				uni.showLoading({
+					title: "加载中....",
+					mask: true
+				});
+
+				getInventoryMoveJobDetail(that.id).then(async res => {
+					uni.hideLoading();
+					if (res.data == null) {
+						that.showMessage('未获取到详情');
+					} else {
+						if (res.data.subList.length > 0) {
+							that.jobContent = res.data;
+							that.toLocationAreaTypeList = getDirectoryItemArray(that.jobContent.toAreaTypes);
+							that.jobStatus = res.data.status
+							that.subList = res.data.subList;
+							that.jobToLocationCode = that.subList[0].toLocationCode
+							that.detailSource = await getDataSource(that.subList)
+							//获取管理模式，封装参数
+							var itemCodes = []
+							this.detailSource.forEach(item => {
+								itemCodes.push(item.itemCode)
+								item.scaned = false
+							})
+							this.toLocationCode = that.subList[0].toLocationCode
+							getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+								if (res.success) {
+									this.managementList = res.list;
+									this.managementType = this.managementList.some(item => item
+										.ManagementPrecision ==
+										'BY_BATCH') ? 'BY_BATCH' : ''
+								}
+							})
+						} else {
+							that.showMessage('列表数据为0');
+						}
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			//继续扫描
+			continueScan() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == this.subList.length) {
+					this.closeScanPopup();
+				} else {
+					this.scanPopupGetFocus();
+				}
+			},
+
+			openDetail(item) {
+				this.$refs.jobDetailPopup.openPopup(item)
+			},
+
+			updateData() {
+				this.calcHandleQty();
+			},
+
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.continueScan()
+				this.$forceUpdate();
+			},
+
+			openScanPopup() {
+				let fromlocationCode = '';
+				let fromlocationList = [];
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					item.subList.forEach(l => {
+						//重复的库位不往里面插入
+						var location = fromlocationList.find(res => res == l.fromLocationCode)
+						if (location == undefined) {
+							fromlocationList.push(l.fromLocationCode);
+						}
+						//来源库位赋默认值
+						if (fromlocationCode == '') {
+							if (!l.scaned) {
+								fromlocationCode = l.fromLocationCode;
+							}
+						}
+					})
+				}
+				this.$refs.scanPopup.openScanPopupForJob(fromlocationCode, fromlocationList, this.jobContent);
+			},
+
+
+			getScanResult(result, managementPrecision) {
+				this.managementType = managementPrecision
+				this.areaType = result && result.balance && result.balance.areaType ? result.balance.areaType  : ''
+				if (managementPrecision == 'BY_BATCH' || managementPrecision == 'BY_QUANTITY') {
+					this.setDataBatch(result, managementPrecision)
+				} else {
+					this.setData(result, managementPrecision)
+				}
+
+			},
+			setDataBatch(result, managementPrecision) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = ''
+						if (managementPrecision == 'BY_QUANTITY') {
+							itemDetail = detail.subList.find(r => {
+								return result.fromLocationCode == r.fromLocationCode
+							})
+						} else {
+							itemDetail = detail.subList.find(r => {
+								return r.batch == batch && result.fromLocationCode == r.fromLocationCode
+							})
+						}
+
+						if (itemDetail == undefined && managementPrecision != 'BY_QUANTITY') {
+							this.showErrorMessage("批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								// this.showMessage("批次【" + batch + "】已经扫描")
+								itemDetail.handleQty = calc.add(itemDetail.handleQty, Number(result.label.qty));
+								this.calcHandleQty();
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续转移?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.label.qty);
+													itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
+													itemDetail.balance.packQty = Number(result.package.packQty)
+													itemDetail.balance.packUnit = result.package.packUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.label.qty);
+									itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.packQty = Number(result.package.packQty)
+									itemDetail.balance.packUnit = result.package.packUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+			setData(result, managementPrecision) {
+				try {
+					var packingNumber = result.label.packingNumber;
+					var batch = result.label.batch;
+					var qty = result.label.qty;
+					var itemCode = result.label.itemCode;
+					var detail = this.detailSource.find(r => r.itemCode == itemCode);
+					if (detail == undefined) {
+						this.showMessage("物料号【" + itemCode + "】不在列表中")
+					} else {
+						var itemDetail = ''
+						if (managementPrecision == 'BY_QUANTITY') {
+							itemDetail = detail.subList.find(r => {
+								return r.itemCode == result.label.itemCode
+							})
+						} else {
+							itemDetail = detail.subList.find(r => {
+								return r.batch == batch
+							})
+						}
+
+						if (itemDetail == undefined && managementPrecision != 'BY_QUANTITY') {
+							this.showErrorMessage("批次[" + batch + "]不在列表中")
+						} else {
+							if (itemDetail.scaned) {
+								this.showMessage("批次【" + batch + "】已经扫描")
+							} else {
+								let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
+								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
+								if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
+									if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
+										this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,是否继续转移?', res => {
+												if (res) {
+													itemDetail.scaned = true;
+													itemDetail.handleQty = Number(result.balance.qty);
+													itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+													itemDetail.balance = result.balance;
+													itemDetail.balance.balanceQty = Number(result.balance.qty);
+													itemDetail.balance.packQty = Number(result.package.packQty)
+													itemDetail.balance.packUnit = result.package.packUnit
+													this.calcHandleQty();
+												} else {
+													this.scanPopupGetFocus();
+												}
+											});
+									} else {
+										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+											itemStatus +
+											']不一致,不允许转移!', res => {
+												this.scanPopupGetFocus();
+											});
+									}
+								} else {
+									itemDetail.scaned = true;
+									itemDetail.handleQty = Number(result.balance.qty);
+									itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
+									itemDetail.balance = result.balance;
+									itemDetail.balance.balanceQty = Number(result.balance.qty);
+									itemDetail.balance.packQty = Number(result.package.packQty)
+									itemDetail.balance.packUnit = result.package.packUnit
+									this.calcHandleQty();
+								}
+							}
+						}
+					}
+					this.scanPopupGetFocus();
+				} catch (e) {
+					this.showErrorMessage(e.message);
+				}
+			},
+
+			async commit() {
+				this.scanCount = getScanCount(this.subList);
+				if (this.scanCount == 0) {
+					this.showErrorMessage("扫描数为0,请先扫描")
+					return;
+				}
+				//查询管理模式
+				this.managementList = [];
+				var precisionStrategParams = this.setPrecisionStrategParams()
+				await getPrecisionStrategyList(precisionStrategParams, res => {
+					if (res.success) {
+						this.managementList = res.list;
+						this.managementType = this.managementList && this.managementList[0] && this
+							.managementList[0].ManagementPrecision ? this.managementList[0]
+							.ManagementPrecision : 'BY_PACKAGING'
+					} else {
+						uni.hideLoading();
+						this.showErrorMessage(res.message);
+					}
+				})
+				//允许部分提交
+				//扫描数量和任务数量相等，直接提交
+				if (this.scanCount == this.subList.length) {
+					if (this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY') {
+						this.checkCountBatch();
+					} else {
+						this.checkCount();
+					}
+				} else if (this.scanCount < this.subList.length) {
+					//扫描数量小于任务数量，判断是否允许部分提交
+					if (this.jobContent.allowPartialComplete == "TRUE") {
+						//提交
+						if (this.managementType == 'BY_BATCH' || this.managementType == 'BY_QUANTITY') {
+							this.checkCountBatch();
+						} else {
+							this.checkCount();
+						}
+					} else {
+						//不允许部分提交，提示
+						this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+							if (res) {
+								this.openScanPopup();
+							}
+						});
+					}
+				}
+			},
+			checkCount() {
+				// 提交的数量和任务数量不一致提示
+				let str = ''
+				this.detailSource.forEach((item) => {
+					item.subList.forEach(cur => {
+						if (cur.qty != cur.handleQty) {
+							var tempHandleQty = 0
+							if (cur.handleQty) {
+								tempHandleQty = cur.handleQty
+							} else {
+								tempHandleQty = 0
+							}
+							str +=
+								`包装号【${cur.packingNumber}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致\n`
+						}
+					})
+				})
+				if (str) {
+					str = '任务明细未全部完成,是否提交?\n' + str
+					this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
+						if (res) {
+							// this.submitJob()
+						}
+					});
+				} else {
+					// this.submitJob()
+				}
+			},
+			checkCountBatch() {
+				// 提交的数量和任务数量不一致提示
+				let str = ''
+				let str1 = ''
+				let str2 = ''
+				this.detailSource.forEach((item) => {
+					item.subList.forEach(cur => {
+						if (cur.scaned) {
+							if (cur.qty != cur.handleQty) {
+								var batchHint = cur.batch ? `批次【${cur.batch}】` : ``
+								str += `物料号【${item.itemCode}】` + `${batchHint}` +
+									`提交数量【${cur.handleQty || 0 }】与任务物料数量【${cur.qty}】不一致\n`
+							}
+							if (cur.handleQty > cur.balance.balanceQty) {
+								str1 += `物料号【${item.itemCode}】` + `${batchHint}` +
+									`提交数量【${ cur.handleQty || 0 }】不可以大于库存数量【${cur.balance.balanceQty}】`
+								str2 += `物料号【${item.itemCode}】在库位【${cur.fromLocationCode}】下` +
+										`提交数量【${ cur.handleQty || 0 }】大于库存数量【${cur.balance.balanceQty}】`
+							}
+						} else {
+							var batchHint = cur.batch ? `批次【${cur.batch}】` : ``
+							str += `物料号【${item.itemCode}】` + `${batchHint}` +
+								`提交数量【0】与任务物料数量【${cur.qty}】不一致\n`
+						}
+					})
+				})
+				
+				if(this.businessTypeCode  == "OkToHold" && this.areaType == "WIP"){
+					console.log(999,this.jobContent.allowSmallerQty)
+					console.log(999,this.jobContent.allowBiggerQty)
+					if(str){
+						if (this.jobContent.allowSmallerQty == "TRUE"  || this.jobContent.allowBiggerQty == "TRUE") {
+							str =  str + '/n是否提交?'
+							this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
+								if (res) {
+									this.submitJob()
+								}
+							});
+						}else{
+							//不允许部分提交，提示
+							this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+								if (res) {
+									this.openScanPopup();
+								}
+							});
+							return;
+						}
+					}
+					if (str2) {
+						str2 = str2 + '\n是否确认提交'
+						this.$refs.comMessage.showQuestionMessage1(str2, 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
+						return;
+					}
+				}else{
+					if (str1) {
+						this.$refs.comMessage.showConfirmWarningModal(str1)
+						return
+					}
+					if (str) {
+						str = '任务明细未全部完成,是否提交?\n' + str
+						this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
+							if (res) {
+								this.submitJob()
+							}
+						});
+					} else {
+					this.submitJob()
+					}
+				}
+			},
+			submitJob() {
+				uni.showLoading({
+					title: "提交中....",
+					mask: true
+				});
+				var params = this.setParams()
+				params = {
+					...params,
+					...this.deptObj
+				}
+				console.log("提交",params)
+				// inventoryMoveSubmit(params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		let showTitle = this.title
+				// 		if (this.title.indexOf('任务') == this.title.length - 2) {
+				// 			showTitle = this.title.replace('任务', '')
+				// 		}
+				// 		this.showCommitSuccessMessage("提交成功\n生成" + showTitle + "记录\n" + res.data)
+				// 	} else {
+				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									res.locationCode == detail.toLocationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
+								detail.packingNumber, detail.toLocationCode, detail.batch);
+							detail.toPackingNumber = info.packingNumber;
+							detail.packingNumber = info.packingNumber;
+							detail.fromPackingNumber = info.packingNumber;
+							// detail.toBatch = info.batch;
+							detail.toContainerNumber = '';
+							// detail.toLocationCode = this.toLocationCode;
+							// 隔离转合格
+							if (this.businessTypeCode == "HoldToOk") {
+								detail.toInventoryStatus = detail.toInventoryStatus;
+							}else  if (this.businessTypeCode == "Move") {
+								detail.toInventoryStatus = detail.inventoryStatus;
+							} else {
+								detail.toInventoryStatus = this.toInventoryStatus;
+							}
+							subList.push(detail)
+						}
+					})
+				})
+				this.jobContent.subList = subList
+				this.jobContent.creator = creator;
+				return this.jobContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.afterCloseMessage()
+					}
+				});
+			},
+
+			showQuestionMessage(message, callback) {
+				setTimeout(r => {
+					this.scanPopupLoseFocus();
+					this.$refs.comMessage.showQuestionMessage(message, res => {
+						if (res) {
+							callback(res);
+						}
+					});
+				})
+			},
+
+
+			scanPopupGetFocus() {
+				this.$refs.scanPopup.packGetFocus();
+			},
+
+			scanPopupLoseFocus() {
+				this.$refs.scanPopup.packLoseFocus();
+			},
+
+			closeScanPopup() {
+				this.$refs.scanPopup.closeScanPopup();
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					navigateBack(1)
+				})
+			},
+			scanLocationCode(location, code) {
+				if (this.jobContent.allowModifyLocation == 'TRUE') {
+					// this.toLocationCode = code;
+					this.jobToLocationCode= code
+					this.toWarehouseCode= location.warehouseCode
+				} else {
+					if (code == this.jobToLocationCode) {
+						this.jobToLocationCode = code;
+					} else {
+						this.showErrorMessage("任务设置中不允许修改库位,扫描的库位【" + code + "】与推荐的库位【" + this.jobToLocationCode + "】不一致")
+					}
+				}
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						detail.toLocationCode = code
+					})
+				})
+			},
+			dutyConfirm(obj){
+				this.deptObj = obj
+				this.submitJob()
+			}
+		}
+	}
+</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>
\ No newline at end of file