|
|
|
@ -376,7 +376,7 @@ |
|
|
|
console.log(mode, resultData) |
|
|
|
var result = resultData |
|
|
|
var itemCode = result.itemCode; |
|
|
|
|
|
|
|
result.uom = result.basicUom; |
|
|
|
let items = this.originalDetails.filter(r => |
|
|
|
r.itemCode === itemCode && r.inventoryStage == this.datacontent.inventoryStage) |
|
|
|
//不在任务列表中，查询库存赋值 |
|
|
|
@ -385,6 +385,7 @@ |
|
|
|
} else if (items.length == 1) { |
|
|
|
var item = items[0]; |
|
|
|
item.isNew = true; |
|
|
|
item.uom= result.uom ; |
|
|
|
var addItem = deepCopyData(item) |
|
|
|
this.addItemExit(addItem, true); |
|
|
|
} else { |
|
|
|
@ -618,6 +619,7 @@ |
|
|
|
detail.inventoryQty = balanceItem.qty; |
|
|
|
detail.countQty = balanceItem.qty; |
|
|
|
detail.status = balanceItem.status; |
|
|
|
detail.uom=balanceItem.uom |
|
|
|
return detail; |
|
|
|
}, |
|
|
|
|
|
|
|
@ -666,22 +668,24 @@ |
|
|
|
this.$forceUpdate(); |
|
|
|
}, |
|
|
|
removeData(item, index) { |
|
|
|
var that=this; |
|
|
|
uni.showModal({ |
|
|
|
title: '提示', |
|
|
|
content: '是否移除选择的行?', |
|
|
|
success: res => { |
|
|
|
if (res.confirm) { |
|
|
|
if (item.isNew) { |
|
|
|
this.showList.splice(index, 1) |
|
|
|
this.scanAllDetails.splice(index, 1) |
|
|
|
that.showList.splice(index, 1) |
|
|
|
that.scanAllDetails.splice(index, 1) |
|
|
|
} else { |
|
|
|
item.isDelete = true; |
|
|
|
item.modified = true; |
|
|
|
} |
|
|
|
this.initList(); |
|
|
|
this.scanPopupGetfocus(); |
|
|
|
this.calcScanCount(); |
|
|
|
this.$forceUpdate(); |
|
|
|
|
|
|
|
that.initList(); |
|
|
|
that.scanPopupGetfocus(); |
|
|
|
that.calcScanCount(); |
|
|
|
that.$forceUpdate(); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
@ -736,7 +740,7 @@ |
|
|
|
mask: true |
|
|
|
}); |
|
|
|
var params =this.setParams(); |
|
|
|
finishCountJob(this.id, params) |
|
|
|
finishCountJob(that.id, params) |
|
|
|
.then(res => { |
|
|
|
uni.hideLoading(); |
|
|
|
if (!res) { |
|
|
|
@ -750,7 +754,7 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
setParams() { |
|
|
|
var filterList = this.scanAllDetails.filter(r => r.modified == true && r.isDelete == false) |
|
|
|
var filterList = this.scanAllDetails.filter(r => r.modified == true) |
|
|
|
|
|
|
|
let submitList = []; //定义空数组，用于装载去重之后的数组， |
|
|
|
filterList.forEach(item => { |
|
|
|
@ -779,7 +783,11 @@ |
|
|
|
item.countOperator = localStorage.userId; |
|
|
|
this.calcScanCount(); |
|
|
|
if (value == item.countQty) { |
|
|
|
item.modified = false |
|
|
|
if(!item.isNew){ |
|
|
|
item.modified = false |
|
|
|
}else { |
|
|
|
item.modified = true |
|
|
|
} |
|
|
|
} else { |
|
|
|
item.modified = true |
|
|
|
} |
|
|
|
|
