Browse Source

Bug修改

hy 7 years ago
parent
commit
fde567d53b

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

@@ -303,10 +303,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         });
     },
     onAudit: function(me){
-        me.up('grid').vastOperation("batchAudit");
+        me.up('grid').vastOperation("batchAudit",'审核');
     },
     onUnAudit:function(me){
-        me.up('grid').vastOperation("batchUnAudit");
+        me.up('grid').vastOperation("batchUnAudit",'反审核');
     },
     onPrint: function (me) {
         console.log("打印");
@@ -366,7 +366,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             saas.util.BaseUtil.showErrorToast('请勾选至少一条明细。');
         }
     },
-    vastOperation :function(type){
+    vastOperation :function(type,msg){
         var me = this;
         var data = me.getGridSelected();
         if(data&&data.length>0){
@@ -381,14 +381,14 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 if(res.data){
                     saas.util.BaseUtil.showSuccessToast(res.data);
                 }else{
-                    saas.util.BaseUtil.showSuccessToast('操作成功');
+                    saas.util.BaseUtil.showSuccessToast(msg?msg + '成功':'操作成功');
                 }
                 me.store.load();
                 me.selModel.deselectAll();
             })
             .catch(function(res) {
                 console.error(res);
-                saas.util.BaseUtil.showErrorToast('操作失败: ' + res.message);
+                saas.util.BaseUtil.showErrorToast((msg?msg + '失败':'操作失败: ') + res.message);
             });
         }else{
             saas.util.BaseUtil.showErrorToast('请勾选至少一条明细。');

+ 5 - 1
frontend/saas-web/app/view/main/Main.js

@@ -133,7 +133,7 @@ Ext.define('saas.view.main.Main', {
                         html:'<img class="x-img x-box-item x-toolbar-item x-img-header" style="height:35px;width:35px;margin-top: 6px;margin-left: 14px;" src="{avatarUrl}" alt="">'
                     }, 
                     menu: {
-                        height: 98,
+                        height: 132,
                         cls:'x-main-menu2 sa-nav-menu', 
                         items: [ {  
                             text: '账户中心',
@@ -145,6 +145,10 @@ Ext.define('saas.view.main.Main', {
                             text: '意见反馈',
                             iconCls:'x-fa fa-comment-o sa-navicon',
                             handler:'feedbackMsg'
+                        }, {  
+                            text: '加入邀请',
+                            iconCls:'x-fa fa-handshake-o sa-navicon',
+                            handler:'invitation'
                         }, {
                             text: '退出',
                             iconCls:'x-fa fa-power-off sa-navicon',