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

frontend/saas-web/app/view/core/form/field/ConDateField.js

@@ -61,6 +61,7 @@ Ext.define('saas.view.core.form.field.ConDateField', {
             allowBlank: allowBlank,
             flex: 1,
             fieldStyle: me.fieldStyle,
+            emptyText: '起始时间',
             //matchFieldWidth:true,
             listeners: {
                 change: function(f){
@@ -95,6 +96,7 @@ Ext.define('saas.view.core.form.field.ConDateField', {
             formatText: '',
             flex: 1,
             fieldStyle: me.fieldStyle,
+            emptyText: '结束时间',
             listeners: {
                 change: function(){
                     var from = me.from.value, to =me.to.value;

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

@@ -39,31 +39,31 @@ Ext.define('saas.view.home.InfoCard', {
         Ext.apply(me, {
             cards: {
                 unship: {
-                    title: '七天内待出货销售',
+                    title: '未出货销售订单',
                     color: 'yellow',
                     viewType: 'sale-sale-querypanel',
                     condition: 'sale.companyid=' + companyId + ' and sa_statuscode=\'AUDITED\' and exists (select 1 from saledetail detail where sd_id=saledetail.sd_id and  IFNULL(sd_sendqty,0)<ifnull(sd_qty,0) and TO_DAYS(sd_delivery)-TO_DAYS(now())<= 7)'
                 },
                 unstorage: {
-                    title: '七天内待入库采购',
+                    title: '未入库采购订单',
                     color: 'purple',
                     viewType: 'purchase-purchase-querypanel',
                     condition: 'purchase.companyId=' + companyId + ' and pu_statuscode=\'AUDITED\' and exists (select 1 from purchasedetail detail where pd_id=purchasedetail.pd_id and IFNULL(pd_acceptqty,0) < ifnull(pd_qty,0) and TO_DAYS(PD_DELIVERY)-TO_DAYS(now()) <= 7)'
                 },
                 unpay: {
-                    title: '七天内待付款',
+                    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)'
                 },
                 unreceive: {
-                    title: '七天内待收款',
+                    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()) <= 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)'
                 },
                 unauditcheck: {
-                    title: '未审核验收',
+                    title: '未审核验收单',
                     color: 'blue',
                     viewType: 'purchase-purchasein-querypanel',
                     condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'采购验收单\' and prodinout.companyId=' + companyId

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

@@ -81,7 +81,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     style: {
                         lineWidth: 0,
                         strokeStyle: 'transparent',
-                        maxBarWidth: 50,
+                        maxBarWidth: 30,
                     },
                 }]
             }]

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

@@ -75,7 +75,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     style: {
                         lineWidth: 0,
                         strokeStyle: 'transparent',
-                        maxBarWidth: 50,
+                        maxBarWidth: 30,
                     },
                 }]
             }]

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

@@ -124,7 +124,14 @@ Ext.define('saas.view.money.report.RecDetail', {
             text: '单据总金额',
             dataIndex: 'pi_total',
             xtype: 'numbercolumn',
-            width: 110
+            width: 110,
+            summaryType: 'sum',
+            summaryRenderer: 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);
+            }
         }, {
             text: '备注',
             dataIndex: 'pd_unit',