首页调整

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

@@ -6,7 +6,7 @@ Ext.define('saas.view.core.chart.ChartBase', {
     ],
 
     height: 300,
-    bodyPadding: '16 0 16 0',
+    bodyPadding: 16,
 
     layout: 'fit',
 

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

@@ -48,19 +48,19 @@ Ext.define('saas.view.home.InfoCard', {
                     title: '七天内待入库采购',
                     color: 'purple',
                     viewType: 'purchase-purchase-querypanel',
-                    condition: 'purchase.companyId=' + companyId + ' and pu_statuscode=\'AUDITED\' and exists (select 1 from purchasedetail where pd_puid=pu_id and IFNULL(pd_acceptqty,0)<ifnull(pd_qty,0) and TO_DAYS(PD_DELIVERY)-TO_DAYS(now()) <7)'
+                    condition: 'purchase.companyId=' + companyId + ' and pu_statuscode=\'AUDITED\' and exists (select 1 from purchasedetail where pd_puid=pu_id and IFNULL(pd_acceptqty,0) < ifnull(pd_qty,0) and TO_DAYS(PD_DELIVERY)-TO_DAYS(now()) <7)'
                 },
                 unpay: {
                     title: '七天内待付款',
                     color: 'red',
                     viewType: 'purchase-purchasein-querypanel',
-                    condition: 'pi_class in(\'采购验收单\',\'采购验退单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(ve_promisedays,0))-TO_DAYS(now())<7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
+                    condition: 'pi_class in(\'采购验收单\',\'采购验退单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(ve_promisedays,0))-TO_DAYS(now()) < 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
                 },
                 unreceive: {
                     title: '七天内待收款',
                     color: 'pink',
                     viewType: 'sale-saleout-querypanel',
-                    condition: 'pi_class in(\'出货单\',\'销售退货单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now())<7and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=1 and ifnull(sl_namount,0)<>0)'
+                    condition: 'pi_class in(\'出货单\',\'销售退货单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now()) < 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=1 and ifnull(sl_namount,0)<>0)'
                 },
                 unauditcheck: {
                     title: '未审核验收',

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

@@ -19,7 +19,7 @@ $max-card-width: 235px;
             
                     .x-box {
                         padding: 16px;
-                        height: 131px;
+                        height: 120px;
                         border-radius: 0.5rem;
                         box-shadow: 0 0 1px rgba(0,0,0,.125), 0 1px 3px rgba(0,0,0,.2);
                         position: relative;

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

@@ -40,10 +40,10 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     minimum: 0,
                     grid: {
                         even: {
-                            stroke: '#E7EBEF'
+                            stroke: '#F7F8FA'
                         },
                         odd: {
-                            stroke: '#E7EBEF',
+                            stroke: '#F7F8FA',
                         }
                     },
                     style: {
@@ -55,7 +55,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     position: 'bottom',
                     fields: ['x'],
                     style: {
-                        fill: '#E7EBEF',
+                        fill: '#F7F8FA',
                         strokeStyle: 'transparent'
                     },
                 }],

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

@@ -32,7 +32,7 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                     fields: ['x'],
                     position: 'bottom',
                     style: {
-                        fill: '#E7EBEF',
+                        fill: '#F7F8FA',
                         strokeStyle: 'transparent'
                     },
                 },{
@@ -42,10 +42,10 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                     adjustByMajorUnit: true,
                     grid: {
                         even: {
-                            stroke: '#E7EBEF'
+                            stroke: '#F7F8FA'
                         },
                         odd: {
-                            stroke: '#E7EBEF',
+                            stroke: '#F7F8FA',
                         }
                     },
                     style: {

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

@@ -36,7 +36,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     fields: ['x'],
                     position: 'bottom',
                     style: {
-                        fill: '#E7EBEF',
+                        fill: '#F7F8FA',
                         strokeStyle: 'transparent'
                     },
                     renderer: me.categoryRender
@@ -46,10 +46,10 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     position: 'left',
                     grid: {
                         even: {
-                            stroke: '#E7EBEF'
+                            stroke: '#F7F8FA'
                         },
                         odd: {
-                            stroke: '#E7EBEF',
+                            stroke: '#F7F8FA',
                         }
                     },
                     style: {

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

@@ -41,8 +41,13 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',
+                    label: {
+                        style: {
+                            fontSize: 12,
+                        }
+                    },
                     style: {
-                        fill: '#E7EBEF',
+                        fill: '#F7F8FA',
                         strokeStyle: 'transparent'
                     },
                     renderer: me.categoryRender
@@ -52,10 +57,10 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                     position: 'left',
                     grid: {
                         even: {
-                            stroke: '#E7EBEF',
+                            stroke: '#F7F8FA',
                         },
                         odd: {
-                            stroke: '#E7EBEF',
+                            stroke: '#F7F8FA',
                         }
                     },
                     style: {

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

@@ -36,7 +36,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     fields: ['x'],
                     position: 'bottom',
                     style: {
-                        fill: '#E7EBEF',
+                        fill: '#F7F8FA',
                         strokeStyle: 'transparent'
                     },
                     renderer: me.categoryRender
@@ -46,10 +46,10 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     position: 'left',
                     grid: {
                         even: {
-                            stroke: '#E7EBEF',
+                            stroke: '#F7F8FA',
                         },
                         odd: {
-                            stroke: '#E7EBEF',
+                            stroke: '#F7F8FA',
                         }
                     },
                     style: {