Commit 1de4c998 by fsn

Merge remote-tracking branch 'origin/master'

parents f8ccfa17 08bb5a94
@/* @/*
按钮标签中各个参数的说明: 按钮标签中各个参数的说明:
spaceCss : 按钮左侧是否有间隔(true/false) btnType : 按钮的类型决定了颜色(default-灰色,primary-绿色,success-蓝色,info-淡蓝色,warning-黄色,danger-红色,white-白色)
space : 按钮左侧是否有间隔(true/false)
clickFun : 点击按钮所执行的方法 clickFun : 点击按钮所执行的方法
icon : 按钮上的图标的样式 icon : 按钮上的图标的样式
name : 按钮名称 name : 按钮名称
......
@/* @/*
表单中input框标签中各个参数的说明: 表单中input框标签中各个参数的说明:
hidden : input hidden框的id
id : input框id id : input框id
name : input框名称 name : input框名称
readonly : readonly属性
clickFun : 点击事件的方法名
style : 附加的css属性
@*/ @*/
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">${name}</label> <label class="col-sm-3 control-label">${name}</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input class="form-control" type="text" id="${id}" value="${value!}"> <input class="form-control" id="${id}" value="${value!}"
@if(isNotEmpty(type)){
type="${type}"
@}else{
type="text"
@}
@if(isNotEmpty(readonly)){
readonly="${readonly}"
@}
@if(isNotEmpty(clickFun)){
onclick="${clickFun}"
@}
@if(isNotEmpty(style)){
style="${style}"
@}
@if(isNotEmpty(disabled)){
disabled="${disabled}"
@}
>
@if(isNotEmpty(hidden)){
<input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
@}
</div> </div>
</div> </div>
@if(isNotEmpty(underline) && underline == 'true'){ @if(isNotEmpty(underline) && underline == 'true'){
......
@/*
select标签中各个参数的说明:
name : select的名称
id : select的id
underline : 是否带分割线
@*/
<div class="form-group">
<label class="col-sm-3 control-label">${name}</label>
<div class="col-sm-9">
<select class="form-control" id="${id}">
${tagBody!}
</select>
@if(isNotEmpty(hidden)){
<input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
@}
</div>
</div>
@if(isNotEmpty(underline) && underline == 'true'){
<div class="hr-line-dashed"></div>
@}
...@@ -5,48 +5,19 @@ ...@@ -5,48 +5,19 @@
<input type="hidden" id="id" value=""> <input type="hidden" id="id" value="">
<!-- 左侧信息 -->
<div class="row"> <div class="row">
<div class="col-sm-6 b-r"> <div class="col-sm-6 b-r">
<div class="form-group"> <#input id="name" name="角色名称" underline="true"/>
<label class="col-sm-3 control-label">角色名称</label> <#input id="pName" name="上级名称" underline="true" hidden="pid" readonly="readonly"
<div class="col-sm-9"> clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
<input class="form-control" type="text" id="name"> style="background-color: #ffffff !important;"/>
</div> <#input id="deptName" name="部门名称" hidden="deptid" readonly="readonly"
</div> clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
<div class="hr-line-dashed"></div> style="background-color: #ffffff !important;"/>
<div class="form-group">
<label class="col-sm-3 control-label">上级名称</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="pName" style="background-color: #ffffff !important;" onclick="RolInfoDlg.showPNameSelectTree(); return false;" readonly="readonly">
<input class="form-control" type="hidden" id="pid">
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">部门名称</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="deptName" style="background-color: #ffffff !important;" onclick="RolInfoDlg.showDeptSelectTree(); return false;" readonly="readonly">
<input class="form-control" type="hidden" id="deptid">
</div>
</div>
</div> </div>
<!-- 左侧信息结束 -->
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <#input id="tips" name="别名" underline="true"/>
<label class="col-sm-3 control-label">别名</label> <#input id="num" name="排序"/>
<div class="col-sm-9">
<input class="form-control" type="text" id="tips">
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">排序</label>
<div class="col-sm-9">
<input class="form-control" type="number" id="num">
</div>
</div>
</div> </div>
</div> </div>
...@@ -64,12 +35,8 @@ ...@@ -64,12 +35,8 @@
<div class="row btn-group-m-t"> <div class="row btn-group-m-t">
<div class="col-sm-10"> <div class="col-sm-10">
<button class="btn btn-info" id="ensure" type="submit" onclick="RolInfoDlg.addSubmit()"> <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="RolInfoDlg.addSubmit()"/>
<i class="fa fa-check"></i>&nbsp;提交 <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="RolInfoDlg.close()"/>
</button>
<button class="btn btn-danger" id="cancel" onclick="RolInfoDlg.close()">
<i class="fa fa-eraser"></i>&nbsp;取消
</button>
</div> </div>
</div> </div>
</div> </div>
......
@layout("/common/_container.html"){ @layout("/common/_container.html"){
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-content"> <div class="ibox-content">
<div class="form-horizontal"> <div class="form-horizontal">
<input type="hidden" id="id" value="${role.id}"> <input type="hidden" id="id" value="${role.id}">
<!-- 左侧信息 -->
<div class="row"> <div class="row">
<div class="col-sm-6 b-r"> <div class="col-sm-6 b-r">
<div class="form-group"> <#input id="name" name="角色名称" underline="true" value="${role.name}"/>
<label class="col-sm-3 control-label">角色名称</label> <#input id="pName" name="上级名称" underline="true" hidden="pid" hiddenValue="${role.pid}" readonly="readonly" value="${pName}"
<div class="col-sm-9"> clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
<input class="form-control" type="text" id="name" value="${role.name}"> style="background-color: #ffffff !important;"/>
</div> <#input id="deptName" name="部门名称" hidden="deptid" hiddenValue="${role.deptid}" readonly="readonly" value="${deptName}"
</div> clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
<div class="hr-line-dashed"></div> style="background-color: #ffffff !important;"/>
<div class="form-group">
<label class="col-sm-3 control-label">上级名称</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="pName" value="${pName}" style="background-color: #ffffff !important;" onclick="RolInfoDlg.showPNameSelectTree(); return false;" readonly="readonly">
<input class="form-control" type="hidden" id="pid" value="${role.pid}">
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">部门名称</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="deptName" value="${deptName}" style="background-color: #ffffff !important;" onclick="RolInfoDlg.showDeptSelectTree(); return false;" readonly="readonly">
<input class="form-control" type="hidden" id="deptid" value="${role.deptid}">
</div>
</div>
</div> </div>
<!-- 左侧信息结束 -->
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <#input id="tips" name="别名" underline="true" value="${role.tips}"/>
<label class="col-sm-3 control-label">别名</label> <#input id="num" name="排序" value="${role.num}"/>
<div class="col-sm-9">
<input class="form-control" type="text" id="tips" value="${role.tips}">
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">排序</label>
<div class="col-sm-9">
<input class="form-control" type="number" id="num" value="${role.num}">
</div>
</div>
</div> </div>
</div> </div>
...@@ -64,12 +35,8 @@ ...@@ -64,12 +35,8 @@
<div class="row btn-group-m-t"> <div class="row btn-group-m-t">
<div class="col-sm-10"> <div class="col-sm-10">
<button class="btn btn-info" id="ensure" type="submit" onclick="RolInfoDlg.editSubmit()"> <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="RolInfoDlg.editSubmit()"/>
<i class="fa fa-check"></i>&nbsp;提交 <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="RolInfoDlg.close()"/>
</button>
<button class="btn btn-danger" id="cancel" onclick="RolInfoDlg.close()">
<i class="fa fa-eraser"></i>&nbsp;取消
</button>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -5,90 +5,35 @@ ...@@ -5,90 +5,35 @@
<input type="hidden" id="id" value=""> <input type="hidden" id="id" value="">
<!-- 左侧信息 -->
<div class="row"> <div class="row">
<div class="col-sm-6 b-r"> <div class="col-sm-6 b-r">
<div class="form-group"> <#input id="account" name="账户" underline="true"/>
<label class="col-sm-3 control-label">账户</label>
<div class="col-sm-9"> <#select id="sex" name="性别" underline="true">
<input class="form-control" type="text" id="account" name="account"> <option value="1"></option>
</div> <option value="2"></option>
</div> </#select>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">性别</label>
<div class="col-sm-9">
<select class="form-control" id="sex" name="sex">
<option value="1"></option>
<option value="2"></option>
</select>
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">密码</label>
<div class="col-sm-9">
<input class="form-control" type="password" id="password"
name="password">
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">角色</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="roleid"
disabled="disabled">
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">邮箱</label>
<div class="col-sm-9">
<input class="form-control" type="email" id="email" name="email">
<!-- 家的纬度 -->
</div>
</div>
</div>
<!-- 左侧信息结束 -->
<#input id="password" name="密码" underline="true" type="password"/>
<#input id="roleid" name="角色" underline="true" disabled="disabled"/>
<#input id="email" name="邮箱" type="email"/>
</div>
<div class="col-sm-6"> <div class="col-sm-6">
<div id="driverInfoContent"> <div id="driverInfoContent">
<div class="form-group"> <#input id="name" name="姓名" underline="true"/>
<label class="col-sm-3 control-label">姓名</label>
<div class="col-sm-8"> <#input id="birthday" name="出生日期" underline="true" type="date"
<input class="form-control" type="text" id="name" name="name"> clickFun="laydate({istime: false, format: 'YYYY-MM-DD'})"/>
</div>
</div> <#input id="rePassword" name="确认密码" type="password" underline="true"/>
<div class="hr-line-dashed "></div>
<div class="form-group"> <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
<label class="col-sm-3 control-label">出生日期</label> clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
<div class="col-sm-8"> style="background-color: #ffffff !important;"/>
<input class="form-control" type="date" id="birthday"
name="birthday" onclick="laydate({istime: false, format: 'YYYY-MM-DD'})"> <#input id="phone" name="电话"/>
</div>
</div>
<div class="hr-line-dashed "></div>
<div class="form-group">
<label class="col-sm-3 control-label">确认密码</label>
<div class="col-sm-8">
<input class="form-control" type="password" id="rePassword">
</div>
</div>
<div class="hr-line-dashed "></div>
<div class="form-group">
<label class="col-sm-3 control-label">部门</label>
<div class="col-sm-8">
<input class="form-control" type="text" id="citySel" style="background-color: #ffffff !important;" onclick="UserInfoDlg.showDeptSelectTree(); return false;" readonly="readonly">
<input class="form-control" type="hidden" name="deptid" id="deptid">
</div>
</div>
<div class="hr-line-dashed "></div>
<div class="form-group">
<label class="col-sm-3 control-label">电话</label>
<div class="col-sm-8">
<input class="form-control" type="text" id="phone" name="phone">
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -101,12 +46,8 @@ ...@@ -101,12 +46,8 @@
<div class="row btn-group-m-t"> <div class="row btn-group-m-t">
<div class="col-sm-10"> <div class="col-sm-10">
<button class="btn btn-info" id="ensure" type="submit" onclick="UserInfoDlg.addSubmit()"> <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
<i class="fa fa-check"></i>&nbsp;提交 <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
</button>
<button class="btn btn-danger" id="cancel" onclick="UserInfoDlg.close()">
<i class="fa fa-eraser"></i>&nbsp;取消
</button>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -5,75 +5,32 @@ ...@@ -5,75 +5,32 @@
<input type="hidden" id="id" value="${user.id}"> <input type="hidden" id="id" value="${user.id}">
<!-- 左侧信息 -->
<div class="row"> <div class="row">
<div class="col-sm-6 b-r"> <div class="col-sm-6 b-r">
<div class="form-group"> <#input id="account" name="账户" underline="true" value="${user.account}"/>
<label class="col-sm-3 control-label">账户</label>
<div class="col-sm-9"> <#select id="sex" name="性别" underline="true" value="${user.sex}">
<input class="form-control" type="text" id="account" name="account" value="${user.account}"> <option value="1"></option>
</div> <option value="2"></option>
</div> </#select>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">性别</label>
<div class="col-sm-9">
<select class="form-control" id="sex" name="sex" value="${user.sex}">
<option value="1"></option>
<option value="2"></option>
</select>
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">角色</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="roleid" value="${roleName}"
disabled="disabled">
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">邮箱</label>
<div class="col-sm-9">
<input class="form-control" type="email" id="email" name="email" value="${user.email}">
<!-- 家的纬度 -->
</div>
</div>
</div>
<!-- 左侧信息结束 -->
<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
<#input id="email" name="邮箱" type="email" value="${user.email}"/>
</div>
<div class="col-sm-6"> <div class="col-sm-6">
<div id="driverInfoContent"> <div id="driverInfoContent">
<div class="form-group"> <#input id="name" name="姓名" underline="true" value="${user.name}"/>
<label class="col-sm-3 control-label">姓名</label>
<div class="col-sm-8"> <#input id="birthday" name="出生日期" underline="true" type="date"
<input class="form-control" type="text" id="name" name="name" value="${user.name}"> value="${user.birthday,dateFormat="yyyy-MM-dd"}"
</div> clickFun="laydate({istime: false, format: 'YYYY-MM-DD'})"/>
</div>
<div class="hr-line-dashed "></div> <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}"
<div class="form-group"> clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
<label class="col-sm-3 control-label">出生日期</label> style="background-color: #ffffff !important;"/>
<div class="col-sm-8">
<input class="form-control" type="date" id="birthday" <#input id="phone" name="电话" value="${user.phone}"/>
name="birthday" onclick="laydate({istime: false, format: 'YYYY-MM-DD'})" value="${user.birthday,dateFormat="yyyy-MM-dd"}">
</div>
</div>
<div class="hr-line-dashed "></div>
<div class="form-group">
<label class="col-sm-3 control-label">部门</label>
<div class="col-sm-8">
<input class="form-control" style="background-color: #ffffff !important;" type="text" id="citySel" onclick="UserInfoDlg.showDeptSelectTree(); return false;" readonly="readonly" value="${deptName}">
<input class="form-control" type="hidden" name="deptid" id="deptid" value="${user.deptid}">
</div>
</div>
<div class="hr-line-dashed "></div>
<div class="form-group">
<label class="col-sm-3 control-label">电话</label>
<div class="col-sm-8">
<input class="form-control" type="text" id="phone" name="phone" value="${user.phone}">
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -86,12 +43,8 @@ ...@@ -86,12 +43,8 @@
<div class="row btn-group-m-t"> <div class="row btn-group-m-t">
<div class="col-sm-10"> <div class="col-sm-10">
<button class="btn btn-info" id="ensure" type="submit" onclick="UserInfoDlg.editSubmit()"> <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
<i class="fa fa-check"></i>&nbsp;提交 <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
</button>
<button class="btn btn-danger" id="cancel" onclick="UserInfoDlg.close()">
<i class="fa fa-eraser"></i>&nbsp;取消
</button>
</div> </div>
</div> </div>
</div> </div>
......
@layout("/common/_container.html"){ @layout("/common/_container.html"){
<div class="col-sm-6 col-sm-offset-3"> <div class="col-sm-6 col-sm-offset-3">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<h5>用户管理</h5> <h5>用户管理</h5>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div class="row row-lg"> <div class="row row-lg">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-content" style="border:none !important; "> <div class="ibox-content" style="border:none !important; ">
<div class="form-horizontal"> <div class="form-horizontal">
<input type="hidden" id="id" value="${user.id}"> <input type="hidden" id="id" value="${user.id}">
<!-- 左侧信息 --> <div class="row">
<div class="row"> <div class="col-sm-6 b-r">
<div class="col-sm-6 b-r"> <#input id="account" name="账户" underline="true" value="${user.account}" disabled="disabled" />
<div class="form-group">
<label class="col-sm-3 control-label">账户</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="account"
name="account" value="${user.account}" disabled="disabled">
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">性别</label>
<div class="col-sm-9">
<select class="form-control" id="sex" name="sex"
value="${user.sex}">
<option value="1"></option>
<option value="2"></option>
</select>
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">角色</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="roleid"
value="${roleName}" disabled="disabled">
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="form-group">
<label class="col-sm-3 control-label">邮箱</label>
<div class="col-sm-9">
<input class="form-control" type="email" id="email"
name="email" value="${user.email}">
<!-- 家的纬度 -->
</div>
</div>
</div>
<!-- 左侧信息结束 -->
<div class="col-sm-6"> <#select id="sex" name="性别" underline="true" value="${user.sex}">
<div id="driverInfoContent"> <option value="1"></option>
<div class="form-group"> <option value="2"></option>
<label class="col-sm-3 control-label">姓名</label> </#select>
<div class="col-sm-8">
<input class="form-control" type="text" id="name"
name="name" value="${user.name}">
</div>
</div>
<div class="hr-line-dashed "></div>
<div class="form-group">
<label class="col-sm-3 control-label">出生日期</label>
<div class="col-sm-8">
<input class="form-control" type="date" id="birthday"
name="birthday"
onclick="laydate({istime: false, format: 'YYYY-MM-DD'})"
value="${user.birthday,dateFormat="yyyy-MM-dd"}">
</div>
</div>
<div class="hr-line-dashed "></div>
<div class="form-group">
<label class="col-sm-3 control-label">部门</label>
<div class="col-sm-8">
<input class="form-control"
style="background-color: #ffffff !important;" type="text"
id="citySel"
onclick="UserInfoDlg.showDeptSelectTree(); return false;"
readonly="readonly" value="${deptName}" disabled="disabled"> <input
class="form-control" type="hidden" name="deptid"
id="deptid" value="${user.deptid}">
</div>
</div>
<div class="hr-line-dashed "></div>
<div class="form-group">
<label class="col-sm-3 control-label">电话</label>
<div class="col-sm-8">
<input class="form-control" type="text" id="phone"
name="phone" value="${user.phone}">
</div>
</div>
</div>
</div>
</div>
<!-- 这是部门选择的下拉框 --> <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
<div id="menuContent" class="menuContent"
style="display: none; position: absolute; z-index: 200;">
<ul id="treeDemo" class="ztree tree-box" style=""></ul>
</div>
<div class="row btn-group-m-t"> <#input id="email" name="邮箱" type="email" value="${user.email}"/>
<div class="col-sm-10"> </div>
<button class="btn btn-info" id="ensure" type="submit"
onclick="UserInfoDlg.editSubmit()"> <div class="col-sm-6">
<i class="fa fa-check"></i>&nbsp;提交 <div id="driverInfoContent">
</button> <#input id="name" name="姓名" underline="true" value="${user.name}"/>
</div>
</div> <#input id="birthday" name="出生日期" underline="true" type="date"
</div> value="${user.birthday,dateFormat="yyyy-MM-dd"}"
</div> clickFun="laydate({istime: false, format: 'YYYY-MM-DD'})"/>
</div>
</div> <#input id="citySel" name="部门" underline="true" readonly="readonly" value="${deptName}"
</div> hidden="deptid" hiddenValue="${user.deptid}"
</div> clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
</div> style="background-color: #ffffff !important;"/>
<#input id="phone" name="电话" value="${user.phone}"/>
</div>
</div>
</div>
<!-- 这是部门选择的下拉框 -->
<div id="menuContent" class="menuContent"
style="display: none; position: absolute; z-index: 200;">
<ul id="treeDemo" class="ztree tree-box" style=""></ul>
</div>
<div class="row btn-group-m-t">
<div class="col-sm-10">
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<script src="${ctxPath}/static/modular/system/user/user_info.js"></script> <script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
@} @}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment