From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html | 155 +++++++++++----------------------------------------
1 files changed, 34 insertions(+), 121 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 2995f5c..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,82 +2,36 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="userInfoForm">
- <input hidden id="language" value="${language}">
- @if(language==1){
<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="citySel" name="部门" underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>
-
- <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
- <#input id="email" name="邮箱" type="email" value="${user.email}"/>
- </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="phone" name="电话" 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 col-sm-offset-4">
- <#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>
- @}
- @if(language==2){
- <input type="hidden" id="id" value="${user.id}">
- <input type="hidden" id="sexValue" value="${user.sex}">
-
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="Account" underline="true" value="${user.account}"/>
-
- <#select id="sex" name="Gender：" underline="true">
- <option value="1">Man</option>
- <option value="2">Woman</option>
- </#select>
-
- <#input id="citySel" name="Department " underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>
-
- <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
- <#input id="email" name="Email" type="email" value="${user.email}"/>
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="Name" underline="true" value="${user.name}"/>
-
- <#input id="birthday" name="Date of birth" underline="true" type="text"
- value="${user.birthday}"/>
-
- <#input id="phone" name="Telephone" value="${user.phone}"/>
-
+ @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>
</div>
-
<!-- 这是部门选择的下拉框 -->
<div id="menuContent" class="menuContent"
style="display: none; position: absolute; z-index: 200;">
@@ -85,67 +39,26 @@
</div>
<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-4">
- <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
- </div>
- </div>
+ <div class="col-sm-10">
+ @if(type == 1){
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
@}
- @if(language==3){
- <input type="hidden" id="id" value="${user.id}">
- <input type="hidden" id="sexValue" value="${user.sex}">
-
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="Akun" underline="true" value="${user.account}"/>
-
- <#select id="sex" name="Jenis kelamin：" underline="true">
- <option value="1">laki-laki</option>
- <option value="2">wanita</option>
- </#select>
-
- <#input id="citySel" name="Departemen" underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>
-
- <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
- <#input id="email" name="Email" type="email" value="${user.email}"/>
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="Nama" underline="true" value="${user.name}"/>
-
- <#input id="birthday" name="Tanggal lahir" underline="true" type="text"
- value="${user.birthday}"/>
-
- <#input id="phone" name="Telepon" value="${user.phone}"/>
-
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
</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 col-sm-offset-4">
- <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Kirim" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
- </div>
-</div>
- @}
- </div>
- </div>
-</div>
+
+
<script src="${ctxPath}/modular/system/user/user_info.js"></script>
<script>
- laydate.render({
- elem: '#birthday'
- ,lang:"en"
- });
+ laydate.render({
+ elem: '#birthday'
+ });
</script>
@}
--
Gitblit v1.7.1