bug

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -473,6 +473,10 @@ Ext.define('saas.view.core.report.ReportPanel', {
             value = formData[n],
             condition;
 
+            if(!value) {
+                continue;
+            }
+
             if(typeof func == 'function') {
                 condition = {
                     type: 'condition',

frontend/saas-web/app/view/stock/report/DataList.js

@@ -22,11 +22,7 @@ Ext.define('saas.view.stock.report.DataList', {
         emptyText: '物料编号/名称/规格',
         columnWidth: 0.25,
         getCondition: function (v) {
-            if (v) {
-                return "(upper(pr_spec) like '%" + v.toUpperCase() + "%' or upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%')";
-            } else {
-                return '1 = 1';
-            }
+            return "(upper(pr_spec) like '%" + v.toUpperCase() + "%' or upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%')";
         },
     }, {
         name: 'wh_code',
@@ -34,11 +30,7 @@ Ext.define('saas.view.stock.report.DataList', {
         emptyText: '仓库编号/名称',
         columnWidth: 0.25,
         getCondition: function (v) {
-            if (v) {
-                return "(upper(wh_code) like '%" + v.toUpperCase() + "%' or upper(wh_description) like '%" + v.toUpperCase() + "%')";
-            } else {
-                return '1 = 1';
-            }
+            return "(upper(wh_code) like '%" + v.toUpperCase() + "%' or upper(wh_description) like '%" + v.toUpperCase() + "%')";
         }
     }, {
         name: 'toggle',