From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html | 98 ++++++++++++++++++++++---------------------------
1 files changed, 44 insertions(+), 54 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
index 6f68f95..16cbe7d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
@@ -2,70 +2,60 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="userInfoForm">
-
<input type="hidden" id="id" value="${user.id}">
<input type="hidden" id="sexValue" value="${user.sex}">
-
+ <input type="hidden" id="roleid_" value="${user.roleid}">
<div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="账户" underline="true" value="${user.account}"/>
- <#select id="sex" name="性别" underline="true">
- <option value="1">男</option>
- <option value="2">女</option>
+ <div class="col-sm-6">
+ <div id="driverInfoContent">
+ <#input id="name" name="员工姓名" underline="true" value="${user.name}" />
+ <#input id="phone" name="联系电话" underline="true" value="${user.phone}" />
+ <#avatar id="avatar" name="照片" underline="true" avatarImg="${user.avatar}" />
+ <#input id="birthday" name="生日" underline="true" type="text" value="${user.birthday}" />
+ <#select id="sex" name="性别" underline="true" >
+ <option value="1" selected>男</option>
+ <option value="2">女</option>
+ </#select>
+ <#input id="idCard" name="身份证号" type="text" underline="true" value="${user.idCard}"/>
+ <#select id="roleid" name="角色" underline="true" >
+ @for(l in list){
+ <option value="${l.id}" ${l.id == user.roleid ? 'selected=selected' : ''}>${l.name}</option>
+ @}
</#select>
- <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
- <#input id="email" name="邮箱" type="email" underline="true" value="${user.email}"/>
- <div class="form-group" ${userCompanyId!=1? "hidden" :" "} >
- <label class="col-sm-3 control-label">所属公司</label>
- <div class="col-sm-9">
- <select class="form-control" id="companyId" name="companyId">
- @if(companyIds!=null && companyId!=null){
- @for(item in companyIds){
- @if(item.id==companyId){
- <option value="${item.id}">${item.name}</option>
- @}
- @}
- @for(item in companyIds){
- @if(item.id!=companyId){
- <option value="${item.id}">${item.name}</option>
- @}
- @}
- @}
- </select>
- </div>
+ @if(role == 1){
+ <#select id="deptid" name="角色" underline="true" >
+ @for(l in depts){
+ <option value="${l.id}" ${l.id == user.deptid ? 'selected=selected' : ''}>${l.fullname}</option>
+ @}
+ </#select>
+ @}
</div>
- <div class="hr-line-dashed" ${companyId!=1? "hidden" :" "} ></div>
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="姓名" underline="true" value="${user.name}"/>
- <#input id="birthday" name="出生日期" underline="true" type="text"
- value="${user.birthday}"/>
- <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}"
- clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
- <#input id="phone" name="电话" underline="true" value="${user.phone}"/>
</div>
</div>
-</div>
-
-<!-- 这是部门选择的下拉框 -->
-<div id="menuContent" class="menuContent"
- style="display: none; position: absolute; z-index: 200;">
- <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
-</div>
-
-<div class="row btn-group-m-t">
- <div class="col-sm-10">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+ <!-- 这是部门选择的下拉框 -->
+ <div id="menuContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
</div>
-</div>
-</div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ @if(type == 1){
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
+ @}
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+ </div>
+ </div>
+
</div>
-</div>
-<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+
+
+
+
+
+
+<script src="${ctxPath}/modular/system/user/user_info.js"></script>
<script>
laydate.render({
elem: '#birthday'
--
Gitblit v1.7.1