root/cwhelp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增员工业务逻辑,优化登录账号权限,更新设计文档

Browse Source
This commit is contained in:
易焱
2019-08-01 01:15:16 +08:00
parent db4e6b237a
commit 8740a34a4a
37 changed files with 726 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/src/main/resources/templates/system/user/add.html
+15 -2
View File
@@ -32,12 +32,20 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label required">所属</label>
<label class="layui-form-label required">系统</label>
<div class="layui-input-inline">
<input class="layui-input select-tree" th:attr="data-url=@{/system/dept/list}, data-value=${user?.dept?.id}"
type="text" name="dept" placeholder="请选择" th:value="${user?.dept?.title}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label required">所属</label>
<div class="layui-input-inline">
<select name="bssPlatform" mo-selected="${user?.bssPlatform?.id}" mo-empty="" lay-verify="bssPlatform">
<option th:each="bssPlatform,userStat:${bssPlatforms}" th:value="${bssPlatform.id}" th:text="${bssPlatform.name}" th:selected="${bssPlatform.id == dept?.bssPlatform?.id}"></option>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">电话号码</label>
<div class="layui-input-inline">
@@ -50,7 +58,12 @@
<input class="layui-input" type="text" name="email" placeholder="请输入邮箱" th:value="${user?.email}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label required">类型</label>
<div class="layui-input-inline">
<select name="type" mo:dict="USER_TYPE" mo-selected="${user?.type}" mo-empty="" lay-verify="type"></select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">选择性别</label>
<div class="layui-input-inline">
admin/src/main/resources/templates/system/user/detail.html
+7 -1
View File
@@ -20,9 +20,15 @@
<th>用户性别</th>
<td th:text="${#dicts.keyValue('USER_SEX', user.sex)}"></td>
</tr>
<tr>
<th>系统</th>
<td th:text="${user.dept?.title}"></td>
<th>类型</th>
<td th:text="${#dicts.keyValue('USER_TYPE', user.type)}"></td>
</tr>
<tr>
<th>所属</th>
<td colspan="4" th:text="${user.dept?.title}"></td>
<td th:text="${user.bssPlatform.name}" colspan="4"></td>
</tr>
<tr>
<th>电话号码</th>
admin/src/main/resources/templates/system/user/index.html
+4 -8
View File
@@ -20,12 +20,6 @@
<select class="timo-search-select" name="status" mo:dict="SEARCH_STATUS" mo-selected="${param.status}"></select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">所属</label>
<div class="layui-input-block">
<input class="layui-input select-tree" th:attr="data-url=@{/system/dept/list}, data-value=${dept?.id}" th:value="${dept?.title}" type="text" name="dept" placeholder="请选择部门">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">用户名</label>
<div class="layui-input-block">
@@ -75,8 +69,9 @@
</th>
<th class="sortable" data-field="username">用户名</th>
<th class="sortable" data-field="nickname">用户昵称</th>
<th class="sortable" data-field="dept">所属</th>
<th class="sortable" data-field="bssPlatform">所属</th>
<th class="sortable" data-field="sex">性别</th>
<th class="sortable" data-field="type">类型</th>
<th class="sortable" data-field="phone">电话</th>
<th class="sortable" data-field="email">邮箱</th>
<th class="sortable" data-field="createDate">创建时间</th>
@@ -90,8 +85,9 @@
<i class="layui-icon layui-icon-ok"></i></label></td>
<td th:text="${item.username}">用户名</td>
<td th:text="${item.nickname}">用户昵称</td>
<td th:text="${item.dept?.title}">用户昵称</td>
<td th:text="${item.bssPlatform?.name}">所属</td>
<td th:text="${#dicts.keyValue('USER_SEX', item.sex)}">性别</td>
<td th:text="${#dicts.keyValue('USER_TYPE', item.type)}">类型</td>
<td th:text="${item.phone}">电话</td>
<td th:text="${item.email}">邮箱</td>
<td th:text="${#dates.format(item.createDate, 'yyyy-MM-dd HH:mm:ss')}">创建时间</td>