放大镜配置调整

frontend/saas-web/app/view/document/product/FormController.js

@@ -32,7 +32,7 @@ Ext.define('saas.view.document.product.FormController', {
                             xtype : "textfield",
                             name: 'name',
                             getCondition: function(v) {
-                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
+                                return "((ve_code) like '%"+v.toUpperCase()+"%' or (ve_name) like '%"+v.toUpperCase()+"%')";
                             },
                             emptyText : "请输入供应商编号或名称", 
                             columnWidth : 0.25
@@ -98,7 +98,7 @@ Ext.define('saas.view.document.product.FormController', {
                             allowBlank : true, 
                             width:260,
                             getCondition:function(v){
-                                return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
+                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         //窗口列设置

frontend/saas-web/app/view/money/payBalance/QueryPanelController.js

@@ -76,14 +76,14 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/money/recBalance/QueryPanelController.js

@@ -76,14 +76,14 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

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

@@ -110,7 +110,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
@@ -118,7 +118,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail） like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
+                                return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%"+ v.toUpperCase() +"%' or upper(pr_spec) like '%"+ v.toUpperCase() +"%')";
                             }
                         }],
                         //窗口列设置

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

@@ -76,14 +76,14 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -110,7 +110,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js

@@ -75,14 +75,14 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -109,7 +109,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             field:'pr_unit',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js

@@ -75,14 +75,14 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -126,14 +126,14 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/sale/sale/QueryPanelController.js

@@ -76,14 +76,14 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/sale/saleIn/FormPanelController.js

@@ -126,14 +126,14 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js

@@ -81,14 +81,14 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -124,14 +124,14 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js

@@ -113,14 +113,14 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -196,7 +196,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -74,14 +74,14 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/stock/make/QueryPanelController.js

@@ -76,14 +76,14 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -202,7 +202,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             field: 'pr_spec',
                             width: 100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 

frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js

@@ -75,14 +75,14 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -190,7 +190,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 

frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js

@@ -75,14 +75,14 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
                             name : "search", 
                             width: 200,
                             getCondition: function(v) {
-                                return "upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25