Browse Source

feeRateDecimal flag

zhongzewei 7 years ago
parent
commit
f3967949c8

+ 0 - 1
web/building_saas/main/js/views/project_property_decimal_view.js

@@ -79,7 +79,6 @@ function isValidDigit(v){
 //newV用户可编辑数据
 function toUpdateDecimal(orgV, newV){
     let rst = false;
-    let len = Object.keys(newV).length;
     reCompare(orgV, newV);
     function reCompare(orgV, newV){
         for(let attr in newV){

+ 6 - 2
web/building_saas/main/js/views/project_view.js

@@ -758,12 +758,16 @@ $('#property_ok').click(function () {
     }
     //小数位数
     let updateDecimal = m_getDecimalData($('input', '#poj-settings-decimal'));
-    if(toUpdateDecimal(decimalObj, updateDecimal)){
+    if(toUpdateDecimal(decimalObj, updateDecimal)) {
+        let frChanged = decimalObj.feeRate != updateDecimal.feeRate;
         setDecimal(decimalObj, updateDecimal);
+        if (frChanged) {
+            project.calcProgram.compileAllTemps()
+        }
         reCalcRations = true;
         reCalcBills = true;
         properties['property.decimal'] = updateDecimal;
-    };
+    }
     // 呈现选项
     projDisplayView.updateChecking(projectID, properties);