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

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

@@ -2,6 +2,7 @@ Ext.define('saas.view.core.query.FormPanel', {
     extend: 'Ext.form.Panel',
     xtype: 'core-query-formpanel',
 
+    controller: 'core-query-formpanel',
     viewModel: 'core-query-formpanel',
     
      //工具类

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

@@ -0,0 +1,5 @@
+Ext.define('saas.view.core.query.FormPanelController', {
+    extend: 'Ext.app.ViewController',
+    alias: 'controller.core-query-formpanel',
+
+});

frontend/saas-web/app/view/core/query/QueryFormPanel.js

@@ -2,7 +2,7 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
     extend: 'Ext.form.Panel',
     xtype: 'core-query-queryformpanel',
 
-    viewModel: 'core-query-queryformpanel',
+    // viewModel: 'core-query-queryformpanel',
 
      //字段属性
     _baseItems: [],
@@ -29,26 +29,31 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
         columnWidth: 0.25,
         blankText: '该字段不能为空'
     },
-
-    dockedItems: [{
-        xtype: 'toolbar',
-        dock: 'bottom',
-        style: {
-            'border-bottom': '1px solid #35baf6 !important'
-        },
-        items: ['->',{
-            xtype: 'button',
-            text: '更多查询',
-            handler: me.moreQuery
-        }, {
-            xtype: 'button',
-            text: '查询',
-            handler: me.onQuery
-        },'->']
-    }],
-    
+ 
     remoteConfig: false, // 是否需要从远端读取form配置
     bindFields: [], // 已绑定字段（需要保存到数据库）
+    initComponent: function() {
+        var me = this;
+        Ext.apply(me, {
+            dockedItems: [{
+                xtype: 'toolbar',
+                dock: 'bottom',
+                style: {
+                    'border-bottom': '1px solid #35baf6 !important'
+                },
+                items: ['->',{
+                    xtype: 'button',
+                    text: '更多查询',
+                    handler: me.moreQuery
+                }, {
+                    xtype: 'button',
+                    text: '查询',
+                    handler: me.onQuery
+                },'->']
+            }]
+        });
+        me.callParent(arguments);
+    },
     moreQuery: function(btn){
         var win = Ext.getCmp('queryMoreWin');
         if(!win){

frontend/saas-web/app/view/core/query/QueryMoreFormPanel.js

@@ -28,35 +28,35 @@ Ext.define('saas.view.core.query.QueryMoreFormPanel', {
         blankText: '该字段不能为空'
     },
 
-    dockedItems: [{
-        xtype: 'toolbar',
-        dock: 'bottom',
-        style: {
-            'border-bottom': '1px solid #35baf6 !important'
-        },
-        items: [{
-            xtype: 'button',
-            text: '重置',
-            handler: me.resetQuery
-        },'->',{
-            xtype: 'button',
-            text: '查询',
-            handler: me.onQueryMore
-        }, {
-            xtype: 'button',
-            text: '关闭',
-            handler: function(btn){
-                var win = Ext.getCmp('queryMoreWin');
-                win.close();
-				win.destroy();
-            }
-        }]
-    }],
-    
     bindFields: [], // 已绑定字段（需要保存到数据库）
     initComponent: function() {
         var me = this;
-        console.log("viewName:"+me.viewName);
+        Ext.apply(me, {
+            dockedItems: [{
+                xtype: 'toolbar',
+                dock: 'bottom',
+                style: {
+                    'border-bottom': '1px solid #35baf6 !important'
+                },
+                items: [{
+                    xtype: 'button',
+                    text: '重置',
+                    handler: me.resetQuery
+                },'->',{
+                    xtype: 'button',
+                    text: '查询',
+                    handler: me.onQueryMore
+                }, {
+                    xtype: 'button',
+                    text: '关闭',
+                    handler: function(btn){
+                        var win = Ext.getCmp('queryMoreWin');
+                        win.close();
+                        win.destroy();
+                    }
+                }]
+            }]
+        });
         me.callParent(arguments);
     },
     resetQuery: function(btn){

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

@@ -30,8 +30,8 @@ Ext.define('saas.view.test.query.FormPanel', {
                 fieldLabel: '单据编号',
                 allowBlank: true,
                 columnWidth: 0.25,
-                configUrl: resources/json/purchase/vendorColumnsDbfind.json,
-                dataUrl: resources/json/purchase/vendorDataDbfind.json
+                configUrl: 'resources/json/purchase/vendorColumnsDbfind.json',
+                dataUrl: 'resources/json/purchase/vendorDataDbfind.json'
             },
             {
                 xtype: 'condatefield',
@@ -48,8 +48,8 @@ Ext.define('saas.view.test.query.FormPanel', {
                 fieldLabel: '供应商编号',
                 allowBlank: true,
                 columnWidth: 0.25,
-                configUrl: resources/json/purchase/vendorColumnsDbfind.json,
-                dataUrl: resources/json/purchase/vendorDataDbfind.json
+                configUrl: 'resources/json/purchase/vendorColumnsDbfind.json',
+                dataUrl: 'resources/json/purchase/vendorDataDbfind.json'
             },
             {
                 xtype: 'textfield',
@@ -67,8 +67,8 @@ Ext.define('saas.view.test.query.FormPanel', {
                 fieldMode: 'DETAIL',
                 allowBlank: true,
                 columnWidth: 0.25,
-                configUrl: resources/json/purchase/vendorColumnsDbfind.json,
-                dataUrl: resources/json/purchase/vendorDataDbfind.json
+                configUrl: 'resources/json/purchase/vendorColumnsDbfind.json',
+                dataUrl: 'resources/json/purchase/vendorDataDbfind.json'
             },
             {
                 xtype: 'textfield',
@@ -124,7 +124,7 @@ Ext.define('saas.view.test.query.FormPanel', {
             {
                 text: '序号',
                 width: 80,
-                xtype: rownumberer
+                xtype: 'rownumberer'
             },
             {
                 text: 'id',

frontend/saas-web/app/view/test/query/QueryFormPanel.js

@@ -25,25 +25,30 @@ Ext.define('saas.view.test.query.QueryFormPanel', {
         blankText: '该字段不能为空'
     },
 
-    dockedItems: [{
-        xtype: 'toolbar',
-        dock: 'bottom',
-        style: {
-            'border-bottom': '1px solid #35baf6 !important'
-        },
-        items: ['->',{
-            xtype: 'button',
-            text: '更多查询',
-            handler: me.moreQuery
-        }, {
-            xtype: 'button',
-            text: '查询',
-            handler: me.onQuery
-        },'->']
-    }],
-    
     remoteConfig: false, // 是否需要从远端读取form配置
     bindFields: [], // 已绑定字段（需要保存到数据库）
+    initComponent: function() {
+        var me = this;
+        Ext.apply(me, {
+            dockedItems: [{
+                xtype: 'toolbar',
+                dock: 'bottom',
+                style: {
+                    'border-bottom': '1px solid #35baf6 !important'
+                },
+                items: ['->',{
+                    xtype: 'button',
+                    text: '更多查询',
+                    handler: me.moreQuery
+                }, {
+                    xtype: 'button',
+                    text: '查询',
+                    handler: me.onQuery
+                },'->']
+            }]
+        });
+        me.callParent(arguments);
+    },
     moreQuery: function(btn){
         var win = Ext.getCmp('queryMoreWin');
         if(!win){