Browse Source

代码提交

hy 7 years ago
parent
commit
aa8db26106

+ 2 - 4
frontend/saas-web/app/view/document/kind/Kind.js

@@ -235,11 +235,9 @@ Ext.define('saas.view.document.kind.Kind', {
                     iconCls:'',
                     iconCls:'',
                     getClass: function(v, meta, rec) {
                     getClass: function(v, meta, rec) {
                         if(rec.get('wh_statuscode')=='OPEN'){
                         if(rec.get('wh_statuscode')=='OPEN'){
-                            this.items[0].tooltip = '启用';
-                            return 'x-grid-checkcolumn-checked';
+                            return 'x-grid-checkcolumn-checked-btn';
                         }else{
                         }else{
-                            this.items[0].tooltip = '不启用';
-                            return 'x-grid-checkcolumn';
+                            return 'x-grid-checkcolumn-btn';
                         }
                         }
                     },
                     },
                     handler: function(view, rowIndex, colIndex) {
                     handler: function(view, rowIndex, colIndex) {

+ 1 - 1
frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -175,7 +175,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
     },{  
     },{  
         xtype : "numberfield", 
         xtype : "numberfield", 
         name : "ve_leftamount", 
         name : "ve_leftamount", 
-        fieldLabel : "应付款额", 
+        fieldLabel : "应付款额", 
         allowBlank : true, 
         allowBlank : true, 
         readOnly:true,
         readOnly:true,
         ignore:true,
         ignore:true,

+ 13 - 0
frontend/saas-web/app/view/main/Main.scss

@@ -158,3 +158,16 @@ $treelist-nav-ui: (
 .x-tbar-display .x-form-display-field-default {
 .x-tbar-display .x-form-display-field-default {
     font: 400 16px/17px 'Microsoft YaHei';
     font: 400 16px/17px 'Microsoft YaHei';
 }
 }
+
+.x-grid-checkcolumn-btn {
+	margin-top: -1px;
+    width: 34px;
+    height: 21px;
+    background: url(../../../../resources/images/grid/uncheck.png) 0 0 no-repeat;
+}
+.x-grid-checkcolumn-checked-btn {
+	margin-top: 0px;
+	width: 34px;
+    height: 21px;
+    background: url(../../../../resources/images/grid/check.png) 0 0 no-repeat;
+}

+ 6 - 2
frontend/saas-web/app/view/stock/stockamount/DataList.js

@@ -89,10 +89,14 @@ Ext.define('saas.view.stock.stockamount.DataList', {
     }, 
     }, 
     {
     {
         text : "数量", 
         text : "数量", 
-        format:'0,000',
-        xtype:'numbercolumn',
         dataIndex : "rc_number", 
         dataIndex : "rc_number", 
         width : 120.0, 
         width : 120.0, 
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length>3?3:arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, 
     }, 
     {
     {
         text : "单价", 
         text : "单价", 

BIN
frontend/saas-web/resources/images/grid/check.png


BIN
frontend/saas-web/resources/images/grid/uncheck.png