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

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -37,7 +37,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
 
         addRows = function(id) {
             var grid = Ext.getCmp(id);
-            if(grid.editable) {
+            if(grid.editable && grid.fireEvent('beforeAddRow', grid, 0)) {
                 grid.addDetail(0);
             }
         };
@@ -225,7 +225,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     addDetail: function(v, d) {
         d = d || {};
         var me = this;
-        if(!me.editable) {
+        if(!me.editable || !me.fireEvent('beforeAddRow', me, v, d)) {
             return;
         }
         var detnoColumn = me.detnoColumn,

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

@@ -18,6 +18,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     _auditdateField: 'pu_auditdate',
     _relationColumn: 'pd_puid',
     _readUrl: '/api/purchase/purchase/read',
+    // _readUrl: 'http://10.1.80.36:8560/api/purchase/purchase/read',
     _saveUrl: '/api/purchase/purchase/save',
     _auditUrl: '/api/purchase/purchase/audit',
     _unAuditUrl: '/api/purchase/purchase/unAudit',
@@ -104,6 +105,15 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     });
                     this.dialog.show();
                 }
+            }, {
+                xtype: "textfield",
+                name: "b2bStatus",
+                fieldLabel: "上传状态",
+                columnWidth: 0.25,
+                readOnly: true,
+                bind: {
+                    hidden: '{!enableB2B}'
+                }
             }, {
                 name: "detailGridField",
                 xtype: "detailGridField",

frontend/saas-web/app/view/sale/b2b/QuoteWin.js

@@ -155,7 +155,17 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
                         renderer: function (v, m, r) {
                             return saas.util.BaseUtil.numberFormat(v, 4, true);
                         },
-                    }]
+                    }],
+                    listeners: {
+                        beforeaddrow: function(grid, index, data) {
+                            if(grid.store.getCount() < 5) {
+                                return true;
+                            }else {
+                                saas.util.BaseUtil.showErrorToast('最多只能设置5条梯度价格');
+                                return false;
+                            }
+                        }
+                    }
                 }, {
                     xtype: 'textfield',
                     name: 'message',