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

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

@@ -104,31 +104,6 @@ Ext.define('saas.view.document.kind.ChildForm', {
                 maxLength: 20
             }]
         },
-        personpower:{
-            items:[{
-                xtype:'hidden',
-                name:'id'
-            },{
-                xtype:'textfield',
-                name:'name',
-                allowBlank:false,
-                fieldLabel:'角色名称',
-                maxLength: 20
-            },{
-                xtype:'textfield',
-                name:'description',
-                allowBlank:false,
-                fieldLabel:'角色描述',
-                maxLength: 20
-            },{
-                xtype:'textfield',
-                hidden:true,
-                name:'code',
-                allowBlank:true,
-                fieldLabel:'角色编号',
-                maxLength: 20
-            }]
-        },
         inoutkind:{
             items:[{
                 xtype:'hidden',
@@ -162,219 +137,6 @@ Ext.define('saas.view.document.kind.ChildForm', {
                     ]
                 }
             }]
-        },
-        accountinformation:{
-            items:[{
-                xtype:'hidden',
-                name:'accountId',
-                hidden:true,
-            },{
-                xtype:'textfield',
-                fieldLabel: '真实姓名',
-                name: 'realname',
-                readOnly:true,
-                editable:false,
-                allowBlank:true,
-                maxLength: 30,
-                beforeLabelTextTpl: "",
-            },{
-                xtype:'datamulticombo',
-                dataUrl:'/api/account/role/list',
-                fieldLabel: '岗位角色',
-                name: 'roleNames',
-                allowBlank:true,
-                maxLength: 20,
-                beforeLabelTextTpl: "",
-            },{
-                xtype:'textfield',
-                fieldLabel: '联系电话',
-                name: 'mobile',
-                readOnly:true,
-                editable:false,
-                allowBlank:true,
-                maxLength: 30,
-                beforeLabelTextTpl: "",
-            },{
-                xtype:'textfield',
-                fieldLabel: '邮箱',
-                name: 'email',
-                readOnly:true,
-                editable:false,
-                allowBlank:true,
-                maxLength: 30,
-                beforeLabelTextTpl: "",
-            }]
-        },
-        accountadd:{
-            items:[{
-                xtype:'textfield',
-                fieldLabel: '联系号码',
-                name: 'mobile',
-                hideTrigger:true,
-                allowBlank:false,
-                maxLength: 30,
-                regex:/^1(3|4|5|7|8)\d{9}$/,
-                regexText:'请输入正确的手机号码',
-                listeners:{
-                    change:function(f,a,b){
-                        if(a==''){
-                            f._lastCheckValue = ''
-                        }
-                    },
-                    blur:function(f,a,b,c){
-                        var form = f.ownerCt;
-                        if(f.value&&f.value!=''&&f.isValid()&&f._lastCheckValue!=f.value){
-                            f._lastCheckValue = f.value;
-                            form.setLoading(true);
-                            Ext.Ajax.request({
-                                url: '/api/account/account/checkMobile?mobile='+f.value,
-                                method: 'GET',
-                                headers:{
-                                    'Access-Control-Allow-Origin': '*',
-                                    "Content-Type": 'application/json;charset=UTF-8',
-                                },
-                                success: function (response) {
-                                    form.setLoading(false);
-                                    var localJson = Ext.decode(response.responseText);
-                                    if(localJson.success){
-                                        if(localJson.data.hasRegister){
-                                            saas.util.BaseUtil.showSuccessToast('校验成功:手机号已在优软云注册');
-                                        }else{
-                                            saas.util.BaseUtil.showErrorToast('校验失败:手机号未在优软云注册');
-                                            f.setValue('');
-                                        }
-                                    }else{
-                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
-                                        f.setValue('');
-                                    }
-                                },
-                                failure: function (response) {
-                                    if(response.responseText){
-                                        var localJson = Ext.decode(response.responseText);
-                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
-                                        f.setValue('');
-                                    }else{
-                                        saas.util.BaseUtil.showErrorToast('手机号校验接口连接超时');
-                                        f.setValue('');
-                                    }
-                                }
-                            });
-                        }
-                    }
-                }
-            },{
-                xtype:'textfield',
-                fieldLabel: '真实姓名',
-                name: 'realname',
-                regex:/^[\u4e00-\u9fa5]+$/,
-                regexText:'请输入汉字',
-                allowBlank:false,
-                maxLength: 30,
-            },{
-                xtype:'textfield',
-                fieldLabel: '邮箱',
-                name: 'email',
-                allowBlank:true,
-                beforeLabelTextTpl: "",
-                regex:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
-                regexText:'请输入正确的邮箱',
-                maxLength: 30,
-                listeners:{
-                    blur:function(f,a,b,c){
-                        var form = f.ownerCt;
-                        if(f.value&&f.value!=''&&f.isValid()&&f._lastCheckValue!=f.value){
-                            form.setLoading(true);
-                            f._lastCheckValue = f.value
-                            Ext.Ajax.request({
-                                url: '/api/account/account/checkEmail?email='+f.value,
-                                method: 'GET',
-                                headers:{
-                                    'Access-Control-Allow-Origin': '*',
-                                    "Content-Type": 'application/json;charset=UTF-8'
-                                },
-                                success: function (response) {
-                                    form.setLoading(false);
-                                    var localJson = Ext.decode(response.responseText);
-                                    if(localJson.success){
-                                        if(!localJson.data){
-                                            saas.util.BaseUtil.showSuccessToast('校验成功:邮箱未注册');
-                                        }else{
-                                            saas.util.BaseUtil.showErrorToast('校验失败:该邮箱已被注册');
-                                            f.setValue('');
-                                        }
-                                    }else{
-                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
-                                    }
-                                },
-                                failure: function (response) {
-                                    if(response.responseText){
-                                        var localJson = Ext.decode(response.responseText);
-                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
-                                    }else{
-                                        saas.util.BaseUtil.showErrorToast('邮箱校验接口连接超时');
-                                    }
-                                }
-                            });
-                        }
-                    }
-                }
-            },{
-                xtype:'datamulticombo',
-                dataUrl:'/api/account/role/list',
-                fieldLabel: '岗位角色',
-                name: 'roleIds',
-                allowBlank:false,
-                maxLength: 30,
-            }]
-        },
-        maxnumbers:{
-            items:[{
-                xtype:'hidden',
-                name:'id'
-            },{
-                xtype:'textfield',
-                fieldLabel: '单据名称',
-                name: 'mn_name',
-                allowBlank:false,
-                editable:false,
-                readOnly:true,
-                maxLength: 20
-            },{
-                xtype:'textfield',
-                fieldLabel: '单据前缀',
-                name: 'mn_leadcode',
-                beforeLabelTextTpl: '',
-                allowBlank:true,
-                maxLength: 20
-            },{
-                xtype:'combo',
-                fieldLabel: '单据规则',
-                name: 'mn_rule',
-                displayField : "display", 
-                editable:false,
-                hideTrigger : false, 
-                maxLength : 100.0, 
-                minValue : null, 
-                positiveNum : false, 
-                queryMode : "local", 
-                valueField : "value", 
-                store:{
-                    fields: ['display', 'value'],
-                    data : [
-                        {"display":"年月日", "value":'yyyymmdd'},
-                        {"display":"年月", "value":'yyyymm'},
-                        {"display":"无", "value":'无'}
-                    ]
-                }
-            },{
-                xtype:'numberfield',
-                hideTrigger : true, 
-                fieldLabel: '流水长度',
-                name: 'mn_number',
-                minValue : 0, 
-                allowBlank:false,
-                mouseWheelEnabled: false
-            }]
         }
     },
     setFormItems:function() {
@@ -417,17 +179,6 @@ Ext.define('saas.view.document.kind.ChildForm', {
         var relativeField,relativeValue;//要赋值的字段和值
         var names = belong.columns.map(column => column.dataIndex);
 
-        //账户资料特殊保存逻辑
-        if(me.dataKind=='accountinformation'){
-            me.accountinformation();
-            return;
-        }
-        //账户资料新增特殊保存逻辑
-        if(me.dataKind=='accountadd'){
-            me.accountadd();
-            return;
-        }
-
         Ext.Array.each(names,function(name) {
             if(name){
                 var dataField = form.down('[name='+name+']');
@@ -484,112 +235,5 @@ Ext.define('saas.view.document.kind.ChildForm', {
     },
     onCancel:function(){
         this.hide();
-    },
-    accountinformation:function(){
-        var me = this;
-        var belong = this.belong;
-        me.setLoading(true);
-        var form=this.down('form');
-        var combo = this._combo;
-        var params = {};
-        var names = belong.columns.map(column => column.dataIndex);
-
-        Ext.Array.each(names,function(name) {
-            if(name){
-                var dataField = form.down('[name='+name+']');
-                if(dataField&&dataField.value){
-                    params[name] = dataField.value;
-                }
-            }
-        });
-
-        //更改参数
-        var o = '';
-        Ext.Array.each(params.roleNames,function(item) {
-            o+=item.value+','
-        });
-        o = o.substring(0,o.length-1);
-
-        if(o==""){
-            saas.util.BaseUtil.showErrorToast('岗位角色未选择，无法保存！')
-        }
-
-        var _params = {
-            accountId:Number(params['accountId']),
-            roleIds:o,
-        };
-
-        //保存接口
-        saas.util.BaseUtil.request({
-            url: belong.reqUrl,
-            params: _params,
-            method: 'POST',
-            headers:{
-                'Access-Control-Allow-Origin': '*',
-                "Content-Type":'application/x-www-form-urlencoded'
-            }
-        })
-        .then(function(localJson) {
-            me.setLoading(false);
-            if(localJson.success){
-                saas.util.BaseUtil.showSuccessToast('保存成功');
-                form.ownerCt._parent.store.load()
-                form.ownerCt.close();
-            }
-        })
-        .catch(function(res) {
-            me.setLoading(false);
-            console.error(res);
-            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
-        });
-    },
-    accountadd:function(){
-        var me = this;
-        var belong = this.belong;
-        me.setLoading(true);
-        var form=this.down('form');
-        var combo = this._combo;
-        var params = {};
-        var names = belong.columns.map(column => column.dataIndex);
-
-        Ext.Array.each(names,function(name) {
-            if(name){
-                var dataField = form.down('[name='+name+']');
-                if(dataField&&dataField.value){
-                    params[name] = dataField.value;
-                    params._value = dataField.value;
-                }
-            }
-        });
-
-        //更改参数
-        var o = '';
-        var dataField = form.down('[name=roleIds]');
-        Ext.Array.each(dataField.value,function(item) {
-            o+=item.value+','
-        });
-        o = o.substring(0,o.length-1);
-        params['username'] = params['mobile'];
-        params['type'] = 1;
-        params['roleIds'] = o;
-        //保存接口
-        saas.util.BaseUtil.request({
-            url: belong.reqUrl,
-            params: JSON.stringify(params),
-            method: 'POST'
-        })
-        .then(function(localJson) {
-            me.setLoading(false);
-            if(localJson.success){
-                form.ownerCt._parent.store.load();
-                saas.util.BaseUtil.showSuccessToast('保存成功');
-                form.ownerCt.close();
-            }
-        })
-        .catch(function(res) {
-            me.setLoading(false);
-            console.error(res);
-            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
-        });
     }
 });

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

@@ -119,77 +119,6 @@ Ext.define('saas.view.document.kind.Kind', {
             keyField:'id',
             reqUrl: '/api/document/fundinouttype/save',
             delUrl: '/api/document/fundinouttype/delete'
-        },
-        maxnumbers:{
-            columns: [{
-                text : "单据名称", 
-                width : 200.0, 
-                dataIndex : "mn_caller" 
-            }, 
-            {
-                text : "单据前缀", 
-                dataIndex : "mn_leadcode", 
-                width : 150.0
-            }, 
-            {
-                text : "单据规则", 
-                dataIndex : "mn_rule", 
-                width : 250.0
-            },{
-                text : "流水长度", 
-                dataIndex : "mn_number", 
-                width : 90.0,
-                xtype: 'numbercolumn',
-            }],
-            keyField:'id',
-            reqUrl:'/api/commons/number/save'
-        },
-        personpower:{
-            columns: [ {
-                text : "编号", 
-                dataIndex : "code", 
-                width : 150.0, 
-                xtype : "", 
-            },{
-                text : "角色名称", 
-                width : 200.0, 
-                dataIndex : "name", 
-                xtype : "", 
-            }, 
-            {
-                text : "角色描述", 
-                dataIndex : "description", 
-                width : 250.0
-            }
-           ],
-            keyField:'id',
-            reqUrl:'/api/account/role/save',
-            updateUrl:'/api/account/role/update',
-        },
-        accountinformation:{
-            columns:[{
-                dataIndex:'accountId',
-            },{
-                dataIndex: 'roleNames',
-                width: 150
-            },{
-                dataIndex: 'mobile',
-                width: 110
-            },{
-                dataIndex: 'email',
-                width: 110
-            }],
-            reqUrl:'/api/account/account/bind/roles',
-        },
-        accountadd:{
-            columns:[{
-                dataIndex:'realname',
-            },{
-                dataIndex: 'mobile',
-            },{
-                dataIndex: 'email',
-            }],
-            reqUrl: '/api/account/account/register/add',
         }
     },
     refresh:function(){

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

@@ -164,45 +164,6 @@ Ext.define('saas.view.document.kind.KindModel', {
                     });
                 }
             }
-        },
-        accountinformation: {    
-            fields:[
-                {name: 'id', type: 'int'},
-                {name: 'rl_name',  type: 'string'}
-            ],
-            proxy: {
-                type: 'ajax',
-                url: '/api/account/account/accountRole/list',
-                actionMethods: {
-                    read: 'GET'
-                },
-                reader: {
-                    type: 'json',
-                    rootProperty: 'data'
-                },
-                listeners: {
-                    exception: function(proxy, response, operation, eOpts) {
-                        if(operation.success) {
-                            if(response.timedout) {
-                                saas.util.BaseUtil.showErrorToast('请求超时');
-                            }
-                        }else {
-                            console.error('exception: ', response.responseJson);
-                            saas.util.BaseUtil.showErrorToast('查询失败：' + response.responseJson.message);
-                        }
-                    }
-                }
-            },
-            pageSize: null,
-            autoLoad: false,
-            listeners: {
-                beforeload: function (store, op) {
-                    Ext.apply(store.proxy.extraParams, {
-                        number: 1,
-                        size: 1000
-                    });
-                }
-            }
         }
     }
 });

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

@@ -0,0 +1,191 @@
+/**
+ * Created by zhouy on 2018/10/18.
+ */
+Ext.define('saas.view.sys.account.AddWindow', {
+    extend: 'saas.view.document.kind.ChildForm',
+    xtype: 'sys-account-addwindow',
+    dataKind:'accountadd',//类型标识
+    belong:{
+        columns:[{
+            dataIndex:'realname',
+        },{
+            dataIndex: 'mobile',
+        },{
+            dataIndex: 'email',
+        }],
+        reqUrl: '/api/account/account/register/add',
+    },
+    etc:{
+        accountadd:{
+            items:[{
+                xtype:'textfield',
+                fieldLabel: '联系号码',
+                name: 'mobile',
+                hideTrigger:true,
+                allowBlank:false,
+                maxLength: 30,
+                regex:/^1(3|4|5|7|8)\d{9}$/,
+                regexText:'请输入正确的手机号码',
+                listeners:{
+                    change:function(f,a,b){
+                        if(a==''){
+                            f._lastCheckValue = ''
+                        }
+                    },
+                    blur:function(f,a,b,c){
+                        var form = f.ownerCt;
+                        if(f.value&&f.value!=''&&f.isValid()&&f._lastCheckValue!=f.value){
+                            f._lastCheckValue = f.value;
+                            form.setLoading(true);
+                            Ext.Ajax.request({
+                                url: '/api/account/account/checkMobile?mobile='+f.value,
+                                method: 'GET',
+                                headers:{
+                                    'Access-Control-Allow-Origin': '*',
+                                    "Content-Type": 'application/json;charset=UTF-8',
+                                },
+                                success: function (response) {
+                                    form.setLoading(false);
+                                    var localJson = Ext.decode(response.responseText);
+                                    if(localJson.success){
+                                        if(localJson.data.hasRegister){
+                                            saas.util.BaseUtil.showSuccessToast('校验成功:手机号已在优软云注册');
+                                        }else{
+                                            saas.util.BaseUtil.showErrorToast('校验失败:手机号未在优软云注册');
+                                            f.setValue('');
+                                        }
+                                    }else{
+                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
+                                        f.setValue('');
+                                    }
+                                },
+                                failure: function (response) {
+                                    if(response.responseText){
+                                        var localJson = Ext.decode(response.responseText);
+                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
+                                        f.setValue('');
+                                    }else{
+                                        saas.util.BaseUtil.showErrorToast('手机号校验接口连接超时');
+                                        f.setValue('');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                }
+            },{
+                xtype:'textfield',
+                fieldLabel: '真实姓名',
+                name: 'realname',
+                regex:/^[\u4e00-\u9fa5]+$/,
+                regexText:'请输入汉字',
+                allowBlank:false,
+                maxLength: 30,
+            },{
+                xtype:'textfield',
+                fieldLabel: '邮箱',
+                name: 'email',
+                allowBlank:true,
+                beforeLabelTextTpl: "",
+                regex:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
+                regexText:'请输入正确的邮箱',
+                maxLength: 30,
+                listeners:{
+                    blur:function(f,a,b,c){
+                        var form = f.ownerCt;
+                        if(f.value&&f.value!=''&&f.isValid()&&f._lastCheckValue!=f.value){
+                            form.setLoading(true);
+                            f._lastCheckValue = f.value
+                            Ext.Ajax.request({
+                                url: '/api/account/account/checkEmail?email='+f.value,
+                                method: 'GET',
+                                headers:{
+                                    'Access-Control-Allow-Origin': '*',
+                                    "Content-Type": 'application/json;charset=UTF-8'
+                                },
+                                success: function (response) {
+                                    form.setLoading(false);
+                                    var localJson = Ext.decode(response.responseText);
+                                    if(localJson.success){
+                                        if(!localJson.data){
+                                            saas.util.BaseUtil.showSuccessToast('校验成功:邮箱未注册');
+                                        }else{
+                                            saas.util.BaseUtil.showErrorToast('校验失败:该邮箱已被注册');
+                                            f.setValue('');
+                                        }
+                                    }else{
+                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
+                                    }
+                                },
+                                failure: function (response) {
+                                    if(response.responseText){
+                                        var localJson = Ext.decode(response.responseText);
+                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
+                                    }else{
+                                        saas.util.BaseUtil.showErrorToast('邮箱校验接口连接超时');
+                                    }
+                                }
+                            });
+                        }
+                    }
+                }
+            },{
+                xtype:'datamulticombo',
+                dataUrl:'/api/account/role/list',
+                fieldLabel: '关联角色',
+                name: 'roleIds',
+                allowBlank:false,
+                maxLength: 30,
+            }]
+        }
+    },
+    onSave:function(){
+        var me = this;
+        var belong = this.belong;
+        me.setLoading(true);
+        var form=this.down('form');
+        var combo = this._combo;
+        var params = {};
+        var names = belong.columns.map(column => column.dataIndex);
+
+        Ext.Array.each(names,function(name) {
+            if(name){
+                var dataField = form.down('[name='+name+']');
+                if(dataField&&dataField.value){
+                    params[name] = dataField.value;
+                    params._value = dataField.value;
+                }
+            }
+        });
+
+        //更改参数
+        var o = '';
+        var dataField = form.down('[name=roleIds]');
+        Ext.Array.each(dataField.value,function(item) {
+            o+=item.value+','
+        });
+        o = o.substring(0,o.length-1);
+        params['username'] = params['mobile'];
+        params['type'] = 1;
+        params['roleIds'] = o;
+        //保存接口
+        saas.util.BaseUtil.request({
+            url: belong.reqUrl,
+            params: JSON.stringify(params),
+            method: 'POST'
+        })
+        .then(function(localJson) {
+            me.setLoading(false);
+            if(localJson.success){
+                form.ownerCt._parent.store.load();
+                saas.util.BaseUtil.showSuccessToast('保存成功');
+                form.ownerCt.close();
+            }
+        })
+        .catch(function(res) {
+            me.setLoading(false);
+            console.error(res);
+            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
+        });
+    }
+});

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

@@ -237,17 +237,12 @@ Ext.define('saas.view.sys.account.DataList', {
         },
         itemClick: function(view,record,a,index,c) {
             var classList = c.target.classList.value;
-            var grid = this;
             if(classList.indexOf('fa-pencil')>-1){
-                var document = Ext.create('saas.view.document.kind.Kind',{});
-                var form = this.ownerCt;
                 this.dialog = this.getController().getView().add({
-                    xtype: 'document-kind-childwin',
+                    xtype: 'sys-account-editwindow',
                     bind: {
                         title: '修改账户信息'
                     },
-                    dataKind:'accountinformation',
-                    belong:document.etc['accountinformation'],
                     _parent:this,
                     record:record,
                     session: true

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

@@ -9,15 +9,12 @@ Ext.define('saas.view.sys.account.DataListController', {
     },
 
     onAdd:function(b){
-        var document = Ext.create('saas.view.document.kind.Kind',{});
         var form = this.view;
         this.dialog = form.add({
-            xtype: 'document-kind-childwin',
+            xtype: 'sys-account-addwindow',
             bind: {
                 title: '新增账户资料'
             },
-            dataKind:'accountadd',
-            belong:document.etc['accountadd'],
             _parent:form,
             record:null,
             session: true

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

@@ -0,0 +1,125 @@
+/**
+ * Created by zhouy on 2018/10/18.
+ */
+Ext.define('saas.view.sys.account.EditWindow', {
+    extend: 'saas.view.document.kind.ChildForm',
+    xtype: 'sys-account-editwindow',
+    dataKind:'accountinformation',//类型标识
+    belong:{
+        columns:[{
+            dataIndex:'accountId',
+        },{
+            dataIndex: 'roleNames',
+            width: 150
+        },{
+            dataIndex: 'mobile',
+            width: 110
+        },{
+            dataIndex: 'email',
+            width: 110
+        }],
+        reqUrl:'/api/account/account/bind/roles',
+    },
+    etc:{
+        accountinformation:{
+            items:[{
+                xtype:'hidden',
+                name:'accountId',
+                hidden:true,
+            },{
+                xtype:'textfield',
+                fieldLabel: '真实姓名',
+                name: 'realname',
+                readOnly:true,
+                editable:false,
+                allowBlank:true,
+                maxLength: 30,
+                beforeLabelTextTpl: "",
+            },{
+                xtype:'datamulticombo',
+                dataUrl:'/api/account/role/list',
+                fieldLabel: '关联角色',
+                name: 'roleNames',
+                allowBlank:true,
+                maxLength: 20,
+                beforeLabelTextTpl: "",
+            },{
+                xtype:'textfield',
+                fieldLabel: '联系电话',
+                name: 'mobile',
+                readOnly:true,
+                editable:false,
+                allowBlank:true,
+                maxLength: 30,
+                beforeLabelTextTpl: "",
+            },{
+                xtype:'textfield',
+                fieldLabel: '邮箱',
+                name: 'email',
+                readOnly:true,
+                editable:false,
+                allowBlank:true,
+                maxLength: 30,
+                beforeLabelTextTpl: "",
+            }]
+        }
+    },
+    onSave:function(){
+        var me = this;
+        var belong = this.belong;
+        me.setLoading(true);
+        var form=this.down('form');
+        var combo = this._combo;
+        var params = {};
+        var names = belong.columns.map(column => column.dataIndex);
+
+        Ext.Array.each(names,function(name) {
+            if(name){
+                var dataField = form.down('[name='+name+']');
+                if(dataField&&dataField.value){
+                    params[name] = dataField.value;
+                }
+            }
+        });
+
+        //更改参数
+        var o = '';
+        Ext.Array.each(params.roleNames,function(item) {
+            o+=item.value+','
+        });
+        o = o.substring(0,o.length-1);
+
+        if(o==""){
+            saas.util.BaseUtil.showErrorToast('关联角色未选择，无法保存！')
+        }
+
+        var _params = {
+            accountId:Number(params['accountId']),
+            roleIds:o,
+        };
+
+        //保存接口
+        saas.util.BaseUtil.request({
+            url: belong.reqUrl,
+            params: _params,
+            method: 'POST',
+            headers:{
+                'Access-Control-Allow-Origin': '*',
+                "Content-Type":'application/x-www-form-urlencoded'
+            }
+        })
+        .then(function(localJson) {
+            me.setLoading(false);
+            if(localJson.success){
+                saas.util.BaseUtil.showSuccessToast('保存成功');
+                form.ownerCt._parent.store.load()
+                form.ownerCt.close();
+            }
+        })
+        .catch(function(res) {
+            me.setLoading(false);
+            console.error(res);
+            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
+        });
+    }
+});

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

@@ -436,9 +436,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
         var viewModel = form.getViewModel();
         if(viewModel.data.fileInfoList&&viewModel.data.fileInfoList.length!=0){
             var logo = viewModel.data.fileInfoList[0].logo;
-            var logoName = logo.name + "  (" + Ext.util.Format.fileSize(logo.size) + ")";
+            //var logoName = logo.name + "  (" + Ext.util.Format.fileSize(logo.size) + ")";
             var signet = viewModel.data.fileInfoList[0].signet;
-            var signetName = signet.name + "  (" + Ext.util.Format.fileSize(signet.size) + ")";
+            //var signetName = signet.name + "  (" + Ext.util.Format.fileSize(signet.size) + ")";
         }
     },
 

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

@@ -51,16 +51,13 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
         hidden:true,
         listeners: {
             click: function(){
-                var document = Ext.create('saas.view.document.kind.Kind',{});
                 var form = this.ownerCt.ownerCt;
                 var grid = this.ownerCt.ownerCt.items.items[0].grid;
                 this.dialog = form.getController().getView().add({
-                    xtype: 'document-kind-childwin',
+                    xtype: 'sys-maxnumbers-window',
                     bind: {
                         title: '新增单据编码规则'
                     },
-                    dataKind:'maxnumbers',
-                    belong:document.etc['maxnumbers'],
                     _parent:form,
                     _combo:grid,
                     record:null,
@@ -201,15 +198,12 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
             var classList = c.target.classList.value;
             var grid = this;
             if(classList.indexOf('fa-pencil')>-1){
-                var document = Ext.create('saas.view.document.kind.Kind',{});
                 var form = this.ownerCt;
                 this.dialog = form.getController().getView().add({
-                    xtype: 'document-kind-childwin',
+                    xtype: 'sys-maxnumbers-window',
                     bind: {
                         title: '修改单据编码规则'
                     },
-                    dataKind:'maxnumbers',
-                    belong:document.etc['maxnumbers'],
                     _parent:form,
                     _combo:this,
                     record:record,

frontend/saas-web/app/view/sys/maxnumbers/Window.js

@@ -0,0 +1,82 @@
+Ext.define('saas.view.sys.maxnumbers.Window', {
+    extend: 'saas.view.document.kind.ChildForm',
+    xtype: 'sys-maxnumbers-window',
+    dataKind:'maxnumbers',//类型标识
+    belong:{
+        columns: [{
+            text : "单据名称", 
+            width : 200.0, 
+            dataIndex : "mn_caller" 
+        }, 
+        {
+            text : "单据前缀", 
+            dataIndex : "mn_leadcode", 
+            width : 150.0
+        }, 
+        {
+            text : "单据规则", 
+            dataIndex : "mn_rule", 
+            width : 250.0
+        },{
+            text : "流水长度", 
+            dataIndex : "mn_number", 
+            width : 90.0,
+            xtype: 'numbercolumn',
+        }],
+        keyField:'id',
+        reqUrl:'/api/commons/number/save'
+    },
+    etc:{
+        maxnumbers:{
+            items:[{
+                xtype:'hidden',
+                name:'id'
+            },{
+                xtype:'textfield',
+                fieldLabel: '单据名称',
+                name: 'mn_name',
+                allowBlank:false,
+                editable:false,
+                readOnly:true,
+                maxLength: 20
+            },{
+                xtype:'textfield',
+                fieldLabel: '单据前缀',
+                name: 'mn_leadcode',
+                beforeLabelTextTpl: '',
+                allowBlank:true,
+                maxLength: 20
+            },{
+                xtype:'combo',
+                fieldLabel: '单据规则',
+                name: 'mn_rule',
+                displayField : "display", 
+                editable:false,
+                hideTrigger : false, 
+                maxLength : 100.0, 
+                minValue : null, 
+                positiveNum : false, 
+                queryMode : "local", 
+                valueField : "value", 
+                store:{
+                    fields: ['display', 'value'],
+                    data : [
+                        {"display":"年月日", "value":'yyyymmdd'},
+                        {"display":"年月", "value":'yyyymm'},
+                        {"display":"无", "value":'无'}
+                    ]
+                }
+            },{
+                xtype:'numberfield',
+                hideTrigger : true, 
+                fieldLabel: '流水长度',
+                name: 'mn_number',
+                minValue : 0, 
+                allowBlank:false,
+                mouseWheelEnabled: false
+            }]
+        }
+    }
+});
+
+

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

@@ -139,55 +139,14 @@ Ext.define('saas.view.sys.power.TreePanel', {
         var isleaf = rec.get('leaf');
         var record = isleaf?rec:null;
         var view = this.ownerCt.getController().getView();
-        var document = Ext.create('saas.view.document.kind.Kind',{});
         this.dialog = view.add({
-            xtype: 'document-kind-childwin',
+            xtype: 'sys-power-window',
             bind: {
                 title: (record?'修改':'新增')+'角色'
             },
-            dataKind:'personpower',
-            belong:document.etc['personpower'],
             _parent:this,
             record:record,
             session: true,
-            onSave:function(){
-                var me = this;
-                var belong = this.belong;
-                me.setLoading(true);
-                var form=this.down('form');
-                var params = {};
-                var names = belong.columns.map(column => column.dataIndex);
-                Ext.Array.each(names,function(name) {
-                    if(name){
-                        var dataField = form.down('[name='+name+']');
-                        if(dataField&&dataField.value){
-                            params[name] = dataField.value;
-                            params._value = dataField.value;
-                        }
-                    }
-                });
-                var idField = form.down('[name='+belong.keyField+']');
-                params[belong.keyField] = idField.value || 0;
-                //保存接口
-                saas.util.BaseUtil.request({
-                    url: idField.value?belong.updateUrl:belong.reqUrl,
-                    params: JSON.stringify(params),
-                    method: 'POST'
-                })
-                .then(function(localJson) {
-                    me.setLoading(false);
-                    if(localJson.success){
-                        saas.util.BaseUtil.showSuccessToast('保存成功');
-                        me._parent.setTree();
-                        form.ownerCt.close();
-                    }
-                })
-                .catch(function(res) {
-                    me.setLoading(false);
-                    console.error(res);
-                    saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
-                });
-            }
         });
         this.dialog.show();
     },

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

@@ -0,0 +1,94 @@
+Ext.define('saas.view.sys.power.Window', {
+    extend: 'saas.view.document.kind.ChildForm',
+    xtype: 'sys-power-window',
+    dataKind:'personpower',//类型标识
+    belong:{
+        columns: [ {
+            text : "编号", 
+            dataIndex : "code", 
+            width : 150.0, 
+            xtype : "", 
+        },{
+            text : "角色名称", 
+            width : 200.0, 
+            dataIndex : "name", 
+            xtype : "", 
+        }, 
+        {
+            text : "角色描述", 
+            dataIndex : "description", 
+            width : 250.0
+        }
+        ],
+        keyField:'id',
+        reqUrl:'/api/account/role/save',
+        updateUrl:'/api/account/role/update',
+    },
+    etc:{
+        personpower:{
+            items:[{
+                xtype:'hidden',
+                name:'id'
+            },{
+                xtype:'textfield',
+                name:'name',
+                allowBlank:false,
+                fieldLabel:'角色名称',
+                maxLength: 20
+            },{
+                xtype:'textfield',
+                name:'description',
+                allowBlank:false,
+                fieldLabel:'角色描述',
+                maxLength: 20
+            },{
+                xtype:'textfield',
+                hidden:true,
+                name:'code',
+                allowBlank:true,
+                fieldLabel:'角色编号',
+                maxLength: 20
+            }]
+        }
+    },
+    onSave:function(){
+        var me = this;
+        var belong = this.belong;
+        me.setLoading(true);
+        var form=this.down('form');
+        var params = {};
+        var names = belong.columns.map(column => column.dataIndex);
+        Ext.Array.each(names,function(name) {
+            if(name){
+                var dataField = form.down('[name='+name+']');
+                if(dataField&&dataField.value){
+                    params[name] = dataField.value;
+                    params._value = dataField.value;
+                }
+            }
+        });
+        var idField = form.down('[name='+belong.keyField+']');
+        params[belong.keyField] = idField.value || 0;
+        //保存接口
+        saas.util.BaseUtil.request({
+            url: idField.value?belong.updateUrl:belong.reqUrl,
+            params: JSON.stringify(params),
+            method: 'POST'
+        })
+        .then(function(localJson) {
+            me.setLoading(false);
+            if(localJson.success){
+                saas.util.BaseUtil.showSuccessToast('保存成功');
+                me._parent.setTree();
+                form.ownerCt.close();
+            }
+        })
+        .catch(function(res) {
+            me.setLoading(false);
+            console.error(res);
+            saas.util.BaseUtil.showErrorToast('保存失败: ' + res.message);
+        });
+    }
+});
+
+