hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

若依2.2版本发布

Browse Source
This commit is contained in:
RuoYi
2018-07-22 23:05:50 +08:00
parent 9e8d80a699
commit cc9c67cdfb
115 changed files with 1579 additions and 1216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/templates/system/user/add.html
View File

@@ -28,7 +28,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">密码：</label>
<div class="col-sm-8">
<input class="form-control" type="password" name="password" id="password" th:value="${@configService.selectConfigByKey('sys.user.initPassword')}">
<input class="form-control" type="password" name="password" id="password" th:value="${@config.getKey('sys.user.initPassword')}">
</div>
</div>
<div class="form-group">
@@ -46,7 +46,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_user_sex')}">
<select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
</select>
</div>
@@ -193,7 +193,7 @@
$.ajax({
cache : true,
type : "POST",
url : ctx + "system/user/save",
url : ctx + "system/user/add",
data : {
"userId": userId,
"deptId": deptId,

4
src/main/resources/templates/system/user/edit.html
View File

@@ -41,7 +41,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">性别：</label>
<div class="col-sm-8">
<select id="sex" class="form-control m-b" th:with="type=${@dictService.selectDictData('sys_user_sex')}">
<select id="sex" class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
<option th:each="dict : ${type}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{sex}"></option>
</select>
</div>
@@ -165,7 +165,7 @@
$.ajax({
cache : true,
type : "POST",
url : ctx + "system/user/save",
url : ctx + "system/user/edit",
data : {
"userId": userId,
"deptId": deptId,

2
src/main/resources/templates/system/user/profile/profile.html
View File

@@ -44,7 +44,7 @@
<p><i class="fa fa-user"></i> [[${user.userName}]] / [[${#strings.defaultString(roleGroup,'无角色')}]]
<p><i class="fa fa-phone"></i> [[${user.phonenumber}]]</p>
<p><i class="fa fa-group"></i> [[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]</p>
<p><i class="fa fa-transgender"></i> [[${user.sex}]]</p>
<p><i class="fa fa-transgender"></i> 性别：[[${user.sex}]]</p>
<p><i class="fa fa-envelope-o"></i> [[${user.email}]]</p>
<p><i class="fa fa-calendar"></i> [[${#dates.format(user.createTime, 'yyyy-MM-dd HH:mm:ss')}]]</p>
</div>

15
src/main/resources/templates/system/user/user.html
View File

@@ -43,7 +43,7 @@
手机号码：<input type="text" name="phonenumber"/>
</li>
<li>
用户状态：<select name="status" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
用户状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
@@ -81,9 +81,10 @@
<script th:src="@{/ajax/libs/jquery-layout/jquery.layout-latest.js}"></script>
<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:user:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:user:remove')}]];
var resetPwdFlag = [[${@permissionService.hasPermi('system:user:resetPwd')}]];
var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:user:remove')}]];
var resetPwdFlag = [[${@permission.hasPermi('system:user:resetPwd')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var prefix = ctx + "system/user"
$(document).ready(function(){
@@ -138,11 +139,7 @@
title: '状态',
align: 'center',
formatter: function(value, row, index) {
if (value == '0') {
return '<span class="badge badge-primary">正常</span>';
} else if (value == '1') {
return '<span class="badge badge-danger">停用</span>';
}
return $.table.selectDictLabel(datas, value);
}
},
{