zhangweicheng 7 years ago
parent
commit
f2073d7817

+ 0 - 1
web/building_saas/main/js/models/project_glj.js

@@ -482,7 +482,6 @@ ProjectGLJ.prototype.calcQuantity  = function (){
 ProjectGLJ.prototype.getQuantityPerGLJ =function (pglj,mixRatioSubdivisionMap,mixRatioTechMap) {
     let billIDs =   projectObj.project.Bills.getSubdivisionProjectLeavesID();//取分部分项上的所有叶子清单ID
     let tech_billIDS =  projectObj.project.Bills.getTechLeavesID();//取所有技术措施项目叶子清单ID
-    console.log(tech_billIDS);
     let ration_glj_list = projectObj.project.ration_glj.datas;
     let mixRatioMap = this.datas.mixRatioMap;
     let rations = projectObj.project.Ration.datas;

+ 9 - 0
web/building_saas/main/js/views/glj_view.js

@@ -902,6 +902,15 @@ var gljOprObj = {
         return data;
 
     },
+    getBasePrice:function (treeNode) {//造价书中的工料机修改的节点要用到
+        let proGLJ =  projectObj.project.projectGLJ;
+        if(this.calcPriceDiff(glj)==true){
+            let glj =_.find(proGLJ.datas.gljList, {'id': treeNode.data.projectGLJID});
+            return proGLJ.getBasePrice(glj);
+        }else {
+            return scMathUtil.roundForObj(treeNode.data.marketUnitFee,getDecimal("glj.unitPrice"));
+        }
+    },
     calcPriceDiff:function (glj) {
         let calcOptions=projectInfoObj.projectInfo.property.calcOptions;
         if(glj.is_evaluate==1){//先按是否暂估判断