zhuth пре 7 година
родитељ
комит
1c71bd5ff2

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

@@ -54,7 +54,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }
                             }else {
-                                console.error('exception: ', response.responseJson);
+                                console.error('exception: ', response);
                                 saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                             }
                         }

+ 2 - 2
frontend/saas-web/app/view/core/dbfind/AddMultiDbfindGridPanel.js

@@ -94,8 +94,8 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }
                             }else {
-                                console.error('exception: ', response.responseJson);
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                                console.error('exception: ', response);
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                             }
                         }
                     }

+ 2 - 2
frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.js

@@ -35,8 +35,8 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }
                             }else {
-                                console.error('exception: ', response.responseJson);
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                                console.error('exception: ', response);
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                             }
                         }
                     }

+ 2 - 2
frontend/saas-web/app/view/core/dbfind/MultiDbfindGridPanel.js

@@ -94,8 +94,8 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }
                             }else {
-                                console.error('exception: ', response.responseJson);
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                                console.error('exception: ', response);
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                             }
                         }
                     }

+ 4 - 4
frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -206,8 +206,8 @@ Ext.define('saas.view.core.report.ReportPanel', {
                             var grid = me.items.items[1],
                                 store = grid.store,
                                 columns = grid.columns,
-                                summaryData = data.data ? (data.data.calculate || []) : [],
-                                datas = data.data ? (data.data.list ? data.data.list.list : []) : [];
+                                summaryData = data ? (data.data ? (data.data.calculate || []) : []) : [],
+                                datas = data ? (data.data ? (data.data.list ? data.data.list.list : []) : []) : [];
 
                             Ext.Array.each(columns, function (c) {
                                 var type = c.summaryType,
@@ -240,7 +240,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                             });
                             return datas;
                         } catch (e) {
-                            console.log(e);
+                            console.error(e);
                             saas.util.BaseUtil.showErrorToast(e.message);
                         }
                     },
@@ -256,7 +256,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                             if (response.timedout) {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             } else {
-                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                                saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                             }
                         }
                     }

+ 2 - 2
frontend/saas-web/app/view/document/address/DataListModel.js

@@ -28,8 +28,8 @@ Ext.define('saas.view.document.address.DataListModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }

+ 2 - 2
frontend/saas-web/app/view/document/bankinformation/DataListModel.js

@@ -33,8 +33,8 @@ Ext.define('saas.view.document.bankinformation.DataListModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }

+ 2 - 9
frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -155,20 +155,13 @@ Ext.define('saas.view.document.bom.FormPanel', {
                 dataIndex : "bd_baseqty",
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 0,
+                    decimalPrecision: 3,
                     minValue:0,
                     maxLength: 10,
-                    listeners: {
-                        change: function(f, v) {
-                            if((v+'').length > 10) {
-                                f.setValue(Number((v+'').substr(0, 10)));
-                            }
-                        }
-                    }
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(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);
                 }

+ 2 - 2
frontend/saas-web/app/view/document/employee/DataListModel.js

@@ -30,8 +30,8 @@ Ext.define('saas.view.document.employee.DataListModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }

+ 8 - 8
frontend/saas-web/app/view/document/kind/KindModel.js

@@ -30,8 +30,8 @@ Ext.define('saas.view.document.kind.KindModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }
@@ -69,8 +69,8 @@ Ext.define('saas.view.document.kind.KindModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }
@@ -108,8 +108,8 @@ Ext.define('saas.view.document.kind.KindModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }
@@ -148,8 +148,8 @@ Ext.define('saas.view.document.kind.KindModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }

+ 2 - 2
frontend/saas-web/app/view/document/productbrand/DataListModel.js

@@ -27,8 +27,8 @@ Ext.define('saas.view.document.productbrand.DataListModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }

+ 2 - 2
frontend/saas-web/app/view/document/productunit/DataListModel.js

@@ -27,8 +27,8 @@ Ext.define('saas.view.document.productunit.DataListModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }

+ 2 - 2
frontend/saas-web/app/view/document/warehouse/DataListModel.js

@@ -31,8 +31,8 @@ Ext.define('saas.view.document.warehouse.DataListModel', {
                                 saas.util.BaseUtil.showErrorToast('请求超时');
                             }
                         }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                            console.error('exception: ', response);
+                            saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                         }
                     }
                 }

+ 1 - 1
frontend/saas-web/app/view/home/infoCardList/InfoList.js

@@ -73,7 +73,7 @@ Ext.define('saas.view.home.infoCardList.InfoList', {
                                 if(response.timedout) {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
-                                    saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                                    saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                                 }
                             }
                         }

+ 0 - 1
frontend/saas-web/app/view/sale/report/Sale.js

@@ -188,7 +188,6 @@ Ext.define('saas.view.sale.report.Sale', {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
-            console.log(v, format, Ext.util.Format.number(v, format));
             return Ext.util.Format.number(v, format);
         }
     }, {

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

@@ -245,7 +245,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
                                 if(response.timedout) {
                                     saas.util.BaseUtil.showErrorToast('请求超时');
                                 }else{
-                                    saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson.message);
+                                    saas.util.BaseUtil.showErrorToast('查询失败:' + response.responseJson?response.responseJson.message:'请求超时');
                                 }
                             }
                         }