bug

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

@@ -15,7 +15,7 @@ Ext.define('saas.model.report.SaleRec', {
         { name: 'rb_backrate', type: 'float' },
         { name: 'pi_total-pi_nettotal', type: 'float',
             convert: function(v, rec) {
-                var t = (rec.get('sd_total') || 0.0) - (rec.get('sd_nettotal') || 0.0);
+                var t = (rec.get('pi_total') || 0.0) - (rec.get('pi_nettotal') || 0.0);
                 return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             depends: ['pi_total', 'pi_nettotal']

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

@@ -10,7 +10,7 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'pr_orispeccode', type: 'string' }, // 型号
         { name: 'pr_spec', type: 'string' }, // 规格
         { name: 'sd_qty', type: 'float' }, // 数量
-        { name: 'pr_unit', type: 'float' }, // 单位
+        { name: 'pr_unit', type: 'string' }, // 单位
         { name: 'sd_netprice', type: 'float', // 单价
         },
         { name: 'sd_price', type: 'float', // 含税单价

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

@@ -60,7 +60,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             from: 'pr_unit', to: 'pr_unit'
                         }, {
-                            from:'pr_purcprice',to:'pd_price'
+                            from:'pr_purcprice',to:'pd_taxprice'
                         },{
                             from:'pr_zxbzs',to:'pr_zxbzs'
                         }],

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

@@ -58,7 +58,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         dbfinds: [{
                             from: 'pr_code', to: 'sd_prodcode'
                         }, {
-                            from: 'pr_saleprice', to: 'sd_price'
+                            from: 'pr_saleprice', to: 'sd_netprice'
                         }, {
                             from: 'pr_detail', to: 'pr_detail'
                         }, {

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

@@ -128,7 +128,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     },  {
         text: '仓库',
         dataIndex: 'pd_whname',
-        width: 80
+        width: 150
     }, {
         text: '往来单位',
         dataIndex: 'bizname',