Merge branch 'release/release' of http://git.dev.yoho.cn/platform/yohobuy-portal…

…-fe into release/release

@@ -21,7 +21,7 @@ var ENUM = {
     tab: {
     tab: {
         "1": 100,
         "1": 100,
         "2": 300,
         "2": 300,
-        "all": 400
+        "all": 'all'
     }
     }
 };
 };
 
 
@@ -46,7 +46,7 @@ var t = new common.tab({
     click: function() {
     click: function() {
         var columnname = $(this).find('a').attr('columnname');
         var columnname = $(this).find('a').attr('columnname');
         currentTab = ENUM.tab[columnname];
         currentTab = ENUM.tab[columnname];
-        layoutGridCloum(columnname);
+        layoutGridCloum(currentTab);
         g.init('/payDelivery/queryTotalBrandPayDelivery');
         g.init('/payDelivery/queryTotalBrandPayDelivery');
     },
     },
     columns: [{
     columns: [{
@@ -146,7 +146,7 @@ function layoutGridCloum(tabname) {
         g.options.columns[5].hidden = false;
         g.options.columns[5].hidden = false;
         g.options.columns[6].hidden = true;
         g.options.columns[6].hidden = true;
 
 
-    } else if(tabname == 1) {
+    } else if(tabname == 100) {
         g.options.columns[1].hidden = true;
         g.options.columns[1].hidden = true;
         g.options.columns[2].hidden = false;
         g.options.columns[2].hidden = false;
         g.options.columns[3].hidden = false;
         g.options.columns[3].hidden = false;

@@ -272,7 +272,7 @@ $(document).on('click', ".edit-class-btn", function () {
             data: data()
             data: data()
         }, function () {
         }, function () {
             g.reload();
             g.reload();
-            loadTab();
+            reloadTab();
         });
         });
     });
     });
 });
 });