标准化搜索框

frontend/saas-web/app/view/core/dbfind/types/BomDbfindTrigger.js

@@ -44,6 +44,14 @@ Ext.define('saas.view.core.dbfind.types.BomDbfindTrigger', {
         text: "产品名称",
         width: 200,
         dataIndex: "bo_mothername",
+    }, {
+        text: "产品品牌",
+        width: 150,
+        dataIndex: "pr_brand",
+    }, {
+        text: "产品型号",
+        width: 150,
+        dataIndex: "pr_orispeccode",
     }, {
         text: "产品规格",
         width: 150,

frontend/saas-web/app/view/core/dbfind/types/ProductAddMultiDbfindTrigger.js

@@ -19,14 +19,14 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
     }],
     defaultCondition: "pr_statuscode='ENABLE'",
     dbSearchFields: [{
-        emptyText: '输入物料编号、名称或规格',
+        emptyText: '输入物料编号、名称或型号',
         width: 200,
         xtype: "textfield",
         name: "search",
         allowBlank: true,
         width:300,
         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_brand) like '%" + v.toUpperCase() + "%')";
         }
     }],
     //窗口列设置

frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js

@@ -15,12 +15,12 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     }],
     defaultCondition: "pr_statuscode='ENABLE'",
     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()+"%')";
+            return "(upper(pr_brand) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
         },
         allowBlank : true, 
         columnWidth :300

frontend/saas-web/app/view/core/dbfind/types/ProductMultiDbfindTrigger.js

@@ -21,14 +21,14 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     }],
     defaultCondition: "pr_statuscode='ENABLE'",
     dbSearchFields: [{
-        emptyText: '输入物料编号、名称或规格',
+        emptyText: '输入物料编号、名称或型号',
         width: 200,
         xtype: "textfield",
         name: "search",
         allowBlank: true,
         width:300,
         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_brand) like '%" + v.toUpperCase() + "%')";
         }
     }],
     //窗口列设置