Browse Source

销售采购单价+税率默认显示格式

rainco 7 years ago
parent
commit
e6ae68abc2

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

@@ -143,13 +143,16 @@ Ext.define('saas.view.document.product.BasePanel', {
             width : 200.0, 
             width : 200.0, 
         }, {
         }, {
             text : "型号", 
             text : "型号", 
-            dataIndex : "pr_orispeccode"
+            dataIndex : "pr_orispeccode", 
+            width : 200.0, 
         }, {
         }, {
             text : "品牌", 
             text : "品牌", 
-            dataIndex : "pr_brand"
+            dataIndex : "pr_brand", 
+            width : 150.0, 
         }, {
         }, {
             text : "供应商", 
             text : "供应商", 
-            dataIndex : "pr_vendname"
+            dataIndex : "pr_vendname", 
+            width : 150.0,
         }, {
         }, {
             text : "最小包装", 
             text : "最小包装", 
             dataIndex : "pr_zxbzs",
             dataIndex : "pr_zxbzs",

+ 9 - 2
frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -199,9 +199,13 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 },
                 },
                 renderer : function(v) {
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
+                    if(v||v==0){
+                        return Ext.util.Format.number(v, '0.00');
+                    }else{
+                        return Ext.util.Format.number(v, format);
+                    }
                 }
                 }
             },
             },
             {
             {
@@ -239,6 +243,9 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     decimalPrecision: 0,
                     decimalPrecision: 0,
                     minValue: 0,
                     minValue: 0,
                     maxValue: 100
                     maxValue: 100
+                },
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
                 }
                 }
             },{
             },{
                 text : "需求日期", 
                 text : "需求日期", 

+ 13 - 5
frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -55,7 +55,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "textfield", 
         xtype : "textfield", 
         name : "sa_toplace", 
         name : "sa_toplace", 
         fieldLabel : "交货地址", 
         fieldLabel : "交货地址", 
-        columnWidth : 0.5
+        columnWidth : 0.5,
+        allowBlank : false
     }, {
     }, {
         name : "detailGridField", 
         name : "detailGridField", 
         xtype : "detailGridField", 
         xtype : "detailGridField", 
@@ -145,7 +146,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 text : "已转数", 
                 text : "已转数", 
                 xtype: 'numbercolumn',
                 xtype: 'numbercolumn',
                 dataIndex : "sd_yqty", 
                 dataIndex : "sd_yqty", 
-                width : 120.0, 
+                width : 0, 
                 hidden : true,
                 hidden : true,
                 editor : {
                 editor : {
                     xtype : "numberfield",
                     xtype : "numberfield",
@@ -177,10 +178,14 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 },
                 },
                 renderer : function(v) {
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
                     var format = '0,000.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                },
+                    if(v||v==0){
+                        return Ext.util.Format.number(v, '0.00');
+                    }else{
+                        return Ext.util.Format.number(v, format);
+                    }
+                }
             }, 
             }, 
             {
             {
                 text : "税率", 
                 text : "税率", 
@@ -193,6 +198,9 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     minValue: 0,
                     minValue: 0,
                     maxValue: 100
                     maxValue: 100
                 },
                 },
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
+                }
             },
             },
             {
             {
                 text : "含税金额", 
                 text : "含税金额",