Browse Source

修改采购模块

zhoudw 7 years ago
parent
commit
89cc436dea

+ 6 - 3
frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -157,7 +157,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -206,7 +207,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0, 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -228,7 +230,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

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

@@ -189,7 +189,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -249,14 +250,24 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },
-            }, 
-           {
+            }, {
+                text : "税率", 
+                dataIndex : "pd_taxrate", 
+                width : 120.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 0,
+                    minValue: 0,
+                    maxValue: 100
+                }
+            },{
                 text : "含税金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -271,23 +282,14 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
-            }, {
-                text : "税率", 
-                dataIndex : "pd_taxrate", 
-                width : 120.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 0,
-                    minValue: 0,
-                    maxValue: 100
-                }
             },
             {
                 text : "未税金额", 
                 dataIndex : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

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

@@ -174,15 +174,18 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     var format = '0.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
-            },            {
-                text : "已转数", 
-                dataIndex : "pd_yqty", 
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
-            },{
+            },            
+            // {
+            //     text : "已转数", 
+            //     dataIndex : "pd_yqty", 
+            //     width : 120.0, 
+            //     xtype : "numbercolumn", 
+            //     format:'0',
+            //     items : null,
+            //     summaryType: 'sum'
+            // },
+            
+            {
                 text : "仓库id", 
                 dataIndex : "pd_whid", 
                 xtype : "numbercolumn",
@@ -222,29 +225,47 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 dataIndex : "pd_orderprice", 
                 width : 120.0, 
                 xtype : "numbercolumn"
-            }, 
-           {
-                text : "含税金额", 
-                dataIndex : "pd_total", 
-                width : 120.0, 
-                xtype : "numbercolumn",
-                summaryType: 'sum'
-            }, {
+            },{
                 text : "税率", 
-                dataIndex : "pd_taxrate",
+                dataIndex : "pd_taxrate", 
+                width : 120.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
                     minValue: 0,
                     maxValue: 100
                 }
+            }, 
+            {
+                text : "含税金额", 
+                dataIndex : "pd_total", 
+                width : 120.0, 
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2,
+                    editable : false
+                },
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                },
+                summaryType: 'sum',
+                summaryRenderer: function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             },
             {
                 text : "未税金额", 
                 dataIndex : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');