rabin 3 gadi atpakaļ
vecāks
revīzija
f124aa36b4
1 mainītis faili ar 5 papildinājumiem un 2 dzēšanām
  1. 5 2
      assets/lib/excel/excel.js

+ 5 - 2
assets/lib/excel/excel.js

@@ -29,7 +29,7 @@ var Excel =
                 }
 	            layer.close(loading);
 	        } else {
-	            $.post(url, {excel_type:1,pg:curPage}, function (ret) {
+	            $.post(url, {excel_type:1,pg:curPage,json:1}, function (ret) {
 	            	var ret = eval('(' + ret + ')');
 	                if (ret.status == 1 && ret.data) {
 	                	filename = ret.data.filename;
@@ -42,7 +42,10 @@ var Excel =
 	            		$('[data-upload-progress]').html((curPage / maxPage * 100).toFixed(2));
 
 	                    return nextPage(curPage + 1, maxPage, false);
-	                }
+	                } else {
+                        layer.close(loading);
+                        layer.alert(ret.msg);
+                    }
 	            }, false);
 	        }
 	    }