瀏覽代碼

数字列默认右对齐

zhuth 7 年之前
父節點
當前提交
536463b526
共有 74 個文件被更改,包括 507 次插入156 次删除
  1. 11 5
      frontend/saas-web/app/view/document/bom/FormController.js
  2. 3 3
      frontend/saas-web/app/view/document/vendor/BasePanel.js
  3. 1 0
      frontend/saas-web/app/view/money/fundtransfer/FormPanel.js
  4. 4 4
      frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js
  5. 1 0
      frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js
  6. 1 0
      frontend/saas-web/app/view/money/othreceipts/FormPanel.js
  7. 7 4
      frontend/saas-web/app/view/money/othreceipts/FormPanelController.js
  8. 1 0
      frontend/saas-web/app/view/money/othreceipts/QueryPanel.js
  9. 7 3
      frontend/saas-web/app/view/money/othreceipts/QueryPanelController.js
  10. 1 0
      frontend/saas-web/app/view/money/othspendings/FormPanel.js
  11. 6 4
      frontend/saas-web/app/view/money/othspendings/FormPanelController.js
  12. 1 0
      frontend/saas-web/app/view/money/othspendings/QueryPanel.js
  13. 7 3
      frontend/saas-web/app/view/money/othspendings/QueryPanelController.js
  14. 5 0
      frontend/saas-web/app/view/money/payBalance/FormPanel.js
  15. 11 6
      frontend/saas-web/app/view/money/payBalance/FormPanelController.js
  16. 3 0
      frontend/saas-web/app/view/money/payBalance/QueryPanel.js
  17. 6 1
      frontend/saas-web/app/view/money/payBalance/QueryPanelController.js
  18. 5 0
      frontend/saas-web/app/view/money/recBalance/FormPanel.js
  19. 21 11
      frontend/saas-web/app/view/money/recBalance/FormPanelController.js
  20. 8 2
      frontend/saas-web/app/view/money/recBalance/QueryPanelController.js
  21. 1 0
      frontend/saas-web/app/view/money/report/AccountBalance.js
  22. 2 2
      frontend/saas-web/app/view/money/report/AccountBalanceController.js
  23. 8 1
      frontend/saas-web/app/view/money/report/CustomerCheck.js
  24. 8 4
      frontend/saas-web/app/view/money/report/CustomerCheckController.js
  25. 4 0
      frontend/saas-web/app/view/money/report/PayDetail.js
  26. 6 2
      frontend/saas-web/app/view/money/report/PayDetailController.js
  27. 3 0
      frontend/saas-web/app/view/money/report/RecDetail.js
  28. 8 4
      frontend/saas-web/app/view/money/report/RecDetailController.js
  29. 8 1
      frontend/saas-web/app/view/money/report/VendorCheck.js
  30. 6 2
      frontend/saas-web/app/view/money/report/VendorCheckController.js
  31. 8 1
      frontend/saas-web/app/view/purchase/purchase/FormPanel.js
  32. 10 4
      frontend/saas-web/app/view/purchase/purchase/FormPanelController.js
  33. 7 1
      frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js
  34. 7 1
      frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js
  35. 7 3
      frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js
  36. 10 2
      frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js
  37. 6 1
      frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js
  38. 8 4
      frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js
  39. 9 2
      frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js
  40. 14 6
      frontend/saas-web/app/view/purchase/report/Purchase.js
  41. 6 2
      frontend/saas-web/app/view/purchase/report/PurchaseController.js
  42. 2 0
      frontend/saas-web/app/view/purchase/report/PurchasePay.js
  43. 6 2
      frontend/saas-web/app/view/purchase/report/PurchasePayController.js
  44. 6 0
      frontend/saas-web/app/view/sale/report/Sale.js
  45. 7 3
      frontend/saas-web/app/view/sale/report/SaleController.js
  46. 8 0
      frontend/saas-web/app/view/sale/report/SaleProfit.js
  47. 13 5
      frontend/saas-web/app/view/sale/report/SaleProfitController.js
  48. 5 2
      frontend/saas-web/app/view/sale/report/SaleRec.js
  49. 9 3
      frontend/saas-web/app/view/sale/report/SaleRecController.js
  50. 6 0
      frontend/saas-web/app/view/sale/sale/FormPanel.js
  51. 10 5
      frontend/saas-web/app/view/sale/sale/FormPanelController.js
  52. 12 3
      frontend/saas-web/app/view/sale/sale/QueryPanelController.js
  53. 5 0
      frontend/saas-web/app/view/sale/saleIn/FormPanel.js
  54. 10 5
      frontend/saas-web/app/view/sale/saleIn/FormPanelController.js
  55. 13 3
      frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js
  56. 5 0
      frontend/saas-web/app/view/sale/saleOut/FormPanel.js
  57. 10 3
      frontend/saas-web/app/view/sale/saleOut/FormPanelController.js
  58. 13 3
      frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js
  59. 1 0
      frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js
  60. 14 7
      frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js
  61. 10 2
      frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js
  62. 4 0
      frontend/saas-web/app/view/stock/make/FormPanel.js
  63. 8 4
      frontend/saas-web/app/view/stock/make/FormPanelController.js
  64. 10 2
      frontend/saas-web/app/view/stock/make/QueryPanelController.js
  65. 5 0
      frontend/saas-web/app/view/stock/otherIn/FormPanel.js
  66. 14 5
      frontend/saas-web/app/view/stock/otherIn/FormPanelController.js
  67. 10 2
      frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js
  68. 5 0
      frontend/saas-web/app/view/stock/otherOut/FormPanel.js
  69. 6 2
      frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js
  70. 4 2
      frontend/saas-web/app/view/stock/report/ProdinoutCountController.js
  71. 3 0
      frontend/saas-web/app/view/stock/report/Prodiodetail.js
  72. 4 2
      frontend/saas-web/app/view/stock/report/ProdiodetailController.js
  73. 7 2
      frontend/saas-web/app/view/stock/stockamount/DataList.js
  74. 6 0
      frontend/saas-web/overrides/grid/column/Number.js

+ 11 - 5
frontend/saas-web/app/view/document/bom/FormController.js

@@ -75,7 +75,8 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -96,7 +97,7 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
@@ -169,7 +170,8 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最新采购单价",
                             "dataIndex": "pr_purcprice",
                             "width": 0,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "仓库id",
                             "dataIndex": "pr_whid",
@@ -186,7 +188,8 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -207,7 +210,7 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
@@ -277,6 +280,7 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最新采购单价",
                             "dataIndex": "pr_purcprice",
                             "width": 0,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "仓库id",
                             "dataIndex": "pr_whid",
@@ -292,6 +296,7 @@ Ext.define('saas.view.document.bom.FormController', {
                         },{
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
+                            xtype: 'numbercolumn',
                             "width": 100,
                         },{
                             "text": "类型",
@@ -313,6 +318,7 @@ Ext.define('saas.view.document.bom.FormController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -71,13 +71,13 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             dataIndex : "ve_taxrate", 
             width : 120.0, 
             xtype : "",
-            align:'right'
+            align:'end'
         }, {
             text : "承付天数", 
+            xtype: 'numbercolumn',
             dataIndex : "ve_promisedays", 
             width : 120.0, 
-            xtype : "",
-            align:'right'
+            align:'end'
         }, {
             text : "纳税人识别号", 
             dataIndex : "ve_nsrzh", 

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

@@ -109,6 +109,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 }
             }, {
                 text : "金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "ftd_nowbalance", 
                 width : 120.0, 
                 editor : {

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

@@ -62,8 +62,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            align:'right',
-                            "xtype": ""
+                            xtype: 'numbercolumn',
+                            align:'end',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,
@@ -131,8 +131,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            align:'right',
-                            "xtype": ""
+                            xtype: 'numbercolumn',
+                            align:'end',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -57,6 +57,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             width: 120
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'ftd_nowbalance',
             width: 120,
             renderer : function(v) {

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

@@ -108,6 +108,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 }
             }, {
                 text : "金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "ord_nowbalance", 
                 width : 120.0, 
                 editor : {

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

@@ -85,19 +85,22 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "flex": 1,
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "额度",
                             "flex": 1,
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "客户地址",
                             "flex": 1,
@@ -171,7 +174,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            "xtype": ""
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -74,6 +74,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             width: 120
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'or_amount',
             width: 120
         }, {

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

@@ -69,17 +69,21 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
+                                align: 'end',
+                                xtype: 'numbercolumn',
                                 "width": 100
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -136,7 +140,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            "xtype": ""
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -108,6 +108,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 }
             }, {
                 text : "金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "osd_nowbalance", 
                 width : 120.0,
                 editor : {

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

@@ -62,12 +62,14 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -148,8 +150,8 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            "xtype": "",
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -74,6 +74,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             width: 120
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'os_amount',
             width: 120,
             renderer : function(v) {

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

@@ -61,11 +61,15 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -130,7 +134,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            "xtype": ""
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -123,6 +123,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             hidden: true
         }, {
             text: "付款金额",
+            xtype: 'numbercolumn',
             dataIndex: "pd_amount",
             editor : {
                 xtype : "numberfield",
@@ -215,6 +216,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             xtype: 'datecolumn'
         }, {
             text: "单据金额",
+            xtype: 'numbercolumn',
             dataIndex: "pbd_amount",
             // editor : {
             //     xtype : "numberfield",
@@ -235,6 +237,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "已核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pb_havebalance",
             // editor : {
             //     xtype : "numberfield",
@@ -255,6 +258,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "未核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pb_pbdamount",
             // editor : {
             //     xtype : "numberfield",
@@ -275,6 +279,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "本次核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pbd_nowbalance",
             editor : {
                 xtype : "numberfield",

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

@@ -66,12 +66,14 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -152,26 +154,29 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "sl_orderamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "已核销金额",
                             "flex": 0,
                             "dataIndex": "sl_yamount",
                             "width": 200,
-                            align:'right',
+                            xtype: 'numbercolumn',
+                            align:'end',
                             "items": null
                         }, {
                             "text": "未核销金额",
                             "flex": 1,
                             "dataIndex": "sl_namount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "单据日期",
                             "flex": 1,
                             "dataIndex": "sl_date",
                             "width": 100,
-                            align:'right'
+                            align:'end'
                         }]
                     });
 

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

@@ -70,11 +70,13 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             width: 120,
         }, {
             text: '付款金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
             width: 120,
             hidden:true
         }, {
             text: '本次核销金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pb_pbdamount',
             width: 120,
             hidden:true
@@ -90,6 +92,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             hidden:true
         }, {
             text: '已核销金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pb_havebalance',
             width: 120,
             hidden:true

+ 6 - 1
frontend/saas-web/app/view/money/payBalance/QueryPanelController.js

@@ -59,7 +59,9 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +145,8 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +167,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -125,6 +125,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             }
         }, {
             text: "收款金额",
+            xtype: 'numbercolumn',
             dataIndex: "rd_amount",
             editor : {
                 xtype : "numberfield",
@@ -223,6 +224,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             xtype: 'datecolumn'
         }, {
             text: "单据金额",
+            xtype: 'numbercolumn',
             dataIndex: "rbd_amount",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -239,6 +241,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             }
         }, {
             text: "已核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "rbd_nowbalance",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -255,6 +258,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             }
         }, {
             text: "未核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pbd_nowbalance",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
@@ -271,6 +275,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             }
         }, {
             text: "本次核销金额",
+            xtype: 'numbercolumn',
             dataIndex: "pbd_nowbalance",
             editor : {
                 xtype : "numberfield",

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

@@ -66,22 +66,26 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "text": "应收款余额",
                             "dataIndex": "cu_leftamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;   
 
@@ -145,17 +149,20 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;   
 
@@ -224,26 +231,29 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "sl_orderamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "已核销金额",
                             "flex": 0,
                             "dataIndex": "sl_yamount",
                             "width": 200,
                             "items": null,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "未核销金额",
                             "flex": 1,
                             "dataIndex": "sl_namount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "单据日期",
                             "flex": 1,
                             "dataIndex": "sl_date",
                             "width": 100,
-                            align:'right'
+                            align:'end'
                         }]
                     });
 

+ 8 - 2
frontend/saas-web/app/view/money/recBalance/QueryPanelController.js

@@ -55,11 +55,14 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +146,8 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +168,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -50,6 +50,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
             dataIndex:'thisamount'
         },{
             text: '账户余额',
+            xtype: 'numbercolumn',
             dataIndex: 'pr_code'
         }, {
             text: '往来单位',

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

@@ -57,8 +57,8 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            align:'right',
-                            "xtype": ""
+                            align:'end',
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -68,23 +68,30 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             dataIndex: 'pd_unit'
         }, {
             text: '数量',
+            xtype: 'numbercolumn',
             dataIndex: 'qty',
-            summaryType: 'count'
+            summaryType: 'count',
+            align: 'end'
         }, {
             text: '单价',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_orderprice'
         }, {
             text: '税率',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_taxrate'
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_total',
             summaryType: 'count'
         }, {
             text: '不含税单价',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_netprice'
         }, {
             text: '不含税金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_nettotal',
             summaryType: 'count'
         }, {

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

@@ -56,22 +56,26 @@ Ext.define('saas.view.money.report.CustomerCheckController', {
                             "text": "应收款余额",
                             "dataIndex": "cu_leftamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;
 

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

@@ -57,14 +57,17 @@ Ext.define('saas.view.money.report.PayDetail', {
             dataIndex: 'pb_date'
         }, {
             text: '期初应付余额',
+            xtype: 'numbercolumn',
             dataIndex: 've_beginapamount',
             summaryType: 'count'
         }, {
             text: '本期付款金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
             summaryType: 'count'
         }, {
             text: '应付余额',
+            xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             summaryType: 'count'
         }, {
@@ -72,6 +75,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             dataIndex: 'mustdate',
         }, {
             text: '单据总金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_total',
             summaryType: 'count'
         }, {

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

@@ -52,11 +52,15 @@ Ext.define('saas.view.money.report.PayDetailController', {
                             }, {
                                 "text": "税率",
                                 "dataIndex": "ve_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "dataIndex": "ve_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "纳税人识别号",
                                 "dataIndex": "ve_bankaccount",

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

@@ -64,10 +64,12 @@ Ext.define('saas.view.money.report.RecDetail', {
             summaryType: 'count'
         },{
             text:'本期收款金额',
+            xtype: 'numbercolumn',
             dataIndex:'pb_pdamount',
             summaryType: 'count'
         },{
             text: '应收余额',
+            xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             summaryType: 'count'
         }, {
@@ -75,6 +77,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             dataIndex: 'mustdate'
         }, {
             text: '单据总金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_total'
         }, {
             text: '备注',

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

@@ -56,22 +56,26 @@ Ext.define('saas.view.money.report.RecDetailController', {
                             "text": "应收款余额",
                             "dataIndex": "cu_leftamount",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;
 

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

@@ -66,23 +66,30 @@ Ext.define('saas.view.money.report.VendorCheck', {
             dataIndex: 'pd_unit'
         }, {
             text: '采购数量',
+            xtype: 'numbercolumn',
             dataIndex: 'qty',
-            summaryType: 'count'
+            summaryType: 'count',
+            align: 'end'
         }, {
             text: '单价',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_orderprice'
         }, {
             text: '税率',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_taxrate'
         }, {
             text: '金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_total',
             summaryType: 'count'
         }, {
             text: '不含税单价',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_netprice'
         }, {
             text: '不含税金额',
+            xtype: 'numbercolumn',
             dataIndex: 'pd_nettotal'
         }, {
             text: '备注',

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

@@ -52,11 +52,15 @@ Ext.define('saas.view.money.report.VendorCheckController', {
                             }, {
                                 "text": "税率",
                                 "dataIndex": "ve_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "dataIndex": "ve_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "纳税人识别号",
                                 "dataIndex": "ve_bankaccount",

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

@@ -139,7 +139,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
-                    debugger
                     if(!v){
                         return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
                     }                     
@@ -163,7 +162,9 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             },
             {
                 text : "最小包装数", 
+                xtype: 'numbercolumn',
                 dataIndex : "pr_zxbzs",
+                align: 'end',
                 ignore:true,
                 renderer: function (v, m, r) {
                     if(!v){
@@ -175,6 +176,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_qty", 
+                xtype: 'numbercolumn',
                 width : 120.0,
                 allowBlank : false,
                 editor : {
@@ -199,6 +201,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             {
                 text : "已转数", 
                 dataIndex : "pd_yqty", 
+                xtype: 'numbercolumn',
                 width : 120.0,
                 hidden:true,
                 editor : {
@@ -222,6 +225,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_price", 
                 width : 120.0,
                 editor : {
@@ -238,6 +242,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             }, 
             {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
                 width : 120.0,
                 editor : {
@@ -249,6 +254,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             },
             {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
                 width : 120.0, 
                 editor : {
@@ -272,6 +278,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             }, 
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxtotal", 
                 width : 120.0,
                 editor : {

+ 10 - 4
frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -62,11 +62,14 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -156,7 +159,8 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         }, {
                             "text": "最新采购单价",
                             "dataIndex": "pr_purcprice",
-                            align:'right',
+                            align:'end',
+                            xtype: 'numbercolumn',
                             "width": 0,
                         },{
                             "text": "仓库id",
@@ -174,7 +178,8 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -195,6 +200,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -59,7 +59,9 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +145,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +167,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -175,6 +175,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
+                xtype: 'numbercolumn',
                 width : 120.0,
                 allowBlank : false,
                 editor : {
@@ -195,9 +196,10 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     var format = '0.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
-            },            {
+            }, {
                 text : "已转数", 
                 dataIndex : "pd_yqty",
+                xtype: 'numbercolumn',
                 hidden:true, 
                 width : 120.0,
                 editor : {
@@ -250,6 +252,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             },
             {
                 text : "单价",
+                xtype: 'numbercolumn',
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -264,6 +267,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     return Ext.util.Format.number(v, format);
                 },
             }, {
+                xtype: 'numbercolumn',
                 text : "税率", 
                 dataIndex : "pd_taxrate", 
                 width : 120.0,
@@ -275,6 +279,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
             },{
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
                 width : 120.0, 
                 editor : {
@@ -298,6 +303,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",

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

@@ -67,12 +67,14 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -171,7 +173,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -192,6 +195,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 10 - 2
frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js

@@ -55,11 +55,15 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -145,6 +149,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -165,6 +171,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -166,7 +166,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "数量", 
-                dataIndex : "pd_outqty", 
+                dataIndex : "pd_outqty",
+                xtype: 'numbercolumn',
                 allowBlank : false,
                 editor : {
                     xtype : "numberfield",
@@ -229,6 +230,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "单价",
+                xtype: 'numbercolumn',
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
@@ -244,6 +246,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 },
             },{
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
                 width : 120.0,
                 editor : {
@@ -255,6 +258,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             }, 
             {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
                 width : 120.0, 
                 editor : {
@@ -278,6 +282,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",

+ 8 - 4
frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -66,12 +66,14 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -170,7 +172,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -191,7 +194,8 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 9 - 2
frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js

@@ -55,11 +55,14 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -142,6 +145,8 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -162,6 +167,8 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -96,29 +96,37 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '采购数量',
         dataIndex: 'pd_qty',
+        xtype: 'numbercolumn',
         summaryType: 'count'
     }, {
         text: '单价',
-        dataIndex: 'pd_price'
+        dataIndex: 'pd_price',
+        xtype: 'numbercolumn'
     }, {
         text: '税率',
-        dataIndex: 'pd_taxrate'
+        dataIndex: 'pd_taxrate',
+        xtype: 'numbercolumn'
     }, {
         text: '金额',
         dataIndex: 'pd_total',
+        xtype: 'numbercolumn',
         summaryType: 'count'
     }, {
         text: '不含税单价',
-        dataIndex: 'pd_taxprice'
+        dataIndex: 'pd_taxprice',
+        xtype: 'numbercolumn'
     }, {
         text: '不含税金额',
-        dataIndex: 'pd_taxtotal'
+        dataIndex: 'pd_taxtotal',
+        xtype: 'numbercolumn'
     }, {
         text: '收货数量',
-        dataIndex: 'pd_acceptqty'
+        dataIndex: 'pd_acceptqty',
+        xtype: 'numbercolumn'
     }, {
         text: '收货金额',
-        dataIndex: 'pd_accepttotal'
+        dataIndex: 'pd_accepttotal',
+        xtype: 'numbercolumn'
     }, {
         text: '备注'
     }]

+ 6 - 2
frontend/saas-web/app/view/purchase/report/PurchaseController.js

@@ -52,11 +52,15 @@ Ext.define('saas.view.purchase.report.PurchaseController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

+ 2 - 0
frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -60,6 +60,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         width: 200
     }, {//∑求和
         text: '采购金额',
+        xtype: 'numbercolumn',
         dataIndex: 'pbd_amount',
         width: 200,
         renderer : function(v) {
@@ -94,6 +95,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         }
     }, {
         text: '应付余额',
+        xtype: 'numbercolumn',
         dataIndex: 'pb_pbdamount',
         width: 200,
         renderer : function(v) {

+ 6 - 2
frontend/saas-web/app/view/purchase/report/PurchasePayController.js

@@ -53,11 +53,15 @@ Ext.define('saas.view.purchase.report.PurchasePayController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -103,6 +103,7 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {//∑数量
         text: '数量',
         dataIndex: 'sd_qty',
+        xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');
@@ -118,6 +119,7 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {
         text: '单价',
+        xtype: 'numbercolumn',
         dataIndex: 'sd_price',
         renderer : function(v) {
             var arr = (v + '.').split('.');
@@ -127,9 +129,11 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {
         text: '税率',
+        xtype: 'numbercolumn',
         dataIndex: 'sd_taxrate'
     }, {//∑金额
         text: '金额',
+        xtype: 'numbercolumn',
         dataIndex: 'sd_total',
         renderer : function(v) {
             var arr = (v + '.').split('.');
@@ -146,6 +150,7 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {//∑不含税金额
         text: '不含税金额',
+        xtype: 'numbercolumn',
         dataIndex: 'sd_nettotal',
         renderer : function(v) {
             var arr = (v + '.').split('.');
@@ -163,6 +168,7 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {
         text: '出货数量',
         dataIndex: 'sd_sendqty',
+        xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');

+ 7 - 3
frontend/saas-web/app/view/sale/report/SaleController.js

@@ -82,17 +82,21 @@ Ext.define('saas.view.sale.report.SaleController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,

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

@@ -77,27 +77,35 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         dataIndex: 'pr_spec'
     }, {
         text: '单位',
+        xtype: 'numbercolumn',
         dataIndex: 'pr_unit'
     }, {
         text: '数量',
+        xtype: 'numbercolumn',
         dataIndex: 'pd_outqty'
     }, {
         text: '单价',
+        xtype: 'numbercolumn',
         dataIndex: 'pd_sendprice'
     }, {
         text: '税率%',
+        xtype: 'numbercolumn',
         dataIndex: 'pd_taxrate'
     }, {
         text: '含税金额',
+        xtype: 'numbercolumn',
         dataIndex: 'pd_ordertotal'
     }, {
         text: '成本金额',
+        xtype: 'numbercolumn',
         dataIndex: 'pd_total'
     }, {
         text: '毛利润',
+        xtype: 'numbercolumn',
         dataIndex: 'pd_profit'
     }, {
         text: '毛利率%',
+        xtype: 'numbercolumn',
         dataIndex: 'pd_profitpresent'
     }, {
         text : "备注", 

+ 13 - 5
frontend/saas-web/app/view/sale/report/SaleProfitController.js

@@ -82,17 +82,23 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -170,7 +176,8 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -191,7 +198,8 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 5 - 2
frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -56,14 +56,17 @@ Ext.define('saas.view.sale.report.SaleRec', {
         dataIndex: 'rbd_slkind'
     }, {
         text: '销售金额',
+        xtype: 'numbercolumn',
         dataIndex: 'rbd_amount'
     }, {
         text: '本次收款',
+        xtype: 'numbercolumn',
         dataIndex: 'rbd_nowbalance'
     }, {
-        text: '应收余额'
+        text: '应收余额',
+        xtype: 'numbercolumn',
     }, {
-        text: '回款比例'
+        text: '回款比例',
     }, {
         text: '备注',
         dataIndex: 'rbd_remark'

+ 9 - 3
frontend/saas-web/app/view/sale/report/SaleRecController.js

@@ -82,17 +82,23 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,

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

@@ -125,6 +125,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             }, {
                 text : "数量", 
                 dataIndex : "sd_qty",
+                xtype: 'numbercolumn',
                 allowBlank:false, 
                 editor : {
                     xtype : "numberfield",
@@ -146,6 +147,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 }
             },  {
                 text : "已转数", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_yqty", 
                 width : 120.0, 
                 hidden : true,
@@ -169,6 +171,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_price", 
                 width : 120.0,
                 editor : {
@@ -185,6 +188,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             }, 
             {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_taxrate", 
                 width : 120.0, 
                 editor : {
@@ -196,6 +200,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             },
             {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_total", 
                 width : 120.0,
                 renderer : function(v) {
@@ -214,6 +219,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             }, 
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "sd_nettotal",
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

+ 10 - 5
frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -84,19 +84,22 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -177,7 +180,8 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -198,7 +202,8 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 12 - 3
frontend/saas-web/app/view/sale/sale/QueryPanelController.js

@@ -80,17 +80,22 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -166,6 +171,8 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -186,6 +193,8 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -116,6 +116,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             }, {
                 text : "数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
                 allowBlank:false,
                 width : 120.0,
@@ -166,6 +167,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_sendprice", 
                 width : 120.0, 
                 editor : {
@@ -182,6 +184,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             }, 
            {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
                 width : 120.0, 
                 renderer : function(v) {
@@ -199,6 +202,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }
             }, {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
                 width : 120.0, 
                 editor : {
@@ -210,6 +214,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

+ 10 - 5
frontend/saas-web/app/view/sale/saleIn/FormPanelController.js

@@ -85,19 +85,22 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "flex": 1,
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "flex": 1,
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "额度",
                             "flex": 1,
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "客户地址",
                             "flex": 1,
@@ -177,7 +180,8 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -198,7 +202,8 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 13 - 3
frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js

@@ -72,17 +72,23 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -160,6 +166,8 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -180,6 +188,8 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -126,6 +126,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             },  {
                 text : "出货数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_outqty", 
                 width : 120.0, 
                 allowBlank:false,
@@ -177,6 +178,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_sendprice", 
                 width : 120.0,
                 editor : {
@@ -193,6 +195,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }, 
            {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
                 width : 120.0, 
                 renderer : function(v) {
@@ -210,6 +213,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             }, {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate", 
                 width : 120.0, 
                 editor : {
@@ -221,6 +225,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

+ 10 - 3
frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -82,19 +82,22 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
                                 "width": 100,
-                                align:'right'
+                                xtype: 'numbercolumn',
+                                align:'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -174,6 +177,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -194,6 +199,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 13 - 3
frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js

@@ -81,17 +81,23 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                                 "text": "税率",
                                 "flex": 1,
                                 "dataIndex": "cu_taxrate",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "承付天数",
                                 "flex": 1,
                                 "dataIndex": "cu_promisedays",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
-                                "width": 100
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align: 'end'
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,
@@ -168,6 +174,8 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -188,6 +196,8 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -172,6 +172,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             },
             {
                 text : "数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
                 width : 120.0,
                 allowBlank:false,

+ 14 - 7
frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -65,12 +65,14 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -144,17 +146,20 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     }) ;   
 
@@ -238,7 +243,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -259,7 +265,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 10 - 2
frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -55,11 +55,15 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -141,6 +145,8 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -161,6 +167,8 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -192,6 +192,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             },            
             {
                 text : "需求数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "mm_qty", 
                 width : 120.0,
                 editor : {
@@ -215,6 +216,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             },
             {
                 text : "单位用量", 
+                xtype: 'numbercolumn',
                 dataIndex : "mm_oneuseqty", 
                 width : 120.0,
                 editor : {
@@ -270,6 +272,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             },{
                 text : "出库单位成本", 
                 dataIndex : "mm_price", 
+                xtype: 'numbercolumn',
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
@@ -287,6 +290,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 }
             },            {
                 text : "出库成本", 
+                xtype: 'numbercolumn',
                 dataIndex : "mm_amount", 
                 width : 120.0, 
                 editor : {

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

@@ -205,7 +205,8 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -226,7 +227,8 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
@@ -323,7 +325,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         //     "text": "总库存数",
                         //     "dataIndex": "po_onhand",
                         //     "width": 100,
-                        //     align:'right'
+                        //     align:'end'
                         // },{
                         //     "text": "类型",
                         //     "dataIndex": "pr_kind",
@@ -344,7 +346,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         //     "text": "最小包装",
                         //     "dataIndex": "pr_zxbzs",
                         //     "width": 100,
-                        //     align:'right'
+                        //     align:'end'
                         // },{
                         //     "text": "L/T",
                         //     "dataIndex": "pr_leadtime",
@@ -437,6 +439,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -457,6 +460,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 10 - 2
frontend/saas-web/app/view/stock/make/QueryPanelController.js

@@ -55,11 +55,15 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +147,8 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +169,8 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -167,6 +167,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "数量", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
                 width : 120.0,
                 allowBlank : false,
@@ -220,6 +221,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "单价", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_orderprice",
                 width : 120.0,
                 editor : {
@@ -236,6 +238,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             }, 
            {
                 text : "含税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_total", 
                 width : 120.0,
                 editor : {
@@ -258,6 +261,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 }
             }, {
                 text : "税率", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_taxrate",
                 editor : {
                     xtype : "numberfield",
@@ -268,6 +272,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "未税金额", 
+                xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",

+ 14 - 5
frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -60,12 +60,14 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -144,17 +146,20 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "text": "税率",
                             "dataIndex": "cu_taxrate",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "承付天数",
                             "dataIndex": "cu_promisedays",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         }]
                     });
 
@@ -247,6 +252,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -267,6 +274,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 10 - 2
frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js

@@ -55,11 +55,15 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +147,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +169,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            xtype: 'numbercolumn',
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -157,6 +157,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "数量",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_outqty",
                 allowBlank : false,
                 width: 120.0,
@@ -210,6 +211,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "单价",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_orderprice",
                 editor : {
                     xtype : "numberfield",
@@ -232,6 +234,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "含税金额",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_total",
                 width: 120.0,
                 editor : {
@@ -254,6 +257,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 }
             }, {
                 text: "税率",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_taxrate",
                 editor : {
                     xtype : "numberfield",
@@ -264,6 +268,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "未税金额",
+                xtype: 'numbercolumn',
                 dataIndex: "pd_nettotal",
                 editor : {
                     xtype : "numberfield",

+ 6 - 2
frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js

@@ -55,11 +55,13 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100
+                            "width": 100,
+                            align: 'end'
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100,
+                            align: 'end'
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -143,6 +145,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
+                            align: 'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -163,6 +166,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
+                            align: 'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 4 - 2
frontend/saas-web/app/view/stock/report/ProdinoutCountController.js

@@ -71,7 +71,8 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -92,7 +93,8 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

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

@@ -90,6 +90,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         dataIndex: 'pd_unit'
     }, {
         text: '入库数量',
+        xtype: 'numbercolumn',
         dataIndex: 'inqty',
         renderer : function(v) {
             var arr = (v + '.').split('.');
@@ -106,6 +107,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         }
     }, {
         text: '出库数量',
+        xtype: 'numbercolumn',
         dataIndex: 'outqty',
         renderer : function(v) {
             var arr = (v + '.').split('.');
@@ -122,6 +124,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         }
     }, {
         text: '成本单价',
+        xtype: 'numbercolumn',
         dataIndex: 'pd_price',
         renderer : function(v) {
             var arr = (v + '.').split('.');

+ 4 - 2
frontend/saas-web/app/view/stock/report/ProdiodetailController.js

@@ -71,7 +71,8 @@ Ext.define('saas.view.stock.report.ProdiodetailController', {
                             "text": "总库存数",
                             "dataIndex": "po_onhand",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "类型",
                             "dataIndex": "pr_kind",
@@ -92,7 +93,8 @@ Ext.define('saas.view.stock.report.ProdiodetailController', {
                             "text": "最小包装",
                             "dataIndex": "pr_zxbzs",
                             "width": 100,
-                            align:'right'
+                            xtype: 'numbercolumn',
+                            align:'end'
                         },{
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",

+ 7 - 2
frontend/saas-web/app/view/stock/stockamount/DataList.js

@@ -88,7 +88,9 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         width : 120.0, 
     }, 
     {
-        text : "数量", 
+        text : "数量",
+        xtype: 'numbercolumn',
+        align: 'end',
         dataIndex : "rc_number", 
         width : 120.0, 
         renderer : function(v) {
@@ -99,7 +101,9 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         }
     }, 
     {
-        text : "单价", 
+        text : "单价",
+        xtype: 'numbercolumn',
+        align: 'end',
         dataIndex : "rc_price", 
         width : 120.0, 
         renderer : function(v) {
@@ -111,6 +115,7 @@ Ext.define('saas.view.stock.stockamount.DataList', {
     }, 
     {
         text : "金额", 
+        xtype: 'numbercolumn',
         dataIndex : "rc_amount", 
         flex : 1.0, 
         renderer : function(v) {

+ 6 - 0
frontend/saas-web/overrides/grid/column/Number.js

@@ -0,0 +1,6 @@
+Ext.define('saas.override.grid.column.Number', {
+    override: 'Ext.grid.column.Number',
+
+    align: 'end'
+
+});