diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue index 0d61c3c1..26599dec 100644 --- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -25,6 +25,9 @@ + + @@ -78,6 +81,7 @@ 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' export default { @@ -88,7 +92,8 @@ comInventoryDetailCard, winScanPackAndLocation, detailInfoPopup, - jobTop + jobTop, + locationCompare }, data() { return { @@ -106,7 +111,8 @@ toInventoryStatus: '', jobStatus: "", title: '', - toLocationAreaTypeList: [] + toLocationAreaTypeList: [], + jobToLocationCode:'' }; }, props: { @@ -238,6 +244,7 @@ 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 = [] @@ -598,7 +605,7 @@ mask: true }); var params = this.setParams() - console.log("提交" + JSON.stringify(params)) + console.log("提交",params) inventoryMoveSubmit(params).then(res => { uni.hideLoading() if (res.data) { @@ -723,7 +730,24 @@ 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 + }) + }) + }, } }