Browse Source

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

rainco 7 years ago
parent
commit
90b1508625

+ 11 - 2
frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -52,7 +52,16 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
         dataIndex: "ve_taxrate",
         width: 100,
         xtype: 'numbercolumn',
-        align:'end'
+        align:'end',
+        renderer : function(v) {
+            if(!v) {
+                return 0;
+            }
+            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: "承付天数",
         dataIndex: "ve_promisedays",
@@ -73,7 +82,7 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
     }, {
         text: "银行账户",
         dataIndex: "ve_bankcode",
-        flex:1
+        width: 200
     }]
 
 });

+ 1 - 0
frontend/saas-web/overrides/form/field/Date.js

@@ -3,6 +3,7 @@ Ext.define('saas.override.form.field.Date', {
     formatText: '',
 
     setValue: function (v) {
+        debugger;
         var me = this;
 
         if(v && me.format) {