Browse Source

主从表初始化数据

zhuth 7 years ago
parent
commit
c460fc58a3

+ 24 - 4
frontend/saas-web/app/util/FormUtil.js

@@ -38,10 +38,10 @@ Ext.define('saas.util.FormUtil', {
                             item.bind = {
                             item.bind = {
                                 store: '{' + storeName + '}'
                                 store: '{' + storeName + '}'
                             };           
                             };           
-                            var detailGrids = viewModel.get('detailGrids');
+                            var detailGrids = formModel.get('detailGrids');
                             detailGrids.push(storeName);
                             detailGrids.push(storeName);
-                            viewModel.set('detailGrids', detailGrids);
-                            viewModel.set(storeName, Ext.create('Ext.data.Store', {
+                            formModel.set('detailGrids', detailGrids);
+                            formModel.set(storeName, Ext.create('Ext.data.Store', {
                                 fields: item.columns ? item.columns.filter(function(c) {
                                 fields: item.columns ? item.columns.filter(function(c) {
                                     return !!c.dataIndex;
                                     return !!c.dataIndex;
                                 }).map(function(c) {
                                 }).map(function(c) {
@@ -63,6 +63,9 @@ Ext.define('saas.util.FormUtil', {
         .then(function(items) {
         .then(function(items) {
             form.fireEvent('afterSetItems', form, items);
             form.fireEvent('afterSetItems', form, items);
         })
         })
+        .then(function() {
+            me.loadData(form);
+        })
         .catch(function(response) {
         .catch(function(response) {
             console.error(response);
             console.error(response);
         });
         });
@@ -70,6 +73,23 @@ Ext.define('saas.util.FormUtil', {
     },
     },
 
 
     loadData: function(form) {
     loadData: function(form) {
-
+        var me = this;
+        
+        if(form.initId && form.initId!=0) {
+            var url = form._dataModelUrl + form.initId,async=false;
+            me.BaseUtil.request({url,async })
+            .then(function(response) {
+                var res = Ext.decode(response.responseText);
+                if(res.success) {
+                    var viewModel = form.getViewModel();
+                    viewModel.setData(res.data.main);
+                    var detailStore = viewModel.get('detailGridField');
+                    detailStore.loadData(res.data.items);
+                }
+            })
+            .catch(function(response) {
+                console.error(response);
+            });
+        }
     }
     }
 });
 });

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

@@ -38,27 +38,6 @@ Ext.define('saas.view.core.form.FormPanel', {
         var me = this;
         var me = this;
         me.FormUtil.setItems(me);
         me.FormUtil.setItems(me);
 
 
-        //判断是否加载数据
-
-        if(me.initId&&me.initId!=0){
-            var url = me._dataModelUrl + me.initId,async=false;
-            me.BaseUtil.request({url,async })
-            .then(function(response) {
-                var res = Ext.decode(response.responseText);
-                if(res.success) {
-                    viewModel = me.getViewModel();
-                    viewModel.setData(res.data.main);
-                    viewModel.setData({'detailGridField':res.data.items});                   
-                }
-            })
-            .catch(function(response) {
-                console.error(response);
-            });
-        }else{
-            viewModel = me.getViewModel();
-            viewModel.setData({'detailGridField':[{},{}]});     
-        }
-
         Ext.apply(me, {
         Ext.apply(me, {
             dockedItems: [{
             dockedItems: [{
                 xtype: 'toolbar',
                 xtype: 'toolbar',

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.test.order.FormPanel', {
     _auditUrl:'http://192.168.253.58:8800/purchase/audit',
     _auditUrl:'http://192.168.253.58:8800/purchase/audit',
     _deleteUrl:'http://192.168.253.58:8800/purchase/delete/',
     _deleteUrl:'http://192.168.253.58:8800/purchase/delete/',
     _deleteDetailUrl:'http://192.168.253.58:8800/purchase/deleteItem/',
     _deleteDetailUrl:'http://192.168.253.58:8800/purchase/deleteItem/',
-    initId:0,
+    initId:11,
 
 
     toolBtns: [{
     toolBtns: [{
         xtype: 'button',
         xtype: 'button',