Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

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

@@ -4,7 +4,7 @@
   <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,6 +64,10 @@
                     @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"/>
                     @}