|
@@ -29,7 +29,7 @@ var Excel =
|
|
|
}
|
|
}
|
|
|
layer.close(loading);
|
|
layer.close(loading);
|
|
|
} else {
|
|
} 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 + ')');
|
|
var ret = eval('(' + ret + ')');
|
|
|
if (ret.status == 1 && ret.data) {
|
|
if (ret.status == 1 && ret.data) {
|
|
|
filename = ret.data.filename;
|
|
filename = ret.data.filename;
|
|
@@ -42,7 +42,10 @@ var Excel =
|
|
|
$('[data-upload-progress]').html((curPage / maxPage * 100).toFixed(2));
|
|
$('[data-upload-progress]').html((curPage / maxPage * 100).toFixed(2));
|
|
|
|
|
|
|
|
return nextPage(curPage + 1, maxPage, false);
|
|
return nextPage(curPage + 1, maxPage, false);
|
|
|
- }
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ layer.close(loading);
|
|
|
|
|
+ layer.alert(ret.msg);
|
|
|
|
|
+ }
|
|
|
}, false);
|
|
}, false);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
rabin