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

frontend/saas-web/app/util/FormUtil.js

@@ -36,6 +36,18 @@ Ext.define('saas.util.FormUtil', {
                     });
                     Ext.Array.each(items, function(item) {
 
+                        //　设置必填
+                        if(item.allowBlank==false){
+                            // TODO 需要判断类型
+                            item.beforeLabelTextTpl = "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>";
+                        }
+
+                        if(item.xtype == 'textfield') {
+                            Ext.applyIf(item, {
+                                maxLength: 50
+                            });
+                        }
+                        
                         if(item.xtype == 'datefield') {
                             Ext.applyIf(item, {
                                 format: 'Y-m-d'
@@ -51,12 +63,6 @@ Ext.define('saas.util.FormUtil', {
                             formModel.set(item.name, 0);
                         }
 
-                        //　设置必填
-                        if(item.allowBlank==false){
-                            // TODO 需要判断类型
-                            item.beforeLabelTextTpl = "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>";
-                        }
-
                         // 如果是从表为其绑定store
                         if(item.xtype == 'detailGridField') {
                             var index = form.detailCount;

frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -114,7 +114,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 dataIndex : "sd_qty", 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -158,7 +159,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -111,7 +111,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -159,7 +160,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 width : 120.0, 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -121,7 +121,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 allowBlank:false,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -170,7 +171,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -165,7 +165,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -72,10 +72,11 @@ Ext.define('saas.view.stock.make.FormPanel', {
         columnWidth: 0.2
     },
     {
-        xtype : "textfield", 
+        xtype : "numberfield", 
         name : "ma_qty", 
         fieldLabel : "数量",
-        columnWidth: 0.2
+        columnWidth: 0.2,
+        minValue:0
     },{
         xtype : "hidden", 
         name : "ma_whid", 
@@ -162,7 +163,8 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');