B2B对接bug修改

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -85,7 +85,8 @@ Ext.define('saas.view.core.base.GridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response);
-                                saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
+                                var message = response.responseJson?(response.responseJson.message==null?'没有数据':response.responseJson.message):'请求超时';
+                                saas.util.BaseUtil.showErrorToast('查询失败：' + message);
                             }
                         }
                     }

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -102,7 +102,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 if(response.timedout) {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
-                                    saas.util.BaseUtil.showErrorToast('查询失败：' + (response.responseJson?response.responseJson.message:'请求超时'));
+                                    console.error('exception: ', response);
+                                    var message = response.responseJson?(response.responseJson.message==null?'没有数据':response.responseJson.message):'请求超时';
+                                    saas.util.BaseUtil.showErrorToast('查询失败：' + message);
                                 }
                             }
                         }

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

@@ -22,7 +22,8 @@ Ext.define('saas.view.sale.b2b.RecDataList', {
                 name:'ar_date',
                 xtype: 'condatefield',
                 fieldLabel: '日期',
-                columnWidth: 0.5
+                columnWidth: 0.5,
+                value:2
             }],
             toolButtons:[{
                 ignore: true,

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

@@ -239,6 +239,7 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanel', {
             name:'date',
             xtype: 'condatefield',
             fieldLabel: '日期',
+            value:2,
             width:520,
         },{
             margin:'0 0 0 10',

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

@@ -71,6 +71,8 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanelController', {
         .catch(function(e) {
             me.setLoading(false);
             console.error(e);
+            saas.util.BaseUtil.showErrorToast('未查询到对账信息，请修改查询条件');
+            viewModel.setData({detailgrid:null});
         });
     },
     check:function(url){
@@ -95,6 +97,22 @@ Ext.define('saas.view.sale.b2b.recformpanel.FormPanelController', {
             }
             checkAmount+=item.get('money')
             item.data.pidate = new Date(item.data.pidate).getTime()
+            item.data.inoutnodetno = item.data.detno
+            item.data.orderClass = item.data.piclass
+            item.data.orderDetno = item.data.orderdetno
+            item.data.checkQty = item.data.thischeckqty
+            item.data.amount = item.data.money
+            item.data.sourceId = item.data.sourceid
+            item.data.sourceTable = item.data.sourcetable
+            item.data.status = 0
+            item.data.receiveCode = item.data.receivecode
+            item.data.receiveName = item.data.receivename
+            item.data.prodCode  = item.data.prodcode
+            item.data.prodTitle  = item.data.prodtitle
+            item.data.prodUnit  = item.data.produnit
+            item.data.prodSpec  = item.data.prodspec
+            item.data.custUserUU  = item.data.custuseruu
+            item.data.price  = item.data.orderprice
             items.push(item.data)
         })
         if(badTaxrate){

frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -37,7 +37,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         bind: '{form.pr_detail}',
         getCondition: function(v) {
             if(v) {
-                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_barnd) like '%"+v.toUpperCase()+"%')";
+                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_brand) like '%"+v.toUpperCase()+"%')";
             }else {
                 return '1 = 1';
             }
@@ -286,6 +286,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
 
             store.setPageSize(pageSize);
 
+            debugger
             grid.ownerCt.el.dom.style.left = '8px';
             grid.el.dom.style.padding = '0px'
         },