Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/parts_list.ftl

@@ -64,6 +64,7 @@
         </form>-->
         <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传Excel</button>
         <button type="button" style="cursor:pointer;" class="my-btn-search" onclick="downloadExcel();">下载模板</button>
+        <button type="button" style="cursor:pointer;" class="my-btn-search" onclick="toExcel();">导出Excel</button>
     </div>
 
     <div class="mt-20">
@@ -152,6 +153,7 @@
             _editor.addListener('afterUpfile', function (t, arg) {
                 console.log(arg[0].url);
                 /*window.location.href=root_path + '/admin/machineParts/excelAdd?sourceFile='+arg[0].url;*/
+                layer.msg('加载中', {icon: 16,time:500000});
                 $.ajax({
                     cache: true,
                     type: "POST",