首页刷新

frontend/saas-web/app/view/core/chart/ChartBase.scss

@@ -26,5 +26,8 @@
                 }
             }
         }
-    } 
+    }
+    .x-mask {
+        background-color: transparent;
+    }
 }

frontend/saas-web/app/view/core/tab/Controller.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.core.tab.Controller', {
     },
 
     onTabActivate: function(component) {
-        var tabView = component.down('panel');
+        var tabView = component.down('container');
 
         if(typeof tabView.refresh == 'function') {
             tabView.refresh();
@@ -63,5 +63,12 @@ Ext.define('saas.view.core.tab.Controller', {
 
             component.resetCloseClick = true;
         }
+
+        tabView.fireEvent('onTabActivate', tabView);
+    },
+
+    onTabDeactivate: function(component) {
+        var tabView = component.down('container');
+        tabView.fireEvent('onTabDeactivate', tabView);
     }
 });

frontend/saas-web/app/view/core/tab/Panel.js

@@ -5,6 +5,7 @@ Ext.define('saas.view.core.tab.Panel', {
     layout: 'fit',
     
     listeners: {
-        activate: 'onTabActivate'
+        activate: 'onTabActivate',
+        deactivate: 'onTabDeactivate'
     }
 });

frontend/saas-web/app/view/home/Home.js

@@ -21,6 +21,8 @@ Ext.define('saas.view.home.Home', {
 
     scrollable: true,
 
+    REFRESH_INTERVALS: 5 * 60 * 1000, // 刷新间隔
+
     defaults: {
         shadow: true,
         cls: 'x-home-box',
@@ -69,5 +71,37 @@ Ext.define('saas.view.home.Home', {
         }, {
             xtype: 'stock-amount'
         }]
-    }]
+    }],
+
+    initComponent: function() {
+        this.lastTime = Ext.Date.now();
+        this.callParent(arguments);
+    },
+
+    listeners: {
+        onTabActivate: function(p) {
+            p.refreshId = window.setInterval((p.refreshStores.bind(p)()).bind(p), p.REFRESH_INTERVALS);
+        },
+        onTabDeactivate: function(p) {
+            p.lastTime = 0;
+            window.clearInterval(p.refreshId);
+        }
+    },
+
+    refreshStores: function() {
+        var me = this,
+        lastTime = me.lastTime || 0,
+        now = Ext.Date.now(),
+        viewModel = me.getViewModel(),
+        stores = viewModel.storeInfo;
+
+        if(now - lastTime > me.REFRESH_INTERVALS) {
+            for(var key in stores) {
+                var store = stores[key];
+                store.load();
+            }
+            me.lastTime = Ext.Date.now();
+        }
+        return me.refreshStores;
+    }
 });

frontend/saas-web/app/view/home/InfoCard.js

@@ -34,8 +34,6 @@ Ext.define('saas.view.home.InfoCard', {
     initComponent: function () {
         var me = this;
 
-        var companyId = saas.util.BaseUtil.getCurrentUser().companyId;
-
         Ext.apply(me, {
             cards: {
                 unship: {
@@ -106,6 +104,7 @@ Ext.define('saas.view.home.InfoCard', {
     addCardItems: function(infoData) {
         infoData = infoData || {};
         var me = this,
+        currentIndex = me.currentIndex,
         p = me.up('home'),
         cards = me.cards,
         datas = [],
@@ -158,6 +157,11 @@ Ext.define('saas.view.home.InfoCard', {
             me.showPageTrigger();
         }
 
+        if(Ext.isNumber(currentIndex)) {
+            me.setActiveItem(me.items.items[currentIndex]);
+        }else {
+            me.currentIndex = 0;
+        }
         me.updateLayout(true);
     },
 
@@ -182,6 +186,7 @@ Ext.define('saas.view.home.InfoCard', {
         var c = me.items.items.length;
         var next = parseInt(i, 10) + incr;
         l.setActiveItem(next);
+        me.currentIndex = me.currentIndex + incr;
 
         me.down('#card-prev').setDisabled(next === 0);
         me.down('#card-next').setDisabled(next === (c-1));

frontend/saas-web/app/view/home/InfoCard.scss

@@ -52,6 +52,10 @@ $max-card-width: 235px;
     .x-toolbar-default-vertical {
         padding: 0;
     }
+
+    .x-mask {
+        background-color: transparent;
+    }
 }
 
 .x-scroller-button {

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

@@ -31,7 +31,7 @@ Ext.define('saas.view.main.Main', {
                     reference: 'mainLogo',
                     width: 180,
                     cls: 'main-logo-wrap',
-                    html: '<div class="main-logo"><img src="resources/images/default/logo-default.png"/><div class="logo-text">优企云服</div></div>',
+                    html: '<div class="main-logo"><img src="resources/images/default/logo-default.png"/><div class="logo-text">U企云服</div></div>',
                     bind: {
                         width: '{navWidth}'
                     }

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

@@ -36,14 +36,15 @@ Ext.define('saas.view.main.MainContainerWrap', {
                 closeAllTabsText: '关闭全部页',
                 closeOthersTabsText: '关闭其他页'
             })],
-            items: [
-                {
-                    iconCls: 'x-sa sa-home',
+            items: [{
+                xtype: 'core-tab-panel',
+                iconCls: 'x-sa sa-home',
+                title: '首页',
+                closable: false,
+                items: [{
                     xtype: 'home',
-                    title: '首页',
-                    closable: false
-                }
-            ]
+                }]
+            }]
         }
     ],
 });

frontend/saas-web/app/view/money/report/TotalRecDetail.js

@@ -26,12 +26,12 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         },
     }, {
         xtype: 'monthdatefield',
-        name: 'vm_yearmonth',
+        name: 'cm_yearmonth',
         fieldLabel: '起始期间',
         columnWidth: 0.2
     }, {
         xtype: 'monthdatefield',
-        name: 'vm_yearmonthTo',
+        name: 'cm_yearmonthTo',
         fieldLabel: '结束期间',
         columnWidth: 0.2
     }],

frontend/saas-web/resources/json/navigation.json

@@ -128,15 +128,15 @@
     "items": [{
         "text": "制单",
         "items": [{
-            "id": "payBalance",
-            "text": "付款单",
-            "addType": "money-paybalance-formpanel",
-            "viewType": "money-paybalance-querypanel"
-        }, {
             "id": "recBbalance",
             "text": "收款单",
             "addType": "money-recbalance-formpanel",
             "viewType": "money-recbalance-querypanel"
+        }, {
+            "id": "payBalance",
+            "text": "付款单",
+            "addType": "money-paybalance-formpanel",
+            "viewType": "money-paybalance-querypanel"
         }, {
             "id": "verification",
             "text": "核销单",
@@ -161,13 +161,13 @@
     }, {
         "text": "报表",
         "items": [{
-            "text": "应付账款明细表",
-            "id": "monry-report-paydetail",
-            "viewType":"monry-report-paydetail"
-        }, {
             "text": "应收账款明细表",
             "id": "monry-report-recdetail",
             "viewType":"monry-report-recdetail"
+        }, {
+            "text": "应付账款明细表",
+            "id": "monry-report-paydetail",
+            "viewType":"monry-report-paydetail"
         }, {
             "text": "账户收支明细表",
             "id": "monry-report-accountbalance",