倒算bug

frontend/saas-web/app/model/purchase/ProdInDetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.purchase.ProdInDetail', {
         { name: 'pd_orderprice', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_netprice', 'pd_taxrate']
         },
         { name: 'pd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * rec.get('pd_inqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_netprice', 'pd_inqty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.purchase.ProdInDetail', {
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_ordertotal') - rec.get('pd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_ordertotal', 'pd_nettotal']
         },
         { name: 'pd_ordertotal', type: 'float', // 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_orderprice') * rec.get('pd_inqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_orderprice', 'pd_inqty']
         },

frontend/saas-web/app/model/purchase/ProdOutDetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.purchase.ProdOutDetail', {
         { name: 'pd_orderprice', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_netprice', 'pd_taxrate']
         },
         { name: 'pd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * rec.get('pd_outqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_netprice', 'pd_outqty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.purchase.ProdOutDetail', {
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_ordertotal') - rec.get('pd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_ordertotal', 'pd_nettotal']
         },
         { name: 'pd_ordertotal', type: 'float', // 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_orderprice') * rec.get('pd_outqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_orderprice', 'pd_outqty']
         },

frontend/saas-web/app/model/purchase/purchasedetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.purchase.Purchasedetail', {
         { name: 'pd_price', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_taxprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_taxprice', 'pd_taxrate']
         },
         { name: 'pd_taxtotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_taxprice') * rec.get('pd_qty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_taxprice', 'pd_qty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.purchase.Purchasedetail', {
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_total') - rec.get('pd_taxtotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_total', 'pd_taxtotal']
         },
         { name: 'pd_total', type: 'float', // 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_price') * rec.get('pd_qty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_price', 'pd_qty']
         },

frontend/saas-web/app/model/sale/SaleInDetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.sale.SaleInDetail', {
         { name: 'pd_sendprice', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_netprice', 'pd_taxrate']
         },
         { name: 'pd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * rec.get('pd_inqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_netprice', 'pd_inqty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.sale.SaleInDetail', {
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_ordertotal') - rec.get('pd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_ordertotal', 'pd_nettotal']
         },
         { name: 'pd_ordertotal', type: 'float',// 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_sendprice') * rec.get('pd_inqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_sendprice', 'pd_inqty']
         },
@@ -46,7 +46,7 @@ Ext.define('saas.model.sale.SaleInDetail', {
         { name: 'pd_whcode', type: 'string' }, // 仓库编号
         { name: 'pd_whname', type: 'string' }, // 仓库
         { name: 'pd_sdid', type: 'int' }, // 销售订单明细id
-        { name: 'pd_ordercode', type: 'int' }, // 销售单号
+        { name: 'pd_ordercode', type: 'string' }, // 销售单号
         { name: 'pd_orderdetno', type: 'int' }, // 销售序号
         { name: 'pd_remark', type: 'string' }, // 备注
     ],

frontend/saas-web/app/model/sale/SaleOutDetail.js

@@ -20,28 +20,28 @@ Ext.define('saas.model.sale.SaleOutDetail', {
         { name: 'pd_sendprice', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * (1 + rec.get('pd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['pd_netprice', 'pd_taxrate']
         },
         { name: 'pd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('pd_netprice') * rec.get('pd_outqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_netprice', 'pd_outqty']
         },
         { name: 'pd_ordertotal', type: 'float', // 价税合计
             convert: function(v, rec) {
                 var t = rec.get('pd_sendprice') * rec.get('pd_outqty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_sendprice', 'pd_outqty']
         },
         { name: 'pd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('pd_ordertotal') - rec.get('pd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pd_ordertotal', 'pd_nettotal']
         },

frontend/saas-web/app/model/sale/Saledetail.js

@@ -16,14 +16,14 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'sd_price', type: 'float', // 含税单价
             convert: function(v, rec) {
                 var t = rec.get('sd_netprice') * (1 + rec.get('sd_taxrate') / 100);
-                return saas.util.BaseUtil.numberFormat(t, 4, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 4, false));
             },
             depends: ['sd_netprice', 'sd_taxrate']
         },
         { name: 'sd_nettotal', type: 'float', // 金额
             convert: function(v, rec) {
                 var t = rec.get('sd_netprice') * rec.get('sd_qty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['sd_netprice', 'sd_qty']
         },
@@ -31,14 +31,14 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'sd_taxamount', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = rec.get('sd_total') - rec.get('sd_nettotal');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['sd_total', 'sd_nettotal']
         },
         { name: 'sd_total', type: 'float',// 价税合计
             convert: function(v, rec) {
                 var t = rec.get('sd_price') * rec.get('sd_qty');
-                return saas.util.BaseUtil.numberFormat(t, 2, true);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['sd_price', 'sd_qty']
         },

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

@@ -208,7 +208,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                             var r = grid.getSelection()[0],
                                 pd_taxrate = r.get('pd_taxrate');
                             var v = value / (1 + pd_taxrate / 100);
-                            r.set('pd_taxprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                            r.set('pd_taxprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                         }
                     }
                 }, {

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

@@ -234,7 +234,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     var r = grid.getSelection()[0],
                         pd_taxrate = r.get('pd_taxrate');
                     var v = value / (1 + pd_taxrate / 100);
-                    r.set('pd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                    r.set('pd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                 }
             }
         }, {

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

@@ -227,7 +227,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     var r = grid.getSelection()[0],
                         pd_taxrate = r.get('pd_taxrate');
                     var v = value / (1 + pd_taxrate / 100);
-                    r.set('pd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                    r.set('pd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                 }
             }
         }, {

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

@@ -231,7 +231,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                             var r = grid.getSelection()[0],
                                 sd_taxrate = r.get('sd_taxrate');
                             var v = value / (1 + sd_taxrate / 100);
-                            r.set('sd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                            r.set('sd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                         }
                     }
                 }, {

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

@@ -246,7 +246,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                         var r = grid.getSelection()[0],
                         pd_taxrate = r.get('pd_taxrate');
                         var v = value / (1 + pd_taxrate / 100);
-                        r.set('pd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                        r.set('pd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                     }
                 }
             }, {

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

@@ -253,7 +253,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     var r = grid.getSelection()[0],
                         pd_taxrate = r.get('pd_taxrate');
                     var v = value / (1 + pd_taxrate / 100);
-                    r.set('pd_netprice', saas.util.BaseUtil.numberFormat(v, 4, true));
+                    r.set('pd_netprice', Number(saas.util.BaseUtil.numberFormat(v, 4, false)));
                 }
             }
         }, {