首页图表样式微调

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -81,13 +81,13 @@ Ext.define('saas.view.core.report.ReportPanel', {
                                 items: [{
                                     text: 'Excel xlsx',
                                     cfg: {
-                                        type: 'excel07',
+                                        type: 'excel',
                                         ext: 'xlsx'
                                     }
                                 }, {
                                     text: 'Excel xlsx (包含分组合计)',
                                     cfg: {
-                                        type: 'excel07',
+                                        type: 'excel',
                                         ext: 'xlsx',
                                         includeGroups: true,
                                         includeSummary: true

frontend/saas-web/app/view/core/report/ReportPanelController.js

@@ -38,7 +38,6 @@ Ext.define('saas.view.core.report.ReportPanelController', {
             if(btn.cfg.isPrint){
                 me.printHtml(grid.getDocumentData(cfg));
             }else  {
-                debugger;
                 grid.saveDocumentAs(cfg);
             }
             grid.store.exportPageSize = null;

frontend/saas-web/app/view/home/charts/KeyData.js

@@ -105,27 +105,27 @@ Ext.define('saas.view.home.charts.KeyData', {
                 itemclick: function(th, record, item, index, e, eOpts) {
                     saas.util.BaseUtil.openTab(record.get('viewType'), record.get('title'), record.get('id'));
                 },
-                itemmouseenter: function(th, record, item, index, e, eOpts) {
-                    var tip = th.tip;
-                    if(!tip) {
-                        var tip = Ext.create('Ext.tip.ToolTip', {
-                            target: th.el,
-                            minWidth: 100,
-                            title: record.get('label'),
-                            html: record.get('value'),
-                            showOnTap: true,
-                            trackMouse: true
-                        });
-                        th.tip = tip;
-                        tip.showAt(e.getXY());
-                    }
-                },
-                itemmouseleave: function(th, record, item, index, e, eOpts) {
-                    var tip = th.tip;
-                    if(tip) {
-                        th.tip = Ext.destroy(th.tip);
-                    }
-                }
+                // itemmouseenter: function(th, record, item, index, e, eOpts) {
+                //     var tip = th.tip;
+                //     if(!tip) {
+                //         var tip = Ext.create('Ext.tip.ToolTip', {
+                //             target: th.el,
+                //             minWidth: 100,
+                //             title: record.get('label'),
+                //             html: record.get('value'),
+                //             showOnTap: true,
+                //             trackMouse: true
+                //         });
+                //         th.tip = tip;
+                //         tip.showAt(e.getXY());
+                //     }
+                // },
+                // itemmouseleave: function(th, record, item, index, e, eOpts) {
+                //     var tip = th.tip;
+                //     if(tip) {
+                //         th.tip = Ext.destroy(th.tip);
+                //     }
+                // }
             }
         });
 

frontend/saas-web/app/view/home/charts/MonthIO.js

@@ -51,10 +51,10 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     },
                     grid: {
                         even: {
-                            stroke: '#F7F8FA'
+                            stroke: '#E2E7ED'
                         },
                         odd: {
-                            stroke: '#F7F8FA',
+                            stroke: '#E2E7ED',
                         }
                     },
                     style: {
@@ -70,7 +70,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
                         fillStyle: '#485465'
                     },
                     style: {
-                        fill: '#F7F8FA',
+                        fill: '#E2E7ED',
                         strokeStyle: 'transparent'
                     },
                 }],

frontend/saas-web/app/view/home/charts/MonthPurchase.js

@@ -30,7 +30,7 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                         fillStyle: '#485465',
                     },
                     style: {
-                        fill: '#F7F8FA',
+                        fill: '#E2E7ED',
                         strokeStyle: 'transparent'
                     },
                     renderer: me.onCategoryLabelRender
@@ -41,10 +41,10 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                     adjustByMajorUnit: true,
                     grid: {
                         even: {
-                            stroke: '#F7F8FA'
+                            stroke: '#E2E7ED'
                         },
                         odd: {
-                            stroke: '#F7F8FA',
+                            stroke: '#E2E7ED',
                         }
                     },
                     label: {

frontend/saas-web/app/view/home/charts/ProfitDetail.js

@@ -30,7 +30,7 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
                         fillStyle: '#485465',
                     },
                     style: {
-                        fill: '#F7F8FA',
+                        fill: '#E2E7ED',
                         strokeStyle: 'transparent'
                     },
                     renderer: me.onCategoryLabelRender
@@ -41,10 +41,10 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
                     adjustByMajorUnit: true,
                     grid: {
                         even: {
-                            stroke: '#F7F8FA'
+                            stroke: '#E2E7ED'
                         },
                         odd: {
-                            stroke: '#F7F8FA',
+                            stroke: '#E2E7ED',
                         }
                     },
                     label: {

frontend/saas-web/app/view/home/charts/PurchaseTrend.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                         fillStyle: '#485465'
                     },
                     style: {
-                        fill: '#F7F8FA',
+                        fill: '#E2E7ED',
                         strokeStyle: 'transparent'
                     },
                     renderer: me.categoryRender
@@ -44,10 +44,10 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     position: 'left',
                     grid: {
                         even: {
-                            stroke: '#F7F8FA'
+                            stroke: '#E2E7ED'
                         },
                         odd: {
-                            stroke: '#F7F8FA',
+                            stroke: '#E2E7ED',
                         }
                     },
                     label: {

frontend/saas-web/app/view/home/charts/SaleTrend.js

@@ -40,7 +40,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                         fillStyle: '#485465',
                     },
                     style: {
-                        fill: '#F7F8FA',
+                        fill: '#E2E7ED',
                         strokeStyle: 'transparent'
                     },
                     renderer: me.categoryRender
@@ -50,10 +50,10 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                     position: 'left',
                     grid: {
                         even: {
-                            stroke: '#F7F8FA',
+                            stroke: '#E2E7ED',
                         },
                         odd: {
-                            stroke: '#F7F8FA',
+                            stroke: '#E2E7ED',
                         }
                     },
                     label: {

frontend/saas-web/app/view/home/charts/StockAmount.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
                         fillStyle: '#485465'
                     },
                     style: {
-                        fill: '#F7F8FA',
+                        fill: '#E2E7ED',
                         strokeStyle: 'transparent'
                     },
                     renderer: me.categoryRender
@@ -44,10 +44,10 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     position: 'left',
                     grid: {
                         even: {
-                            stroke: '#F7F8FA',
+                            stroke: '#E2E7ED',
                         },
                         odd: {
-                            stroke: '#F7F8FA',
+                            stroke: '#E2E7ED',
                         }
                     },
                     label: {

frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
     viewName: 'sale-report-salerec',
 
     groupField: 'rb_custcode',
-    groupHeaderTpl: '客户名称: {[values.rows[0].data.rd_custname]}',
+    groupHeaderTpl: '客户名称: {[values.rows[0].data.rb_custname]}',
     listUrl: '/api/sale/report/saleRec',
     defaultCondition: null,
     reportTitle: '销售收款报表',
@@ -99,6 +99,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
     }, {
         text: '回款比例%',
         dataIndex: 'rb_backrate',
+        exportFormat: 'Number2',
         xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');

frontend/saas-web/overrides/exporter/Stylesheet.js

@@ -10,15 +10,31 @@ Ext.define('saas.override.exporter.Stylesheet', {
         'Currency': '"$"#,##0.00',
         'Euro Currency': '"€"#,##0.00',
         /**  new  */
-        'Integer': function(v) {
+        'Number0': function(v) {
             return Ext.util.Format.number(v, '0');
         },
-        'Total':function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+        'Number1': function(v) {
+            return Ext.util.Format.number(v, '0.0');
+        },
+        'Number2': function(v) {
+            return Ext.util.Format.number(v, '0.00');
+        },
+        'Number3': function(v) {
+            return Ext.util.Format.number(v, '0.000');
+        },
+        'Number4': function(v) {
+            return Ext.util.Format.number(v, '0.0000');
+        },
+        'Integer': function(v) {
+            return Ext.util.Format.number(v, '0');
         },
+        // 'Total':function(v) {
+        //     var arr = (v + '.').split('.');
+        //     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+        //     var format = '0,000.' + xr.join('');
+        //     return Ext.util.Format.number(v, format);
+        // },
+        'Total': '#,##0.00',
         'Amount': function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -37,6 +53,7 @@ Ext.define('saas.override.exporter.Stylesheet', {
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         },
-    }
+        // 'Price': '#,##0.00',
+    },
 
 });

frontend/saas-web/overrides/exporter/file/Style.js

@@ -11,7 +11,17 @@ Ext.define('saas.override.exporter.file.Style', {
             return ret;
         }
 
-        if(f === 'Integer') { // new
+        if(f === 'Number0') {
+            return Ext.util.Format.number(v, '0');
+        }else if(f === 'Number1') {
+            return Ext.util.Format.number(v, '0.0');
+        }else if(f === 'Number2') {
+            return Ext.util.Format.number(v, '0.00');
+        }else if(f === 'Number3') {
+            return Ext.util.Format.number(v, '0.000');
+        }else if(f === 'Number4') {
+            return Ext.util.Format.number(v, '0.0000');
+        }else if(f === 'Integer') { // new
             return Ext.util.Format.number(v, '0');
         }else if(f === 'Total') {
             var arr = (v + '.').split('.');