bugs

config/gulpConfig.js

@@ -14,7 +14,8 @@ module.exports = {
         'public/web/gljUtil.js',
         'public/web/PerfectLoad.js',
         'lib/lodash/lodash.js',
-        'public/web/commonAlert.js'
+        'public/web/commonAlert.js',
+        'lib/jquery-editable-select/jquery.editable-select.min.js'
     ],
     common_css:[
         'lib/jquery-ui/jquery-ui.css',
@@ -22,7 +23,8 @@ module.exports = {
         'lib/spreadjs/sheets/css/gc.spread.sheets.sc.css',
         'web/building_saas/css/main.css',
         'web/building_saas/css/custom.css',
-        'lib/font-awesome/font-awesome.min.css'
+        'lib/font-awesome/font-awesome.min.css',
+        'lib/jquery-editable-select/jquery.editable-select.min.css'
     ],
     login_jspaths:[
         'public/web/url_util.js',

web/building_saas/main/html/main.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="/web/building_saas/css/custom.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
     <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">
-
+    <link rel="stylesheet" href="/lib/jquery-editable-select/jquery.editable-select.min.css" type="text/css">
     <!--zTree-->
     <link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
     <!--SpreadJs-->

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

@@ -733,13 +733,13 @@ var feeRateObject={
     },
     checkFeeRateName:function (newVal) {
         if(!newVal||newVal==""){
-            $('#saveAsConfirm').attr("disabled","disabled");
+            //$('#saveAsConfirm').attr("disabled","disabled");
             $('#nameError').text("请输入文件名称。").show();
             return;
         }
         var callback=function (data) {
             if(data){
-                $('#saveAsConfirm').attr("disabled","disabled");
+               // $('#saveAsConfirm').attr("disabled","disabled");
                 $('#nameError').text("已存在同名费率文件。").show();
                 $('#valid_name').val('');
             }else {
@@ -752,25 +752,26 @@ var feeRateObject={
     },
     feeRateFileSaveAs:function (newName) {
         if(!newName||newName==""){
-            $('#saveAsConfirm').attr("disabled","disabled");
+           // $('#saveAsConfirm').attr("disabled","disabled");
             $('#nameError').text("请输入文件名称。").show();
             return;
         }
-        let valideName = $('#valid_name').val();
-        if(valideName==''||valideName!==newName){
-            let callback=function (data) {
-                if(data){
-                    $('#saveAsConfirm').attr("disabled","disabled");
-                    $('#nameError').text("已存在同名费率文件。").show();
-                    $('#valid_name').val('');
-                }else {
-                    feeRateObject.submitSaveAs(newName);
-                }
+        let callback=function (data) {
+            if(data){
+               // $('#saveAsConfirm').attr("disabled","disabled");
+                $('#nameError').text("已存在同名费率文件。").show();
+                $('#valid_name').val('');
+            }else {
+                feeRateObject.submitSaveAs(newName);
             }
-            projectObj.project.FeeRate.checkFeeRateName(newName,callback);
+        }
+        projectObj.project.FeeRate.checkFeeRateName(newName,callback);
+       /* let valideName = $('#valid_name').val();
+        if(valideName==''||valideName!==newName){
+
         }else {
             feeRateObject.submitSaveAs(newName);
-        }
+        }*/
     },
     submitSaveAs:function (newName) {
         let me = this;

web/common/html/header.html

@@ -149,4 +149,6 @@
 <script type="text/javascript" src="/public/web/PerfectLoad.js"></script>
 <script type="text/javascript" src="/lib/lodash/lodash.js"></script>
 <script type="text/javascript" src="/public/web/commonAlert.js"></script>
+<script type="text/javascript" src="/lib/jquery-editable-select/jquery.editable-select.min.js"></script>
+
 <!-- endinject -->