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

test/unit/reports/test_rpt_test_template.js

@@ -56,7 +56,7 @@ let demoPrjId = - 1;
 // let demoRptId = 551; //表05
 // let demoRptId = 1104; //内蒙2017 表09
 
-let demoRptId = 479;
+let demoRptId = 1143;
 
 let pagesize = "A4";
 
@@ -72,7 +72,7 @@ let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // demoPrjId = 2260; //QA:
 // demoPrjId = 5029; //
 // demoPrjId = 5029; //项目名称过长
-demoPrjId = 37189; //
+demoPrjId = 22936; //
 // demoPrjId = 4107; //UAT:
 //*/
 let userId_Dft = userId_Leng;

web/building_saas/main/js/views/item_increase_fee_view.js

@@ -412,7 +412,7 @@ let itemIncreaseFeeObj = {
                         serialNo = serialNo+1;
                         let newRationData = this.inserNewItemNodes(node.data.ID,node.data.quantity,preID,serialNo,code,s.name,total,datas);
                         preID = newRationData.ID;
-                        newRationData.manageFeeRate = manageFeeRate;
+                        if(!_.isEmpty(installationFeeObj.feeRateMap))newRationData.manageFeeRate = manageFeeRate;
                     }
                 }else { //如果total小于0，但又存在的话，删除定额（同时后端处理时记得要删除定额工料机）
                     if(ZMZJFnode){