代码提交

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

@@ -5,11 +5,13 @@ Ext.define('saas.view.core.base.BasePanel', {
     controller: 'core-base-basepanel',
     viewModel: 'core-base-basepanel',
 
+    cls:'core-base-basepanel',
     //工具类
     FormUtil: Ext.create('saas.util.FormUtil'),
     BaseUtil: Ext.create('saas.util.BaseUtil'),
 
     //基础属性
+    frame:false,
     autoScroll: true,
     border: 1,
     bodyPadding: 5,
@@ -38,6 +40,7 @@ Ext.define('saas.view.core.base.BasePanel', {
 
         Ext.apply(me, {
             dockedItems: [{
+                frame:false,
                 xtype: 'toolbar',
                 dock: 'top',
                 style: {

frontend/saas-web/app/view/core/base/BasePanel.scss

@@ -0,0 +1,33 @@
+.core-base-basepanel{
+    .x-panel-default-outer-border-trl {
+        border-top-color: #fff !important;
+        border-top-width: 1px !important;
+        border-right-color: #fff !important;
+        border-right-width: 1px !important;
+        border-left-color: #fff !important;
+        border-left-width: 1px !important;
+    }
+    .x-panel-default-outer-border-rbl {
+        border-top-color: #fff !important;
+        border-top-width: 1px !important;
+        border-right-color: #fff !important;
+        border-right-width: 1px !important;
+        border-left-color: #fff !important;
+        border-left-width: 1px !important;
+        border-bottom-color: #fff !important;
+        border-bottom-width: 1px !important;
+    }
+}
+.core-base-gridpanel{
+    .x-grid-body{
+        border:1px solid #abdaff !important;
+        border-top-width: 0 !important;
+    }
+    .x-grid-header-ct{
+        border:1px solid #abdaff !important;
+    }
+}
+.x-basepanel-pagingtoolbar{
+    border:1px solid #abdaff !important;
+    border-top-width: 0 !important;
+}

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

@@ -8,6 +8,8 @@ Ext.define('saas.view.core.base.GridPanel', {
         mode : "MULTI" ,
         ignoreRightMouseSelection : false
     },
+
+    cls:'core-base-gridpanel',
     
     dataUrl: '',
     dbSearchFields: [],
@@ -15,6 +17,7 @@ Ext.define('saas.view.core.base.GridPanel', {
 
     initComponent: function() {
         var me = this;
+        me.frame = false;
         if(me.columns){
             var fields = me.columns.map(column => column.dataIndex);
             me.columns = me.insertFirstColumn(me.columns);
@@ -129,6 +132,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                 },{
                     xtype: 'pagingtoolbar',
                     dock: 'bottom',
+                    cls:'x-basepanel-pagingtoolbar',
                     displayInfo: true,
                     store: me.store
                 }]

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

@@ -260,7 +260,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             },{
                 readOnly:true,
                 xtype:'textfield',
-                fieldLabel: '状态',
+                fieldLabel: '仓库状态',
                 name: 'wh_status',   
                 value:'已开启',
                 maxLength: 20

frontend/saas-web/app/view/sys/account/DataList.js

@@ -16,14 +16,14 @@ Ext.define('saas.view.sys.account.DataList', {
 
     tbar: [{
         width: 150,
-        name: 'mn_name',
+        name: 'username',
         xtype: 'textfield',
         emptyText : '账户名称'
     },{
         width: 150,
-        name: 'mn_leadcode',
+        name: 'mobile',
         xtype: 'textfield',
-        emptyText : '账户编号'
+        emptyText : '电话'
     },{
         cls:'x-formpanel-btn-orange',
         xtype:'button',
@@ -49,28 +49,44 @@ Ext.define('saas.view.sys.account.DataList', {
 
     columns : [{
         text : 'id', 
-        width : 0, 
+        hidden:true,
         dataIndex : 'id', 
-        xtype : 'numbercolumn', 
+        xtype : 'numbercolumn',   
+    },{
+        text : 'accountId', 
+        hidden:true,
+        dataIndex : 'accountId', 
+        xtype : 'numbercolumn',   
     },{
         text : '账户名称', 
         width : 200.0, 
-        dataIndex : 'mn_name', 
+        dataIndex : 'username', 
         xtype : '', 
     }, 
     {
-        text : '账户编号', 
-        dataIndex : 'mn_leadcode', 
+        text : '真实姓名', 
+        dataIndex : 'realname', 
         width : 120.0, 
         xtype : '', 
     }, 
     {
-        text : '单据规则', 
-        dataIndex : 'mn_rule', 
+        text : '联系电话', 
+        dataIndex : 'mobile', 
         width : 220.0,
     },{
-        text : '流水长度', 
-        dataIndex : 'mn_number', 
+        text : '联系邮箱', 
+        dataIndex : 'email', 
+        width : 120.0, 
+        xtype : '', 
+    },{
+        text : '关联角色id', 
+        hidden:true,
+        dataIndex : 'roleIds', 
+        width : 120.0, 
+        xtype : '', 
+    },{
+        text : '关联角色', 
+        dataIndex : 'roleNames', 
         width : 120.0, 
         xtype : '', 
     }],
@@ -185,25 +201,6 @@ Ext.define('saas.view.sys.account.DataList', {
                     session: true
                 });
                 this.dialog.show();
-            }else if(classList.indexOf('fa-trash-o')>-1){
-                //删除
-                var id = record.get('id');
-                if(id){
-                    grid.BaseUtil.request({
-                        url: grid.deleteUrl+id,
-                        method: 'POST',
-                    })
-                    .then(function(localJson) {
-                        if(localJson.success){
-                            //解析参数
-                            showToast('删除成功');
-                            view.ownerCt.store.load();
-                        }
-                    })
-                    .catch(function() {
-                        showToast('删除失败');
-                    });
-                }
             }
         }
     },

frontend/saas-web/app/view/sys/manager/FormPanel.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.sys.manager.FormPanel', {
     },
 
     defaults: {
-        iconAlign: 'top',
+        iconAlign: 'left',
         bodyPadding: 15
     },
 
@@ -29,6 +29,7 @@ Ext.define('saas.view.sys.manager.FormPanel', {
         title: '公司设置',
         xtype:'sys-config-formpanel'
     }, {
+        cls:'sys-account-datalist',
         iconCls:'x-fa fa-key',
         title: '账户设置',
         xtype:'sys-account-datalist' 

frontend/saas-web/app/view/sys/manager/FormPanel.scss

@@ -33,6 +33,11 @@
         }
     }
 }
+.sys-account-datalist{
+    .x-grid-body{
+        padding:0 !important;
+    }
+}
 .sys-power-formpanel{
     .x-panel-body-default-framed{
         padding:0 !important;

frontend/saas-web/resources/json/navigation.json

@@ -288,21 +288,11 @@
             "text": "新手导航",
             "viewType": "sys-guide-formpanel",
             "leaf": true
-        },{  
+        }, {  
             "id":"sys-manager-formpanel",
             "text": "系统管理",
             "viewType": "sys-manager-formpanel",
             "leaf": true
-        }, {  
-            "id":"sys-config-formpanel",
-            "text": "公司设置",
-            "viewType": "sys-config-formpanel",
-            "leaf": true
-        }, {
-            "id":"sys-power-formpanel",
-            "text": "权限设置",
-            "viewType": "sys-power-formpanel",
-            "leaf": true
         }, {
             "id":"sys-messagelog-datalist",
             "text": "操作日志",