后台bug修改

44323

2023-11-14 ddbb38c54db9c3670e5ff53f4bf713525de1099d

 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html

@@ -1,10 +1,10 @@
@layout("/common/_container.html"){
<link rel="stylesheet" href="${ctxPath}/static/js/layui/css/layui.css"  media="all">
<link rel="stylesheet" href="${ctxPath}/layui/css/layui.css"  media="all">
<div class="row">
   <div class="col-sm-12">
      <div class="ibox float-e-margins">
         <div class="ibox-title">
            <h5>用户管理</h5>
            <h5>员工管理</h5>
         </div>
         <div class="ibox-content">
            <div class="row row-lg">
@@ -13,7 +13,26 @@
                     <div class="col-lg-10 col-sm-9">
                        <div class="row">
                           <div class="col-lg-4 col-sm-12">
                              <#NameCon id="name" name="搜索" placeholder="帐号/姓名/手机号"/>
                              <#NameCon id="name" name="员工姓名" placeholder="请输入"/>
                           </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>
@@ -36,8 +55,8 @@
                     @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/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"/>
@@ -45,9 +64,10 @@
                     @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"/>
                     @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"/>
                     @}
@@ -59,8 +79,8 @@
      </div>
   </div>
</div>
<script src="${ctxPath}/static/modular/system/user/user.js"></script>
<script src="${ctxPath}/static/js/layui/layui.js" charset="utf-8"></script>
<script src="${ctxPath}/modular/system/user/user.js"></script>
<script src="${ctxPath}/layui/layui.js" charset="utf-8"></script>
<script>
   laydate.render({
      elem: '#beginTime'