合计栏代码提交

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

@@ -8,17 +8,17 @@ Ext.define('saas.view.core.form.FormPanelController', {
     auditBtnClick: function() {
         var me = this,
         form = me.getView(),
-        statusField = form._statusField,
+        statusCodeField = form._statusCodeField,
         viewModel = me.getViewModel(),
-        status = viewModel.get(statusField);
+        status = viewModel.get(statusCodeField);
 
-        status == 'AUDIT' ? me.unAudit() : me.audit();
+        status == 'AUDITED' ? me.unAudit() : me.audit();
     },
 
-    add: function(btn){
-        var form = btn.ownerCt.ownerCt;
+    add: function(){
+        var form = this.getView();
         var mainTab = Ext.getCmp('main-tab-panel');
-        var title = '新增' + btn.ownerCt.ownerCt._title;
+        var title = '新增' + form._title;
         var id = form.xtype + '_add';
         existingItem = mainTab.down('[id=' + id + ']');
         lastView = mainTab.getActiveTab();
@@ -35,9 +35,9 @@ Ext.define('saas.view.core.form.FormPanelController', {
         }
     },
     
-    delete: function(btn){
+    delete: function(){
         var me = this;
-        var form = btn.ownerCt.ownerCt;
+        var form = this.getView();
         var id = form.getForm().findField(form._idField);
         if(id&&id.value!=0){
             me.BaseUtil.request({
@@ -59,9 +59,9 @@ Ext.define('saas.view.core.form.FormPanelController', {
         }
     },
 
-    save:function(btn){
+    save:function(){
         var me = this;
-        var form = btn.ownerCt.ownerCt;
+        var form = this.getView();
         if(form.getForm().wasDirty==false){
             Ext.Msg.alert('提示','未修改数据，请修改后保存');
             return false;
@@ -107,9 +107,9 @@ Ext.define('saas.view.core.form.FormPanelController', {
         });
     },
 
-    audit: function(btn){
+    audit: function(){
         var me = this;
-        var form = btn.ownerCt.ownerCt;
+        var form = this.getView();
         if(form.getForm().wasDirty==false){
             Ext.Msg.alert('提示','未修改数据，请修改后保存');
             return false;
@@ -146,6 +146,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
             var localJson = new Ext.decode(res.responseText);
             if(localJson.success){
                 Ext.Msg.alert('提示','审核成功');
+                form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
             }
         })

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -25,6 +25,16 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     showIndex: true,
     configUrl: '',
 
+    features: [{
+        ftype : 'groupingsummary',
+        groupHeaderTpl : '{name}',
+        hideGroupedHeader : false,
+        enableGroupingMenu : false
+    }, {
+        ftype: 'summary',
+        dock: 'bottom'
+    }],
+
     initComponent: function() {
         var me = this;
         Ext.apply(me, {

frontend/saas-web/app/view/test/order/FormPanel.js

@@ -129,7 +129,8 @@ Ext.define('saas.view.test.order.FormPanel', {
                 text : "序号", 
                 dataIndex : "pd_detno", 
                 width : 80.0, 
-                xtype : "rownumberer"
+                xtype : "rownumberer",
+                summaryType: 'count'
             }, 
             {
                 editor : {
@@ -165,27 +166,31 @@ Ext.define('saas.view.test.order.FormPanel', {
                 text : "数量", 
                 dataIndex : "pd_yqty", 
                 width : 120.0, 
-                xtype : "", 
-                items : null
+                xtype : "numbercolumn", 
+                items : null,
+                summaryType: 'sum'
             }, 
             {
                 text : "单价", 
                 dataIndex : "pd_price", 
                 width : 120.0, 
                 xtype : "numbercolumn", 
-                items : null
+                items : null,
+                summaryType: 'sum'
             }, 
             {
                 text : "总额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             }, 
             {
                 text : "税额", 
                 dataIndex : "pd_taxtotal", 
                 flex : 1.0, 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                summaryType: 'sum'
             }
         ]
     }, {