|
|
@@ -393,7 +393,7 @@ var gljOprObj = {
|
|
|
}
|
|
|
},
|
|
|
onCheckBoxClick: function (sender, args) {
|
|
|
- if(typeof projectObj != 'undefined'){
|
|
|
+ if(typeof projectObj != 'undefined'){
|
|
|
let selected = projectObj.project.mainTree.selected;
|
|
|
if(selected.sourceType == ModuleNames.ration_glj){//选中的是工料机时不可编辑
|
|
|
return ;
|
|
|
@@ -792,7 +792,7 @@ var gljOprObj = {
|
|
|
}
|
|
|
}
|
|
|
if(ration) gljOprObj.getTotalQuantity(ration_gljs[i], ration);
|
|
|
- if(ration) ration_gljs[i].tenderQuantity = gljUtil.getRationGLJTenderQuantity(ration_gljs[i], ration,getDecimal("glj.quantity"),scMathUtil,glj);
|
|
|
+ // if(ration) ration_gljs[i].tenderQuantity = gljUtil.getRationGLJTenderQuantity(ration_gljs[i], ration,getDecimal("glj.quantity"),scMathUtil,glj);
|
|
|
}else {
|
|
|
console.log("没有找到工料机："+ration_gljs[i].name)
|
|
|
}
|
|
|
@@ -1013,7 +1013,7 @@ var gljOprObj = {
|
|
|
return false;
|
|
|
},
|
|
|
getParentPrice:function(subList,value,radio,type = 'modify'){
|
|
|
- let marketPrice = 0,basePrice=0;
|
|
|
+ let marketPrice = 0,basePrice=0;
|
|
|
let decimal = getDecimal('glj.unitPrice');
|
|
|
for(let s of subList){
|
|
|
let c = parseFloat(s.consumption);
|
|
|
@@ -1034,7 +1034,7 @@ var gljOprObj = {
|
|
|
subList = rg.subList;
|
|
|
break;
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
let [marketPrice,basePrice] = this.getParentPrice(subList,0,ratio,"delete");
|
|
|
try {
|
|
|
$.bootstrapLoading.start()
|
|
|
@@ -1070,7 +1070,7 @@ var gljOprObj = {
|
|
|
subList = rg.subList;
|
|
|
break;
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
let [marketPrice,basePrice] = this.getParentPrice(subList,doc.consumption,ratio);
|
|
|
|
|
|
try {
|
|
|
@@ -1082,14 +1082,14 @@ var gljOprObj = {
|
|
|
if(pgljData.mixRatioMap && pgljData.mixRatioMap[pk]){
|
|
|
for(let m of pgljData.mixRatioMap[pk]){
|
|
|
if(m.id == ratio.mixRatioId) gljUtil.setProperty(m,doc);
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
for(let r of ratio.parentGLJ.ratio_data){
|
|
|
if(r.id == ratio.mixRatioId) gljUtil.setProperty(r,doc);
|
|
|
}
|
|
|
ratio.parentGLJ.unit_price.market_price = marketPrice;
|
|
|
ratio.parentGLJ.unit_price.base_price = basePrice;
|
|
|
-
|
|
|
+
|
|
|
|
|
|
//重新计算消耗量
|
|
|
projectObj.project.projectGLJ.calcQuantity();
|
|
|
@@ -1102,7 +1102,7 @@ var gljOprObj = {
|
|
|
}finally{
|
|
|
$.bootstrapLoading.end()
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
|
|
|
|
