Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/util/QueryUtil.js

@@ -83,7 +83,7 @@ Ext.define('saas.util.QueryUtil', {
 						condition += ' AND ' + f.name + endChar + f.value;
 					}
 				} else if(f.xtype == 'combobox' ){
-                    if(f.value != '$ALL'&&f.value!=null){
+                    if(f.value != '$ALL'&& f.value!=null){
                         if(condition == ''){
                             condition = f.name+" = '"+f.value+"' ";
                         } else {
@@ -91,11 +91,14 @@ Ext.define('saas.util.QueryUtil', {
                         }
                     }
 				} else if(f.xtype == 'multicombo' ){
-				    if(f.value && !me.contains(f.value, '$ALL', true)){
+				    if(f.value && f.value.length > 0){
+                        var text = f.value.map(function(v) {
+                            return '\'' + v.value + '\'';
+                        }).join(',');
                         if(condition == ''){
-                            condition = f.name + " in (" + f.value+")";
+                            condition = f.name + " in (" + text +")";
                         } else {
-                            condition += ' AND ' +  f.name + " in (" + f.value+")";
+                            condition += ' AND ' +  f.name + " in (" + text +")";
                         }
                     }
 

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -87,7 +87,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         allowBlank: true,
         columnWidth: 0.25,
         datas: [
-            ["$ALL", "全部"],
             ["TURNIN", "已入库"],
             ["NOIN", "未入库"],
             ["PARTIN", "部分入库"]