Merge branch 'hotfix-批量上架skn' into grey

# Conflicts:
#	code/apps/goods/controllers/basegoods.js
#	code/apps/goods/views/netsale/Batch.html
#	code/static/js.jquery/module/goods/netsale/Batch.js

@@ -120,4 +120,8 @@ module.exports=function(app) {
 
 	/*通过任务ID查看任务是否被执行完  学生价变价*/
 	app.post("/product/queryBatchImportStudentPriceResult","basegoods_queryBatchUpdateStudentPriceResult");
+
+	/*通过任务ID查看任务是否被执行完  批量上架*/
+	app.post("/product/queryBatchImportResultOfOnShelveSkn","basegoods_queryBatchImportResultOfOnShelveSkn");
+	
 }
\ No newline at end of file

@@ -198,5 +198,6 @@ module.exports={
 				{name:"param",type:"String"}
 			]
         }
+        
     }
 }
\ No newline at end of file

@@ -49,6 +49,25 @@
                         5、<a href="/ajax/link/offShelveSkn">下载样例</a>
                     </td>
                 </tr>
+                
+                <tr>
+                    <td rowspan="2">批量上架</td>
+                    <td>上传EXCEL:</td>
+                    <td style="position: relative;">
+                    <input id="onShelve-file" name="file" data-type="onShelveSkn" type="file" style="cursor: pointer; height: 37px; top: 8px;">
+                    </td>
+                </tr>
+                <tr>
+                    <td>说明：</td>
+                    <td colspan="2">
+                        1、<span style="color:red;">不支持</span>预操作（预售|预上架）<br>
+                        2、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
+                        3、Excel表头为：<span style="color: #67D267;">SKN</span><br>
+                        4、第一行为表头内容，第二行开始为正式内容<br>
+                        5、每个文件控制在500行以内<br>
+                        6、<a href="/ajax/link/onShelveSkn">下载样例</a>
+                    </td>
+                </tr>
             </table>
         </div>
     </div>

@@ -34,3 +34,30 @@ function batchExport(el, type) {
 common.edit.ajaxfileupload('#sort-file', batchExport('#sort-file', 'searchSort'));
 common.edit.ajaxfileupload('#brand-file', batchExport('#brand-file', 'brandProperty'));
 common.edit.ajaxfileupload('#offShelve-file', batchExport('#offShelve-file', 'offShelveSkn'));
+common.edit.ajaxfileupload('#onShelve-file', batchExport('#onShelve-file', 'onShelveSkn'));
+
+
+function __ajaxCheckTask(unquid){
+    var params={param:unquid};
+
+    common.util.__ajax({
+        url:'/product/queryBatchImportResultOfOnShelveSkn',
+        data:params
+    },function(res){
+        if(res.data.length){
+            
+            //成功操作
+            if (loadModal) {
+                loadModal.close();
+            }
+             common.util.__tip(res.message, 'success');
+
+        }else{
+           setTimeout(function(){
+             __ajaxExeclById.call(null,unquid);
+           },1000);
+        }
+        $("#message").html(res.message);
+    },true);
+    
+}