From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html | 186 +++++++++++-----------------------------------
1 files changed, 44 insertions(+), 142 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 494e054..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
@@ -1,151 +1,53 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
- <div class="ibox-content">
- <div class="form-horizontal" id="userInfoForm">
- <input hidden id="language" value="${language}">
- <input type="hidden" id="id" value="">
- @if(language==1){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="账户" underline="true"/>
+ <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" >
+ <option value="1" selected>男</option>
+ <option value="2">女</option>
+ </#select>
+ <#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>
+ @}
- <#select id="sex" name="性别：" underline="true">
- <option value="1">男</option>
- <option value="2">女</option>
- </#select>
+ </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>
- <#input id="password" name="密码" underline="true" type="password"/>
- <#input id="rePassword" name="确认密码" type="password"/>
-
- <#input id="email" name="邮箱" type="email"/>
- <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="姓名" underline="true"/>
-
- <#input id="birthday" name="出生日期" underline="true" type="text"/>
-
- <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
- clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
-
- <#input id="phone" name="电话"/>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+ </div>
+ </div>
- </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.addSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==2){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="Account" underline="true"/>
-
- <#select id="sex" name="Gender：" underline="true">
- <option value="1">Man</option>
- <option value="2">Woman</option>
- </#select>
-
- <#input id="password" name="Password" underline="true" type="password"/>
- <#input id="rePassword" name="Confirm the password" type="password"/>
-
- <#input id="email" name="Email" type="email"/>
- <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="Name" underline="true"/>
-
- <#input id="birthday" name="Date of birth" underline="true" type="text"/>
-
- <#input id="citySel" name="Department " underline="true" readonly="readonly" hidden="deptid"
- clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
-
- <#input id="phone" name="Telephone"/>
-
-
- </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="Submit" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="Akun" underline="true"/>
- <#select id="sex" name="Jenis kelamin：" underline="true">
- <option value="1">laki-laki</option>
- <option value="2">wanita</option>
- </#select>
-
- <#input id="password" name="Kata sandi" underline="true" type="password"/>
- <#input id="rePassword" name="Konfirmasikan kata sandi" type="password"/>
-
- <#input id="email" name="Email" type="email"/>
- <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="Nama Lengkap" underline="true"/>
-
- <#input id="birthday" name="Tanggal lahir" underline="true" type="text"/>
-
- <#input id="citySel" name="Departemen" underline="true" readonly="readonly" hidden="deptid"
- clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
-
- <#input id="phone" name="Telepon"/>
-
-
- </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.addSubmit()"/>
- <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
- </div>
-</div>
- @}
-
-
- </div>
-
- </div>
</div>
<script src="${ctxPath}/modular/system/user/user_info.js"></script>
<script>
--
Gitblit v1.7.1