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

frontend/saas-web/app/view/core/base/BasePanel.js

@@ -28,6 +28,8 @@ Ext.define('saas.view.core.base.BasePanel', {
     searchField:[],
     gridColumns: [],
 
+    _deleteMsg: '是否删除所选单据？',
+
     initComponent: function() {
 
         var me = this,

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -123,7 +123,11 @@ Ext.define('saas.view.core.base.GridPanel', {
                         text: '删除',
                         handler: function(){
                             var form = this.ownerCt.ownerCt.ownerCt;
-                            me.onVastDeal(form._batchDeleteUrl);
+                            deleteWarn(form._deleteMsg,function(btn){
+                                if(btn == 'yes'){
+                                    me.onVastDeal(form._batchDeleteUrl);
+                                }
+                            });
                         }
                     }, {
                         text: '刷新',