Merge remote-tracking branch 'origin/dev' into dev

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

@@ -297,6 +297,10 @@ Ext.define('saas.view.core.form.FormPanel', {
     initFormData: function(data) {
         var me = this;
         me.setFormData(data);
+        var fields = me.getForm().getFields().items;
+        Ext.Array.each(fields, function(f) {
+            f.resetOriginalValue ? f.resetOriginalValue() : '';
+        });
     },
 
     /**
@@ -365,5 +369,26 @@ Ext.define('saas.view.core.form.FormPanel', {
                 typeof item.setDisabled == 'function' && item.setDisabled(!able);
             }
         });
-    }
+    },
+
+    //overriders
+    isDirty: function () {
+        var me = this,
+        detailGrids = me.query('detailGridField'),
+        dirty = false;
+
+        for(var i = 0; i < detailGrids.length; i++) {
+            var grid = detailGrids[i];
+            if(grid.isDirty()) {
+                dirty = true;
+                break;
+            }
+        }
+
+        if(!dirty) {
+            dirty = me.callParent();
+        }
+
+        return dirty;
+    },
 });

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

@@ -127,10 +127,6 @@ Ext.define('saas.view.core.form.FormPanelController', {
             return false;
         }
         
-        if(form.getForm().wasDirty==false){
-            showToast('未修改数据，请修改后保存');
-            return false;
-        }
         //form里面数据
         var formData = form.getFormData();
         var params = {

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -142,6 +142,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "单据日期",
             dataIndex: "pbd_sldate",
+            xtype: 'datecolumn',
             defaultValue: new Date()
         }, {
             text: "单据金额",