toast提示框替换/删除GridUtil、QueryUtil

frontend/saas-web/app/util/BaseUtil.js

@@ -40,21 +40,4 @@ Ext.define('saas.util.BaseUtil', {
             });
         })
     },
-
-    /**
-     * 显示toast提示
-     * @param content: 内容
-     * @param title: 标题
-     * 
-     */
-    showToast: function(content, title) {
-        Ext.toast({
-            html: content,
-            title: title,
-            closable: false,
-            align: 't',
-            slideDUration: 400,
-            maxWidth: 400
-        });
-    }
 });

frontend/saas-web/app/util/Errors.js

@@ -42,16 +42,16 @@ Ext.define('saas.util.Errors', {
                 if (error.code === -32096) {    // READONLY_SESSION
                     // The session is read-only (demo version), let's display a temporary message
                     // and return false since this exception should not be considered as an error.
-                    Ext.toast(error.message, 2000);
+                    showToast(error.message);
                     return false;
                 }
                 if (error.code === -32001 && form) {
                     form.setErrors(this.toForm(error));
                 } else {
-                    Ext.Msg.alert(error.name + ' Error', error.message);
+                    showToast(error.name + ' Error：' + error.message);
                 }
             } else if (Ext.isString(error)) {
-                Ext.Msg.alert('Error', error);
+                showToast('Error：' + error);
             }
 
             return true;

frontend/saas-web/app/view/auth/LoginController.js

@@ -18,7 +18,7 @@ Ext.define('saas.view.auth.LoginController', {
         //         me.fireEvent('login', session);
         //     })
         //     .catch(function(error) {
-        //         Ext.toast(error);
+        //         showToast(error);
         //     })
         //     .then(function(session) {
         //         me.getView().setMasked(false);

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

@@ -152,14 +152,14 @@ Ext.define('saas.view.core.baseform.GridPanel', {
                     async:false
                 })
                 .then(function() {
-                    Ext.toast('操作成功');
+                    showToast('操作成功');
                 })
                 .catch(function(response) {
-                    Ext.toast('操作失败');
+                    showToast('操作失败');
                 });
                 grid.store.load();
         }else{
-            Ext.toast('请勾选至少一条明细。');
+            showToast('请勾选至少一条明细。');
         }
     },
 
@@ -182,12 +182,12 @@ Ext.define('saas.view.core.baseform.GridPanel', {
                     .then(function(localJson) {
                         if(localJson.success){
                             //解析参数
-                            Ext.Msg.alert('提示','删除成功');
+                            showToast('删除成功');
                             view.ownerCt.store.load();
                         }
                     })
                     .catch(function() {
-                        Ext.Msg.alert('提示','删除失败');
+                        showToast('删除失败');
                     });
                 }
             }

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

@@ -1,8 +1,7 @@
 Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
     extend: 'Ext.grid.Panel',
     xtype: 'multidbfindgridpanel',
-    GridUtil: Ext.create('saas.util.GridUtil'),
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
+
     dataUrl: '',
     dbSearchFields: [],
     condition:'',

frontend/saas-web/app/view/core/dbfind/MultiDbfindTrigger.js

@@ -10,8 +10,6 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
     displayField: 'dispaly',
     valueField: 'value',
     triggerCls: 'x-form-search-trigger',
-    GridUtil: Ext.create('saas.util.GridUtil'),
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
     minChars:1, // 设置用户输入字符多少时触发查询
     tpl: '',
     enableKeyEvents:true,

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -36,11 +36,12 @@ Ext.define('saas.view.core.form.FormPanelController', {
                     var mainTab = Ext.getCmp('main-tab-panel');
                     mainTab.getActiveTab().close();
                     //解析参数
-                    Ext.toast('删除成功');
+                    showToast('删除成功');
                 }
             })
-            .catch(function() {
-                Ext.toast('删除失败');
+            .catch(function(res) {
+                console.error(res);
+                showToast('删除失败: ' + res.message);
             });
         }
     },
@@ -50,11 +51,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
         form = this.getView();
 
         if(form.getForm().wasDirty==false){
-            Ext.toast('未修改数据，请修改后保存');
+            showToast('未修改数据，请修改后保存');
             return false;
         }
         if(form.getForm().wasValid==false){
-            Ext.toast('表单校验有误，请检查');
+            showToast('表单校验有误，请检查');
             return false;
         }
         //form里面数据
@@ -114,12 +115,12 @@ Ext.define('saas.view.core.form.FormPanelController', {
             if(localJson.success){
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
-                Ext.toast('保存成功');
+                showToast('保存成功');
             }
         })
-        .catch(function(e) {
-            console.error(e);
-            Ext.toast('保存失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('保存失败: ' + res.message);
         });
     },
 
@@ -131,11 +132,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
         modelData = viewModel.getData();
         
         if(form.getForm().wasDirty==false){
-            Ext.toast('未修改数据，请修改后保存');
+            showToast('未修改数据，请修改后保存');
             return false;
         }
         if(form.getForm().wasValid==false){
-            Ext.toast('表单校验有误，请检查');
+            showToast('表单校验有误，请检查');
             return false;
         }
         //form里面数据
@@ -184,11 +185,12 @@ Ext.define('saas.view.core.form.FormPanelController', {
             if(localJson.success){
                 form.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
-                Ext.toast('审核成功');
+                showToast('审核成功');
             }
         })
         .catch(function(res) {
-            Ext.toast('审核失败: ' + res.message);
+            console.error(res);
+            showToast('审核失败: ' + res.message);
         });
     },
     unAudit: function() {

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

@@ -197,11 +197,11 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
                 success: function (response, opts) {
                     store.remove(selectedRecord);
                     //解析参数
-                    Ext.toast('删除成功');
+                    showToast('删除成功');
                 },
                 failure: function (response, opts) {
                     //失败
-                    Ext.toast('删除失败');
+                    showToast('删除失败');
                 }
             });
         }else{

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

@@ -1,58 +0,0 @@
-Ext.define('saas.view.core.query.MoreQueryFormPanel', {
-    extend: 'Ext.form.Panel',
-    xtype: 'core-query-morequeryformpanel',
-
-    layout: 'column',
-    autoScroll: true,
-    buttonAlign : 'center',
-    bodyPadding: 5,
-    frame:true,
-    defaults: {
-        xtype:'textfield',
-        margin: '0 5 5 0',
-        labelAlign: 'right',
-        labelWidth: 90,
-        columnWidth: 0.5,
-        blankText: '该字段不能为空'
-    },
-
-    initComponent: function() {
-        var me = this;
-        Ext.apply(me, {
-            dockedItems: [{
-                xtype: 'toolbar',
-                dock: 'bottom',
-                style: {
-                    'border-bottom': '1px solid #35baf6 !important'
-                },
-                items: [{
-                    xtype: 'button',
-                    text: '重置',
-                    handler: function(btn){
-                        btn.ownerCt.ownerCt.reset();
-                    }
-                },'->',{
-                    xtype: 'button',
-                    text: '查询',
-                    handler: me.onQueryMore
-                }, {
-                    xtype: 'button',
-                    text: '关闭',
-                    handler: function(btn){
-                        var win = Ext.getCmp('queryMoreWin');
-                        win.close();
-                        win.destroy();
-                    }
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    },
-    onQueryMore: function(btn){
-        var me = this,
-            queryMoreForm = me.up('core-query-queryformpanel'),
-            parentForm = queryMoreForm.up('core-query-formpanel')
-            parentForm.QueryUtil.turnRelativeGrid(grid,queryForm,queryMoreForm);
-    }
-    
-});

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

@@ -3,8 +3,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     xtype: 'core-query-querygridpanel',
 
     //工具类
-    QueryUtil: Ext.create('saas.util.QueryUtil'),
-    GridUtil: Ext.create('saas.util.GridUtil'),
     BaseUtil: Ext.create('saas.util.BaseUtil'),
     //字段属性
     baseColumn: [],
@@ -50,7 +48,8 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     },
                     listeners: {
                         exception: function(proxy, response, operation, eOpts) {
-                            alert('exception');
+                            console.error('exception: ', response.responseJson.message);
+                            showToast('exception：' + response.responseJson.message);
                         }
                     }
                 },
@@ -255,20 +254,21 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         if(data&&data.length>0){
             var params = JSON.stringify({baseDTOs:data});
             me.BaseUtil.request({
-                    url: me.baseVastUrl+type,
-                    params: params,
-                    method: 'POST',
-                    async:false
-                })
-                .then(function() {
-                    Ext.toast('提示','操作成功');
-                })
-                .catch(function(response) {
-                    Ext.toast('提示','操作失败');
-                });
-                me.getStore().loadPage(1);
+                url: me.baseVastUrl+type,
+                params: params,
+                method: 'POST',
+                async:false
+            })
+            .then(function() {
+                showToast('操作成功');
+            })
+            .catch(function(res) {
+                console.error(res);
+                showToast('操作失败: ' + res.message);
+            });
+            me.getStore().loadPage(1);
         }else{
-            Ext.toast('提示','请勾选至少一条明细。');
+            showToast('请勾选至少一条明细。');
         }
     },
     /**

frontend/saas-web/app/view/document/customer/panel/FormController.js

@@ -221,14 +221,15 @@ Ext.define('saas.view.document.customer.panel.FormController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','启用成功');
+                showToast('启用成功');
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','启用失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('启用失败: ' + res.message);
         });
     },
     unAudit: function() {
@@ -243,14 +244,15 @@ Ext.define('saas.view.document.customer.panel.FormController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','禁用成功');
+                showToast('禁用成功');
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','禁用失败');
+        .catch(function(res) {
+            console.log(res);
+            showToast('禁用失败: ' + res.message);
         });
     }
 });

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -160,7 +160,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','保存成功');
+                showToast('保存成功');
                 var grid = form.ownerCt._parent.lookup('document-kind-Grid');
                 if(grid){
                     grid.store.load();
@@ -168,8 +168,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 form.ownerCt.close();
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','保存失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('保存失败: ' + res.message);
         });
     },
     onCancel:function(){

frontend/saas-web/app/view/document/kind/KindController.js

@@ -82,12 +82,13 @@ Ext.define('saas.view.document.kind.KindController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','删除成功');
+                showToast('删除成功');
                 grid.store.load();
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','删除失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('删除失败: ' + res.message);
         });
     },
     createDialog: function(dataKind,record) {

frontend/saas-web/app/view/document/product/panel/FormController.js

@@ -221,14 +221,15 @@ Ext.define('saas.view.document.product.panel.FormController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','启用成功');
+                showToast('启用成功');
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','启用失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('启用失败: ' + res.message);
         });
     },
     unAudit: function() {
@@ -243,14 +244,15 @@ Ext.define('saas.view.document.product.panel.FormController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','禁用成功');
+                showToast('禁用成功');
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','禁用失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('禁用失败: ' + res.message);
         });
     }
 });

frontend/saas-web/app/view/document/vendor/panel/FormController.js

@@ -221,14 +221,15 @@ Ext.define('saas.view.document.vendor.panel.FormController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','启用成功');
+                showToast('启用成功');
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','启用失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('启用失败: ' + res.message);
         });
     },
     unAudit: function() {
@@ -243,14 +244,15 @@ Ext.define('saas.view.document.vendor.panel.FormController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','禁用成功');
+                showToast('禁用成功');
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
                 viewModel.set('base.editable', false);
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','禁用失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('禁用失败: ' + res.message);
         });
     }
 });

frontend/saas-web/app/view/main/Navigation.js

@@ -144,6 +144,8 @@ Ext.define('saas.view.main.Navigation', {
                                         text = dataset.text,
                                         id = dataset.id;
 
+                                        menuItems;
+                            debugger;
                                     var tabTitle = text + (type == 'form' ? '' : '查询'),
                                         tabId = 'maintab-' + type + '-' + id;
 

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -146,12 +146,13 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
               
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('转单失败: ' + res.message);
         });
      }
 });

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -16,12 +16,12 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     _statusField: 'rb_status',
     _statusCodeField: 'rb_statuscode',
     
-    _readUrl: 'money/recbalance/read/',
-    _saveUrl: 'money/recbalance/save/',
-    _auditUrl: 'money/recbalance/audit/',
-    _unAuditUrl: 'money/recbalance/unAudit/',
-    _deleteUrl: 'money/recbalance/delete/',
-    _deleteDetailUrl: 'money/recbalance/deleteItem/',
+    _readUrl: basePath + 'money/recbalance/read/',
+    _saveUrl: basePath + 'money/recbalance/save/',
+    _auditUrl: basePath + 'money/recbalance/audit/',
+    _unAuditUrl: basePath + 'money/recbalance/unAudit/',
+    _deleteUrl: basePath + 'money/recbalance/delete/',
+    _deleteDetailUrl: basePath + 'money/recbalance/deleteItem/',
     initId: 0,
 
     defaultItems: [{
@@ -82,7 +82,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance1',
         detnoColumn: 'rd_detno',
-        _deleteDetailUrl: 'http://192.168.253.129:8940/money/recbalance/audit/',
+        _deleteDetailUrl: basePath + 'money/recbalance/audit/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',
@@ -143,7 +143,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance2',
         detnoColumn: 'rbd_detno',
-        _deleteDetailUrl: 'http://192.168.253.129:8940/money/recbalance/unAudit/',
+        _deleteDetailUrl: basePath + 'money/recbalance/unAudit/',
         columns: [{
             text: 'ID',
             dataIndex: 'id',

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -153,12 +153,13 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
               
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('转单失败: ' + res.message);
         });
      }
 });

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -33,7 +33,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         addTitle: '收款单',
         addXtype: 'money-recbalance-formpanel',
         defaultCondition:'',
-        baseVastUrl: 'money/recbalance/',
+        baseVastUrl: basePath + 'money/recbalance/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

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

@@ -202,12 +202,13 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
               
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('转单失败: ' + res.message);
         });
      }
 });

frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -160,12 +160,13 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
               
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('转单失败: ' + res.message);
         });
      }
 });

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

@@ -121,11 +121,12 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('转单失败: ' + res.message);
         });
      }
 });

frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -188,12 +188,13 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
               
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('转单失败: ' + res.message);
         });
      }
 });

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -146,12 +146,13 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
               
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('转单失败: ' + res.message);
         });
      }
 });

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

@@ -202,12 +202,13 @@ Ext.define('saas.view.stock.make.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
               
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            console.error(res);
+            showToast('转单失败: ' + res.message);
         });
      }
 });

frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -146,12 +146,12 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
               
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            showToast('转单失败: ' + res.message);
         });
      }
 });

frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -145,12 +145,12 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
         })
         .then(function(localJson) {
             if(localJson.success){
-                Ext.Msg.alert('提示','转单成功');
+                showToast('转单成功');
               
             }
         })
-        .catch(function() {
-            Ext.Msg.alert('提示','转单失败');
+        .catch(function(res) {
+            showToast('转单失败: ' + res.message);
         });
      }
 });

frontend/saas-web/overrides/i18n.js

@@ -1,5 +1,12 @@
 var basePath = 'http://192.168.0.181:8560/api/';
 
+/**
+ * 打开/切换到新页签
+ * @param xtype: view xtype
+ * @param title: 标题
+ * @param id: id
+ * @param config: 绑定到view的其他配置
+ */
 function openTab(xtype, title, id, config) {
     var mainTab = Ext.getCmp('main-tab-panel');
     var panel = Ext.getCmp(id);
@@ -17,4 +24,21 @@ function openTab(xtype, title, id, config) {
     }else {
         mainTab.setActiveTab(panel);
     }
+}
+
+/**
+ * 显示toast提示
+ * @param content: 内容
+ * @param title: 标题
+ * 
+ */
+function showToast(content, title) {
+    Ext.toast({
+        html: content,
+        title: title,
+        closable: false,
+        align: 't',
+        slideDUration: 400,
+        maxWidth: 400
+    });
 }