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

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

@@ -52,6 +52,7 @@ Ext.define('saas.view.core.dbfind.types.BomDbfindTrigger', {
         text: "版本",
         width: 200,
         dataIndex: "bo_version",
+        flex: 1
     }]
 
 });

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

@@ -5,7 +5,6 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     extend: 'saas.view.core.dbfind.DbfindTrigger',
     xtype: 'productDbfindTrigger',
 
-    conditionCode:'pr_code',
     dataUrl:'/api/document/product/list',
     addXtype: 'document-product-formpanel',
     addTitle: '物料资料',

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -55,7 +55,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
         name: 'bo_motherid',
         fieldLabel: '产品id'
     },{
-        xtype : "productDbfindTrigger", 
+        xtype : "bomDbfindTrigger", 
         name: 'bo_mothercode',
         fieldLabel: '产品编号',
         allowBlank: false

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

@@ -54,7 +54,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         name: 'ma_prodid',
         fieldLabel: '产品id'
     },{
-        xtype : "productDbfindTrigger",
+        xtype : "bomDbfindTrigger",
         name : "ma_prodcode", 
         fieldLabel : "产品编号",
         allowBlank : false,

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

@@ -52,7 +52,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
 
                 }
             },
-            'dbfindtrigger[name=ma_prodcode]':{
+            'bomDbfindTrigger[name=ma_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         //放大镜赋值设置

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

@@ -44,7 +44,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             }
         }
     },{
-        xtype: 'productDbfindTrigger',
+        xtype: 'bomDbfindTrigger',
         name: 'ma_prodcode',
         fieldLabel: '产品编号'
     }],