From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
index d070658..4591282 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
@@ -3,24 +3,34 @@
<div class="ibox-content">
<div class="form-horizontal" id="userInfoForm">
<input type="hidden" id="id" value="">
+ <input type="hidden" id="role" value="role">
<div class="row">
<div class="col-sm-6">
<div id="driverInfoContent">
- <#input id="name" name="员工姓名" underline="true"/>
- <#input id="phone" name="联系电话" underline="true"/>
- <#avatar id="avatar" name="照片" underline="true"/>
- <#input id="birthday" name="生日" underline="true" type="text"/>
- <#select id="sex" name="性别" underline="true" >
+ <#input id="name" name="*员工姓名" underline="true"/>
+ <#input id="phone" name="*联系电话" underline="true"/>
+ <#avatar id="avatar" name="*照片" underline="true"/>
+ <#input id="birthday" name="*生日" underline="true" type="text"/>
+ <#select id="sex" name="*性别" underline="true" >
<option value="1" selected>男</option>
<option value="2">女</option>
</#select>
- <#input id="idCard" name="身份证号" type="text" underline="true"/>
- <#select id="roleid" name="角色" underline="true" >
+ <#input id="idCard" name="*身份证号" type="text" underline="true"/>
+ <#select id="deptid" name="*所在部门" underline="true" >
+ <option value="">请选择</option>
+ @for(l in depts){
+ <option value="${l.id}">${l.fullname}</option>
+ @}
+ </#select>
+ @if(role == 1){
+ <#select id="roleid" name="*所属角色" underline="true" >
+ <option value="">请选择</option>
@for(l in list){
<option value="${l.id}">${l.name}</option>
@}
-
</#select>
+ @}
+
</div>
</div>
</div>
--
Gitblit v1.7.1