代码提交

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -170,7 +170,9 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
 
     judge:function(f){
-        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1||(f.ownerCt.ownerCt&&f.ownerCt.ownerCt.xtype.trim().toUpperCase().indexOf('BASEPANEL')>-1)){
+        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1
+           ||(f.ownerCt.ownerCt&&(f.ownerCt.ownerCt.xtype.trim().toUpperCase().indexOf('BASEPANEL')>-1
+           ||f.ownerCt.ownerCt.xtype.trim().toUpperCase().indexOf('EDITDATALIST')>-1))){
             f.belong = 'form';
             return f.ownerCt.ownerCt
         }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORM')>-1){

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -56,6 +56,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
     }],
 
     //字段属性
+    caller:'Customer',
     _formXtype:'document-customer-formpanel',
     _title:'客户资料',
     _deleteUrl:'/api/document/customer/delete/',

frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -25,7 +25,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
     tbar: [{		
         xtype: 'warehouseDbfindTrigger',
         name: 'wh_description',
-        fieldLabel: '仓库',
+        emptyText: '仓库',
         dbfinds:[{
             from:'id',to:'id',ignore:true 
         }, { 
@@ -33,13 +33,13 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         }, {
             from:'wh_description',to:'wh_description'
         }],
-        columnWidth: 0.2
+        width:150,
     },{
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/producttype/getCombo',
         name : "pr_kind", 
-        fieldLabel : "类型", 
+        emptyText : "类型", 
         allowBlank : false, 
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
@@ -57,12 +57,13 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
                 session: true
             });
             this.dialog.show();
-        }
+        },
+        width:150
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        fieldLabel: '物料名称',
         emptyText:'输入物料编号或名称',
+        width:150,
         dbfinds:[{
             from:'pr_detail',to:'pr_detail',
         },{
@@ -91,8 +92,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
                 grid.store.loadPage(1);
             }
         }
-    },{
-        cls:'x-formpanel-btn-orange',
+    },'->',{
         xtype:'button',
         text:'保存',
         listeners: {
@@ -102,7 +102,6 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
             }
         }
     },{
-        cls:'x-formpanel-btn-orange',
         xtype:'button',
         text:'导出',
         listeners: {
@@ -111,7 +110,6 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
             }
         }
     },{
-        cls:'x-formpanel-btn-orange',
         xtype:'button',
         text:'生成盘点单据',
         listeners: {