Browse Source

Merge remote-tracking branch 'origin/dev' into dev

heqinwei 7 years ago
parent
commit
8138136e8a

+ 2 - 2
frontend/saas-web/app/Application.scss

@@ -421,8 +421,8 @@ div::-webkit-scrollbar-track {
   border-left: 1px solid #D2D6E5;
   
   &:before {
-    content: "\e80f";
-    font-family: font-saas;
+    // content: "\e80f";
+    // font-family: font-saas;
     color: #5AC6F8;
   }
 }

+ 2 - 1
frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -89,7 +89,8 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         xtype: 'numbercolumn',
         dataIndex: 'pb_pbdamount',
         xtype: 'numbercolumn',
-        width: 110
+        width: 110,
+        hidden:true
     }, {
         text: '付款比例%',
         //本次付款/采购金额*100%

+ 1 - 0
frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -85,6 +85,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
         text: '应收余额',
         xtype: 'numbercolumn',
         dataIndex: 'rb_rbdamount',
+        hidden:true,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');