Explorar o código

Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

vian %!s(int64=3) %!d(string=hai) anos
pai
achega
bc92a26c4e

+ 3 - 0
web/building_saas/css/custom.css

@@ -529,3 +529,6 @@ margin-right: 100px !important;
   display: inline-block;
 }
 
+#div_more_dropdown_right{
+  transform: translate3d(-105px, 32px, 0px)!important
+}

+ 1 - 1
web/building_saas/main/js/views/project_glj_view.js

@@ -1827,7 +1827,7 @@ let projectGljObject = {
   },
   applyInfoPrice: function (projectGLJData, price, coe) {
     let priceFrom = this.getPriceFrom();
-    let infoPrice = price * coe;
+    let infoPrice =  scMathUtil.roundForObj(price * coe,getDecimal("glj.unitPrice")) ;
     let marketPrice =  gljUtil.calcMarketPriceByInfoPrice(infoPrice,projectGLJData.purchaseFeeRate,getDecimal("glj.unitPrice"));
     projectObj.project.projectGLJ.updatePrice(projectGLJData, "market_price", marketPrice, 'pg', {
      priceFrom,infoPrice