|
|
@@ -438,11 +438,12 @@ ProjectGLJ.prototype.priceCalc = function (glj,dataMap) {
|
|
|
let priceList = _.filter(this.datas.originalList,{"connect_key":gljUtil.getIndex(glj)});
|
|
|
if(dataMap["price"] && dataMap["price"]["add"]) priceList = priceList.concat(dataMap["price"]["add"]); //把添加的加进去
|
|
|
for(let p of priceList){
|
|
|
- let supplyPrice = p.supplyPrice ,coe = p.coe;
|
|
|
+ let supplyPrice = p.supplyPrice ,coe = p.coe,supplyLocation=p.supplyLocation;
|
|
|
if(dataMap["price"] && dataMap["price"]["update"]){//覆盖更新的数据
|
|
|
let t = dataMap["price"]["update"][p.ID];
|
|
|
if(t && t["supplyPrice"]) supplyPrice =t["supplyPrice"];
|
|
|
if(t && t["coe"]) coe =t["coe"];
|
|
|
+ if(t && t["supplyLocation"]) supplyLocation = t["supplyLocation"];
|
|
|
}
|
|
|
if(dataMap["price"] && dataMap["price"]["delete"]){//忽略删除的数据
|
|
|
if(p.ID ==dataMap["price"]["delete"]) continue;
|
|
|
@@ -451,7 +452,7 @@ ProjectGLJ.prototype.priceCalc = function (glj,dataMap) {
|
|
|
coe = scMathUtil.roundForObj(coe,unitPirce);
|
|
|
let t_p = scMathUtil.roundForObj(supplyPrice * coe,process);
|
|
|
original_price=scMathUtil.roundForObj(original_price+t_p,process);
|
|
|
- supplyList.push(p.supplyLocation);
|
|
|
+ supplyList.push(supplyLocation);
|
|
|
}
|
|
|
supplyLocation = supplyList.join(',');
|
|
|
if(priceList.length == 0){//如果原价计算表没有数据，则读取输入的或单价文件的值
|
