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

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

@@ -114,6 +114,7 @@ Ext.define('saas.view.main.Main', {
                 },
                 {
                     ui: 'header',
+                    xtype:'tbtext',
                     bind: {
                         tooltip: '{account.realname}',
                         text: '{account.realname}'

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -116,7 +116,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 120
         },{
             text: '单据日期',
-            dataIndex: 'pu_indate',
+            dataIndex: 'pu_date',
             xtype: 'datecolumn',
             width: 200
         }, {
@@ -152,7 +152,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 120
         }, {
             text: '单据日期',
-            dataIndex: 'pu_indate',
+            dataIndex: 'pu_date',
             xtype: 'datecolumn',
             width: 200
         }, {