zhangweicheng 7 лет назад
Родитель
Сommit
cf773d16b4

+ 2 - 2
web/building_saas/main/js/models/project_glj.js

@@ -646,10 +646,10 @@ ProjectGLJ.prototype.getBasePrice = function(glj){
 };
 
 
-ProjectGLJ.prototype.getMarketPrice = function (glj,needRound) {
+ProjectGLJ.prototype.getMarketPrice = function (glj,isRadio) {
     let price_decimal = getDecimal("glj.unitPrice");
     let quantity_decimal = getDecimal("glj.quantity");
-    let process_decimal = needRound==true?price_decimal:getDecimal("process");
+    let process_decimal = isRadio==true?price_decimal:getDecimal("process");
     if (notEditType.indexOf(glj.unit_price.type)!=-1&&glj.ratio_data.length>0) {//对于混凝土、配合比、砂浆、机械台班等有组成物的材料,价格需根据组成物计算得出。
         let p =0;
         for(let ratio of glj.ratio_data){

+ 5 - 5
web/building_saas/main/js/views/glj_view.js

@@ -965,13 +965,13 @@ var gljOprObj = {
     setGLJPrice:function (data,glj,isRadio = false) {//isRadio 标记是否算组成物的价格
         let proGLJ =  projectObj.project.projectGLJ;
         glj = glj?glj:_.find(proGLJ.datas.gljList, {'id': data.projectGLJID});
-        data.marketPrice = proGLJ.getMarketPrice(glj,needRound);
+        data.marketPrice = proGLJ.getMarketPrice(glj,isRadio);
         if(this.calcPriceDiff(glj)==true) {//计取价差
-            data.basePrice = proGLJ.getBasePrice(glj,needRound);
-            data.adjustPrice = proGLJ.getAdjustPrice(glj,needRound);
+            data.basePrice = proGLJ.getBasePrice(glj,isRadio);
+            data.adjustPrice = proGLJ.getAdjustPrice(glj,isRadio);
         }else {//不计价差
-            data.basePrice = proGLJ.getMarketPrice(glj,needRound);
-            data.adjustPrice = proGLJ.getMarketPrice(glj,needRound);
+            data.basePrice = proGLJ.getMarketPrice(glj,isRadio);
+            data.adjustPrice = proGLJ.getMarketPrice(glj,isRadio);
         }
         return data;