Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/RoleServiceImpl.java

@@ -108,33 +108,12 @@ public class RoleServiceImpl extends CommonBaseServiceImpl<RoleMapper, Role> imp
                     String classify = String.valueOf(map.get("classify"));
                     //角色有权限的,设置为true
                     setPowerValue(powerDTO, classify, true);
-                    setOtherPower(powerDTO, powerInfo.getGrougId(), id, otherPowerList);
                 }
+                //设置其他权限
+                setOtherPower(powerDTO, powerInfo.getGrougId(), id, otherPowerList);
             }
             powerDTOList.add(powerDTO);
         }
-
-        /*//查询所有模块
-        List<ResourceModule> modules = resourceModuleMapper.selectByAppId(BaseContextHolder.getAppId());
-        for (ResourceModule module : modules){
-            //查询所有分组
-            List<ResourceGroup> groups = resourceGroupMapper.selectByModuleId(module.getId());
-            for (ResourceGroup group : groups) {
-                PowerDTO powerDTO = new PowerDTO();
-                powerDTO.setGroupId(group.getId());
-                powerDTO.setModuleName(module.getName());
-                powerDTO.setGroupName(group.getName());
-                //赋值权限
-                for (Map<String, Object> map : classifyList){
-                    if (group.getId().equals(map.get("group_id"))){
-                        String classify = String.valueOf(map.get("classify"));
-                        setPowerValue(powerDTO, classify);
-                        setOtherPower(powerDTO, group.getId(), id, otherPowerList);
-                    }
-                }
-                powerDTOList.add(powerDTO);
-            }
-        }*/
         return powerDTOList;
     }
 

frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.scss

@@ -0,0 +1,3 @@
+.x-window-dbfind{
+    border:none;
+}

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

@@ -6,6 +6,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     displayField: 'dispaly',
     valueField: 'value',
     triggerCls: 'x-form-search-trigger',
+    cls:'x-window-dbfind',
     minChars:1, // 设置用户输入字符多少时触发查询
     tpl: '',
     enableKeyEvents:true,

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

@@ -85,7 +85,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                                 }
                             }else {
                                 console.error('exception: ', response.responseJson);
-                                saas.util.BaseUtil.showToast('请求错误：' + response.responseJson.message);
+                                saas.util.BaseUtil.showToast('查询失败：' + response.responseJson.message);
                             }
                         }
                     }

frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -37,6 +37,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
         }, {
             text: '日期',
             dataIndex: 'date',
+            xtype:'datecolumn',
             width: 200
         }, {
             text: '业务类型',
@@ -60,7 +61,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
             }
         },{
             text:'支出',
-            dataIndex:'outamount',
+            dataIndex:'inamount',
             xtype: 'numbercolumn',
             renderer : function(v) {
                 var arr = (v + '.').split('.');

frontend/saas-web/app/view/sys/power/FormPanelController.js

@@ -94,13 +94,6 @@ Ext.define('saas.view.sys.power.FormPanelController', {
                 checked:data['audit']
             })
         }
-        if((typeof modified.update) == 'boolean'){
-            powerSetList.push({
-                groupId:groupId,
-                classify:'update',
-                checked:data['update']
-            })
-        }
         if((typeof modified.unAudit) == 'boolean'){
             powerSetList.push({
                 groupId:groupId,

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -114,38 +114,6 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         doUpdateHeaderState: function(e) {
             return true;
         }
-    }, {
-        header: '修改',
-        dataIndex: 'update',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('update');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
-                            isAllCheck = false
-                        }
-                    }
-                    rec.set('update',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
-            }
-        },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
     }, {
         header: '删除',
         dataIndex: 'delete',
@@ -362,7 +330,6 @@ Ext.define('saas.view.sys.power.GroupGrid', {
                 {name: 'add'},
                 {name: 'delete'},
                 {name: 'audit'},
-                {name: 'update'},
                 {name: 'unAudit'},
                 {name: 'fileExport'},
                 {name: 'fileImport'},
@@ -420,7 +387,6 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         data.query = record.get('query')==null?null:bool;
         data.delete = record.get('delete')==null?null:bool;
         data.audit = record.get('audit')==null?null:bool;
-        data.update = record.get('update')==null?null:bool;
         data.unAudit= record.get('unAudit')==null?null:bool;
         data.fileExport= record.get('fileExport')==null?null:bool;
         data.fileImport= record.get('fileImport')==null?null:bool;