Authored by 马力

Merge branch 'hotfix/priceexport' into grey

... ... @@ -24,10 +24,10 @@ $("#batchExportPrice").click(function(){
var select = tabTree.getAddress();
var shopId = common.util.__input("shop");
var brandId = common.util.__input("brand");
if(!shopId && !brandId && !(select[0] && select[0].id)){
alert("请至少选择一个筛选条件后再导出!");
return false;
}
//if(!shopId && !brandId && !(select[0] && select[0].id)){
// alert("请至少选择一个筛选条件后再导出!");
// return false;
//}
var getResult=function(){
return {
shop_id: shopId,
... ...