提交

@@ -670,29 +670,33 @@ $("#basedaochu").click(function(){
         len = selectedArr.length,
         data = g.options.parms();
 
+         var filter=$(".wqt_all").prop("checked");
+
     $.each(data, function(key, value) {
         if (value && value != '' && key != 'size' && key != 'tab') {
             count++;
         }
     });
 
-    if (count == 0 && len <= 0) {
+    if ((count > 0&&filter) || len > 0) {
+        var productSknList=[];
+        
+        if (len > 0) {
+            data.productSknList = [];
+            $.each(selectedArr, function(i, value) {
+                data.productSknList.push(value['productSkn']);
+            });
+        }
+        data.isAuditing=200;
+        var result={};
+        for(var name in data){
+            if(data.hasOwnProperty(name)&&data[name]){
+                result[name]=data[name];
+            }
+        }
+        window.open("/ajax/down?queryConf=" + JSON.stringify(result) + "&type=baseProduce");
+    }else{
         common.util.__tip('请选择导出商品的条件', 'warning');
         return;
     }
-
-    if (len > 0) {
-        data.productSknList = [];
-        $.each(selectedArr, function(i, value) {
-            data.productSknList.push(value['productSkn']);
-        });
-    }
-    data.isAuditing=200;
-    var result={};
-    for(var name in data){
-        if(data.hasOwnProperty(name)&&data[name]){
-            result[name]=data[name];
-        }
-    }
-    window.open("/ajax/down?queryConf=" + JSON.stringify(result) + "&type=baseProduce");
 });
\ No newline at end of file