3.在页签上架前、下架、上架后、搜索/标签、上架后信息缺失、全部商品列表中，【商品类别】列中新增字段：奥莱/非奥莱、JIT/非JIT、BLK平台/有货平台。

@@ -49,7 +49,20 @@ var ENUM = {
 	Url:{
 		grid:"/product/queryNetSaleInforList",
 		tab:"/product/queryTabProductNum"
-	}
+	},
+    isJIT: {
+        "Y": "JIT",
+        "N": "非JIT"
+    },
+    APPType: {
+        0: "有货平台",
+        1: "BLK平台"
+    },
+    isOutLets: {
+        'Y': "奥莱",
+        'N': "非奥莱",
+        'B':"非奥莱"
+    }
 };
 
 var tabTree = new common.tabTree("#sortTree");
@@ -86,26 +99,30 @@ var t = new common.tab2({
 		g.init(ENUM.Url.grid);
 	},
 	columns: [{
-		name: "0",
-		value: '8,3,2',
-		display: "上架前({1})"
-	}, {
-		name: "1",
-		value: '4,1,0,5,6,7,9,10',
-		display: "上架后({2})"
-	}, {
-		name: "2",
-		value: '1',
-		display: "搜索/标签({3})"
-	}, {
-		name: "3",
-		value: '1',
-		display: "上架后信息缺失({4})"
-	}, {
-		name: "all",
-		value: 'all',
-		display: "全部商品({all})"
-	}]
+        name: "0",
+        value: '8',
+        display: "新品待上架({1})"
+    }, {
+        name: "1",
+        value: '1',
+        display: "上架({2})"
+    }, {
+        name: "2",
+        value: '1',
+        display: "搜索/标签({3})"
+    }, {
+        name: "3",
+        value: '1',
+        display: "上架后信息缺失({4})"
+    },  {
+        name: "4",
+        value: '0',
+        display: "下架({5})"
+    },{
+        name: "all",
+        value: 'all',
+        display: "全部商品({all})"
+    }]
 }).init(ENUM.tab);
 
 
@@ -220,15 +237,23 @@ var g = new common.grid({
             return html;
         }
     }, {
-        display: '商品类别',
-        name: 'attribute', //商品属性(1普通、2赠品等)   商品类别
+         display: '商品类别',
+        //name: 'attribute', //商品属性(1普通、2赠品等)   商品类别
         render: function (item) {
+            var html = [];
             if (item.attribute) {
-                return ENUM.attribute[item.attribute];
-            } else {
-                return '';
+                 html.push("<p>"+ENUM.attribute[item.attribute]+"</p>");
             }
-
+            if (item.isJit) {
+                html.push("<p>"+ENUM.isJIT[item.isJit]+"</p>");
+            }
+            if (item.appType || item.appType == 0) {
+                html.push("<p>"+ENUM.APPType[item.appType]+"</p>");
+            }
+            if (item.isOutlets) {
+                html.push("<p>"+ENUM.isOutLets[item.isOutlets]+"</p>");
+            }
+            return html.join('');
         }
     }, {
         display: '搜索/标签',