bug修改

frontend/saas-web/app/model/report/SaleProfit.js

@@ -26,17 +26,6 @@ Ext.define('saas.model.report.SaleProfit', {
             depends: ['pd_ordertotal', 'pd_nettotal']
         }, 
         { name: 'pd_ordertotal', type: 'float' },//价税合计
-        { name: 'pd_ordertotal*pi_rate', type: 'float' ,
-            convert: function(v, rec) {
-                return Number(saas.util.BaseUtil.numberFormat((rec.get('pd_ordertotal') || 0.0), 2, false));
-            },
-            depends: ['pd_ordertotal']
-            /* convert: function(v, rec) {
-                var t = (rec.get('pd_ordertotal') || 0.0) * (rec.get('pi_rate') || 1.0);
-                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
-            },
-            depends: ['pd_ordertotal', 'pi_rate'] */
-        },//价税合计本位币
         { name: 'pd_price', type: 'float' },//成本单价
         { name: 'pd_total', type: 'float' },
         { name: 'pd_profit', type: 'float' },

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

@@ -193,7 +193,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         }
     }, {
         text: '毛利润(元)',
-        dataIndex: 'pd_profit*pi_rate',
+        dataIndex: 'pd_profit',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
         renderer: function(v) {