|
@@ -14,7 +14,7 @@ Ext.define('saas.view.document.product.BasePanel', {
|
|
|
width:300,
|
|
width:300,
|
|
|
emptyText:'输入物料编号、名称、型号或规格',
|
|
emptyText:'输入物料编号、名称、型号或规格',
|
|
|
getCondition: function (v) {
|
|
getCondition: function (v) {
|
|
|
- return "(upper(CONCAT(pr_code,'#',pr_detail,'#',pr_spec,'#',pr_orispeccode)) like '%" + v.toUpperCase() + "%')";
|
|
|
|
|
|
|
+ return "(upper(CONCAT(pr_code,'#',pr_detail,'#',ifnull(pr_spec,''),'#',ifnull(pr_orispeccode,''))) like '%" + v.toUpperCase() + "%')";
|
|
|
},
|
|
},
|
|
|
},{
|
|
},{
|
|
|
editable:true,
|
|
editable:true,
|
|
@@ -23,7 +23,7 @@ Ext.define('saas.view.document.product.BasePanel', {
|
|
|
storeUrl: '/api/document/producttype/getCombo',
|
|
storeUrl: '/api/document/producttype/getCombo',
|
|
|
name : "pr_kind",
|
|
name : "pr_kind",
|
|
|
emptyText : "物料类型",
|
|
emptyText : "物料类型",
|
|
|
- width:120,
|
|
|
|
|
|
|
+ width:120
|
|
|
}, {
|
|
}, {
|
|
|
xtype : "textfield",
|
|
xtype : "textfield",
|
|
|
name : "pr_brand",
|
|
name : "pr_brand",
|
