Browse Source

资金报表合计

rainco 7 years ago
parent
commit
55474c398c

+ 1 - 1
frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -58,7 +58,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
                 return Ext.util.Format.number(v, format);
-            },
+            }
         }, {
         }, {
             text: '往来单位',
             text: '往来单位',
             dataIndex: 'bcode'
             dataIndex: 'bcode'

+ 15 - 3
frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -85,11 +85,17 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             dataIndex: 'pd_total',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
+            renderer : 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);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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);
                 return Ext.util.Format.number(v, format);
             }
             }
         }, {
         }, {
@@ -101,10 +107,16 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             dataIndex: 'pd_nettotal',
             dataIndex: 'pd_nettotal',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
+            renderer : 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);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
                 return Ext.util.Format.number(v, format);
             }
             }

+ 37 - 9
frontend/saas-web/app/view/money/report/PayDetail.js

@@ -57,34 +57,55 @@ Ext.define('saas.view.money.report.PayDetail', {
             dataIndex: 've_beginapamount',
             dataIndex: 've_beginapamount',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             width: 140,
             width: 140,
+            renderer : 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);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: '本期付款金额',
             text: '本期付款金额',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
             dataIndex: 'pb_pdamount',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
-            summaryType: 'sum',
             width: 140,
             width: 140,
+            renderer : 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);
+            },
+            summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: '应付余额',
             text: '应付余额',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             dataIndex: 'mustpay',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
+            renderer : 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);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: '应付日期',
             text: '应付日期',
@@ -95,11 +116,18 @@ Ext.define('saas.view.money.report.PayDetail', {
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             dataIndex: 'pi_total',
             dataIndex: 'pi_total',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
+            renderer : 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);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: '备注',
             text: '备注',

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

@@ -62,37 +62,59 @@ Ext.define('saas.view.money.report.RecDetail', {
             text:'期初应收',
             text:'期初应收',
             dataIndex:'cu_beginaramount',
             dataIndex:'cu_beginaramount',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
+            renderer : 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);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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:'本期收款金额',
             text:'本期收款金额',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             dataIndex:'pb_pdamount',
             dataIndex:'pb_pdamount',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
+            renderer : 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);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
             }
         },{
         },{
             text: '应收余额',
             text: '应收余额',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             dataIndex: 'mustpay',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
+            renderer : 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);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                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: '应收日期',
             text: '应收日期',
-            dataIndex: 'mustdate'
+            dataIndex: 'mustdate',
+            xtype:'datecolumn'
         }, {
         }, {
             text: '单据总金额',
             text: '单据总金额',
             dataIndex: 'pi_total',
             dataIndex: 'pi_total',

+ 16 - 2
frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -72,11 +72,18 @@ Ext.define('saas.view.money.report.VendorCheck', {
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             dataIndex: 'qty',
             dataIndex: 'qty',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+	            var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+	            var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
             }
         }, {
         }, {
             text: '单价',
             text: '单价',
@@ -91,11 +98,18 @@ Ext.define('saas.view.money.report.VendorCheck', {
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
             dataIndex: 'pd_total',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
             xtype: 'numbercolumn',
+            renderer : 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);
+            },
             summaryType: 'sum',
             summaryType: 'sum',
             summaryRenderer: function(v) {
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
                 var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
             }
         }, {
         }, {
             text: '不含税单价',
             text: '不含税单价',