更换费率文件重命名相关bug

web/building_saas/fee_rates/fee_rate.html

@@ -156,7 +156,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal" id="renameConfirm" disabled>确定</button>
+                <button type="button" class="btn btn-primary" id="renameConfirm">确定</button>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>

web/building_saas/main/html/main.html

@@ -729,7 +729,7 @@
                                                 </label>
                                             </div>
                                         </fieldset>
-                                            <label style="margin-top: 320px">将影响所有建设项目</label>
+                                            <label style="margin-top: 320px">*将影响所有建设项目</label>
                                     </div>
                                 </div>
                             </div>

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

@@ -786,14 +786,29 @@ var feeRateObject={
             alert("请选择一个费率文件！");
             return;
         }
-        var currentOption = _.find(this.changeInfo.currentProject.currentOptions,{name:name})
+        var callback=function (data) {
+            if(data){
+                //$('#renameConfirm').attr("disabled","disabled");
+                $('#renameError').text("本建设项目中已存在同名费率文件。").show();
+                $('#rename-lv').modal('show');
+                $("#newFeeRateID").val(feeRateFileID);
+                $("#newFeeRateName").val(name);
+            }else {
+                //$('#renameConfirm').removeAttr("disabled");
+                $('#renameError').hide();
+                feeRateObject.changeFeeRateFileConfirm(feeRateFileID,name);
+            }
+        };
+        projectObj.project.FeeRate.checkFeeRateName(name,callback);
+
+       /* var currentOption = _.find(this.changeInfo.currentProject.currentOptions,{name:name})
         if(currentOption){
             $("#rename-lv").modal({show:true});
             $("#newFeeRateID").val(feeRateFileID);
             $("#newFeeRateName").val(name);
         }else {
             this.changeFeeRateFileConfirm(feeRateFileID,name);
-        }
+        }*/
     },
     changeFeeRateFileConfirm:function(feeRateFileID,name){
         $.bootstrapLoading.start();
@@ -941,16 +956,16 @@ $(function(){
     $('#newFeeRateName').change(function () {
         var newName = $(this).val();
         if(!newName||newName==""){
-            $('#renameConfirm').attr("disabled","disabled");
+            //$('#renameConfirm').attr("disabled","disabled");
             $('#renameError').text("请输入文件名称。").show();
             return;
         }
         var callback=function (data) {
             if(data){
-                $('#renameConfirm').attr("disabled","disabled");
+                //$('#renameConfirm').attr("disabled","disabled");
                 $('#renameError').text("本建设项目中已存在同名费率文件。").show();
             }else {
-                $('#renameConfirm').removeAttr("disabled");
+                //$('#renameConfirm').removeAttr("disabled");
                 $('#renameError').hide();
             }
         };
@@ -988,7 +1003,18 @@ $(function(){
     $('#renameConfirm').bind('click',function (){
         var feeRateFileID= $("#newFeeRateID").val();
         var name = $("#newFeeRateName").val();
-        feeRateObject.changeFeeRateFileConfirm(feeRateFileID,name);
+        var callback=function (data) {
+            if(data){
+                $('#renameError').text("已存在同名费率文件。").show();
+                $("#newFeeRateID").val(feeRateFileID);
+                $("#newFeeRateName").val(name);
+            }else {
+                $('#renameError').hide();
+                $('#rename-lv').modal('hide');
+                feeRateObject.changeFeeRateFileConfirm(feeRateFileID,name);
+            }
+        };
+        projectObj.project.FeeRate.checkFeeRateName(name,callback);
     })