首页样式调整1

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

@@ -6,11 +6,11 @@ Ext.define('saas.view.core.chart.ChartBase', {
     ],
 
     height: 300,
+    bodyPadding: 5,
 
     layout: 'fit',
 
     cls: 'quick-graph-panel shadow',
-    // headerPosition: 'bottom',
 
     defaults: {
         width: '100%'

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

@@ -143,7 +143,7 @@ Ext.define('saas.view.home.HomeModel', {
                         if(r.get('x') == '收入') {
                             Ext.getCmp('home').getViewModel().set('month_in', sum);
                         }else if(r.get('x') == '支出') {
-                            Ext.getCmp('home').getViewModel().set('month_in', sum);
+                            Ext.getCmp('home').getViewModel().set('month_out', sum);
                         }
                     });
                 }

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

@@ -37,17 +37,27 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     position: 'left',
                     adjustByMajorUnit: true,
                     fields: ['main'],
-                    minimum: 0
+                    minimum: 0,
+                    grid: {
+                        even: {
+                            stroke: '#E7EBEF'
+                        },
+                        odd: {
+                            stroke: '#E7EBEF',
+                        }
+                    },
+                    style: {
+                        fill: '#fff',
+                        strokeStyle: 'transparent'
+                    },
                 }, {
                     type: 'category',
                     position: 'bottom',
-                    grid: true,
                     fields: ['x'],
-                    label: {
-                        rotate: {
-                            degrees: -45
-                        }
-                    }
+                    style: {
+                        fill: '#E7EBEF',
+                        strokeStyle: 'transparent'
+                    },
                 }],
                 series: [{
                     type: 'bar',
@@ -56,7 +66,9 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     yField: ['main', 'other'],
                     stacked: true,
                     style: {
-                        opacity: 0.80
+                        lineWidth: 0,
+                        strokeStyle: 'transparent',
+                        maxBarWidth: 50,
                     },
                     tooltip: {
                         trackMouse: true,

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

@@ -29,23 +29,40 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                 },
                 axes: [{
                     type: 'category',
-                    fields: [
-                        'x'
-                    ],
-                    position: 'bottom'
+                    fields: ['x'],
+                    position: 'bottom',
+                    style: {
+                        fill: '#E7EBEF',
+                        strokeStyle: 'transparent'
+                    },
                 },{
                     type: 'numeric',
-                    fields: [
-                        'y'
-                    ],
-                    position: 'left'
+                    fields: ['y'],
+                    position: 'left',
+                    adjustByMajorUnit: true,
+                    grid: {
+                        even: {
+                            stroke: '#E7EBEF'
+                        },
+                        odd: {
+                            stroke: '#E7EBEF',
+                        }
+                    },
+                    style: {
+                        fill: '#fff',
+                        strokeStyle: 'transparent'
+                    },
+                    minimum: 0
                 }],
                 series: [{
                     type: 'bar',
                     xField: 'x',
-                    yField: [
-                        'y'
-                    ],
+                    yField: ['y'],
+                    style: {
+                        lineWidth: 0,
+                        strokeStyle: 'transparent',
+                        maxBarWidth: 50,
+                    },
                     tooltip: {
                         trackMouse: true,
                         renderer: me.onBarTipRender

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

@@ -36,8 +36,12 @@ Ext.define('saas.view.home.charts.MonthSale', {
                 width: '100%',
                 innerPadding: 20,
                 // legend: {
-                //     docked: 'bottom'
+                //     type: 'dom',
+                //     docked: 'right'
                 // },
+                style: {
+                    stroke: "#789"
+                },
                 interactions: ['rotate', 'itemhighlight'],
                 series: [{
                     type: 'pie',
@@ -52,6 +56,10 @@ Ext.define('saas.view.home.charts.MonthSale', {
                         trackMouse: true,
                         renderer: me.onSeriesTooltipRender
                     },
+                    style: {
+                        lineWidth: 0,
+                        strokeStyle: 'transparent',
+                    },
                 }]
             }],
         });

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

@@ -30,11 +30,27 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                 axes: [{
                     type: 'category',
                     fields: ['x'],
-                    position: 'bottom'
+                    position: 'bottom',
+                    style: {
+                        fill: '#E7EBEF',
+                        strokeStyle: 'transparent'
+                    },
                 },{
                     type: 'numeric',
                     fields: ['y'],
-                    position: 'left'
+                    position: 'left',
+                    grid: {
+                        even: {
+                            stroke: '#E7EBEF'
+                        },
+                        odd: {
+                            stroke: '#E7EBEF',
+                        }
+                    },
+                    style: {
+                        fill: '#fff',
+                        strokeStyle: 'transparent'
+                    },
                 }],
                 series: [{
                     type: 'bar',
@@ -43,7 +59,12 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     tooltip: {
                         trackMouse: true,
                         renderer: me.onBarTipRender
-                    }
+                    },
+                    style: {
+                        lineWidth: 0,
+                        strokeStyle: 'transparent',
+                        maxBarWidth: 50,
+                    },
                 }]
             }]
         });

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

@@ -28,6 +28,11 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                 bind: {
                     store: '{sale_trend}',
                 },
+                // legend: {
+                //     type: 'dom',
+                //     docked: 'top',
+
+                // },
                 axes: [{
                     type: 'category',
                     fields: ['x'],
@@ -36,11 +41,27 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                         rotate: {
                             degrees: -25
                         }
-                    }
+                    },
+                    style: {
+                        fill: '#E7EBEF',
+                        strokeStyle: 'transparent'
+                    },
                 },{
                     type: 'numeric',
                     fields: ['sale', 'saleback'],
                     position: 'left',
+                    grid: {
+                        even: {
+                            stroke: '#E7EBEF',
+                        },
+                        odd: {
+                            stroke: '#E7EBEF',
+                        }
+                    },
+                    style: {
+                        fill: '#fff',
+                        strokeStyle: 'transparent'
+                    },
                 }],
                 series: [{
                     type: 'line',

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

@@ -30,11 +30,27 @@ Ext.define('saas.view.home.charts.StockAmount', {
                 axes: [{
                     type: 'category',
                     fields: ['x'],
-                    position: 'bottom'
+                    position: 'bottom',
+                    style: {
+                        fill: '#E7EBEF',
+                        strokeStyle: 'transparent'
+                    },
                 },{
                     type: 'numeric',
                     fields: ['y'],
-                    position: 'left'
+                    position: 'left',
+                    grid: {
+                        even: {
+                            stroke: '#E7EBEF',
+                        },
+                        odd: {
+                            stroke: '#E7EBEF',
+                        }
+                    },
+                    style: {
+                        fill: '#fff',
+                        strokeStyle: 'transparent'
+                    },
                 }],
                 series: [{
                     type: 'bar',
@@ -43,7 +59,12 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     tooltip: {
                         trackMouse: true,
                         renderer: me.onBarTipRender
-                    }
+                    },
+                    style: {
+                        lineWidth: 0,
+                        strokeStyle: 'transparent',
+                        maxBarWidth: 50,
+                    },
                 }]
             }]
         });

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -177,12 +177,17 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         columnWidth : 0.75
     }, {
         xtype : "textfield", 
-        name : "ft_recorder", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        hidden:true
+    }, {
+        xtype : "textfield", 
+        name : "creator", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "ft_recorddate",
+        name : "createTime",
         fieldLabel : "录入日期",
         readOnly:true
     }