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

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -135,8 +135,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
 
                         if(mode=="MAIN"){
                             me.reconfigure(store, me.initColumns(me.baseColumn));
+                            me.applyScrollable(true)
                         }else{
                             me.reconfigure(store, me.initColumns(me.relativeColumn));
+                            me.applyScrollable(true)
                         }
                     }
                 }

frontend/saas-web/app/view/core/report/ReportPanel.scss

@@ -18,6 +18,9 @@ $border-color: #999;
 
                     .x-column-header-text-inner {
                         font-weight: bold;
+                        &:after {
+                            display: none;
+                        }
                     }
                 }
             }

frontend/saas-web/app/view/document/product/BasePanel.js

@@ -110,7 +110,7 @@ Ext.define('saas.view.document.product.BasePanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text : "标准定价(元)", 
+            text : "标准单价(元)", 
             dataIndex : "pr_standardprice",
             xtype: 'numbercolumn',
             width : 120.0,
@@ -132,7 +132,7 @@ Ext.define('saas.view.document.product.BasePanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text : "最新售价(元)", 
+            text : "最新出货单价(元)", 
             dataIndex : "pr_saleprice",
             xtype: 'numbercolumn',
             width : 120.0,

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

@@ -212,7 +212,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         }
                     }
                 }, {
-                    text: "金额",
+                    text: "金额(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "pd_taxtotal",
                     width: 120,
@@ -238,7 +238,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         return Ext.util.Format.number(v, '0');
                     }
                 }, {
-                    text: "税额",
+                    text: "税额(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "pd_taxamount",
                     width: 120,
@@ -250,7 +250,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
-                    text: "价税合计",
+                    text: "价税合计(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "pd_total",
                     width: 120,

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

@@ -238,7 +238,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
             }
         }, {
-            text: "金额",
+            text: "金额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_nettotal",
             width: 120,
@@ -264,7 +264,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 return Ext.util.Format.number(v, '0');
             },
         }, {
-            text: "税额",
+            text: "税额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_taxamount",
             width: 120,
@@ -276,7 +276,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: "价税合计",
+            text: "价税合计(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_ordertotal",
             width: 120,

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

@@ -231,7 +231,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 }
             }
         }, {
-            text: "金额",
+            text: "金额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_nettotal",
             width: 120,
@@ -257,7 +257,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 return Ext.util.Format.number(v, '0');
             },
         }, {
-            text: "税额",
+            text: "税额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_taxamount",
             width: 120,
@@ -269,7 +269,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: "价税合计",
+            text: "价税合计(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_ordertotal",
             width: 120,

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

@@ -235,7 +235,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         }
                     }
                 }, {
-                    text: "金额",
+                    text: "金额(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "sd_nettotal",
                     width: 120,
@@ -261,7 +261,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         return Ext.util.Format.number(v, '0');
                     }
                 }, {
-                    text: "税额",
+                    text: "税额(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "sd_taxamount",
                     width: 120,
@@ -273,7 +273,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
-                    text: "价税合计",
+                    text: "价税合计(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "sd_total",
                     width: 120,

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

@@ -250,7 +250,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     }
                 }
             }, {
-                text : "金额", 
+                text : "金额(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_nettotal", 
                 width : 120, 
@@ -276,7 +276,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     return Ext.util.Format.number(v, '0');
                 },
             }, {
-                text: "税额",
+                text: "税额(元)",
                 xtype: 'numbercolumn',
                 dataIndex: "pd_taxamount",
                 width: 120,
@@ -288,7 +288,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 }
             }, {
-                text : "价税合计", 
+                text : "价税合计(元)", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_ordertotal", 
                 width : 120, 

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

@@ -243,7 +243,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pr_unit',
             width: 80
         }, {
-            text: '销售单价(元)',
+            text: '出货单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
             width: 140,

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

@@ -257,7 +257,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }
             }
         }, {
-            text: "金额",
+            text: "金额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_nettotal",
             width: 120,
@@ -283,7 +283,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 return Ext.util.Format.number(v, '0');
             }
         }, {
-            text: "税额",
+            text: "税额(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_taxamount",
             width: 120,
@@ -295,7 +295,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: "价税合计",
+            text: "价税合计(元)",
             xtype: 'numbercolumn',
             dataIndex: "pd_ordertotal",
             width: 120,

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

@@ -235,7 +235,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pr_unit',
             width: 80
         }, {
-            text: '销售单价(元)',
+            text: '出货单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
             width: 140,