From 313a58d5dd241ab3a73da4ba3bcdc9c1a03b014b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 16:26:54 +0800
Subject: [PATCH] bug修改,新增用户取消销售人员必填校验,新增学员取消体测表必填校验
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html | 253 ++++++++++++--------------------------------------
1 files changed, 63 insertions(+), 190 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html
index afde83b..dc53d53 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html
@@ -1,219 +1,92 @@
@layout("/common/_container.html"){
+<link rel="stylesheet" href="${ctxPath}/layui/css/layui.css" media="all">
<div class="row">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
<div class="ibox float-e-margins">
- @if(language==1){
<div class="ibox-title">
- <h5>用户管理</h5>
+ <h5>员工管理</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
- <div class="col-lg-2 col-sm-3">
- <div class="panel panel-default">
- <div class="panel-heading">组织机构</div>
- <div class="panel-body dept-tree">
- <ul id="deptTree" class="ztree"></ul>
- </div>
- </div>
- </div>
<div class="col-lg-10 col-sm-9">
<div class="row">
- <div class="col-lg-10 col-sm-9">
- <div class="row">
- <div class="col-lg-4 col-sm-6">
- <#TimeCon id="createTime" name="创建时间" isTime="false"/>
- </div>
- <div class="col-lg-4 col-sm-12">
- <#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
- </div>
- </div>
+ <div class="col-lg-4 col-sm-12">
+ <#NameCon id="name" name="员工姓名" placeholder="请输入"/>
</div>
- <div class="col-lg-2 col-sm-3">
- <div class="row">
- <div class="col-lg-12 col-sm-12">
- <#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
- <#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
- </div>
- </div>
+ <div class="col-lg-4 col-sm-12">
+ <#NameCon id="phone" name="联系电话" placeholder="请输入"/>
+ </div>
+ <div class="col-lg-4 col-sm-12">
+ <#NameCon id="idCard" name="身份证号" placeholder="请输入"/>
+ </div>
+ <div class="col-lg-4 col-sm-12">
+ <#SelectCon id="isSales" name="销售人员" >
+ <option value="">全部</option>
+ <option value="1">是</option>
+ </#SelectCon>
+ </div>
+ <div class="col-lg-4 col-sm-12">
+ <#SelectCon id="status" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
</div>
</div>
- <div class="hidden-xs" id="managerTableToolbar" role="group">
- @if(shiro.hasPermission("/mgr/add")){
- <#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
- @}
- @if(shiro.hasPermission("/mgr/edit")){
- <#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/delete")){
- <#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/reset")){
- <#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/freeze")){
- <#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/unfreeze")){
- <#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/setRole")){
- <#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
- @}
- </div>
- <#table id="managerTable"/>
</div>
- </div>
- </div>
- </div>
- </div>
- @}
- @if(language==2){
- <div class="ibox-title">
- <h5>User management</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
<div class="col-lg-2 col-sm-3">
- <div class="panel panel-default">
- <div class="panel-heading">Institutional framework</div>
- <div class="panel-body dept-tree">
- <ul id="deptTree" class="ztree"></ul>
- </div>
- </div>
- </div>
- <div class="col-lg-10 col-sm-9">
<div class="row">
- <div class="col-lg-10 col-sm-9">
- <div class="row">
- <div class="col-lg-4 col-sm-6">
- <#TimeCon id="createTime" name="Creation time" isTime="false"/>
- </div>
- <div class="col-lg-4 col-sm-12">
- <#NameCon id="name" name="Name of user" placeholder="Account/name/mobile number"/>
- </div>
- </div>
- </div>
- <div class="col-lg-2 col-sm-3">
- <div class="row">
- <div class="col-lg-12 col-sm-12">
- <#button name="Search" icon="fa-search" clickFun="MgrUser.search()"/>
- <#button name="Reset" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
- </div>
- </div>
+ <div class="col-lg-12 col-sm-12">
+ <#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
</div>
</div>
- <div class="hidden-xs" id="managerTableToolbar" role="group">
- @if(shiro.hasPermission("/mgr/add")){
- <#button name="Add" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
- @}
- @if(shiro.hasPermission("/mgr/edit")){
- <#button name="Update" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/delete")){
- <#button name="Delete" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/reset")){
- <#button name="Reset password" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/freeze")){
- <#button name="Freeze" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/unfreeze")){
- <#button name="Unfreeze" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/setRole")){
- <#button name="Role assignment" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
- @}
- </div>
- <#table id="managerTable"/>
</div>
</div>
- </div>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="ibox-title">
- <h5>Manajemen pengguna</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-lg-2 col-sm-3">
- <div class="panel panel-default">
- <div class="panel-heading">Organisasi</div>
- <div class="panel-body dept-tree">
- <ul id="deptTree" class="ztree"></ul>
- </div>
- </div>
- </div>
- <div class="col-lg-10 col-sm-9">
- <div class="row">
- <div class="col-lg-10 col-sm-9">
- <div class="row">
- <div class="col-lg-4 col-sm-6">
- <#TimeCon id="createTime" name="Waktu penciptaan" isTime="false"/>
- </div>
- <div class="col-lg-4 col-sm-12">
- <#NameCon id="name" name="Nama pengguna" placeholder="Akaun/nama/nomor ponsel"/>
- </div>
- </div>
- </div>
- <div class="col-lg-2 col-sm-3">
- <div class="row">
- <div class="col-lg-12 col-sm-12">
- <#button name="Pencarian" icon="fa-search" clickFun="MgrUser.search()"/>
- <#button name="Mengatur ulang" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
- </div>
- </div>
- </div>
- </div>
- <div class="hidden-xs" id="managerTableToolbar" role="group">
- @if(shiro.hasPermission("/mgr/add")){
- <#button name="Tambah" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
- @}
- @if(shiro.hasPermission("/mgr/edit")){
- <#button name="Edit" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/delete")){
- <#button name="Hapus" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/reset")){
- <#button name="Setel ulang kata sandi" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/freeze")){
- <#button name="Membekukan" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/unfreeze")){
- <#button name="Batalkan pembekuan Akun" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/setRole")){
- <#button name="Penugasan peran" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
- @}
- </div>
- <#table id="managerTable"/>
- </div>
- </div>
- </div>
- </div>
- </div>
- @}
+ <div class="hidden-xs" id="managerTableToolbar" role="group">
+ @if(shiro.hasPermission("/mgr/add")){
+ <#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
+ @}
+ @if(shiro.hasPermission("/mgr/edit")){
+ <#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/delete")){
+ <#button name="查看详情" icon="fa-remove" clickFun="MgrUser.openChangeUser1()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/freeze")){
+ <#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/unfreeze")){
+ <#button name="解冻" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/reset")){
+ <#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/kanbanPermissions")){
+ <#button name="看板权限设置" icon="fa-user-secret" clickFun="MgrUser.kanbanPermissions()" space="true"/>
+ @}
+ </div>
+ <#table id="managerTable"/>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
<script src="${ctxPath}/modular/system/user/user.js"></script>
-<script type="text/javascript">
- laydate.render({
- elem: '#createTime'
- ,range: true
- ,lang:"en"
- });
+<script src="${ctxPath}/layui/layui.js" charset="utf-8"></script>
+<script>
+ laydate.render({
+ elem: '#beginTime'
+ });
+ laydate.render({
+ elem: '#endTime'
+ });
</script>
@}
--
Gitblit v1.7.1