Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-16 4e8951a439c03e87568789cedeb62033884412db

 management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js

@@ -19,14 +19,26 @@
                    message: '别名不能为空'
                }
            }
        }/*,
        pName: {
        },
        headName: {
            validators: {
                notEmpty: {
                    message: '父级名称不能为空'
                    message: '负责人名称不能为空'
                },
                regexp: {
                    regexp:  /^[\u4E00-\u9FA5A-Za-z\s]+$/,
                    message: '不能输入特殊字符和数字'
                }
            }
        }*/
        },
        headPhone: {
            validators: {
                regexp: {
                    regexp: /^1[3-9]\d{9}$/,
                    message: '请输入合法手机号'
                }
            }
        }
    }
};

@@ -118,7 +130,7 @@
 * 收集数据
 */
RolInfoDlg.collectData = function () {
    this.set('id').set('name').set('pid').set('deptid').set('tips').set('num');
    this.set('id').set('name').set('pid').set('deptid').set('tips').set('num').set("headName").set("headPhone");
};

/**