Selaa lähdekoodia

合计栏不能正确对齐bug解决/从表renderer参数调整

zhuth 7 vuotta sitten
vanhempi
commit
ee6ebbf6c9
54 muutettua tiedostoa jossa 248 lisäystä ja 214 poistoa
  1. 0 4
      frontend/saas-web/app/view/core/form/field/DetailGridField.js
  2. 1 1
      frontend/saas-web/app/view/core/report/ReportPanel.js
  3. 1 1
      frontend/saas-web/app/view/document/bom/FormPanel.js
  4. 4 4
      frontend/saas-web/app/view/document/customer/FormPanel.js
  5. 3 3
      frontend/saas-web/app/view/document/product/FormPanel.js
  6. 3 3
      frontend/saas-web/app/view/document/vendor/BasePanel.js
  7. 3 3
      frontend/saas-web/app/view/document/vendor/FormPanel.js
  8. 5 5
      frontend/saas-web/app/view/home/infoCardList/Payment.js
  9. 5 5
      frontend/saas-web/app/view/home/infoCardList/PurchaseIn.js
  10. 4 4
      frontend/saas-web/app/view/home/infoCardList/SaleOut.js
  11. 5 5
      frontend/saas-web/app/view/home/infoCardList/UnauditCheckIn.js
  12. 1 1
      frontend/saas-web/app/view/money/fundtransfer/FormPanel.js
  13. 1 1
      frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js
  14. 2 2
      frontend/saas-web/app/view/money/othreceipts/FormPanelController.js
  15. 3 3
      frontend/saas-web/app/view/money/othreceipts/QueryPanel.js
  16. 1 1
      frontend/saas-web/app/view/money/othspendings/FormPanel.js
  17. 3 3
      frontend/saas-web/app/view/money/othspendings/QueryPanel.js
  18. 5 5
      frontend/saas-web/app/view/money/payBalance/FormPanel.js
  19. 0 2
      frontend/saas-web/app/view/money/payBalance/FormPanelController.js
  20. 2 2
      frontend/saas-web/app/view/money/payBalance/QueryPanel.js
  21. 5 5
      frontend/saas-web/app/view/money/recBalance/FormPanel.js
  22. 2 4
      frontend/saas-web/app/view/money/recBalance/FormPanelController.js
  23. 1 1
      frontend/saas-web/app/view/money/recBalance/QueryPanel.js
  24. 2 2
      frontend/saas-web/app/view/money/report/AccountBalance.js
  25. 3 3
      frontend/saas-web/app/view/money/report/RecDetail.js
  26. 8 8
      frontend/saas-web/app/view/money/report/TotalPayDetail.js
  27. 8 8
      frontend/saas-web/app/view/money/report/TotalRecDetail.js
  28. 8 8
      frontend/saas-web/app/view/money/verification/FormPanel.js
  29. 4 4
      frontend/saas-web/app/view/money/verification/FormPanelController.js
  30. 1 1
      frontend/saas-web/app/view/money/verification/QueryPanel.js
  31. 7 7
      frontend/saas-web/app/view/purchase/purchase/FormPanel.js
  32. 7 7
      frontend/saas-web/app/view/purchase/purchase/QueryPanel.js
  33. 7 7
      frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js
  34. 7 7
      frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js
  35. 7 7
      frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js
  36. 7 7
      frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js
  37. 8 8
      frontend/saas-web/app/view/purchase/report/Purchase.js
  38. 1 1
      frontend/saas-web/app/view/sale/report/Sale.js
  39. 1 1
      frontend/saas-web/app/view/sale/report/SaleProfit.js
  40. 7 7
      frontend/saas-web/app/view/sale/sale/FormPanel.js
  41. 8 8
      frontend/saas-web/app/view/sale/saleIn/FormPanel.js
  42. 7 7
      frontend/saas-web/app/view/sale/saleIn/QueryPanel.js
  43. 7 7
      frontend/saas-web/app/view/sale/saleOut/FormPanel.js
  44. 7 7
      frontend/saas-web/app/view/sale/saleOut/QueryPanel.js
  45. 1 1
      frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js
  46. 1 1
      frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js
  47. 4 4
      frontend/saas-web/app/view/stock/make/FormPanel.js
  48. 1 1
      frontend/saas-web/app/view/stock/make/QueryPanel.js
  49. 3 3
      frontend/saas-web/app/view/stock/otherIn/FormPanel.js
  50. 4 4
      frontend/saas-web/app/view/stock/otherIn/QueryPanel.js
  51. 3 3
      frontend/saas-web/app/view/stock/otherOut/FormPanel.js
  52. 4 4
      frontend/saas-web/app/view/stock/otherOut/QueryPanel.js
  53. 3 3
      frontend/saas-web/app/view/stock/report/DataList.js
  54. 42 0
      frontend/saas-web/overrides/grid/feature/Summary.js

+ 0 - 4
frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -266,8 +266,6 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
             }
         });
 
-        // 不写该方法合计列会错位,这里触发afterEdit事件用来刷新grid
-        store.getAt(0) ? store.afterEdit(store.getAt(0), ['']) : null;
         me.fireEvent('validChange');
         return r;
     },
@@ -315,8 +313,6 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
             store.remove(selectedRecord);
             me.fireEvent('validChange');
         }
-        // 不写该方法合计列会错位,这里触发afterEdit事件用来刷新grid
-        store.getAt(0) ? store.afterEdit(store.getAt(0), ['']) : null;
     },
 
     swapUp: function() {

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

@@ -343,7 +343,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
             } else if (c.xtype == 'numbercolumn') {
                 Ext.applyIf(c, {
                     align: 'end', // 数字右对齐
-                    // renderer: function (v) {
+                    // renderer: function(v, m, r) {
                     //     var arr = (v + '.').split('.');
                     //     var xr = (new Array(arr[1].length)).fill('0');
                     //     var format = '0.' + xr.join('');

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

@@ -199,7 +199,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
                         maxLength: 10,
                         align: 'end'
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 }, {

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

@@ -142,7 +142,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 thousandSeparator: ',',
                 minValue: 0,
                 group: '交易信息',
-                renderer: function (v) {
+                renderer: function(v, m, r) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
             }, {
@@ -156,7 +156,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 thousandSeparator: ',',
                 minValue: 0,
                 group: '交易信息',
-                renderer: function (v) {
+                renderer: function(v, m, r) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
             }, {
@@ -169,7 +169,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 decimalPrecision: 2,
                 thousandSeparator: ',',
                 group: '交易信息',
-                renderer: function (v) {
+                renderer: function(v, m, r) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
             }, {
@@ -219,7 +219,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 decimalPrecision: 2,
                 minValue: 0,
                 group: '交易信息',
-                renderer: function (v) {
+                renderer: function(v, m, r) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
             }, {

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

@@ -332,7 +332,7 @@ Ext.define('saas.view.document.product.FormPanel', {
                     listeners: {
                         edit: 'amount_change'
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -355,7 +355,7 @@ Ext.define('saas.view.document.product.FormPanel', {
                     listeners: {
                         edit: 'amount_change'
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                 }, {
@@ -365,7 +365,7 @@ Ext.define('saas.view.document.product.FormPanel', {
                     align: 'end',
                     width: 110.0,
                     allowBlank: true,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -99,7 +99,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "ve_taxrate",
                     width: 80.0,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, false);
                     }
                 }, {
@@ -107,7 +107,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "ve_promisedays",
                     width: 110.0,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return Ext.util.Format.number(v, '0');
                     }
                 }, {
@@ -115,7 +115,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 've_leftamount',
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {

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

@@ -148,7 +148,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 thousandSeparator: ',',
                 minValue: 0,
                 group: '交易信息',
-                renderer: function (v) {
+                renderer: function(v, m, r) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
             }, {
@@ -162,7 +162,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 thousandSeparator: ',',
                 minValue: 0,
                 group: '交易信息',
-                renderer: function (v) {
+                renderer: function(v, m, r) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
             }, {
@@ -176,7 +176,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 decimalPrecision: 2,
                 thousandSeparator: ',',
                 group: '交易信息',
-                renderer: function (v) {
+                renderer: function(v, m, r) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
             }, {

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

@@ -50,7 +50,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         text: '总额(元)',
         dataIndex: 'pi_total',
         width: 80,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     },{
@@ -99,7 +99,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         xtype: 'numbercolumn',
         width: 110,
         hidden: true,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
@@ -112,7 +112,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         dataIndex: 'pd_orderprice',
         xtype: 'numbercolumn',
         hidden: true,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 4, true);
         },
         width: 110
@@ -122,7 +122,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         xtype: 'numbercolumn',
         hidden: true,
         width: 80,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         },
     }, {
@@ -131,7 +131,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
         xtype: 'numbercolumn',
         width: 110,
         hidden: true,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }],

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

@@ -43,7 +43,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         dataIndex: 'pd_detno',
         xtype: 'numbercolumn',
         width: 80,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return Ext.util.Format.number(v, '0');
         }
     }, {
@@ -71,7 +71,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         dataIndex: 'pd_qty',
         xtype: 'numbercolumn',
         width: 110,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
@@ -88,7 +88,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         dataIndex: 'pd_price',
         xtype: 'numbercolumn',
         width: 110,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
@@ -96,7 +96,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         dataIndex: 'pd_taxrate',
         xtype: 'numbercolumn',
         width: 80,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         },
     }, {
@@ -104,7 +104,7 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
         dataIndex: 'pd_total',
         xtype: 'numbercolumn',
         width: 110,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {

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

@@ -44,7 +44,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         dataIndex: 'sd_detno',
         xtype: 'numbercolumn',
         width: 100,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return Ext.util.Format.number(v, '0');
         }
     }, {
@@ -76,7 +76,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         dataIndex: 'sd_qty',
         xtype: 'numbercolumn',
         width: 110,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
@@ -88,7 +88,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         dataIndex: 'sd_price',
         xtype: 'numbercolumn',
         width: 110,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 4, true);
         },
     }, {
@@ -96,7 +96,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
         dataIndex: 'sd_sendqty',
         xtype: 'numbercolumn',
         width: 110,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {

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

@@ -50,7 +50,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         text: '总额(元)',
         dataIndex: 'pi_total',
         width: 80,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     },{
@@ -99,7 +99,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         xtype: 'numbercolumn',
         width: 110,
         hidden: true,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
     }, {
@@ -112,7 +112,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         dataIndex: 'pd_orderprice',
         hidden: true,
         xtype: 'numbercolumn',
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 4, true);
         },
         width: 110
@@ -122,7 +122,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         xtype: 'numbercolumn',
         hidden: true,
         width: 80,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         },
     }, {
@@ -131,7 +131,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         xtype: 'numbercolumn',
         hidden: true,
         width: 110,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }],

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

@@ -132,7 +132,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                         xtype: "numberfield",
                         decimalPrecision: 2
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -105,7 +105,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'ftd_nowbalance',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {

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

@@ -45,7 +45,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             dataIndex: "cu_taxrate",
                             xtype: 'numbercolumn',
                             width:80,
-                            renderer: function (v) {
+                            renderer: function(v, m, r) {
                                 return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         },{
@@ -61,7 +61,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             dataIndex: "cu_promisedays",
                             width:110,
                             xtype: 'numbercolumn',
-                            renderer: function (v) {
+                            renderer: function(v, m, r) {
                                 return saas.util.BaseUtil.numberFormat(v, 0, false);
                             }
                         }, {

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

@@ -123,7 +123,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'or_amount',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -162,7 +162,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'or_amount',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -179,7 +179,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'ord_nowbalance',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {

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

@@ -123,7 +123,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                         xtype: "numberfield",
                         decimalPrecision: 2
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -121,7 +121,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'os_amount',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -161,7 +161,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'os_amount',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -178,7 +178,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'osd_nowbalance',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {

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

@@ -140,7 +140,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                         decimalPrecision: 2,
                         thousandSeparator: ','
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -295,7 +295,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pbd_amount",
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -308,7 +308,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                     dataIndex: "sl_yamount",
                     width: 120,
                     ignore: true,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -321,7 +321,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                     dataIndex: "sl_namount",
                     ignore: true,
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -338,7 +338,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                         decimalPrecision: 2
                     },
                     allowBlank: false,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -325,7 +325,5 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
         })
         store.removeAll();
         store.add(datas);
-        // 不写该方法合计列会错位,这里触发afterEdit事件用来刷新grid
-        store.getAt(0) ? store.afterEdit(store.getAt(0), ['']) : null;
     },
 });

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

@@ -94,7 +94,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                         xtype: 'numbercolumn',
                         dataIndex: 'pb_amount',
                         width: 120,
-                        renderer: function (v) {
+                        renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                     }, {
@@ -142,7 +142,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'pd_amount',
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 } ,{

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

@@ -142,7 +142,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                         xtype: "numberfield",
                         decimalPrecision: 2
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -302,7 +302,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "rbd_amount",
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -315,7 +315,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                     dataIndex: "sl_yamount",
                     width: 120,
                     ignore: true,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -328,7 +328,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                     dataIndex: "sl_namount",
                     width: 120,
                     ignore: true,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -345,7 +345,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                         decimalPrecision: 2
                     },
                     allowBlank: false,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -46,7 +46,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             dataIndex: "cu_taxrate",
                             xtype: 'numbercolumn',
                             width:80,
-                            renderer: function (v) {
+                            renderer: function(v, m, r) {
                                 return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         },{
@@ -62,7 +62,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             dataIndex: "cu_promisedays",
                             width:110,
                             xtype: 'numbercolumn',
-                            renderer: function (v) {
+                            renderer: function(v, m, r) {
                                 return Ext.util.Format.number(v, '0');
                             }
                         }, {
@@ -306,7 +306,5 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
         })
         store.removeAll();
         store.add(datas);
-        // 不写该方法合计列会错位,这里触发afterEdit事件用来刷新grid
-        store.getAt(0) ? store.afterEdit(store.getAt(0), ['']) : null;
     },
 });

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

@@ -134,7 +134,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'rd_amount',
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {

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

@@ -49,7 +49,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',
@@ -62,7 +62,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',

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

@@ -51,7 +51,7 @@ Ext.define('saas.view.money.report.RecDetail', {
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryLabel: '增加应收',
@@ -65,7 +65,7 @@ Ext.define('saas.view.money.report.RecDetail', {
         exportFormat: 'Amount',
         dataIndex: 'rd_addpre',
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryLabel: '增加预收',
@@ -79,7 +79,7 @@ Ext.define('saas.view.money.report.RecDetail', {
         exportFormat: 'Amount',
         dataIndex: 'rd_remain',
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryLabel: '应收余额(合计)',

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

@@ -47,7 +47,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             exportFormat: 'Amount',
             dataIndex: 'vm_beginpreamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
@@ -56,7 +56,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             exportFormat: 'Amount',
             dataIndex: 'vm_beginamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
@@ -68,7 +68,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             exportFormat: 'Amount',
             dataIndex: 'vm_nowpreamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
@@ -77,7 +77,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             exportFormat: 'Amount',
             dataIndex: 'vm_nowamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
@@ -86,7 +86,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             exportFormat: 'Amount',
             dataIndex: 'vm_nowpayamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             } 
         }]
@@ -98,7 +98,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             summaryType: 'sum',
@@ -111,7 +111,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             summaryType: 'sum',
@@ -125,7 +125,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',

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

@@ -47,7 +47,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             exportFormat: 'Amount',
             dataIndex: 'cm_beginpreamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
@@ -56,7 +56,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             exportFormat: 'Amount',
             dataIndex: 'cm_beginamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
@@ -68,7 +68,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             exportFormat: 'Amount',
             dataIndex: 'cm_nowpreamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
@@ -77,7 +77,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             exportFormat: 'Amount',
             dataIndex: 'cm_nowamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
@@ -86,7 +86,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             exportFormat: 'Amount',
             dataIndex: 'cm_nowpayamount',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             } 
         }]
@@ -98,7 +98,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             summaryType: 'sum',
@@ -111,7 +111,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
             width: 120,
-            renderer: function (v) {
+            renderer: function(v, m, r) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             },
             summaryType: 'sum',
@@ -125,7 +125,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',

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

@@ -180,7 +180,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         xtype: 'numbercolumn',
                         dataIndex: "vd_amount",
                         width: 110,
-                        renderer: function (v) {
+                        renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
@@ -193,7 +193,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         dataIndex: "sl_yamount",
                         width: 120,
                         ignore: true,
-                        renderer: function (v) {
+                        renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
@@ -206,7 +206,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         dataIndex: "sl_namount",
                         width: 120,
                         ignore: true,
-                        renderer: function (v) {
+                        renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
@@ -223,7 +223,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             decimalPrecision: 2
                         },
                         allowBlank: false,
-                        renderer: function (v) {
+                        renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
@@ -324,7 +324,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         xtype: 'numbercolumn',
                         dataIndex: "vcd_amount",
                         width: 110,
-                        renderer: function (v) {
+                        renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
@@ -337,7 +337,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         dataIndex: "sl_yamount",
                         width: 120,
                         ignore: true,
-                        renderer: function (v) {
+                        renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
@@ -350,7 +350,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         dataIndex: "sl_namount",
                         width: 120,
                         ignore: true,
-                        renderer: function (v) {
+                        renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',
@@ -367,7 +367,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             xtype: "numberfield",
                             decimalPrecision: 2
                         },
-                        renderer: function (v) {
+                        renderer: function(v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 2, true);
                         },
                         summaryType: 'sum',

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

@@ -46,7 +46,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             dataIndex: "cu_taxrate",
                             xtype: 'numbercolumn',
                             width:80,
-                            renderer: function (v) {
+                            renderer: function(v, m, r) {
                                 return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         },{
@@ -62,7 +62,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             dataIndex: "cu_promisedays",
                             width:110,
                             xtype: 'numbercolumn',
-                            renderer: function (v) {
+                            renderer: function(v, m, r) {
                                 return Ext.util.Format.number(v, '0');
                             }
                         }, {
@@ -128,7 +128,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             dataIndex: "cu_taxrate",
                             xtype: 'numbercolumn',
                             width:80,
-                            renderer: function (v) {
+                            renderer: function(v, m, r) {
                                 return saas.util.BaseUtil.numberFormat(v, 2, false);
                             }
                         },{
@@ -144,7 +144,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             dataIndex: "cu_promisedays",
                             width:110,
                             xtype: 'numbercolumn',
-                            renderer: function (v) {
+                            renderer: function(v, m, r) {
                                 return Ext.util.Format.number(v, '0');
                             }
                         }, {

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

@@ -125,7 +125,7 @@ Ext.define('saas.view.money.verification.QueryPanel', {
                     dataIndex: 'vc_amount1',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }]

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

@@ -157,7 +157,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -185,7 +185,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -198,7 +198,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     listeners: {
@@ -214,7 +214,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_taxtotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -232,7 +232,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         minValue: 0,
                         maxValue: 100
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, false);
                     }
                 }, {
@@ -240,7 +240,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_taxamount",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -252,7 +252,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_total",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -118,7 +118,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     dataIndex: 'pu_taxtotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -126,7 +126,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     dataIndex: 'pu_total',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -204,7 +204,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     dataIndex: 'pd_qty',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 }, {
@@ -216,7 +216,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     dataIndex: 'pd_taxprice',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -224,7 +224,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     dataIndex: 'pd_price',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -232,7 +232,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     dataIndex: 'pd_taxtotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -249,7 +249,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     dataIndex: 'pd_total',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {

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

@@ -205,7 +205,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -234,7 +234,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     },
                     dataIndex: "pd_netprice",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                 }, {
@@ -248,7 +248,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     },
                     dataIndex: "pd_orderprice",
                     width: 120.0,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     listeners: {
@@ -264,7 +264,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_nettotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -282,7 +282,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                         minValue: 0,
                         maxValue: 100
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, false);
                     },
                 }, {
@@ -290,7 +290,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_taxamount",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -302,7 +302,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_ordertotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -128,7 +128,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'pi_nettotal',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -136,7 +136,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'pi_total',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -215,7 +215,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     dataIndex: 'pd_inqty',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 }, {
@@ -226,7 +226,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     text: '单价(元)',
                     dataIndex: 'pd_netprice',
                     xtype: 'numbercolumn',
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     width: 110
@@ -234,7 +234,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     text: '含税单价(元)',
                     dataIndex: 'pd_orderprice',
                     xtype: 'numbercolumn',
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     width: 110
@@ -243,7 +243,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     dataIndex: 'pd_nettotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {
@@ -260,7 +260,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     dataIndex: 'pd_ordertotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {

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

@@ -201,7 +201,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -229,7 +229,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                 }, {
@@ -242,7 +242,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                         minValue: 0
                     },
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     listeners: {
@@ -258,7 +258,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_nettotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -276,7 +276,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                         minValue: 0,
                         maxValue: 100
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, false);
                     },
                 }, {
@@ -284,7 +284,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_taxamount",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -296,7 +296,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_ordertotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -134,7 +134,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'pi_nettotal',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {
@@ -142,7 +142,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'pi_total',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {
@@ -221,7 +221,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     dataIndex: 'pd_outqty',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                 }, {
@@ -232,7 +232,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     text: '单价(元)',
                     dataIndex: 'pd_netprice',
                     xtype: 'numbercolumn',
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     width: 110
@@ -240,7 +240,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     text: '含税单价(元)',
                     dataIndex: 'pd_netprice',
                     xtype: 'numbercolumn',
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     width: 110
@@ -249,7 +249,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     dataIndex: 'pd_nettotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {
@@ -265,7 +265,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     dataIndex: 'pd_ordertotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {

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

@@ -102,7 +102,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 110,
         exportFormat: 'Quantity',
         xtype: 'numbercolumn',
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, true);
         },
         summaryType: 'sum',
@@ -116,7 +116,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         exportFormat: 'Quantity',
         width: 110,
         summaryType: 'sum',
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
         summaryRenderer: function(v, d, f, m) {
@@ -132,7 +132,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 120,
         xtype: 'numbercolumn',
         exportFormat: 'Price',
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
@@ -141,7 +141,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 120,
         xtype: 'numbercolumn',
         exportFormat: 'Price',
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
@@ -150,7 +150,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 120,
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryLabel: '金额',
@@ -164,7 +164,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         exportFormat: 'Integer',
         xtype: 'numbercolumn',
         width: 80,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         },
     }, {
@@ -174,7 +174,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 120,
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryLabel: '税额',
@@ -189,7 +189,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 120,
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryLabel: '价税合计',

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

@@ -166,7 +166,7 @@ Ext.define('saas.view.sale.report.Sale', {
         exportFormat: 'Integer',
         width: 80,
         xtype: 'numbercolumn',
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         },
     }, {

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

@@ -123,7 +123,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         exportFormat: 'Integer',
         xtype: 'numbercolumn',
         width: 80,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
     }, {

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

@@ -189,7 +189,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -217,7 +217,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -230,7 +230,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     listeners: {
@@ -246,7 +246,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "sd_nettotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -264,7 +264,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         minValue: 0,
                         maxValue: 100
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, false);
                     }
                 }, {
@@ -272,7 +272,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "sd_taxamount",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -284,7 +284,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "sd_total",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -222,7 +222,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -250,7 +250,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                 }, {
@@ -263,7 +263,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     listeners: {
@@ -279,7 +279,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_nettotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -297,7 +297,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                         minValue: 0,
                         maxValue: 100
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, false);
                     }
                 }, {
@@ -305,7 +305,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_taxamount",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -317,7 +317,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_ordertotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -331,7 +331,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     width: 110.0,
                     format: '0',
                     ignore: true,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return v ? v : null;
                     }
                 }, {

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

@@ -123,7 +123,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     dataIndex: 'pi_nettotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -131,7 +131,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     dataIndex: 'pi_total',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -217,7 +217,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     dataIndex: 'pd_inqty',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 }, {
@@ -229,7 +229,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     dataIndex: 'pd_netprice',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -237,7 +237,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     dataIndex: 'pd_sendprice',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -245,7 +245,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     dataIndex: 'pd_nettotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -261,7 +261,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     dataIndex: 'pd_ordertotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {

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

@@ -233,7 +233,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -261,7 +261,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                 }, {
@@ -274,7 +274,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     },
                     listeners: {
@@ -290,7 +290,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_nettotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -308,7 +308,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                         minValue: 0,
                         maxValue: 100
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, false);
                     }
                 }, {
@@ -316,7 +316,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_taxamount",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',
@@ -328,7 +328,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_ordertotal",
                     width: 120,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -123,7 +123,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     dataIndex: 'pi_nettotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {
@@ -131,7 +131,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     dataIndex: 'pi_total',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -217,7 +217,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     dataIndex: 'pd_outqty',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 }, {
@@ -229,7 +229,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     dataIndex: 'pd_netprice',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -237,7 +237,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     dataIndex: 'pd_sendprice',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -245,7 +245,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     dataIndex: 'pd_nettotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
@@ -261,7 +261,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     dataIndex: 'pd_ordertotal',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {

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

@@ -169,7 +169,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',

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

@@ -188,7 +188,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                     dataIndex: 'pd_outqty',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 }, {

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

@@ -226,7 +226,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -239,7 +239,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "mm_oneuseqty",
                     hidden: true,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                 }, {
@@ -294,7 +294,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     listeners: {
                         edit: 'price_change'
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -307,7 +307,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                         decimalPrecision: 2,
                         editable: false
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -139,7 +139,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
                     dataIndex: 'ma_qty',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                 }, {

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

@@ -208,7 +208,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -236,7 +236,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -244,7 +244,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_total",
                     width: 120.0,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -113,7 +113,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'pi_costtotal',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {
@@ -182,7 +182,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                     dataIndex: 'pd_inqty',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                 }, {
@@ -194,7 +194,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                     dataIndex: 'pd_price',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -202,7 +202,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                     dataIndex: 'pd_total',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {

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

@@ -193,7 +193,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                         decimalPrecision: 3,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     },
                     summaryType: 'sum',
@@ -221,7 +221,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                         decimalPrecision: 4,
                         minValue: 0
                     },
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -229,7 +229,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: "pd_total",
                     width: 120.0,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                     summaryType: 'sum',

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

@@ -113,7 +113,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                     xtype: 'numbercolumn',
                     dataIndex: 'pi_costtotal',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
                 }, {
@@ -182,7 +182,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                     dataIndex: 'pd_outqty',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 3, false);
                     }
                 }, {
@@ -194,7 +194,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                     dataIndex: 'pd_price',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 4, true);
                     }
                 }, {
@@ -202,7 +202,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                     dataIndex: 'pd_total',
                     xtype: 'numbercolumn',
                     width: 110,
-                    renderer: function (v) {
+                    renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {

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

@@ -79,7 +79,7 @@ Ext.define('saas.view.stock.report.DataList', {
         exportFormat: 'Quantity',
         dataIndex: "rc_number",
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     },{
@@ -94,7 +94,7 @@ Ext.define('saas.view.stock.report.DataList', {
         align: 'end',
         dataIndex: "rc_price",
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
@@ -104,7 +104,7 @@ Ext.define('saas.view.stock.report.DataList', {
         exportFormat: 'Amount',
         toggle: true,
         width: 120,
-        renderer: function (v) {
+        renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',

+ 42 - 0
frontend/saas-web/overrides/grid/feature/Summary.js

@@ -0,0 +1,42 @@
+Ext.define('saas.override.grid.feature.Summary', {
+    override: 'Ext.grid.feature.Summary',
+
+    // Synchronize column widths in the docked summary Component or the inline summary row
+    // depending on whether we are docked or not.
+    afterHeaderCtLayout: function(headerCt) {
+        var me = this,
+            view = me.view,
+            columns = view.getVisibleColumnManager().getColumns(),
+            column,
+            len = columns.length,
+            i, summaryEl, el, width, innerCt;
+        if (me.showSummaryRow && view.refreshCounter) {
+            if (me.dock) {
+                summaryEl = me.summaryBar.el;
+                width = headerCt.getTableWidth();
+                innerCt = me.summaryBar.innerCt;
+                // Stretch the innerCt of the summary bar upon headerCt layout
+                me.summaryBar.item.setWidth(width);
+                // headerCt's tooNarrow flag is set by its layout if the columns overflow.
+                // Must not measure+set in after layout phase, this is a write phase.
+                if (headerCt.tooNarrow) {
+                    width += Ext.getScrollbarSize().width;
+                }
+                innerCt.setWidth(width);
+            } else {
+                summaryEl = Ext.fly(Ext.fly(view.getNodeContainer()).down('.' + me.summaryItemCls, true));
+            }
+            // If the layout was in response to a clearView, there'll be no summary element
+            if (summaryEl) {
+                for (i = 0; i < len; i++) {
+                    column = columns[i];
+                    el = summaryEl.down(view.getCellSelector(column), true);
+                    if (el) {
+                        // 【override】当最后一列为flex且列数较少时会导致合计对不齐的情况
+                        Ext.fly(el).setWidth(column.el.getWidth() || (column.width || (column.lastBox ? column.lastBox.width : 100)));
+                    }
+                }
+            }
+        }
+    },
+});