From c48bdc9afe6c4eec782f34f1ee657d44fb68bfd0 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 7 Mar 2018 16:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E9=85=8D=E7=BD=AE=E3=80=8B?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/basics/sysDictForm.jsp      | 20 ++++++++--------
 .../WEB-INF/views/basics/sysDictList.jsp      | 24 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
index 617b1d100..f76a7d3a9 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
@@ -141,13 +141,13 @@
 
 	<div class="theme-panel hidden-xs hidden-sm">
 		
-		<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button>
+		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
 
 	</div>
 		
 		
 	<h3 class="page-title">
-		配置管理 
+	<spring:message code="effect_range"/>
 	</h3>
 
 	<div class="row">
@@ -155,7 +155,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>配置<shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
+						<i class="fa fa-gift"></i><shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse"> </a>
 						<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -174,14 +174,14 @@
 							<form:hidden path="sysDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
-								<label class="col-md-3 control-label">上级配置:</label>
+								<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
 								<div class="col-md-4">
 					                <sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}"
 										title="菜单" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
+								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
 								<div class="col-md-4">
 				                    <select id="itemType" name="itemType" class="form-control">
 					                    <c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
@@ -203,13 +203,13 @@
 								</div>
 							</div> --%>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>配置内容:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
 								<div class="col-md-4">
 									<form:input path="itemValue" htmlEscape="false" maxlength="2000" class="form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label"><font color="red">*</font>是否为叶子节点:</label>
+								<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
 								<div class="col-md-4">
 									<%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%>
 									<form:select path="isLeaf"  class="form-control">
@@ -218,7 +218,7 @@
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-md-3 control-label">描述信息:</label>
+								<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
 								<div class="col-md-4">
 									<form:textarea path="itemDesc" htmlEscape="false" maxlength="2000" class="form-control"/>
 								</div>
@@ -226,8 +226,8 @@
 							<div class="form-actions">
 								<div class="row">
 									<div class="col-md-offset-3 col-md-9">
-										<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission>
-										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">Cancel</button>
+										<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue"><spring:message code="submit"/></button></shiro:hasPermission>
+										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
 									</div>
 								</div>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index 391b81d92..3437e428c 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -39,11 +39,11 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">新增配置</button>
+			onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'"><spring:message code="add"/></button>
 	</div>
 	
 		<h3 class="page-title">
-			配置管理
+			<spring:message code="effect_range"/>
 		</h3>
 	
 		<div class="row">
@@ -51,7 +51,7 @@
 				<div class="portlet box blue">
 					<div class="portlet-title">
 						<div class="caption">
-							<i class="fa fa-cogs"></i>列表信息
+							<i class="fa fa-cogs"></i><spring:message code="date_list"/>
 						</div>
 					</div>
 					<div class="portlet-body">
@@ -62,11 +62,11 @@
 									<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 									<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 									<div class="col-md-12">
-										<label class="search-lable">配置内容:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/>
-										<label class="search-lable">配置编码:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemCode}"/>
-					                     <label class="search-lable itemType">数据类型:</label> 
+										<label class="search-lable"><spring:message code="config_content"/>:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/>
+										<label class="search-lable"><spring:message code="item_code"/>:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemCode}"/>
+					                     <label class="search-lable itemType"><spring:message code="item_value"/>:</label> 
                                            <select id="itemType" name="itemType"  >
-							                   	<option value="" selected="selected">-请选择-</option>
+							                   	<option value="" selected="selected"><spring:message code="select"/></option>
 							                    <c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
 							                       <c:forEach items="${intArr}" var="itTemp">
 							                        <c:if test="${dict.itemCode eq itTemp}"> 
@@ -88,7 +88,7 @@
 									 </div>
 								  </form:form>
 									<table id="treeTable" class="table table-striped table-bordered table-condensed">
-										<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
+										<thead><tr><th><spring:message code="config_content"/></th><th><spring:message code="item_code"/></th><th><spring:message code="desc"/></th><th><spring:message code="item_type"/></th><th><spring:message code="is_leaf"/></th><th><spring:message code="creator"/></th><th><spring:message code="create_time"/></th><th><spring:message code="editor"/></th><th><spring:message code="edit_time"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
 										<tbody><c:forEach items="${list}" var="sysDictInfo">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
 												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
@@ -106,14 +106,14 @@
 												<td><fmt:formatDate value="${sysDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 												<td>
 													<div class="btn-group btn-xs">
-													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#">操作<span class="caret"></span></a>
+													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"/><span class="caret"></span></a>
 													      <ul class="dropdown-menu btn-xs">
-													         <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}">查看</a></li>
+													         <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0&itType=${itType}"><spring:message code="show"/></a></li>
 													         <shiro:hasPermission name="sys:dict:edit">
-														        <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)">修改</a></li>
+														        <li><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要修改该项配置吗？', this.href)"><spring:message code="edit"/></a></li>
 													         </shiro:hasPermission>
 													         <shiro:hasPermission name="sys:dict:edit">
-													       	 	<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)">删除</a></li>
+													       	 	<li><a href="${ctx}/basics/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}&itType=${itType}" onclick="return confirmx('您确认要删除该项配置吗？', this.href)"><spring:message code="delete"/></a></li>
 															 </shiro:hasPermission>
 													    
 													      </ul>