2.5基础网销优化

@@ -313,7 +313,7 @@ var g = new common.grid({
 
 
             return html.join('');
             return html.join('');
         }
         }
-    }, {
+    },  {
         display: '搜索/标签',
         display: '搜索/标签',
         hidden: true,
         hidden: true,
         render: function (item) {
         render: function (item) {
@@ -387,6 +387,9 @@ var g = new common.grid({
             return html.join('');
             return html.join('');
         }
         }
     },  {
     },  {
+        display: 'SKC个数',
+        name: 'skcNum'
+    },{
         display: '操作',
         display: '操作',
         render: function (item) {
         render: function (item) {
             var HtmArr = [];
             var HtmArr = [];
@@ -643,7 +646,8 @@ var shelveTable = new common.grid({
         render: function (item) {
         render: function (item) {
 
 
             return 'SKC：' + item.productSkc + '<br>' +
             return 'SKC：' + item.productSkc + '<br>' +
-                '颜色：' + item.goodsName;
+                '颜色：' + item.goodsName+ '<br>' +
+                '厂家颜色：' + item.factoryGoodsName;
         }
         }
     }, {
     }, {
         display: 'SKC上架操作（状态）',
         display: 'SKC上架操作（状态）',
@@ -808,7 +812,7 @@ $(document).on("click", ".brandSort-btn", function () {
             productSkn: item.productSkn,
             productSkn: item.productSkn,
             modelId: i + 1,
             modelId: i + 1,
             projectId: 1,
             projectId: 1,
-            intValue: num
+            intValue: $.trim(num)
         };
         };
     }
     }
     common.util.__ajax({
     common.util.__ajax({
@@ -832,7 +836,7 @@ $(document).on("click", ".shopsSort-btn", function () {
         productSkn: item.productSkn,
         productSkn: item.productSkn,
         modelId: 1,
         modelId: 1,
         projectId: 5,
         projectId: 5,
-        intValue: num
+        intValue: $.trim(num)
     });
     });
 
 
     common.util.__ajax({
     common.util.__ajax({