Merge remote-tracking branch 'origin/dev' into dev

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js

@@ -54,7 +54,7 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
     }, {
         text: "业务员编号",
         dataIndex: "cu_sellercode",
-        width:110
+        width:150
     }, {
         text: "业务员",
         dataIndex: "cu_sellername",

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

@@ -17,7 +17,11 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                                 from:'cu_name',to:'sa_custname'
                             },{
                                 from:'ca_address',to:'sa_toplace'
-                        }],
+                            },{
+                                from:'cu_sellercode',to:'sa_sellercode'
+                            },{
+                                from:'cu_sellername',to:'sa_seller'
+                            }],
                     }) ;   
 
                 }

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

@@ -238,7 +238,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             text: '已审核采购单数',
             dataIndex: 'sd_pdqty',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 180,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');

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

@@ -260,6 +260,9 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     decimalPrecision: 0,
                     minValue: 0,
                     maxValue: 100
+                },
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
                 }
             },
             {

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

@@ -233,6 +233,9 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     decimalPrecision: 0,
                     minValue: 0,
                     maxValue: 100
+                },
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
                 }
             },
             {

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

@@ -94,7 +94,7 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         width : 110.0, 
         renderer : function(v) {
             var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length>8?8:arr[1].length)).fill('0');
+            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);
         }