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

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

@@ -122,6 +122,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     	}
     },
     onTriggerClick:function(f){
+        this.fireEvent('beforetriggerclick', this);
         f.blur(f);
         //判断dbfindtrigger归属
         f.judge(f);//form

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

@@ -129,6 +129,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
     	}
     },
     onTriggerClick:function(f){
+        this.fireEvent('beforetriggerclick', this);
         f.blur(f);
         //判断dbfindtrigger归属
         f.judge(f);

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

@@ -56,11 +56,13 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
+                            xtype: 'numbercolumn',
                             align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
+                            xtype: 'numbercolumn',
                             align: 'end'
                         }, {
                             "text": "纳税人识别号",
@@ -145,6 +147,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
                             align: 'end'
                         },{
                             "text": "类型",
@@ -166,6 +169,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
                             align: 'end'
                         },{
                             "text": "L/T",