bugs

web/building_saas/main/js/models/calc_program.js

@@ -950,7 +950,13 @@ let calcTools = {
                   return o.value;
               }
         };
-     }
+     },
+    getFeeRateByNode(node){
+        let decimal = getDecimal("feeRate");
+        if(node.data.feeRateID) return scMathUtil.roundForObj(projectObj.project.FeeRate.getFeeRateByID(node.data.feeRateID).rate,decimal);
+        if (node.data.feeRate || node.data.feeRate == 0) return scMathUtil.roundForObj(node.data.feeRate,decimal);
+        return 100
+    }
 };
 
 let rationCalcBases = {
@@ -1794,9 +1800,7 @@ class CalcProgram {
                 treeNode.data.programID = null;
                 treeNode.changed = true;
             }
-            let f = 100;
-            if (treeNode.data.feeRate || treeNode.data.feeRate == 0)
-                f = treeNode.data.feeRate;
+            let f = calcTools.getFeeRateByNode(treeNode);
             let b = treeNode.data.calcBaseValue ? treeNode.data.calcBaseValue : 0;
             let tb = treeNode.data.tenderCalcBaseValue ? treeNode.data.tenderCalcBaseValue : 0;
             let q = nQ ? nQ : 1;
@@ -2161,8 +2165,6 @@ class CalcProgram {
             };
             projectObj.project.calcProgram.calculate(treeNode, false, false, tenderTypes.ttCalc);  // 再正向算
         };
-
-
     };
 };
 

web/building_saas/main/js/views/locate_view.js

@@ -327,6 +327,14 @@ $("#locate_btn").click(function () {
     locateObject.findRecodes();
 });
 
+//回车键搜索
+$('#locateInput').bind('keypress', function (event) {
+    if(event.keyCode === 13){
+        $(this).blur();
+        locateObject.findRecodes();
+    }
+});
+
 $("input[name='content_type']").each(function(){
     $(this).click(function(){
         let options = $(this).val();