diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 79283255..27afcb68 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -24,7 +24,7 @@ + :locationAreaTypeList="toLocationAreaTypeList" :isShowEdit='true'> @@ -124,7 +124,7 @@ dataContent: {}, fromLocationAreaTypeList: [], toLocationAreaTypeList: [], - isShowEditLocation:false + isShowEditLocation: false } }, @@ -144,7 +144,7 @@ }, onLoad() { - + }, methods: { @@ -153,12 +153,12 @@ this.title = "库存转移记录"; this.toInventoryStatus = "" this.toLocationCode = "" - this.isShowEditLocation =true; + this.isShowEditLocation = true; } else if (this.businessTypeCode == "HoldToOk") { this.title = "隔离转合格记录"; this.toInventoryStatus = "OK" this.toLocationCode = "" - this.isShowEditLocation =true; + this.isShowEditLocation = true; } else if (this.businessTypeCode == "HoldToScrap") { this.title = "隔离转报废记录"; this.toInventoryStatus = "SCRAP" @@ -184,7 +184,7 @@ title: this.title }) }, - getLocationInfo(){ + getLocationInfo() { if (this.toLocationCode != "") { getBasicLocationByCode(this.toLocationCode).then(res => { if (res.data.total > 0) { @@ -199,14 +199,14 @@ } else { this.showErrorMessage('库位[' + this.toLocationCode + ']不存在') } - + }).catch(error => { uni.hideLoading(); this.showErrorMessage(error) }) } }, - + openScanPopup() { if (this.fromLocationCode == "") { this.showFromLocationPopup(); @@ -239,8 +239,12 @@ if (item == undefined) { var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); - // newDetail.inventoryStatus = balance.inventoryStatus; - newDetail.toInventoryStatus = this.toInventoryStatus; + // + if (this.businessTypeCode == "Move") { + newDetail.toInventoryStatus = balance.inventoryStatus; + } else { + newDetail.toInventoryStatus = this.toInventoryStatus; + } newDetail.toLocationCode = this.toLocationCode; newDetail.fromLocationCode = result.fromLocationCode itemp.subList.push(newDetail); @@ -367,8 +371,7 @@ this.detailSource.forEach(item => { item.subList.forEach(detail => { if (detail.scaned) { - if (detail.toLocationCode == '') - { + if (detail.toLocationCode == '') { detail.toLocationCode = this.toLocationCode; } var filterResult = itemList.filter(res => { @@ -422,7 +425,7 @@ submitItem.package = null; submitItem.Records = null; - + submitItem.qty = detail.handleQty; subList.push(submitItem) @@ -441,4 +444,4 @@ + \ No newline at end of file