diff --git a/src/pages/productDismantle/job/productDismantleDetail.vue b/src/pages/productDismantle/job/productDismantleDetail.vue
index c8a8f7c5..0f22b8ca 100644
--- a/src/pages/productDismantle/job/productDismantleDetail.vue
+++ b/src/pages/productDismantle/job/productDismantleDetail.vue
@@ -1,548 +1,549 @@
 <template>
-	<view class="page-wraper">
-	<view class="page-header">
-		<view class="header_job_top">
-			<job-top :dataContent="jobContent"></job-top>
-		</view>
-		<view class="header_item">
-			申请单号 : {{jobContent.requestNumber}}
-		</view>
-		<view class='split_line'></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="">
-						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail">
-						</com-detail-card>
-					</view>
-					<view class='split_line'></view>
-				</view>
-			</scroll-view>
-		</view>
-
-
-
-		<view class="page-footer">
-			<view class="uni-flex u-col-center space-between padding_10"
-				style="background-color:ghostwhite; width: 100%; ">
-				<view class="">
-					<requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
-						@getLocation='getToLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
-						:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
-				</view>
-				<view class=" uni-flex uni-row">
-					<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
-				</view>
-			</view>
-		</view>
-
-		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
-		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
-
-		<comMessage ref="comMessage"></comMessage>
-	</view>
+  <view class="page-wraper">
+    <view class="page-header">
+      <view class="header_job_top">
+        <job-top :dataContent="jobContent"></job-top>
+      </view>
+      <view class="header_item">
+        申请单号 : {{jobContent.requestNumber}}
+      </view>
+      <view class='split_line'></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="">
+            <com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+                             @remove="updateData" @updateData="updateData" @openDetail="openDetail">
+            </com-detail-card>
+          </view>
+          <view class='split_line'></view>
+        </view>
+      </scroll-view>
+    </view>
+
+
+
+    <view class="page-footer">
+      <view class="uni-flex u-col-center space-between padding_10"
+            style="background-color:ghostwhite; width: 100%; ">
+        <view class="">
+          <requiredLocation ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
+                            @getLocation='getToLocationCode' :isShowEdit="jobContent.allowModifyLocation == 'TRUE'"
+                            :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
+        </view>
+        <view class=" uni-flex uni-row">
+          <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+        </view>
+      </view>
+    </view>
+
+    <win-scan-button @goScan='openScanPopup'></win-scan-button>
+    <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+    <detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+
+    <comMessage ref="comMessage"></comMessage>
+  </view>
 </template>
 
 <script>
-	import {
-		getManagementPrecisions
-	} from '@/common/balance.js';
-
-	import {
-		getProductDismantleJobDetail,
-		getBasicLocationByCode,
-		takeProductDismantleJob,
-		cancleTakeProductDismantleJob,
-		productDismantleJobSubmit
-	} from '@/api/request2.js';
-
-	import {
-		goHome,
-		getCurrDateTime,
-		navigateBack,
-		getPackingNumberAndBatch,
-	} from '@/common/basic.js';
-	
-	import {
-		getInventoryStatusName
-	} from '@/common/directory.js';
-	
-	import {
-		getLocationTypeArray
-	} from '@/common/array.js';
-
-	import {
-		getDataSource,
-		createRecordInfo,
-		calcHandleQty
-	} from '@/common/detail.js';
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
-	import detailInfoPopup from '@/pages/productDismantle/coms/detailInfoPopup.vue'
-	import jobTop from '@/mycomponents/job/jobTop.vue'
-	
-	export default {
-		components: {
-			winScanButton,
-			winScanPackAndLocation,
-			requiredLocation,
-			comDetailCard,
-			detailInfoPopup,
-			jobTop
-		},
-		data() {
-			return {
-				id: '',
-				received: false,
-				scanCount: 0,
-				jobContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				managementList: [],
-				fromLocationCode: "",
-				toLocationCode: "",
-				toLocationInfo: {},
-				toLocationAreaTypeList: [],
-			};
-		},
-		onLoad(option) {
-			this.id = option.id;
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				// if (option.status == "JOB_PENDING") {
-				// 	this.receive((callback => {
-				// 		this.received = true;
-				// 		this.getDetail();
-				// 	}));
-				// } else {
-				// 	this.getDetail();
-
-				// }
-				this.getDetail();
-			}
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {
-			//已经接收但是没提交任务
-			if (e.from == 'backbutton') {
-				if (this.received) {
-					//取消承接任务	
-					cancleTakeProductDismantleJob(this.id).then(res => {
-						uni.navigateBack();
-					}).catch(error => {
-						uni.navigateBack();
-					})
-				} else {
-					uni.navigateBack();
-				}
-
-				return true;
-			}
-		},
-
-
-		mounted() {
-
-		},
-		methods: {
-			//接收
-			receive(callback) {
-				if (this.id != null) {
-					takeProductDismantleJob(this.id).then(res => {
-						callback();
-					}).catch(error => {
-						this.showErrorMessage(error)
-					})
-				}
-			},
-
-			getDetail() {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				getProductDismantleJobDetail(that.id).then(res => {
-					uni.hideLoading();
-					if (res.data == null) {
-						that.showMessage('未获取到详情');
-					} else {
-						if (res.data.subList.length > 0) {
-							that.jobContent = res.data;
-							that.subList = res.data.subList;
-							that.fromLocationCode = that.subList[0].fromLocationCode
-							that.toLocationCode = that.subList[0].toLocationCode
-							that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes)
-							that.detailSource = getDataSource(that.subList)
-							that.getLocationInfo(that.toLocationCode);
-						} else {
-							that.showMessage('列表数据为0');
-						}
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			getLocationInfo(locationCode) {
-				if (locationCode != '') {
-					getBasicLocationByCode(locationCode).then(res => {
-						if (res.data.list.length > 0) {
-							this.toLocationInfo = res.data.list[0]
-						}
-					})
-				}
-			},
-
-			calcHandleQty() {
-				calcHandleQty(this.detailSource);
-				this.continueScan()
-				this.$forceUpdate();
-			},
-
-			//继续扫描
-			continueScan() {
-				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == this.subList.length) {
-					this.closeScanPopup();
-				} else {
-					this.scanPopupGetFocus();
-				}
-			},
-
-
-			updateData() {
-				this.calcHandleQty();
-			},
-
-			openDetail(item) {
-				this.$refs.detailInfoPopup.openPopup(item)
-			},
-
-			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);
-			},
-
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
-
-			getScanResult(result) {
-				try {
-					var packingNumber = result.balance.packingNumber;
-					var batch = result.balance.batch;
-					var qty = result.balance.qty;
-					var itemCode = result.balance.itemCode;
-					var locationCode = result.balance.locationCode;
-					var inventoryStatus = result.balance.inventoryStatus;
-					var detail = this.detailSource.find(r => r.itemCode == itemCode);
-
-					if (detail == undefined) {
-						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
-					} else {
-						var itemDetail = detail.subList.find(r => {
-							return r.packingNumber == packingNumber &&
-								r.batch == batch &&
-								r.fromLocationCode == locationCode
-						})
-						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
-								"]不在列表中")
-						} else {
-							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
-									"]已经扫描")
-							} 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);
-													this.calcHandleQty();
-												} else {
-													this.scanPopupGetFocus();
-												}
-											});
-									}else {
-										this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
-											']不一致,不允许转移!', res => {
-												this.scanPopupGetFocus();
-											});
-									}
-									
-								} else {
-									itemDetail.scaned = true;
-									itemDetail.handleQty = Number(result.label.qty);
-									this.calcHandleQty();
-								}
-							}
-						}
-					}
-				} catch (e) {
-					this.showMessage(e.message)
-				}
-			},
-
-			scanLocationCode(location, code) {
-				this.toLocationCode = code
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						detail.toLocationCode = code
-					})
-				})
-			},
-
-			commit() {
-				//校验库位、
-				if (!this.checkLocation()) {
-					return
-				}
-
-				console.log("校验通过")
-
-				//扫描数量和任务数量相等，直接提交
-				if (this.scanCount == this.subList.length) {
-					this.submitJob();
-				} else if (this.scanCount < this.subList.length) {
-					//扫描数量小于任务数量，判断是否允许部分提交
-					if (this.jobContent.allowPartialComplete == "TRUE") {
-						//提交
-						this.submitJob();
-					} else {
-						//不允许部分提交，提示
-						this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交<br>' + "已经扫描[" + this.scanCount +
-							"]箱总共[" + this
-							.subList.length + "]箱", res => {
-								if (res) {
-									this.openScanPopup();
-								}
-							});
-					}
-				}
-			},
-
-			async submitJob() {
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-				var itemCodes = []
-				this.detailSource.forEach(item => {
-					itemCodes.push(item.itemCode)
-				})
-
-				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
-					if (res.success) {
-						this.managementList = res.list;
-						var params = this.setParams()
-						console.log("提交参数", JSON.stringify(params));
-						// productDismantleJobSubmit(this.id, params).then(res => {
-						// 	if (res.data) {
-						// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data.Number, )
-						// 	} else {
-						// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-						// 	}
-						// 	uni.hideLoading()
-						// }).catch(error => {
-						// 	uni.hideLoading()
-						// 	this.showErrorMessage(error)
-						// })
-					} else {
-						uni.hideLoading();
-						this.showErrorMessage(res.message);
-					}
-				});
-			},
-
-			setParams() {
-				var subList = []
-				var creator = this.$store.state.user.id
-
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.batch);
-							detail.toPackingNumber = info.packingNumber;
-							detail.toBatch = info.batch;
-							subList.push(detail)
-						}
-					})
-				})
-				this.jobContent.subList = subList
-				this.jobContent.creator = creator;
-				return this.jobContent;
-			},
-			checkLocation() {
-				var isPass = true;
-				if (this.toLocationCode == "") {
-					this.$refs.comMessage.showMessage('请扫描收货库位', res => {
-						if (res) {
-							this.$refs.requiredLocation.showLocation();
-						}
-					});
-					return isPass = false;
-				}
-				//空库位校验
-				var isHaveNullLocation = false;
-				var nullLocationList = [];
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.toLocationCode == null || detail.toLocationCode == "") {
-							nullLocationList.push(detail)
-						}
-					})
-				})
-
-
-
-				if (nullLocationList.length > 0) {
-					//弹出提示，是否把其他的库位都变成默认库位
-					this.$refs.comMessage.showQuestionMessage("是否把其他的库位都变成默认库位", res => {
-						nullLocationList.forEach(res => {
-							res.toLocationCode = this.toLocationCode
-						})
-					})
-					isPass = false;
-				}
-				return isPass;
-			},
-
-
-			showMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showMessage(message, res => {
-						if (res) {
-							this.afterCloseMessage()
-						}
-					});
-				})
-			},
-
-			showErrorMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					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();
-			},
-
-			afterCloseMessage() {
-				this.scanPopupGetFocus();
-			},
-
-			getToLocationCode(location, code) {
-				if (this.fromLocationCode == code) {
-					this.$refs.comMessage.showMessage('来源库位[' + this.fromLocationCode + '] 不能与目标库位[' + code + '] 一致 ',
-						res => {
-							this.$refs.comScanLocation.showLocation();
-						});
-				} else {
-					this.toLocationInfo = location;
-					this.toLocationCode = code;
-				}
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					navigateBack(1)
-				})
-			},
-		}
-	}
+import {
+  getManagementPrecisions
+} from '@/common/balance.js';
+
+import {
+  getProductDismantleJobDetail,
+  getBasicLocationByCode,
+  takeProductDismantleJob,
+  cancleTakeProductDismantleJob,
+  productDismantleJobSubmit
+} from '@/api/request2.js';
+
+import {
+  goHome,
+  getCurrDateTime,
+  navigateBack,
+  getPackingNumberAndBatch,
+} from '@/common/basic.js';
+
+import {
+  getInventoryStatusName
+} from '@/common/directory.js';
+
+import {
+  getLocationTypeArray
+} from '@/common/array.js';
+
+import {
+  getDataSource,
+  createRecordInfo,
+  calcHandleQty
+} from '@/common/detail.js';
+
+import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+import detailInfoPopup from '@/pages/productDismantle/coms/detailInfoPopup.vue'
+import jobTop from '@/mycomponents/job/jobTop.vue'
+
+export default {
+  components: {
+    winScanButton,
+    winScanPackAndLocation,
+    requiredLocation,
+    comDetailCard,
+    detailInfoPopup,
+    jobTop
+  },
+  data() {
+    return {
+      id: '',
+      received: false,
+      scanCount: 0,
+      jobContent: {}, //任务内容
+      subList: [], //接口返回的任务subList
+      detailSource: [], //绑定在页面上的数据源
+      managementList: [],
+      fromLocationCode: "",
+      toLocationCode: "",
+      toLocationInfo: {},
+      toLocationAreaTypeList: [],
+    };
+  },
+  onLoad(option) {
+    this.id = option.id;
+    if (this.id != undefined) {
+      //新建的任务自动接收
+      // if (option.status == "JOB_PENDING") {
+      // 	this.receive((callback => {
+      // 		this.received = true;
+      // 		this.getDetail();
+      // 	}));
+      // } else {
+      // 	this.getDetail();
+
+      // }
+      this.getDetail();
+    }
+  },
+  //返回首页
+  onNavigationBarButtonTap(e) {
+    if (e.index === 0) {
+      goHome();
+    }
+  },
+  //拦截返回按钮事件
+  onBackPress(e) {
+    //已经接收但是没提交任务
+    if (e.from == 'backbutton') {
+      if (this.received) {
+        //取消承接任务
+        cancleTakeProductDismantleJob(this.id).then(res => {
+          uni.navigateBack();
+        }).catch(error => {
+          uni.navigateBack();
+        })
+      } else {
+        uni.navigateBack();
+      }
+
+      return true;
+    }
+  },
+
+
+  mounted() {
+
+  },
+  methods: {
+    //接收
+    receive(callback) {
+      if (this.id != null) {
+        takeProductDismantleJob(this.id).then(res => {
+          callback();
+        }).catch(error => {
+          this.showErrorMessage(error)
+        })
+      }
+    },
+
+    getDetail() {
+      var that = this;
+      uni.showLoading({
+        title: "加载中....",
+        mask: true
+      });
+      getProductDismantleJobDetail(that.id).then(res => {
+        uni.hideLoading();
+        if (res.data == null) {
+          that.showMessage('未获取到详情');
+        } else {
+          if (res.data.subList.length > 0) {
+            that.jobContent = res.data;
+            that.subList = res.data.subList;
+            that.fromLocationCode = that.subList[0].fromLocationCode
+            that.toLocationCode = that.subList[0].toLocationCode
+            that.toLocationAreaTypeList = getLocationTypeArray(that.jobContent.toAreaTypes)
+            that.detailSource = getDataSource(that.subList)
+            that.getLocationInfo(that.toLocationCode);
+          } else {
+            that.showMessage('列表数据为0');
+          }
+        }
+      }).catch(error => {
+        uni.hideLoading()
+        this.showErrorMessage(error)
+      })
+    },
+
+    getLocationInfo(locationCode) {
+      if (locationCode != '') {
+        getBasicLocationByCode(locationCode).then(res => {
+          if (res.data.list.length > 0) {
+            this.toLocationInfo = res.data.list[0]
+          }
+        })
+      }
+    },
+
+    calcHandleQty() {
+      calcHandleQty(this.detailSource);
+      this.continueScan()
+      this.$forceUpdate();
+    },
+
+    //继续扫描
+    continueScan() {
+      this.scanCount = getScanCount(this.subList);
+      if (this.scanCount == this.subList.length) {
+        this.closeScanPopup();
+      } else {
+        this.scanPopupGetFocus();
+      }
+    },
+
+
+    updateData() {
+      this.calcHandleQty();
+    },
+
+    openDetail(item) {
+      this.$refs.detailInfoPopup.openPopup(item)
+    },
+
+    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);
+    },
+
+    closeScanPopup() {
+      this.$refs.scanPopup.closeScanPopup();
+    },
+
+    getScanResult(result) {
+      try {
+        var packingNumber = result.balance.packingNumber;
+        var batch = result.balance.batch;
+        var qty = result.balance.qty;
+        var itemCode = result.balance.itemCode;
+        var locationCode = result.balance.locationCode;
+        var inventoryStatus = result.balance.inventoryStatus;
+        var detail = this.detailSource.find(r => r.itemCode == itemCode);
+
+        if (detail == undefined) {
+          this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
+        } else {
+          var itemDetail = detail.subList.find(r => {
+            return r.packingNumber == packingNumber &&
+                r.batch == batch &&
+                r.fromLocationCode == locationCode
+          })
+          if (itemDetail == undefined) {
+            this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
+                "]不在列表中")
+          } else {
+            if (itemDetail.scaned) {
+              this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]库位[" + locationCode +
+                  "]已经扫描")
+            } 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);
+                      this.calcHandleQty();
+                    } else {
+                      this.scanPopupGetFocus();
+                    }
+                  });
+                } else {
+                  this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
+                      ']不一致,不允许转移!', res => {
+                    this.scanPopupGetFocus();
+                  });
+                }
+
+              } else {
+                itemDetail.scaned = true;
+                itemDetail.handleQty = Number(result.label.qty);
+                this.calcHandleQty();
+              }
+            }
+          }
+        }
+      } catch (e) {
+        this.showMessage(e.message)
+      }
+    },
+
+    scanLocationCode(location, code) {
+      this.toLocationCode = code
+      this.detailSource.forEach(item => {
+        item.subList.forEach(detail => {
+          detail.toLocationCode = code
+        })
+      })
+    },
+
+    commit() {
+      //校验库位、
+      if (!this.checkLocation()) {
+        return
+      }
+
+      console.log("校验通过")
+
+      //扫描数量和任务数量相等，直接提交
+      if (this.scanCount == this.subList.length) {
+        this.submitJob();
+      } else if (this.scanCount < this.subList.length) {
+        //扫描数量小于任务数量，判断是否允许部分提交
+        if (this.jobContent.allowPartialComplete == "TRUE") {
+          //提交
+          this.$refs.comMessage.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+            if (res) {
+              this.submitJob()
+            }
+          });
+        } else {
+          //不允许部分提交，提示
+          this.$refs.comMessage.showErrorMessage("任务明细未全部完成,不允许部分提交!", res => {
+            if (res) {
+              this.openScanPopup();
+            }
+          });
+        }
+      }
+    },
+
+    async submitJob() {
+      uni.showLoading({
+        title: "提交中....",
+        mask: true
+      });
+      var itemCodes = []
+      this.detailSource.forEach(item => {
+        itemCodes.push(item.itemCode)
+      })
+
+      getManagementPrecisions(itemCodes, this.toLocationCode, res => {
+        if (res.success) {
+          this.managementList = res.list;
+          var params = this.setParams()
+          console.log("提交参数", JSON.stringify(params));
+          // productDismantleJobSubmit(this.id, params).then(res => {
+          // 	if (res.data) {
+          // 		this.showCommitSuccessMessage("提交成功\n生成采购收货记录" + res.data.Number, )
+          // 	} else {
+          // 		this.showErrorMessage("提交失败[" + res.msg + "]")
+          // 	}
+          // 	uni.hideLoading()
+          // }).catch(error => {
+          // 	uni.hideLoading()
+          // 	this.showErrorMessage(error)
+          // })
+        } else {
+          uni.hideLoading();
+          this.showErrorMessage(res.message);
+        }
+      });
+    },
+
+    setParams() {
+      var subList = []
+      var creator = this.$store.state.user.id
+
+      this.detailSource.forEach(item => {
+        item.subList.forEach(detail => {
+          if (detail.scaned) {
+            var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+                detail.packingNumber, detail.batch);
+            detail.toPackingNumber = info.packingNumber;
+            detail.toBatch = info.batch;
+            subList.push(detail)
+          }
+        })
+      })
+      this.jobContent.subList = subList
+      this.jobContent.creator = creator;
+      return this.jobContent;
+    },
+    checkLocation() {
+      var isPass = true;
+      if (this.toLocationCode == "") {
+        this.$refs.comMessage.showMessage('请扫描收货库位', res => {
+          if (res) {
+            this.$refs.requiredLocation.showLocation();
+          }
+        });
+        return isPass = false;
+      }
+      //空库位校验
+      var isHaveNullLocation = false;
+      var nullLocationList = [];
+      this.detailSource.forEach(item => {
+        item.subList.forEach(detail => {
+          if (detail.toLocationCode == null || detail.toLocationCode == "") {
+            nullLocationList.push(detail)
+          }
+        })
+      })
+
+
+      if (nullLocationList.length > 0) {
+        //弹出提示，是否把其他的库位都变成默认库位
+        this.$refs.comMessage.showQuestionMessage("是否把其他的库位都变成默认库位", res => {
+          nullLocationList.forEach(res => {
+            res.toLocationCode = this.toLocationCode
+          })
+        })
+        isPass = false;
+      }
+      return isPass;
+    },
+
+
+    showMessage(message) {
+      setTimeout(r => {
+        this.scanPopupLoseFocus();
+        this.$refs.comMessage.showMessage(message, res => {
+          if (res) {
+            this.afterCloseMessage()
+          }
+        });
+      })
+    },
+
+    showErrorMessage(message) {
+      setTimeout(r => {
+        this.scanPopupLoseFocus();
+        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();
+    },
+
+    afterCloseMessage() {
+      this.scanPopupGetFocus();
+    },
+
+    getToLocationCode(location, code) {
+      if (this.fromLocationCode == code) {
+        this.$refs.comMessage.showMessage('来源库位[' + this.fromLocationCode + '] 不能与目标库位[' + code + '] 一致 ',
+            res => {
+              this.$refs.comScanLocation.showLocation();
+            });
+      } else {
+        this.toLocationInfo = location;
+        this.toLocationCode = code;
+      }
+    },
+
+    showCommitSuccessMessage(hint) {
+      this.$refs.comMessage.showSuccessMessage(hint, res => {
+        navigateBack(1)
+      })
+    },
+  }
+}
 </script>
 
 <style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
-
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
-
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
-
-	}
+page {
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+}
+
+.page-wraper {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+}
+
+
+.page-main {
+  flex: 1;
+  position: relative;
+}
+
+.page-main-scroll {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.page-main-list {
+  /*  height: 80rpx;
+    line-height: 80rpx; */
+  text-align: center;
+  background: #e0e0e0;
+
+}
 </style>
diff --git a/src/pages/productDismantle/record/productDismantleRecord.vue b/src/pages/productDismantle/record/productDismantleRecord.vue
index 0ff35dbd..44c81400 100644
--- a/src/pages/productDismantle/record/productDismantleRecord.vue
+++ b/src/pages/productDismantle/record/productDismantleRecord.vue
@@ -1,373 +1,362 @@
 <template>
-	<view class="page-wraper">
-		<view class="">
-			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
-		</view>
-
-		<view class="page-wraper" v-if="detailSource.length>0">
-			<view class="page-main">
-				<scroll-view scroll-y="true" class="page-main-scroll">
-					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-						<view class="">
-							<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
-								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
-							</record-com-detail-card>
-						</view>
-						<view class='split_line'></view>
-					</view>
-				</scroll-view>
-			</view>
-
-			<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
-				:locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
-
-			<view class="page-footer">
-				<view class="uni-flex u-col-center space-between padding_10"
-					style="background-color:ghostwhite; width: 100%; ">
-					<view class="">
-					</view>
-					<view class=" uni-flex uni-row">
-						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
-					</view>
-				</view>
-			</view>
-			<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		</view>
-
-		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
-		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
-			:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
+  <view class="page-wraper">
+    <view class="">
+      <com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
+    </view>
+
+    <view class="page-wraper" v-if="detailSource.length>0">
+      <view class="page-main">
+        <scroll-view scroll-y="true" class="page-main-scroll">
+          <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+            <view class="">
+              <record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
+                                      @removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
+              </record-com-detail-card>
+            </view>
+            <view class='split_line'></view>
+          </view>
+        </scroll-view>
+      </view>
+
+      <requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+                        :locationAreaTypeList="toLocationAreaTypeList"></requiredLocation>
+
+      <view class="page-footer">
+        <view class="uni-flex u-col-center space-between padding_10"
+              style="background-color:ghostwhite; width: 100%; ">
+          <view class="">
+          </view>
+          <view class=" uni-flex uni-row">
+            <button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+          </view>
+        </view>
+      </view>
+      <win-scan-button @goScan='openScanPopup'></win-scan-button>
+    </view>
+
+    <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'></win-scan-pack-and-location>
+    <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+                       :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+    <comMessage ref="comMessage"></comMessage>
+  </view>
 </template>
 
 <script>
-	import {
-		productDismantleRecordSubmit
-	} from '@/api/request2.js';
-	import {
-		goHome,
-	} from '@/common/basic.js';
-
-	import {
-		getInventoryStatusDesc,
-		getDirectoryItemArray
-	} from '@/common/directory.js';
-
-	import {
-		getBusinessType,
-		createItemInfo,
-		createDetailInfo,
-		calcHandleQty
-	} from '@/common/record.js';
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import comProductionRecord from '@/pages/productionReceipt/coms/comProductionRecord.vue'
-	import comBlankView from '@/mycomponents/common/comBlankView.vue'
-	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
-
-
-	export default {
-		components: {
-			winScanButton,
-			winScanPack,
-			comProductionRecord,
-			requiredLocation,
-			comBlankView,
-			winScanLocation,
-			winScanPackAndLocation,
-			recordComDetailCard
-		},
-		data() {
-			return {
-				id: '',
-				receiptJob: {},
-				received: false,
-				isShowPackingCode: true,
-				scanCount: 0,
-				jobContent: {}, //任务内容
-				detailList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				toLocationInfo: {},
-				businessTypeInfo: {},
-				fromLocationInfo: {},
-				fromLocationCode: "",
-				toLocationCode: "",
-				isShowLocation: false,
-				fromLocationAreaTypeList: [],
-				toLocationAreaTypeList: [],
-				allowModifyLocation: false,
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				businessType: {}
-			};
-		},
-		onLoad(option) {
-			var typeCode = "ProductPutaway"
-			getBusinessType(typeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
-					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
-					this.showFromLocationPopup();
-				} else {
-					this.showErrorMessage(res.message)
-				}
-			});
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {},
-
-		onPullDownRefresh() {},
-
-		mounted() {},
-		methods: {
-			getScanResult(result) {
-				let balance = result.balance;
-				let label = result.label;
-				let pack = result.package;
-				var item = this.detailSource.find(res => {
-					if (res.itemCode == balance.itemCode) {
-						return res
-					}
-				})
-				if (item == undefined) {
-					var itemp = createItemInfo(balance, pack);
-					let newDetail = createDetailInfo(balance, pack); //
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
-				} else {
-					var detail = item.subList.find(r => {
-						if (r.packingNumber == balance.packingNumber &&
-							r.batch == balance.batch &&
-							r.locationCode == balance.locationCode &&
-							r.inventoryStatus == balance.inventoryStatus) {
-							return r;
-						}
-					})
-					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
-						item.subList.push(newDetail);
-					} else {
-						if (detail.scaned == true) {
-							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
-						}
-					}
-				}
-				this.calcHandleQty();
-
-			},
-
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
-			calcHandleQty() {
-				calcHandleQty(this.detailSource);
-				this.$forceUpdate();
-			},
-
-			updateData() {
-				this.calcHandleQty();
-			},
-			removeItem(index, item) {
-				this.detailSource.splice(index, 1)
-			},
-			removePack() {
-				for (var i = 0; i < this.detailSource.length; i++) {
-					var item = this.detailSource[i];
-					if (item.subList.length == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-				this.updateData();
-			},
-
-			openScanPopup() {
-				if (this.fromLocationCode == "") {
-					this.showFromLocationPopup();
-					return
-				}
-				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
-			},
-			showFromLocationPopup() {
-				this.$nextTick(() => {
-					this.$refs.scanLocationCode.openScanPopup();
-				})
-
-			},
-			closeScanPopup() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.closeScanPopup();
-				}
-			},
-
-			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.getfocus();
-				}
-			},
-
-			scanLocationCode(location, code) {
-				this.toLocationCode = code
-				this.toLocationCode = location;
-
-			},
-
-			commit() {
-				if (this.toLocationCode == "") {
-					this.showMessage("请先选择目标库位")
-					return;
-				}
-				//允许部分提交
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-
-				var params = this.setParams();
-				console.log("提交" + JSON.stringify(params))
-				// productDismantleRecordSubmit(params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.data) {
-				// 		this.showCommitSuccessMessage("提交成功<br>生成采购收货记录" + res.data, )
-				// 	} else {
-				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-				// 	}
-				// }).catch(error => {
-				// 	uni.hideLoading()
-				// 	this.showErrorMessage(error)
-				// })
-
-			},
-
-			setParams() {
-				var subList = []
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-							// 	detail.packingNumber, detail.batch);
-							// 	detail.toPackingNumber =info.packingNumber;
-							// 	detail.toBatch =info.batch;
-							subList.push(detail)
-						}
-					})
-				})
-				return subList;
-
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {}
-				});
-			},
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-
-					}
-				});
-			},
-
-			showScanMessage(message) {
-				this.$refs.comMessage.showScanMessage(message);
-			},
-
-			afterCloseMessage() {
-				this.scanPopupGetFocus();
-			},
-
-			closeScanMessage() {
-				this.scanPopupGetFocus();
-			},
-			getLocation(location, code) {
-				this.getFromLocationCode(location, code)
-			},
-			getFromLocationCode(location, code) {
-				this.fromLocationInfo = location;
-				this.fromLocationCode = code;
-				this.openScanPopup();
-			},
-			getToLocationCode(location, code) {
-				if (this.fromLocationCode == code) {
-					uni.showToast({
-						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
-						duration: 2000
-					})
-					return
-				}
-				this.ToLocationCodeInfo = location;
-				this.toLocationCode = code;
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.fromLocationCode = '';
-
-				})
-			},
-
-			updateData() {
-				this.calcHandleQty();
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					if (item.qty == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-			}
-		}
-	}
+import {
+  productDismantleRecordSubmit
+} from '@/api/request2.js';
+import {
+  goHome,
+} from '@/common/basic.js';
+
+import {
+  getInventoryStatusDesc,
+  getDirectoryItemArray
+} from '@/common/directory.js';
+
+import {
+  getBusinessType,
+  createItemInfo,
+  createDetailInfo,
+  calcHandleQty
+} from '@/common/record.js';
+
+import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+import comProductionRecord from '@/pages/productionReceipt/coms/comProductionRecord.vue'
+import comBlankView from '@/mycomponents/common/comBlankView.vue'
+import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+
+export default {
+  components: {
+    winScanButton,
+    winScanPack,
+    comProductionRecord,
+    requiredLocation,
+    comBlankView,
+    winScanLocation,
+    winScanPackAndLocation,
+    recordComDetailCard
+  },
+  data() {
+    return {
+      id: '',
+      receiptJob: {},
+      received: false,
+      isShowPackingCode: true,
+      scanCount: 0,
+      jobContent: {}, //任务内容
+      detailList: [], //接口返回的任务subList
+      detailSource: [], //绑定在页面上的数据源
+      toLocationInfo: {},
+      businessTypeInfo: {},
+      fromLocationInfo: {},
+      fromLocationCode: "",
+      toLocationCode: "",
+      isShowLocation: false,
+      fromLocationAreaTypeList: [],
+      toLocationAreaTypeList: [],
+      allowModifyLocation: false,
+      inInventoryStatus: "", //目标入库库存状态
+      outInventoryStatus: "", //来源出库库存状态
+      businessType: {}
+    };
+  },
+  onLoad(option) {
+    var typeCode = "ProductPutaway"
+    getBusinessType(typeCode, res => {
+      if (res.success) {
+        this.businessType = res.businessType;
+        this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
+        this.toLocationAreaTypeList = res.toLocationAreaTypeList;
+        this.showFromLocationPopup();
+      } else {
+        this.showErrorMessage(res.message)
+      }
+    });
+  },
+  //返回首页
+  onNavigationBarButtonTap(e) {
+    if (e.index === 0) {
+      goHome();
+    }
+  },
+  //拦截返回按钮事件
+  onBackPress(e) {},
+
+  onPullDownRefresh() {},
+
+  mounted() {},
+  methods: {
+    getScanResult(result) {
+      let balance = result.balance;
+      let label = result.label;
+      let pack = result.package;
+      var item = this.detailSource.find(res => {
+        if (res.itemCode == balance.itemCode) {
+          return res
+        }
+      })
+      if (item == undefined) {
+        var itemp = createItemInfo(balance, pack);
+        let newDetail = createDetailInfo(balance, pack); //
+        itemp.subList.push(newDetail);
+        this.detailSource.push(itemp)
+      } else {
+        var detail = item.subList.find(r => {
+          if (r.packingNumber == balance.packingNumber &&
+              r.batch == balance.batch &&
+              r.locationCode == balance.locationCode &&
+              r.inventoryStatus == balance.inventoryStatus) {
+            return r;
+          }
+        })
+        if (detail == undefined) {
+          let newDetail = createDetailInfo(balance, pack);
+          item.subList.push(newDetail);
+        } else {
+          if (detail.scaned == true) {
+            this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+          }
+        }
+      }
+      this.calcHandleQty();
+
+    },
+
+    showErrorMessage(message) {
+      this.$refs.comMessage.showErrorMessage(message, res => {
+        if (res) {
+
+        }
+      });
+    },
+    calcHandleQty() {
+      calcHandleQty(this.detailSource);
+      this.$forceUpdate();
+    },
+
+    removeItem(index, item) {
+      this.detailSource.splice(index, 1)
+    },
+    removePack() {
+      for (var i = 0; i < this.detailSource.length; i++) {
+        var item = this.detailSource[i];
+        if (item.subList.length == 0) {
+          this.detailSource.splice(i, 1)
+        }
+      }
+      this.updateData();
+    },
+
+    openScanPopup() {
+      if (this.fromLocationCode == "") {
+        this.showFromLocationPopup();
+        return
+      }
+      this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+    },
+    showFromLocationPopup() {
+      this.$nextTick(() => {
+        this.$refs.scanLocationCode.openScanPopup();
+      })
+
+    },
+    closeScanPopup() {
+      if (this.$refs.scanPopup != undefined) {
+        this.$refs.scanPopup.closeScanPopup();
+      }
+    },
+
+    scanPopupGetFocus() {
+      if (this.$refs.scanPopup != undefined) {
+        this.$refs.scanPopup.getfocus();
+      }
+    },
+
+    scanLocationCode(location, code) {
+      this.toLocationCode = code
+      this.toLocationCode = location;
+
+    },
+
+    commit() {
+      if (this.toLocationCode == "") {
+        this.showMessage("请先选择目标库位")
+        return;
+      }
+      //允许部分提交
+      uni.showLoading({
+        title: "提交中....",
+        mask: true
+      });
+
+      var params = this.setParams();
+      console.log("提交" + JSON.stringify(params))
+      // productDismantleRecordSubmit(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 = []
+      this.detailSource.forEach(item => {
+        item.subList.forEach(detail => {
+          if (detail.scaned) {
+            // var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
+            // 	detail.packingNumber, detail.batch);
+            // 	detail.toPackingNumber =info.packingNumber;
+            // 	detail.toBatch =info.batch;
+            subList.push(detail)
+          }
+        })
+      })
+      return subList;
+
+    },
+
+    showMessage(message) {
+      this.$refs.comMessage.showMessage(message, res => {
+        if (res) {}
+      });
+    },
+    showScanMessage(message) {
+      this.$refs.comMessage.showScanMessage(message);
+    },
+
+    afterCloseMessage() {
+      this.scanPopupGetFocus();
+    },
+
+    closeScanMessage() {
+      this.scanPopupGetFocus();
+    },
+    getLocation(location, code) {
+      this.getFromLocationCode(location, code)
+    },
+    getFromLocationCode(location, code) {
+      this.fromLocationInfo = location;
+      this.fromLocationCode = code;
+      this.openScanPopup();
+    },
+    getToLocationCode(location, code) {
+      if (this.fromLocationCode == code) {
+        uni.showToast({
+          title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
+          duration: 2000
+        })
+        return
+      }
+      this.ToLocationCodeInfo = location;
+      this.toLocationCode = code;
+    },
+
+    showCommitSuccessMessage(hint) {
+      this.$refs.comMessage.showSuccessMessage(hint, res => {
+        this.fromLocationCode = '';
+
+      })
+    },
+
+    updateData() {
+      this.calcHandleQty();
+      for (var i = 0; i < this.detailSource.length; i++) {
+        let item = this.detailSource[i];
+        if (item.qty == 0) {
+          this.detailSource.splice(i, 1)
+        }
+      }
+    }
+  }
+}
 </script>
 
 <style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
-
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
-
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
-
-	}
+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>