merge

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

@@ -25,11 +25,6 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     showIndex: true,
     configUrl: '',
 
-    features: [{
-        ftype: 'summary',
-        dock: 'bottom'
-    }],
-
     initComponent: function() {
         var me = this;
         me.setSummary();
@@ -97,7 +92,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                 dock: 'bottom'
             });
         }
-        Ext.apply(me, {
+        Ext.applyIf(me, {
             features: features
         });
     },

frontend/saas-web/app/view/main/MainModel.js

@@ -56,18 +56,6 @@ Ext.define('saas.view.main.MainModel', {
                                         viewType:'purchase-purchaseOut-querypanel',
                                         leaf: true
                                     },
-                                    {
-                                        id: 'list1',
-                                        text: '列表界面1',
-                                        viewType: 'purchase-list-gridpanel1',
-                                        leaf: true
-                                    },
-                                    {
-                                        id: 'list2',
-                                        text: '列表界面2',
-                                        viewType: 'purchase-list-gridpanel2',
-                                        leaf: true
-                                    },
                                     {
                                         id: 'form1',
                                         text: '测试-采购单明细界面',