代码提交

frontend/saas-web/app/view/purchase/deviceQuery/DataList.js

@@ -7,8 +7,7 @@ Ext.define('saas.view.purchase.deviceQuery.DataList', {
     controller: 'purchase-deviceQuery-datalist',
     viewModel: 'purchase-deviceQuery-datalist',
     autoScroll: true,
-    frame:true,
-    style:'padding:0;',
+    style:'padding:0;border:1px solid #fff',
     layout:'fit',
     dataUrl:'/api/purchase/purchase/device/list',                 
     deleteUrl:'/api/commons/number/delete/',

frontend/saas-web/app/view/purchase/quotationList/DataList.js

@@ -5,7 +5,7 @@ Ext.define('saas.view.purchase.quotationList.DataList', {
     controller: 'purchase-quotationList-datalist',
     viewModel: 'purchase-quotationList-datalist',
     autoScroll: true,
-    frame:true,
+    style:'border:1px solid #fff',
     cls:'x-quotation-main',
     layout:'fit',
     
@@ -86,8 +86,8 @@ Ext.define('saas.view.purchase.quotationList.DataList', {
                                 beforeshow: function updateTipBody(tip) {
                                     var dg = Ext.getCmp('grid-'+id);
                                     var rowindex = tip.triggerElement.parentNode.rowIndex;
-							        var rec = Ext.getCmp(grid.id).getStore().getAt(rowindex-1);
-                                    dg.store.loadData(val);
+                                    var rec = Ext.getCmp(grid.id).getStore().getAt(rowindex);
+                                    dg.store.loadData(rec.get('replies'));
                                     dg.show();
                                 }
                             },
@@ -100,7 +100,10 @@ Ext.define('saas.view.purchase.quotationList.DataList', {
                                 columns: [{
                                     text: '分段数量',
                                     dataIndex: 'lapQty',
-                                    width: 110
+                                    width: 110,
+                                    renderer:function(v,m,rec){
+                                        return '≥' +v
+                                    }
                                 }, {
                                     text: '分段价格',
                                     dataIndex: 'price',
@@ -136,6 +139,7 @@ Ext.define('saas.view.purchase.quotationList.DataList', {
                             success: function(response, o){
                                 var res = Ext.decode(response.responseText);
                                 if(res.success){
+                                    Ext.getCmp('main-tab-panel').getActiveTab().items.items[0].store.loadPage(1);
                                     saas.util.BaseUtil.showSuccessToast('操作成功');
                                 }else{
                                     saas.util.BaseUtil.showErrorToast('操作失败:'+res.message);

frontend/saas-web/app/view/purchase/sendQuotation/DataList.js

@@ -7,9 +7,8 @@ Ext.define('saas.view.purchase.sendQuotation.DataList', {
     controller: 'purchase-sendQuotation-datalist',
     viewModel: 'purchase-sendQuotation-datalist',
     autoScroll: true,
-    frame:true,
     layout:'fit',
-    
+    style:'border:1px solid #fff',
     dataUrl:'/api/document/product/list',                 
     sendQuotationUrl:'/api/purchase/purchase/inquiry/send',
 
@@ -53,7 +52,8 @@ Ext.define('saas.view.purchase.sendQuotation.DataList', {
                 grid.store.loadPage(1);
             }
         }
-    },'->',{
+    },{
+        margin:'0 10 0 30',
         width: 180,
         name: 'endDate',
         xtype: 'numberfield',
@@ -75,6 +75,11 @@ Ext.define('saas.view.purchase.sendQuotation.DataList', {
                 grid.onVastDeal(grid.sendQuotationUrl,endDate.value);
             }
         }
+    },'->',{
+        ignore:true,
+        style:'text-align: center;',
+        xtype:'displayfield',
+        value:'<a href=\"javascript:saas.util.BaseUtil.openTab(\'purchase-quotationList-datalist\',\'询价信息查询\',\'maintab-query-quotationList\')\">询价信息查询</a>'
     }],
 
     columns : [{
@@ -298,7 +303,7 @@ Ext.define('saas.view.purchase.sendQuotation.DataList', {
             value = item.value,
             condition;
 
-            if(value&&value!=''){
+            if(value&&value!=''&&!item.ignore){
                 if(typeof func == 'function') {
                     condition = {
                         type: 'condition',

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.sale.b2b.QuoteWin', {
 
                     for (var x = 0; x < gridData.length; x++) {
                         var d = gridData[x];
-                        if (!d.get('step') || !d.get('price')) {
+                        if (!d.get('lapQty') || !d.get('price')) {
                             flag = false
                         }
                     }