|
|
@@ -570,22 +570,23 @@
|
|
|
content['addBtnShow'] = false ;
|
|
|
content['type'] = type ;
|
|
|
this.processContents.unshift(content);
|
|
|
- this.commodityIds.push(processContent.bill_type+"_"+commodity.id+"_"+content['type']);
|
|
|
+ this.commodityIds.push(processContent.wms_code+"_"+commodity.id+"_"+content['type']);
|
|
|
if (!type) this.sum += Number(commodity.amount);
|
|
|
return content;
|
|
|
},
|
|
|
//添加所有
|
|
|
addAll(processContent){
|
|
|
+ console.log("processContent.wms_code:"+processContent.wms_code)
|
|
|
let _this=this;
|
|
|
processContent.commodities.forEach(function (commodity) {
|
|
|
- if (!_this.commodityIds.includes(processContent.bill_type+"_"+commodity.id+"_"+false)){
|
|
|
+ if (!_this.commodityIds.includes(processContent.wms_code+"_"+commodity.id+"_"+false)){
|
|
|
let content = _this._add(processContent,commodity,false);
|
|
|
if (processContent.bill_type==='入库单' && !_this.commodityIds.includes(commodity.id+"_"+true)){
|
|
|
let contentTemp={};
|
|
|
Object.assign(contentTemp,content);
|
|
|
contentTemp['type'] = true;
|
|
|
_this.processContents.unshift(contentTemp);
|
|
|
- _this.commodityIds.push(processContent.bill_type+"_"+commodity.id+"_"+contentTemp['type']);
|
|
|
+ _this.commodityIds.push(processContent.wms_code+"_"+commodity.id+"_"+contentTemp['type']);
|
|
|
}
|
|
|
}
|
|
|
});
|