From 9b4d2e220a846ade316f076bd1dba98e6cf331c4 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 26 七月 2023 18:03:58 +0800
Subject: [PATCH] 管理后台的语言去除

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html |  153 ++++++++++++--------------------------------------
 1 files changed, 38 insertions(+), 115 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..6f68f95 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,122 +2,49 @@
 <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}">
 
 			<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">
+					<#select id="sex" name="性别" underline="true">
 					<option value="1">男</option>
 					<option value="2">女</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}"/>
-
+				<#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>
 			</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}"/>
-
-			</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.editSubmit()"/>
-			<#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
-		</div>
-	</div>
-			@}
-			@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 class="hr-line-dashed" ${companyId!=1? "hidden" :" "} ></div>
 	</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"
+			<#input id="name" name="姓名" underline="true" value="${user.name}"/>
+			<#input id="birthday" name="出生日期" underline="true" type="text"
 			value="${user.birthday}"/>
-
-			<#input id="phone" name="Telepon" value="${user.phone}"/>
-
+			<#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>
@@ -129,23 +56,19 @@
 </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 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>
 </div>
-			@}
-
-
-		</div>
-
-	</div>
 </div>
-<script src="${ctxPath}/modular/system/user/user_info.js"></script>
+
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
 <script>
-    laydate.render({
-        elem: '#birthday'
-		,lang:"en"
-    });
+	laydate.render({
+		elem: '#birthday'
+	});
 </script>
 @}

--
Gitblit v1.7.1