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

一波细节优化

Browse Source
This commit is contained in:
RuoYi
2018-08-23 17:06:31 +08:00
parent 58f21c0350
commit 1a5e3606d2
53 changed files with 285 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/resources/templates/system/dept/add.html
View File

@@ -44,10 +44,10 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:checked="${dict['isDefault'] == 'Y' ? true : false}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
@@ -74,12 +74,11 @@
dataType: "json",
data: {
"deptName" : function() {
return $("input[name='deptName']").val();
return $.common.trim($("#deptName").val());
}
},
dataFilter: function(data, type) {
if (data == "0") return true;
else return false;
return $.validate.unique(data);
}
}
},

4
src/main/resources/templates/system/dept/dept.html
View File

@@ -16,7 +16,7 @@
<li>
部门状态：<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>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
@@ -32,7 +32,7 @@
<i class="fa fa-plus"></i> 新增
</a>
</div>
<div class="col-sm-12 select-info table-striped">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table" data-mobile-responsive="true"></table>
</div>
</div>

15
src/main/resources/templates/system/dept/edit.html
View File

@@ -45,10 +45,10 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门状态：</label>
<div class="col-sm-8" th:with="type=${@dict.getType('sys_normal_disable')}">
<div th:each="dict : ${type}" th:class="${dict['cssClass']}">
<input type="radio" th:id="${dict['dictCode']}" name="status" th:value="${dict['dictValue']}" th:field="*{status}">
<label th:for="${dict['dictCode']}" th:text="${dict['dictLabel']}"></label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}">
<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
@@ -74,15 +74,14 @@
dataType: "json",
data: {
"deptId": function() {
return $("input[name='deptId']").val();
return $.common.trim($("#deptId").val());
},
"deptName": function() {
return $("input[name='deptName']").val();
return $.common.trim($("#deptName").val());
}
},
dataFilter: function(data, type) {
if (data == "0") return true;
else return false;
return $.validate.unique(data);
}
}
},