Merge remote-tracking branch 'origin/dev' into dev

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -271,7 +271,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 }
                 if(combo){
                     combo.store.load(function() {
-                        combo.setValue(params._value);
+                        typeof combo.setValue == 'function' && combo.setValue(params._value);
                     });
                 }
                 form.ownerCt.close();

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
@@ -71,7 +71,7 @@ Ext.define('saas.view.document.product.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.58:9480/warehouse/list',
+                        dataUrl:'/api/document/warehouse/list',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'wh_code',to:'pr_whcode'
@@ -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/main/Navigation.scss

@@ -97,6 +97,7 @@
         border-bottom-right-radius: 4px;
 
         .menu {
+            
             width: 200px;
             border-right: 1px dashed #ccc;
             letter-spacing: 1px;
@@ -125,7 +126,7 @@
                         cursor: pointer;
                         line-height: 24px;
                         white-space: nowrap;
-                        width: 124px;
+                        width: 130px;
                         overflow: hidden;
                         text-overflow: ellipsis;
                     }

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

@@ -76,14 +76,23 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -76,14 +76,23 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -94,7 +94,6 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         dataUrl: '/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
-                        defaultCondition:"pr_statuscode='OPEN'",
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
@@ -111,7 +110,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        //窗口字段设置
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
                             emptyText:'输入物料编号、名称或规格',
                             xtype : "textfield", 
@@ -119,14 +118,15 @@ 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() +"%')";
                             }
                         }],
                         //窗口列设置
                         dbColumns:[{
                             "text": "物料ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                        },{
+                        }, {
                             "text": "物料编号",
                             "dataIndex": "pr_code",
                         }, {

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

@@ -76,14 +76,23 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -110,26 +110,24 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
-                        defaultCondition: 'pr_statuscode="OPEN"',
-                        //窗口字段设置
+                        defaultCondition: "pr_statuscode='OPEN'",
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            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()+"%')";
+                            },
                             allowBlank : true, 
-                            columnWidth : 0.25,
-                            getCondition:function(v){
-                                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-                            }
+                            columnWidth : 0.25
                         }],
                         //窗口列设置
                         dbColumns:[{
                             "text": "物料ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                        }, {
                             "text": "物料编号",       
                             "dataIndex": "pr_code",
                             "width": 100,

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

@@ -75,14 +75,23 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -109,26 +109,24 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             field:'pr_unit',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()+"%')";
+                            },
                             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()+"%')";
-                            }
-                        }],                       
+                            columnWidth : 0.25
+                        }],                      
                         //窗口列设置
                         dbColumns:[{
                             "text": "物料ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                        }, {
                             "text": "物料编号",       
                             "dataIndex": "pr_code",
                             "width": 100,

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

@@ -75,14 +75,23 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -126,14 +126,23 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

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

@@ -76,14 +76,23 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

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

@@ -126,14 +126,23 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

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

@@ -81,14 +81,23 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

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

@@ -124,14 +124,23 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
                                 "text": "物料ID",
-                                "flex": 0,
+                                "hidden": true,
                                 "dataIndex": "id",
-                                "width": 0,
-                                "xtype": "",
-                                "items": null
                             },{
                                 "text": "物料编号",
                                 "flex": 1,

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

@@ -113,15 +113,24 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
-                        {
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            {
+                                "text": "物料ID",
+                                "hidden": true,
+                                "dataIndex": "id",
+                            },{
                             "text": "物料编号",
                             "flex": 1,
                             "dataIndex": "pr_code",

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

@@ -196,24 +196,22 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             field:'pr_spec',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()+"%')";
+                            },
                             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()+"%'";
-                            }
-                        }],                         
+                            columnWidth : 0.25
+                        }],                   
                         dbColumns:[{
                             "text": "物料ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
                             "text": "物料编号",       
                             "dataIndex": "pr_code",

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

@@ -74,7 +74,23 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
+                            "text": "物料ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        },{
                             "text": "物料ID",
                             "flex": 0,
                             "dataIndex": "pr_id",

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

@@ -76,9 +76,21 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "pr_id",
                             "width": 0,
                             "xtype": "",

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

@@ -202,24 +202,24 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             field: 'pr_spec',
                             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()+"%')";
+                            },
                             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()+"%')";
-                            }
+                            columnWidth : 0.25
                         }],                        
                         dbColumns:[{
                             "text": "物料ID",
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
-                            "items": null
+                            "hidden": true
                         },{
                             "text": "物料编号",       
                             "dataIndex": "pr_code",

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

@@ -75,9 +75,21 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "pr_id",
                             "width": 0,
                             "xtype": "",

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

@@ -190,24 +190,24 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             field:'pr_spec',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()+"%')";
+                            },
                             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()+"%')";
-                            }
-                        }],                        
+                            columnWidth : 0.25
+                        }],                      
                         dbColumns:[{
                             "text": "物料ID",
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
-                            "items": null
+                            "hidden": true
                         },{
                             "text": "物料编号",       
                             "dataIndex": "pr_code",

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

@@ -75,9 +75,21 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
+                        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()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "物料ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "pr_id",
                             "width": 0,
                             "xtype": "",

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/window/Window.js

@@ -0,0 +1,7 @@
+Ext.define('Ext.locale.zh_CN.window.Window', {
+    override: 'Ext.window.Window',
+
+    config: {
+        closeToolText: '关闭面板'
+    }
+});