bugs

web/building_saas/main/js/models/ration.js

@@ -421,7 +421,7 @@ var Ration = {
                        node.data.feesIndex = {};
                        //删除定额节点下的主材和设备节点
                        project.ration_glj.removeNodeByRation(recode.ration,projectObj.mainController);
-                       project.Ration.deleteSubListOfRation(recode.ration);//删除旧定额下的相关记录
+                       project.Ration.deleteSubListOfRation(recode.ration,cleanzmhs);//删除旧定额下的相关记录
                        //添加新的记录
                        project.Ration.addSubListOfRation(recode);
 
@@ -707,12 +707,15 @@ var Ration = {
             }
             else return null;
         };
-        ration.prototype.deleteSubListOfRation = function(ration){
+        ration.prototype.deleteSubListOfRation = function(ration,cleanzmhs=false){
             projectObj.project.ration_glj.deleteByRation(ration);
             projectObj.project.ration_coe.deleteByRation(ration);
-            projectObj.project.quantity_detail.deleteByRation(ration);
-            projectObj.project.ration_installation.deleteByRation(ration);
-            projectObj.project.ration_template.deleteByRation(ration);
+            if(cleanzmhs == false){
+                projectObj.project.ration_installation.deleteByRation(ration);
+                projectObj.project.quantity_detail.deleteByRation(ration);
+                projectObj.project.ration_template.deleteByRation(ration);
+            }
+
         };
         ration.prototype.addSubListOfRation = function (data) {
              project.ration_glj.addDatasToList(data.ration_gljs);

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

@@ -200,7 +200,8 @@ var feeRateObject={
         }
     },
     initFeeRateEditDiv:function(optionValue){//“0” 手工输入; “1” 选择费率
-        let radioValue = optionValue,feeRateValue;
+        let radioValue = 1,feeRateValue;
+        $("#customFeeRate").val("");//先清空输入
         if(!gljUtil.isDef(optionValue)){
             let fID = 0;
             if ($("#calc_program_manage").is(":visible")){
@@ -210,10 +211,13 @@ var feeRateObject={
                 fID = projectObj.project.mainTree.selected.data.feeRateID;
                 feeRateValue = projectObj.project.mainTree.selected.data.feeRate;
             }
-            radioValue = fID?"1":"0";
-            $("#customFeeRate").val(feeRateValue);
+            if(fID){
+                feeRateValue = projectObj.project.FeeRate.getFeeRateByID(fID).rate;
+            }
+            if(!fID&&gljUtil.isDef(feeRateValue)) radioValue = 0; //2019-04-18 只有在没有费率ID，但是有费率值的情况下才显示自定义费率页，其它所有的情况都显示费率选择页面
+            if(!isNaN(feeRateValue))$("#customFeeRate").val(feeRateValue);
         }
-        $("input[name='editFeeRateOptions'][value='"+radioValue+"']").attr("checked",true);
+        $("input[name='editFeeRateOptions'][value='"+radioValue+"']").prop("checked",true);
         if(radioValue == "0"){
             $("#selfDiv").show();
             $("#fee_rate_sheet").hide();