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

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

@@ -226,6 +226,9 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
                             if(nowRec.get(item.to)&&nowRec.get(item.to)!=""){
                                 nowRec.set(item.to,null);
                                 delete nowRec.modified[item.to];
+                                if(JSON.stringify(nowRec.modified)=="{}"){
+                                    nowRec.dirty = false
+                                }
                             }
                             if(me.name==item.to){
                                 me.column.getEditor().setValue('');

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -179,23 +179,6 @@ Ext.define('saas.view.core.form.FormPanel', {
         return items;
     },
 
-    isValid: function() {
-        var me = this;
-        var viewModel = me.getViewModel();
-        var valid = me.getForm().isValid();
-        var detailGrids = me.query('detailGridField');
-
-        for(var i = 0; i < detailGrids.length; i++) {
-            var g = detailGrids[i];
-            if(!g.isValid()) {
-                valid = false;
-                break;
-            }
-        }
-        viewModel.set('base.valid', valid);
-        return valid;
-    },
-
     /**
      * 一些初始化viewModel的方法
      */
@@ -415,6 +398,23 @@ Ext.define('saas.view.core.form.FormPanel', {
     },
 
     //overriders
+    isValid: function() {
+        var me = this;
+        var viewModel = me.getViewModel();
+        var valid = me.getForm().isValid();
+        var detailGrids = me.query('detailGridField');
+
+        for(var i = 0; i < detailGrids.length; i++) {
+            var g = detailGrids[i];
+            if(!g.isValid()) {
+                valid = false;
+                break;
+            }
+        }
+        viewModel.set('base.valid', valid);
+        return valid;
+    },
+
     isDirty: function () {
         var me = this,
         detailGrids = me.query('detailGridField'),
@@ -437,5 +437,21 @@ Ext.define('saas.view.core.form.FormPanel', {
 
     getDirtyData: function() {
         return this.getForm().getDirtyData();
-    }
+    },
+
+    beforeSave: function() {
+        return true;
+    },
+
+    beforeDelete: function() {
+        return true;
+    },
+
+    beforeAudit: function() {
+        return true;
+    },
+
+    beforeUnAudit: function() {
+        return true;
+    },
 });

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -82,6 +82,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var id = viewModel.get(form._idField);
         var code = viewModel.get(form._codeField);
         if(id&&id.value!=0){
+
+            if(!form.beforeDelete()) {
+                return false;
+            }
+
             deleteWarn(form._deleteMsg,function(btn){
                 if(btn == 'yes'){
                     me.BaseUtil.request({
@@ -115,6 +120,10 @@ Ext.define('saas.view.core.form.FormPanelController', {
             return false;
         }
 
+        if(!form.beforeSave()) {
+            return false;
+        }
+
         me.save();
     },
 
@@ -196,6 +205,10 @@ Ext.define('saas.view.core.form.FormPanelController', {
             showToast(form.invalidText);
             return false;
         }
+
+        if(!form.beforeAudit()) {
+            return false;
+        }
         
         //form里面数据
         var formData = form.getFormData();
@@ -263,6 +276,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
         var id = viewModel.get(form._idField);
         var code = viewModel.get(form._codeField);
         if(id&&id.value!=0){
+
+            if(!form.beforeUnAudit()) {
+                return false;
+            }
+
             me.BaseUtil.request({
                 url: form._unAuditUrl+id,
                 method: 'POST',

frontend/saas-web/app/view/home/HomeModel.js

@@ -2,6 +2,10 @@ Ext.define('saas.view.home.HomeModel', {
     extend: 'Ext.app.ViewModel',
     alias: 'viewmodel.home',
 
+    data: {
+        month_sale_sum: '0'
+    },
+
     stores: {
         infoData: {
             model: 'saas.model.home.Info',
@@ -9,7 +13,7 @@ Ext.define('saas.view.home.HomeModel', {
             proxy: {
                 type: 'ajax',
                 // url: 'http://192.168.253.58:8920/homePage/liveData',
-                url: '/api/common/homePage/liveData',
+                url: '/api/commons/homePage/liveData',
                 reader: {
                     type: 'json'
                 },
@@ -283,24 +287,14 @@ Ext.define('saas.view.home.HomeModel', {
         pieData: {
             model: 'saas.model.chart.DataXY',
             data: [{
-                "xvalue": "华商龙",
-                "yvalue": 200.19
-            }, {
-                "xvalue": "维泰",
-                "yvalue": 180.17
-            }, {
-                "xvalue": "数码",
-                "yvalue": 150.15
-            }, {
-                "xvalue": "优企",
-                "yvalue": 150.15
-            }, {
-                "xvalue": "云服",
-                "yvalue": 120.12
-            }, {
-                "xvalue": "其他",
-                "yvalue": 230.22
-            }]
+                "xvalue": "无",
+                "yvalue": 1
+            }],
+            listeners: {
+                load: function() {
+                    console.log();
+                }
+            }
         },
 
         areaData: {