Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -49,12 +49,6 @@ Ext.define('saas.view.document.bom.FormController', {
                         dbfinds:[
                         {
                             from:'pr_code',to:'bd_replace'                          
-                        },{
-                            from:'pr_detail',to:'pr_detail'
-                        },{
-                            from:'pr_spec',to:'pr_spec'
-                        },{
-                            from:'pr_unit',to:'pr_unit'
                         }],
                     }) ;   
                 }

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

@@ -125,7 +125,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 150
         },{
             text: '总金额',
-            dataIndex: 'pd_ordertotal',
+            dataIndex: 'pi_total',
             width: 110
         },{
             text: '单据状态',

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

@@ -125,7 +125,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             width: 150
         },{
             text: '总金额',
-            dataIndex: 'pd_ordertotal',
+            dataIndex: 'pi_total',
             width: 110
         },{
             text: '单据状态',