fix bug

config/gulpConfig.js

@@ -8,7 +8,8 @@ module.exports = {
         'lib/jquery/jquery-3.2.1.min.js',
         'lib/popper/popper.min.js',
         'lib/bootstrap/bootstrap.min.js',
-        'web/building_saas/js/*.js'
+        'web/building_saas/js/*.js',
+        'public/web/scMathUtil.js'
     ],
     common_css:[
         'lib/bootstrap/css/bootstrap.min.css',

modules/fee_rates/facade/fee_rates_facade.js

@@ -27,7 +27,9 @@ module.exports={
     changeFeeRateFileFromOthers:changeFeeRateFileFromOthers,
     newFeeRateFile:newFeeRateFile,
     getFeeRatesByProject:getFeeRatesByProject,
-    getGCFeeRateFiles: getGCFeeRateFiles    updateFeeRate:updateFeeRate};
+    getGCFeeRateFiles: getGCFeeRateFiles ,
+    updateFeeRate:updateFeeRate
+};
 let operationMap={
     'ut_create':create_fee_rate,
     'ut_update':update_fee_rate,
@@ -41,14 +43,6 @@ let updateFunctionMap = {
     'feeRateFileSaveAs':feeRateFileSaveAs
 }
 
-//测试数据 key projectID, value feeRateFileID
-let project_feeRateF_map={
-    99:'da059df1-7c18-11e7-9e2f-1390b52643b4'
-}
-
-
-
-
 
 function create_fee_rate() {
 

web/building_saas/main/js/models/fee_rate.js

@@ -254,7 +254,7 @@ var FeeRate = {
                 if(editInfo.calcItem.feeRateID){
                     var rate = projectObj.project.FeeRate.getFeeRateByID(editInfo.calcItem.feeRateID);
                     if(rate!=undefined){
-                        this.updateFeeRateByCalc(rate,value,editInfo.calcItem);
+                        this.updateFeeRateByCalc(rate,value,editInfo);
                         return;
                     }
                 }
@@ -269,7 +269,7 @@ var FeeRate = {
                 rationPM.refreshDetailSheet();
             }
         };
-        FeeRate.prototype.updateFeeRateByCalc=function (rate,value,calcItem) {
+        FeeRate.prototype.updateFeeRateByCalc=function (rate,value,editInfo) {
             var me=this;
             var data={
                 query:{
@@ -281,8 +281,11 @@ var FeeRate = {
                 }
             }
             CommonAjax.post('/feeRates/updateFeeRate', data, function (data) {
-                calcItem.feeRateID=rate.ID;
-                calcItem.feeRate=value;
+                _.forEach(editInfo.template.calcItems,function (item) {
+                    if(item.feeRateID==rate.ID){
+                        item.feeRate = value;
+                    }
+                })
                 rate.rate=value;
                 rationPM.refreshDetailSheet();
                 socket.emit('feeRateChangeNotify', me.getActivateFeeRateFileID());

web/building_saas/main/js/views/calc_program_manage.js

@@ -25,7 +25,7 @@ let rationPM = {
             {headerName:"费用名称",headerWidth:200,dataCode:"name", dataType: "String"},
             {headerName:"计算基数",headerWidth:180,dataCode:"dispExpr", dataType: "String"},
             {headerName:"基数说明",headerWidth:300,dataCode:"statement", dataType: "String"},
-            {headerName:"费率",headerWidth:80,dataCode:"feeRate", dataType: "Number",hAlign: "left"},
+            {headerName:"费率",headerWidth:80,dataCode:"feeRate", dataType: "Number",hAlign: "left",tofix:feeRate_consts.decimal},
             {headerName:"字段名称",headerWidth:140,dataCode:"displayFieldName", dataType: "String", hAlign: "center"},
             {headerName:"备注",headerWidth:100,dataCode:"memo", dataType: "String"}
         ],

web/building_saas/main/js/views/fee_rate_view.js

@@ -648,7 +648,7 @@ var feeRateObject={
         var data={'projectID': projectObj.project.ID(),'templatesID': calInfo.template.ID,'calcItem': calInfo.calcItem};
         rationPM.saveCalcItem(data,function (result) {
             calInfo.calcItem.feeRate=rate.rate;
-            me.refreshDetailSheet();
+            rationPM.refreshDetailSheet();
             $("#fee_rate_tree").modal('hide');
         });
         console.log(calInfo);

web/common/html/header.html

@@ -61,4 +61,5 @@
 <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
 <script type="text/javascript" src="/web/building_saas/js/moment.min.js"></script>
 <script type="text/javascript" src="/web/building_saas/js/message.js"></script>
+<script type="text/javascript" src="/public/web/scMathUtil.js"></script>
 <!-- endinject -->

web/users/html/login.html

@@ -69,6 +69,7 @@
     </div>
     <!-- JS. -->
     <!-- inject:js -->
+    <script type="text/javascript" src="/public/web/scMathUtil.js"></script>
     <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
     <script src="/public/web/url_util.js"></script>
     <script src="/lib/popper/popper.min.js"></script>