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

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -305,7 +305,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                         }
                     }
                 }, 
-                text : "是否默认联系人", 
+                text : "默认联系人", 
                 width : 200.0, 
                 dataIndex : "cc_default", 
                 xtype : "",
@@ -401,7 +401,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                         }
                     }
                 }, 
-                text : "是否默认地址", 
+                text : "默认地址", 
                 dataIndex : "ca_default", 
                 xtype : "",
                 renderer: function (v, m, r) {

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -275,7 +275,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                         }
                     }
                 }, 
-                text : "是否默认联系人", 
+                text : "默认联系人", 
                 dataIndex : "vc_default", 
                 xtype : "",
                 renderer: function (v, m, r) {

frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -94,10 +94,10 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         dataIndex: 'pb_payrate',
         xtype: 'numbercolumn',
         renderer : function(v) {
-            var arr = (v*100 + '.').split('.');
+            var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0.' + xr.join();
-            return Ext.util.Format.number(v*100, format);
+            return Ext.util.Format.number(v, format);
         }
     }, {
         text: '备注',

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

@@ -327,7 +327,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             },{
                 text : "替代料",
                 dataIndex : "mm_repprodcode",
-                width : 200.0,
+                width : 0,
                 editor : {
                     xtype : "textfield"
                 },

frontend/saas-web/overrides/form/field/Date.js

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