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

frontend/saas-web/app/util/BaseUtil.js

@@ -133,7 +133,7 @@ Ext.define('saas.util.BaseUtil', {
         },
 
         getCurrentUser: function () {
-            return saas.util.State.get('session') ? saas.util.State.get('session').account : {};
+            return saas.util.State.get('session') ? (saas.util.State.get('session').account || {}) : {};
         },
 
         /**

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -55,7 +55,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }

frontend/saas-web/app/view/core/dbfind/AddMultiDbfindGridPanel.js

@@ -95,7 +95,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }

frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.js

@@ -36,7 +36,7 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }

frontend/saas-web/app/view/core/dbfind/MultiDbfindGridPanel.js

@@ -95,7 +95,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js

@@ -54,7 +54,7 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
         xtype: 'numbercolumn',
         width:80,
         renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
     }, {
         text: "业务员编号",

frontend/saas-web/app/view/core/dbfind/types/OriOrderMutiDbfindTrigger.js

@@ -40,17 +40,26 @@ Ext.define('saas.view.core.dbfind.types.OriOrderMutiDbfindTrigger', {
         "text": "单据金额(元)",
         "dataIndex": "sl_orderamount",
         "width": 110,
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },
     }, {
         "text": "已核销金额(元)",
         "dataIndex": "sl_yamount",
         "width": 120,
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },
     }, {
         "text": "未核销金额(元)",
         "dataIndex": "sl_namount",
         "width": 120,
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },
     },{
         "text": "单据日期",
         "dataIndex": "sl_date",

frontend/saas-web/app/view/core/dbfind/types/ProductAddMultiDbfindTrigger.js

@@ -68,10 +68,7 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
         width: 100,
         xtype: 'numbercolumn',
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
         text: "采购提前期",
@@ -94,12 +91,18 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
         text: "最新采购单价(元)",
         dataIndex: "pr_purcprice",
         xtype: 'numbercolumn',
-        hidden:true
+        hidden:true,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
+        }
     }, {
         text: "最新出货单价(元)",
         dataIndex: "pr_saleprice",
         xtype: 'numbercolumn',
-        hidden:true
+        hidden:true,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
+        }
     }, {
         dataIndex: '',
         flex: 1

frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js

@@ -63,10 +63,7 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
         width: 100,
         xtype: 'numbercolumn',
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     },{
         text: "采购提前期",
@@ -89,17 +86,26 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
         text: "最新采购单价(元)",
         dataIndex: "pr_purcprice",
         xtype: 'numbercolumn',
-        hidden:true
+        hidden:true,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
+        }
     }, {
         text: "最新出货单价(元)",
         dataIndex: "pr_saleprice",
         xtype: 'numbercolumn',
-        hidden:true
+        hidden:true,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
+        }
     }, {
         text: "成本单价(元)",
         dataIndex: "po_avprice",
         xtype: 'numbercolumn',
-        hidden:true
+        hidden:true,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
+        }
     }, {
         dataIndex: '',
         flex: 1

frontend/saas-web/app/view/core/dbfind/types/ProductMultiDbfindTrigger.js

@@ -70,10 +70,7 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
         width: 100,
         xtype: 'numbercolumn',
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
         text: "采购提前期",
@@ -96,17 +93,26 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
         text: "最新采购单价(元)",
         dataIndex: "pr_purcprice",
         xtype: 'numbercolumn',
-        hidden:true
+        hidden:true,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
+        }
     }, {
         text: "最新出货单价(元)",
         dataIndex: "pr_saleprice",
         xtype: 'numbercolumn',
-        hidden:true
+        hidden:true,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
+        }
     }, {
         text: "成本单价(元)",
         dataIndex: "po_avprice",
         xtype: 'numbercolumn',
-        hidden:true
+        hidden:true,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
+        }
     }, {
         dataIndex: '',
         flex: 1

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -56,13 +56,7 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
         xtype: 'numbercolumn',
         align:'end',
         renderer : function(v) {
-            if(!v) {
-                return 0;
-            }
-            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);
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
     }, {
         text: "备注",

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -92,7 +92,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 if(response.timedout) {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
-                                    saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                    saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                                 }
                             }
                         }

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

@@ -226,7 +226,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                             if (response.timedout) {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             } else {
-                                saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }
@@ -305,12 +305,12 @@ Ext.define('saas.view.core.report.ReportPanel', {
             } else if (c.xtype == 'numbercolumn') {
                 Ext.applyIf(c, {
                     align: 'end', // 数字右对齐
-                    renderer: function (v) {
-                        var arr = (v + '.').split('.');
-                        var xr = (new Array(arr[1].length)).fill('0');
-                        var format = '0.' + xr.join('');
-                        return Ext.util.Format.number(v, format);
-                    },
+                    // renderer: function (v) {
+                    //     var arr = (v + '.').split('.');
+                    //     var xr = (new Array(arr[1].length)).fill('0');
+                    //     var format = '0.' + xr.join('');
+                    //     return Ext.util.Format.number(v, format);
+                    // },
                     exportStyle:{
                         format: c.exportFormat || 'Total',
                         alignment: {

frontend/saas-web/app/view/document/address/DataListModel.js

@@ -29,7 +29,7 @@ Ext.define('saas.view.document.address.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

frontend/saas-web/app/view/document/bankinformation/DataList.js

@@ -39,10 +39,7 @@ Ext.define('saas.view.document.bankinformation.DataList', {
                 dataIndex: 'bk_beginamount',
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 flex: 1
             },{
@@ -50,10 +47,7 @@ Ext.define('saas.view.document.bankinformation.DataList', {
                 dataIndex: 'bk_thisamount',
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 flex: 1
             },{

frontend/saas-web/app/view/document/bankinformation/DataListModel.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.document.bankinformation.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

frontend/saas-web/app/view/document/bankinformation/Window.js

@@ -24,10 +24,7 @@ Ext.define('saas.view.document.bankinformation.Window', {
             dataIndex: 'bk_beginamount',
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             flex: 1
         },{
@@ -35,10 +32,7 @@ Ext.define('saas.view.document.bankinformation.Window', {
             dataIndex: 'bk_thisamount',
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             flex: 1
         },{

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -187,7 +187,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                     maxLength: 10,
                 },
                 renderer : function(v) {
-                    return saas.util.BaseUtil.numberFormat(v, 3, true);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 }
             }, {
                 text : "单位", 

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -103,7 +103,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
             xtype: 'numbercolumn', 
             width : 110.0, 
             renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
+                return saas.util.BaseUtil.numberFormat(v, 2, false);
             }
         }, {
             text : "结算天数", 
@@ -118,10 +118,7 @@ Ext.define('saas.view.document.customer.BasePanel', {
             dataIndex: 'cu_leftamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text : "业务员", 

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -100,10 +100,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         decimalPrecision: 2,
         minValue:0,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     },{ 
         xtype : "numberfield", 
@@ -115,10 +112,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         decimalPrecision: 2,
         minValue:0,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },   
     },{
         xtype : "numberfield", 
@@ -144,13 +138,10 @@ Ext.define('saas.view.document.customer.FormPanel', {
         fieldLabel : "额度", 
         allowBlank : true, 
         columnWidth : 0.25,
-        decimalPrecision: 8,
+        decimalPrecision: 2,
         minValue:0,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }, {
         xtype : "hidden", 
@@ -200,12 +191,9 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank : true, 
         readOnly:true,
         columnWidth : 0.25,
-        decimalPrecision: 8,
+        decimalPrecision: 2,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     },{
         xtype : "datefield", 

frontend/saas-web/app/view/document/employee/DataListModel.js

@@ -31,7 +31,7 @@ Ext.define('saas.view.document.employee.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

frontend/saas-web/app/view/document/kind/KindModel.js

@@ -31,7 +31,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }
@@ -70,7 +70,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }
@@ -109,7 +109,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }
@@ -149,7 +149,7 @@ Ext.define('saas.view.document.kind.KindModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

frontend/saas-web/app/view/document/product/BasePanel.js

@@ -101,10 +101,7 @@ Ext.define('saas.view.document.product.BasePanel', {
             xtype: 'numbercolumn',
             width : 100.0,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }, {
             text : "单位", 

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -129,13 +129,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision: 4,
-        minValue:0,
-        renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        }
+        minValue:0
     },{
         xtype : "numberfield", 
         name : "pr_zxbzs", 
@@ -181,13 +175,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision: 4,
-        minValue:0,
-        renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        }
+        minValue:0
     },{
         ignore:true,
         readOnly:true,
@@ -195,13 +183,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_saleprice", 
         fieldLabel : "最新售价(元)", 
         decimalPrecision: 4,
-        minValue:0,
-        renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        }
+        minValue:0
     },{  
         hidden:true,
         xtype : "datefield", 
@@ -299,17 +281,11 @@ Ext.define('saas.view.document.product.FormPanel', {
                 edit:'amount_change'
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             },
             summaryType: 'sum',
             summaryRenderer: 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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         },
         {
@@ -321,7 +297,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             allowBlank : true,
             editor : {
                 xtype : "numberfield",
-                decimalPrecision: 8,
+                decimalPrecision: 4,
                 allowDecimals: true,
                 minValue:0
             },
@@ -329,10 +305,7 @@ Ext.define('saas.view.document.product.FormPanel', {
                 edit:'amount_change'
             },
             renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
             },
         },
         {
@@ -343,17 +316,11 @@ Ext.define('saas.view.document.product.FormPanel', {
             width : 110.0,
             allowBlank : true,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }],

frontend/saas-web/app/view/document/productbrand/DataListModel.js

@@ -28,7 +28,7 @@ Ext.define('saas.view.document.productbrand.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

frontend/saas-web/app/view/document/productunit/DataListModel.js

@@ -28,7 +28,7 @@ Ext.define('saas.view.document.productunit.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -96,7 +96,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             dataIndex : "ve_taxrate", 
             width : 80.0, 
             renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
+                return saas.util.BaseUtil.numberFormat(v, 2, false);
             }
         }, {
             text : "结算天数", 
@@ -112,10 +112,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             dataIndex : 've_leftamount',
             width : 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text : "备注", 

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -106,10 +106,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         decimalPrecision: 2,
         minValue:0,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     },{ 
         xtype : "numberfield", 
@@ -121,10 +118,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         decimalPrecision: 2,
         minValue:0,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },    
     },{
         xtype : "numberfield", 
@@ -187,12 +181,9 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         readOnly:true,
         ignore:true,
         columnWidth : 0.25,
-        decimalPrecision: 8,
+        decimalPrecision: 2,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },  
     },
     {

frontend/saas-web/app/view/document/warehouse/DataListModel.js

@@ -32,7 +32,7 @@ Ext.define('saas.view.document.warehouse.DataListModel', {
                             }
                         }else {
                             console.error('exception: ', response);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                            saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                         }
                     }
                 }

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

@@ -38,7 +38,7 @@ Ext.define('saas.view.home.HomeModel', {
                         p && p.setLoading(false);
 
                     if(!d) return;
-                    var res = d[0].data.data || {};
+                    var res = d[0] ? (d[0].data ? (d[0].data.data || {}) : {}) : {};
 
                     Ext.getCmp('infocard').addCardItems(res);
                 }

frontend/saas-web/app/view/home/infoCardList/InfoList.js

@@ -60,6 +60,7 @@ Ext.define('saas.view.home.infoCardList.InfoList', {
                     },
                     reader: {
                         type: 'json',
+                        readRecordsOnFailure: false,
                         rootProperty: 'data.list',
                         totalProperty: 'data.total',
                     },
@@ -73,7 +74,7 @@ Ext.define('saas.view.home.infoCardList.InfoList', {
                                 if(response.timedout) {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
-                                    saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                    saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                                 }
                             }
                         }

frontend/saas-web/app/view/home/infoCardList/Payment.js

@@ -51,10 +51,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         dataIndex: 'pi_total',
         width: 80,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     },{
         text: '付款状态',
@@ -103,10 +100,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         width: 110,
         hidden: true,
         renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
         text: '仓库',
@@ -119,10 +113,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         xtype: 'numbercolumn',
         hidden: true,
         renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         },
         width: 110
     }, {
@@ -132,7 +123,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         hidden: true,
         width: 80,
         renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         },
     }, {
         text: '金额(元)',
@@ -141,10 +132,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         width: 110,
         hidden: true,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }],
     listeners: {

frontend/saas-web/app/view/home/infoCardList/PurchaseIn.js

@@ -73,10 +73,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         xtype: 'numbercolumn',
         width: 110,
         renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
         text: '单位',
@@ -93,10 +90,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         xtype: 'numbercolumn',
         width: 110,
         renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
         text: '税率',
@@ -104,7 +98,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         xtype: 'numbercolumn',
         width: 80,
         renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         },
     }, {
         text: '金额(元)',
@@ -112,10 +106,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         xtype: 'numbercolumn',
         width: 110,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '备注',

frontend/saas-web/app/view/home/infoCardList/Recment.js

@@ -42,7 +42,10 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         text: '总金额(元)',
         dataIndex: 'pi_total',
         xtype:'numbercolumn',
-        width: 110
+        width: 110,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },
     },{
         text: '收款状态',
         align: 'center',
@@ -98,10 +101,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         width: 110,
         hidden:true,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '销售单价(元)',
@@ -110,10 +110,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         hidden:true,
         width: 140,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
         text: '金额(元)',
@@ -122,10 +119,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         width: 110,
         hidden:true,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '税率',
@@ -134,7 +128,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         width: 80,
         hidden:true,
         renderer : function(v) {
-            return Ext.util.Format.number(v, '0');
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
     }, {
         text: '成本单价(元)',
@@ -143,10 +137,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         width: 140,
         hidden:true,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
         text: '备注',

frontend/saas-web/app/view/home/infoCardList/SaleOut.js

@@ -77,10 +77,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         xtype: 'numbercolumn',
         width: 110,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
         text: '单位',
@@ -92,10 +89,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         xtype: 'numbercolumn',
         width: 110,
         renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         },
     }, {
         text: '已出货数',
@@ -103,10 +97,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         xtype: 'numbercolumn',
         width: 110,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
         text: '备注',

frontend/saas-web/app/view/home/infoCardList/UnauditCheckIn.js

@@ -51,10 +51,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         dataIndex: 'pi_total',
         width: 80,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     },{
         text: '付款状态',
@@ -103,10 +100,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         width: 110,
         hidden: true,
         renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
         text: '仓库',
@@ -119,10 +113,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         hidden: true,
         xtype: 'numbercolumn',
         renderer: function (v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         },
         width: 110
     }, {
@@ -132,7 +123,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         hidden: true,
         width: 80,
         renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         },
     }, {
         text: '金额(元)',
@@ -141,10 +132,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         hidden: true,
         width: 110,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }],
     listeners: {

frontend/saas-web/app/view/home/infoCardList/UnauditSaleOut.js

@@ -42,7 +42,10 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
         text: '总金额(元)',
         dataIndex: 'pi_total',
         xtype:'numbercolumn',
-        width: 110
+        width: 110,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },
     },{
         text: '收款状态',
         align: 'center',
@@ -95,10 +98,7 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
         width: 110,
         hidden:true,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '销售单价(元)',
@@ -107,10 +107,7 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
         width: 140,
         hidden:true,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
         text: '金额(元)',
@@ -119,10 +116,7 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
         width: 110,
         hidden:true,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '税率',
@@ -131,7 +125,7 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
         width: 80,
         hidden:true,
         renderer : function(v) {
-            return Ext.util.Format.number(v, '0');
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
     }, {
         text: '成本单价(元)',
@@ -140,10 +134,7 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
         width: 140,
         hidden:true,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
         text: '备注',

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

@@ -132,17 +132,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     decimalPrecision: 2
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text : "结算方式",

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

@@ -104,10 +104,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             dataIndex: 'ftd_nowbalance',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
         }, {
             text: '结算方式',

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

@@ -123,17 +123,11 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                     decimalPrecision: 2
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text : "备注", 

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -46,7 +46,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             xtype: 'numbercolumn',
                             width:80,
                             renderer: function (v) {
-                                return Ext.util.Format.number(v, '0');
+                                return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         },{
                             text: "应收款余额",
@@ -54,13 +54,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             width:110,
                             xtype: 'numbercolumn',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, true);
                             }
                         }, {
                             text: "结算天数",
@@ -68,7 +62,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             width:110,
                             xtype: 'numbercolumn',
                             renderer: function (v) {
-                                return Ext.util.Format.number(v, '0');
+                                return saas.util.BaseUtil.numberFormat(v, 0, false);
                             }
                         }, {
                             text: "额度",

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -122,10 +122,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             dataIndex: 'or_amount',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '单据状态',
@@ -164,10 +161,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             dataIndex: 'or_amount',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '单据状态',
@@ -182,7 +176,10 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             text: '明细金额(元)',
             xtype: 'numbercolumn',
             dataIndex: 'ord_nowbalance',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
         } ,{
             text: '备注',
             dataIndex: 'ord_remark',

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

@@ -123,17 +123,11 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                     decimalPrecision: 2
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text : "备注", 

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -32,13 +32,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             xtype: 'numbercolumn',
                             align:'end',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         }, {
                             text: "应付款余额",
@@ -46,13 +40,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             width:110,
                             xtype: 'numbercolumn',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, true);
                             }
                         },{
                             text: "结算天数",

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -120,10 +120,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             dataIndex: 'os_amount',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '单据状态',
@@ -163,10 +160,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             dataIndex: 'os_amount',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '单据状态',
@@ -181,7 +175,10 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             text: '明细金额(元)',
             xtype: 'numbercolumn',
             dataIndex: 'osd_nowbalance',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
         },{
             text: '备注',
             dataIndex: 'osd_remark',

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

@@ -133,17 +133,11 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 decimalPrecision: 2
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: "结算方式",
@@ -237,17 +231,11 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             dataIndex: "pbd_amount", 
             width : 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: "已核销金额",
@@ -256,17 +244,11 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             width : 110,
             ignore:true,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: "未核销金额",
@@ -275,17 +257,11 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             ignore:true, 
             width : 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: "本次核销金额",
@@ -298,17 +274,11 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             },
             allowBlank : false,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '备注',

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -33,13 +33,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             xtype: 'numbercolumn',
                             align:'end',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         }, {
                             text: "应付款余额",
@@ -47,13 +41,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             width:110,
                             xtype: 'numbercolumn',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, true);
                             }
                         },{
                             text: "结算天数",

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -139,10 +139,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             dataIndex: 'pd_amount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
         } ,{
             text: '结算方式',

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

@@ -137,17 +137,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 decimalPrecision: 2
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: "结算方式",
@@ -244,17 +238,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             dataIndex: "rbd_amount",
             width:110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: "已核销金额(元)",
@@ -263,17 +251,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             width:110,
             ignore:true,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: "未核销金额(元)",
@@ -282,17 +264,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             width:110,
             ignore:true,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: "本次核销金额(元)",
@@ -305,17 +281,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             },
             allowBlank : false,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -47,7 +47,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             xtype: 'numbercolumn',
                             width:80,
                             renderer: function (v) {
-                                return Ext.util.Format.number(v, '0');
+                                return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         },{
                             text: "应收款余额",
@@ -55,13 +55,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             width:110,
                             xtype: 'numbercolumn',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, true);
                             }
                         }, {
                             text: "结算天数",

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -130,10 +130,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             dataIndex: 'rd_amount',
             width: 100,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '结算方式',

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

@@ -80,10 +80,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         dataIndex: 'qty',
         width: 110,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '单位',
@@ -96,10 +93,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         xtype: 'numbercolumn',
         width: 120,
         renderer: function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
         text: '含税单价(元)',
@@ -108,10 +102,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         xtype: 'numbercolumn',
         width: 120,
         renderer: function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
         text: '金额(元)',
@@ -120,10 +111,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         width: 120,
         dataIndex: 'pd_nettotal',
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }, {
         text: '税率(%)',
@@ -132,7 +120,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         xtype: 'numbercolumn',
         width: 80,
         renderer: function(v) {
-            return Ext.util.Format.number(v, '0');
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
     }, {
         text: '税额(元)',
@@ -141,10 +129,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         exportFormat: 'Amount',
         dataIndex: 'pd_ordertotal-pd_nettotal',
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '价税合计(元)',
@@ -153,10 +138,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         exportFormat: 'Amount',
         dataIndex: 'pd_ordertotal',
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }],
 

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

@@ -85,17 +85,11 @@ Ext.define('saas.view.money.report.OtherIODetail', {
         exportFormat: 'Amount',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '支出',
@@ -103,17 +97,11 @@ Ext.define('saas.view.money.report.OtherIODetail', {
         exportFormat: 'Amount',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '往来单位',

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

@@ -51,17 +51,11 @@ Ext.define('saas.view.money.report.PayDetail', {
         dataIndex: 'pd_addpay',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '增加预付',
@@ -70,17 +64,11 @@ Ext.define('saas.view.money.report.PayDetail', {
         dataIndex: 'pd_addpre',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '应付余额',
@@ -89,17 +77,11 @@ Ext.define('saas.view.money.report.PayDetail', {
         dataIndex: 'pd_remain',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'customize_last',
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         mySummaryRenderer: function(grid, column, datas) {
             var store = grid.store,

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

@@ -52,17 +52,11 @@ Ext.define('saas.view.money.report.RecDetail', {
         xtype: 'numbercolumn',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '增加预收',
@@ -71,17 +65,11 @@ Ext.define('saas.view.money.report.RecDetail', {
         dataIndex: 'rd_addpre',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '应收余额',
@@ -90,17 +78,11 @@ Ext.define('saas.view.money.report.RecDetail', {
         dataIndex: 'rd_remain',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'customize_last',
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         mySummaryRenderer: function (grid, column, datas) {
             datas = datas || [];

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

@@ -52,10 +52,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             dataIndex: 'vm_beginpreamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '应付',
@@ -64,10 +61,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             dataIndex: 'vm_beginamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -79,10 +73,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             dataIndex: 'vm_nowpreamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '应付',
@@ -91,10 +82,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             dataIndex: 'vm_nowamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '核销',
@@ -103,10 +91,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             dataIndex: 'vm_nowpayamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             } 
         }]
     }, {
@@ -118,17 +103,11 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             xtype: 'numbercolumn',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '应付',
@@ -137,17 +116,11 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             xtype: 'numbercolumn',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -157,17 +130,11 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         xtype: 'numbercolumn',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         dataIndex: '',

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

@@ -52,10 +52,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             dataIndex: 'cm_beginpreamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '应收',
@@ -64,10 +61,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             dataIndex: 'cm_beginamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -79,10 +73,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             dataIndex: 'cm_nowpreamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '应收',
@@ -91,10 +82,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             dataIndex: 'cm_nowamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '核销',
@@ -103,10 +91,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             dataIndex: 'cm_nowpayamount',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             } 
         }]
     }, {
@@ -118,17 +103,11 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             xtype: 'numbercolumn',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '应收',
@@ -137,17 +116,11 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             xtype: 'numbercolumn',
             width: 120,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -157,17 +130,11 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         xtype: 'numbercolumn',
         width: 120,
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         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);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         dataIndex: '',

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

@@ -86,7 +86,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 110,
         renderer: function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '单位',
@@ -126,7 +126,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 80,
         renderer : function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 2, true);
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         },
     }, {
         text: '税额(元)',

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

@@ -106,17 +106,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 dataIndex: "vd_amount",
                 width: 110,
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text: "已核销金额",
@@ -125,17 +119,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 width: 110,
                 ignore:true,
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text: "未核销金额",
@@ -144,17 +132,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 width: 110,
                 ignore:true,
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text: "本次核销金额",
@@ -167,17 +149,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 },
                 allowBlank : false,
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }]
         },
@@ -228,17 +204,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 dataIndex: "vcd_amount",
                 width: 110,
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text: "已核销金额",
@@ -247,17 +217,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 width: 110,
                 ignore:true,
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text: "未核销金额",
@@ -266,17 +230,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 width: 110,
                 ignore:true,
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text: "本次核销金额",
@@ -289,17 +247,11 @@ Ext.define('saas.view.money.verification.FormPanel', {
                     decimalPrecision: 2
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }]
         },

frontend/saas-web/app/view/money/verification/FormPanelController.js

@@ -47,7 +47,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             xtype: 'numbercolumn',
                             width:80,
                             renderer: function (v) {
-                                return Ext.util.Format.number(v, '0');
+                                return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         },{
                             text: "应收款余额",
@@ -55,13 +55,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             width:110,
                             xtype: 'numbercolumn',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, true);
                             }
                         }, {
                             text: "结算天数",
@@ -135,7 +129,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             xtype: 'numbercolumn',
                             width:80,
                             renderer: function (v) {
-                                return Ext.util.Format.number(v, '0');
+                                return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         },{
                             text: "应收款余额",
@@ -143,13 +137,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             width:110,
                             xtype: 'numbercolumn',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, true);
                             }
                         }, {
                             text: "结算天数",
@@ -209,13 +197,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             xtype: 'numbercolumn',
                             align:'end',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         }, {
                             text: "应付款余额",
@@ -223,13 +205,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             width:110,
                             xtype: 'numbercolumn',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, true);
                             }
                         },{
                             text: "结算天数",
@@ -296,13 +272,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             xtype: 'numbercolumn',
                             align:'end',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         }, {
                             text: "应付款余额",
@@ -310,13 +280,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             width:110,
                             xtype: 'numbercolumn',
                             renderer : function(v) {
-                                if(!v) {
-                                    return 0;
-                                }
-                                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);
+                                return saas.util.BaseUtil.numberFormat(v, 2, true);
                             }
                         },{
                             text: "结算天数",

frontend/saas-web/app/view/money/verification/QueryPanel.js

@@ -124,10 +124,7 @@ Ext.define('saas.view.money.verification.QueryPanel', {
             xtype: 'numbercolumn',
             width: 100,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -158,11 +158,11 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         minValue: 0
                     },
                     renderer: function (v) {
-                        return saas.util.BaseUtil.numberFormat(v, 3, true);
+                        return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
                     summaryRenderer: function (v) {
-                        return saas.util.BaseUtil.numberFormat(v, 3, true);
+                        return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 }, {
                     text: "单位",
@@ -233,7 +233,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         maxValue: 100
                     },
                     renderer: function (v) {
-                        return Ext.util.Format.number(v, '0');
+                        return saas.util.BaseUtil.numberFormat(v, 2, false);
                     }
                 }, {
                     text: "税额(元)",

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -207,7 +207,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             renderer : function(v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }, {
             text: '单位',

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -204,11 +204,11 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 minValue: 0
             },
             renderer: function (v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             },
             summaryType: 'sum',
             summaryRenderer: function (v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }, {
             text: "单位",
@@ -281,7 +281,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 maxValue: 100
             },
             renderer: function (v) {
-                return Ext.util.Format.number(v, '0');
+                return saas.util.BaseUtil.numberFormat(v, 2, false);
             },
         }, {
             text: "税额(元)",

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -141,7 +141,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             text: '币别',
             dataIndex: 'pi_currency',
             width: 65
-        },{
+        }, {
             text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
@@ -214,8 +214,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
-            },
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
+            }
         }, {
             text: '单位',
             dataIndex: 'pr_unit',

frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -199,11 +199,11 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 minValue: 0
             },
             renderer: function (v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             },
             summaryType: 'sum',
             summaryRenderer: function (v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }, {
             text: "单位",
@@ -274,7 +274,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 maxValue: 100
             },
             renderer: function (v) {
-                return Ext.util.Format.number(v, '0');
+                return saas.util.BaseUtil.numberFormat(v, 2, false);
             },
         }, {
             text: "税额(元)",

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -138,12 +138,18 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             text: '金额(元)',
             xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
         }, {
             text: '价税合计(元)',
             xtype: 'numbercolumn',
             dataIndex: 'pi_total',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
         },{
             text: '币别',
             dataIndex: 'pi_currency',
@@ -220,10 +226,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             renderer: function (v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             },
         }, {
             text: '单位',
@@ -234,10 +237,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pd_netprice',
             xtype: 'numbercolumn',
             renderer: function (v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
             },
             width: 110
         }, {
@@ -245,10 +245,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pd_netprice',
             xtype: 'numbercolumn',
             renderer: function (v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
             },
             width: 110
         }, {
@@ -257,10 +254,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
         }, {
             text: '税额(元)',
@@ -268,11 +262,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             renderer: function (v, g, r) {
-                v = (r.data["pd_ordertotal"] || 0.0) - (r.data["pd_nettotal"] || 0.0);
-                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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '价税合计(元)',
@@ -280,10 +270,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
         }, {
             text: '关联验收单号',

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -93,10 +93,10 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 110,
         summaryType: 'sum',
         renderer: function (v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
         summaryRenderer: function (v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '收货数量',
@@ -153,7 +153,10 @@ Ext.define('saas.view.purchase.report.Purchase', {
         dataIndex: 'pd_taxrate',
         exportFormat: 'Integer',
         xtype: 'numbercolumn',
-        width: 80
+        width: 80,
+        renderer: function (v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
+        },
     }, {
         text: '税额(元)',
         dataIndex: 'pd_total-pd_taxtotal',

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

@@ -91,12 +91,12 @@ Ext.define('saas.view.sale.report.Sale', {
         xtype: 'numbercolumn',
         width: 110,
         renderer : function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
         summaryType: 'sum',
         summaryLabel: '销售数量',
         summaryRenderer: function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 2, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '单位',
@@ -140,9 +140,9 @@ Ext.define('saas.view.sale.report.Sale', {
         exportFormat: 'Integer',
         width: 80,
         xtype: 'numbercolumn',
-        renderer : function(v) {
-            return Ext.util.Format.number(v, '0');
-        }
+        renderer: function (v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
+        },
     }, {
         text: '税额(元)',
         xtype: 'numbercolumn',
@@ -178,12 +178,12 @@ Ext.define('saas.view.sale.report.Sale', {
         xtype: 'numbercolumn',
         width: 110,
         renderer : function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
         summaryType: 'sum',
         summaryLabel: '出货数量',
         summaryRenderer: function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 2, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text : "备注", 

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

@@ -83,7 +83,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         xtype: 'numbercolumn',
         width: 110,
         renderer : function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '单位',
@@ -121,8 +121,8 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         exportFormat: 'Integer',
         xtype: 'numbercolumn',
         width: 80,
-        renderer: function(v) {
-            return Ext.util.Format.number(v, '0');
+        renderer: function (v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
     }, {
         text: '税额(元)',

frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -183,11 +183,11 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         minValue: 0
                     },
                     renderer: function (v) {
-                        return saas.util.BaseUtil.numberFormat(v, 3, true);
+                        return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
                     summaryRenderer: function (v) {
-                        return saas.util.BaseUtil.numberFormat(v, 3, true);
+                        return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 }, {
                     text: "单位",
@@ -258,7 +258,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         maxValue: 100
                     },
                     renderer: function (v) {
-                        return Ext.util.Format.number(v, '0');
+                        return saas.util.BaseUtil.numberFormat(v, 2, false);
                     }
                 }, {
                     text: "税额(元)",

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -118,10 +118,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '价税合计(元)',
@@ -129,10 +126,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '审核状态',
@@ -207,10 +201,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             },
         }, {
             text: '单位',
@@ -222,10 +213,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
             },
         }, {
             text: '金额(元)',
@@ -233,10 +221,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '税额(元)',
@@ -244,11 +229,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             renderer : function(v,g,r) {
-                v = (r.data["sd_total"]||0.0) - (r.data["sd_nettotal"]||0.0);
-                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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         },{
             text: '价税合计(元)',
@@ -256,10 +237,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '备注',

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -224,11 +224,11 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     minValue:0
                 },
                 renderer : function(v) {
-                    return saas.util.BaseUtil.numberFormat(v, 3, true);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 },
                 summaryType: 'sum',
                 summaryRenderer: function(v) {
-                    return saas.util.BaseUtil.numberFormat(v, 3, true);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 }
             },{
                 text : "单位", 
@@ -298,9 +298,9 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     minValue: 0,
                     maxValue: 100
                 },
-                renderer : function(v) {
-                    return Ext.util.Format.number(v, '0');
-                },
+                renderer: function (v) {
+                    return saas.util.BaseUtil.numberFormat(v, 2, false);
+                }
             }, {
                 text: "税额(元)",
                 xtype: 'numbercolumn',

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -122,10 +122,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '价税合计(元)',
@@ -133,10 +130,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '审核状态',
@@ -210,10 +204,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }, {
             text: '单位',
@@ -225,10 +216,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
             }
         }, {
             text: '含税单价(元)',
@@ -236,10 +224,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
             }
         }, {
             text: '金额(元)',
@@ -247,10 +232,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '税额(元)',
@@ -258,11 +240,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v,g,r) {
-                v = (r.data["pd_ordertotal"]||0.0) - (r.data["pd_nettotal"]||0.0);
-                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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '价税合计(元)',
@@ -270,10 +248,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '关联出货单号',

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -232,11 +232,11 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 minValue: 0
             },
             renderer: function (v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             },
             summaryType: 'sum',
             summaryRenderer: function (v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }, {
             text: "单位",
@@ -307,7 +307,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 maxValue: 100
             },
             renderer: function (v) {
-                return Ext.util.Format.number(v, '0');
+                return saas.util.BaseUtil.numberFormat(v, 2, false);
             }
         }, {
             text: "税额(元)",

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -120,12 +120,18 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '金额(元)',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
         }, {
             text: '价税合计(元)',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
         }, {
             text: '审核状态',
             align: 'center',
@@ -198,10 +204,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }, {
             text: '单位',
@@ -213,10 +216,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
             }
         }, {
             text: '含税单价(元)',
@@ -224,10 +224,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                var format = '0.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
             }
         }, {
             text: '金额(元)',
@@ -235,10 +232,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '税额(元)',
@@ -246,11 +240,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v,g,r) {
-                v = (r.data["pd_ordertotal"]||0.0) - (r.data["pd_nettotal"]||0.0);
-                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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '价税合计(元)',
@@ -258,10 +248,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
             text: '关联销售单号',

frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -173,17 +173,11 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                     minValue:0
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 },
                 summaryType: 'sum',
                 summaryRenderer: 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);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 }
             },{
                 text : "单位", 

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -190,7 +190,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 xtype:'numbercolumn',
                 width: 110,
                 renderer : function(v) {
-                    return saas.util.BaseUtil.numberFormat(v, 3, true);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 }
             }, {
                 text: '单位',

frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -150,10 +150,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         width : 110.0, 
         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);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         } 
     }, {
         text : "单位", 

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -121,13 +121,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         readOnly:true,
         editable:false,
         decimalPrecision:4,
-        columnWidth: 0.25,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        }
+        columnWidth: 0.25
     },{
         xtype : "numberfield", 
         name : "ma_total",
@@ -233,18 +227,21 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     minValue:0
                 },
                 renderer : function(v) {
-                    return saas.util.BaseUtil.numberFormat(v, 3, true);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 },
                 summaryType: 'sum',
                 summaryRenderer: function(v) {
-                    return saas.util.BaseUtil.numberFormat(v, 3, true);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 }
             }, {
             
                 text : "单位用量", 
                 xtype: 'numbercolumn',
                 dataIndex : "mm_oneuseqty", 
-                hidden:true
+                hidden:true,
+                renderer : function(v) {
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
+                },
             }, {
                 text : "单位", 
                 dataIndex : "pr_unit",

frontend/saas-web/app/view/stock/make/QueryPanel.js

@@ -145,10 +145,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             xtype: 'numbercolumn',
             width: 110,
             renderer : function(v) {
-                var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-                var format = '0,000.' + xr.join('');
-                return Ext.util.Format.number(v, format);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             },
         },{
             text: '单位',

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -208,17 +208,11 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     minValue:0
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 },
                 summaryType: 'sum',
                 summaryRenderer: 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);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 }
             },{
                 text : "单位", 
@@ -242,10 +236,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     minValue:0
                 },
                 renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                    var format = '0.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
+                    return saas.util.BaseUtil.numberFormat(v, 4, true);
                 }
             }, {
                 text : "金额(元)", 
@@ -253,17 +244,11 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 dataIndex : "pd_total", 
                 width : 120.0,
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text : "备注", 

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -114,7 +114,10 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             text: '金额(元)',
             xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
         }, {
             text: '审核状态',
             align: 'center',
@@ -179,7 +182,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             },
         }, {
             text: '单位',

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -191,17 +191,11 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     minValue:0
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 },
                 summaryType: 'sum',
                 summaryRenderer: 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);
+                    return saas.util.BaseUtil.numberFormat(v, 3, false);
                 }
             },{
                 text : "单位", 
@@ -225,10 +219,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     minValue:0
                 },
                 renderer : function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-                    var format = '0.' + xr.join('');
-                    return Ext.util.Format.number(v, format);
+                    return saas.util.BaseUtil.numberFormat(v, 4, true);
                 }
             }, {
                 text: "金额(元)",
@@ -236,17 +227,11 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 dataIndex: "pd_total",
                 width: 120.0,
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
                 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);
+                    return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
                 text : "备注", 

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -114,7 +114,10 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '金额(元)',
             xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
-            width: 110
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
+            },
         }, {
             text: '审核状态',
             align: 'center',
@@ -179,7 +182,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             xtype:'numbercolumn',
             width: 110,
             renderer : function(v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, true);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         }, {
             text: '单位',

frontend/saas-web/app/view/stock/report/DataList.js

@@ -83,7 +83,7 @@ Ext.define('saas.view.stock.report.DataList', {
         dataIndex: "rc_number",
         width: 120,
         renderer: function (v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     },{
         text: "单位",

frontend/saas-web/app/view/stock/report/ProdinoutCount.js

@@ -68,10 +68,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             xtype: 'numbercolumn',
             width:110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             },
         },{
             text: '成本(元)',
@@ -80,10 +77,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             xtype: 'numbercolumn',
             width:110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -95,10 +89,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             xtype: 'numbercolumn',
             width:110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         },{
             text: '成本(元)',
@@ -107,10 +98,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             xtype: 'numbercolumn',
             width:110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -122,10 +110,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             xtype: 'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         },{
             text: '成本(元)',
@@ -134,10 +119,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             xtype: 'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -149,10 +131,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             xtype: 'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 3, false);
             }
         },{
             text: '成本(元)',
@@ -161,10 +140,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             xtype: 'numbercolumn',
             width: 110,
             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);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }]

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -100,7 +100,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         width: 110,
         summaryType: 'sum',
         summaryRenderer: function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '出库数量',
@@ -110,7 +110,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         width: 110,
         summaryType: 'sum',
         summaryRenderer: function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '单位',

frontend/saas-web/app/view/sys/account/DataList.js

@@ -200,7 +200,7 @@ Ext.define('saas.view.sys.account.DataList', {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
                                     if(proxy.showPowerMessage){
-                                        saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                        saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                                     }
                                 }
                             }

frontend/saas-web/app/view/sys/invitation/DataList.js

@@ -210,7 +210,7 @@ Ext.define('saas.view.sys.invitation.DataList', {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
                                     if(proxy.showPowerMessage){
-                                        saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                        saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                                     }
                                 }
                             }

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -209,7 +209,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
                             if(response.timedout) {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }else{
-                                saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson?response.responseJson.message:'请求超时');
+                                saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
                             }
                         }
                     }