Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

web/building_saas/fee_rates/fee_rate.html

@@ -88,7 +88,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">费率1 重选标准</h5>
+                <h5 class="modal-title"><span id="set-lv-feeRateName">费率1</span>&nbsp;重选标准</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>

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

@@ -117,7 +117,8 @@ var feeRateObject={
         if(this.mainViews){
             this.mainViews.refresh()
         }else {
-            setTimeout("feeRateObject.createSpreadView()",100);
+            feeRateObject.createSpreadView();
+            //setTimeout("feeRateObject.createSpreadView()",100);
         }
     },
     updateBySelect:function (rate,selectMap,mapID) {
@@ -356,11 +357,9 @@ $('#pop-lv').popover({
     }
 );
 
-
-$('#tab_fee_rate').bind('click', function () {
+$('#tab_fee_rate').on('shown.bs.tab', function (e) {
     feeRateObject.reFreshRateViews();
     feeRateObject.loadPageContent();
-    //feeRateObject.loadFeeRateSelection();
 });
 
 $('#setNewFeeRate').bind('click', function () {
@@ -371,6 +370,7 @@ $('#setNewFeeRate').bind('click', function () {
         listString+="<li>"+u.name+"</li>"
     })
     $("#usageProjectList").html(listString);
+    $("#set-lv-feeRateName").text(feeRateFile.name);
 
     feeRateObject.getFeeRateStandards(function (data) {
         $('#standardSelect').empty();
@@ -380,7 +380,6 @@ $('#setNewFeeRate').bind('click', function () {
         })
         $('#standardSelect').val(feeRateFile.libID);
     });
-
 });
 $('#changeConfirm').bind('click', function (){
     var newVal=$('#standardSelect').val();
@@ -441,11 +440,8 @@ $('#changeFeeRateConfirm').bind('click',function (){
     }else {
         feeRateObject.changeFeeRateFileFromOthers();
     }
-
 })
 
-
-
 $('#changFeeRateFile').bind('click',function (){
     $("input[name='chaneg-lv-Radio']")[0].checked=true;
     $("#fromProject").show();