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

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -26,6 +26,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
 
     @Override
     public boolean save(Bankinformation bankinformation){
+        bankinformation.setCompanyId(BaseContextHolder.getCompanyId());
         if(bankinformation.getId() == 0){
             bankinformationMapper.insertSelective(bankinformation);
         }else{

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -192,6 +192,35 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             }
         });
 
+    },
+    delete: function(){
+        var me = this;
+        var form = this.getView();
+        warnMsg('确定删除该单据吗?', function(btn){
+			if(btn == 'yes'){
+                var viewModel = me.getViewModel();
+                var id = viewModel.get(form._idField);
+                var code = viewModel.get(form._codeField);
+                if(id&&id.value!=0){
+                    me.BaseUtil.request({
+                        url: form._deleteUrl+id,
+                        method: 'POST',
+                    })
+                    .then(function(localJson) {
+                        if(localJson.success){
+                            var mainTab = Ext.getCmp('main-tab-panel');
+                            mainTab.getActiveTab().close();
+                            //解析参数
+                            showToast('删除成功');
+                        }
+                    })
+                    .catch(function(res) {
+                        console.error(res);
+                        showToast('删除失败: ' + res.message);
+                    });
+                }
+                }
+});
     },
     turnOut: function() {
         var me = this,

frontend/saas-web/overrides/i18n.js

@@ -58,4 +58,14 @@ function getCurrentTab() {
     var currentTab = mainTab.getActiveTab();
 
     return currentTab;
+}
+
+function warnMsg(msg, fn){
+	Ext.MessageBox.show({
+     	title: '提示',
+     	msg: msg,
+     	buttons: Ext.Msg.YESNO,
+     	icon: Ext.Msg.WARNING,
+     	fn: fn
+	});
 }