1.修改重复跟错误的国际化配置

2018-03-28 10:21:33 +08:00
parent e3d8a491b1
commit 6409e2108d
6 changed files with 160 additions and 108 deletions
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -19,6 +19,7 @@ show=show
 edit=edit
 hi=hi
 exit=exit
+choose=choose

 #============menu begin======================
 requestInfo=requestInfo
@@ -40,16 +41,13 @@ sip_ip_control=sip ip control
 domain_control_white=domain control white
 ip_address_control=ip address control
 ip_control=ip control
-ip_port_control=ip port control
 domain_control=domain control
 dns_control=dns control
 basic_configuration=basic configuration
 letter_from=letter from
 classification=classification
 classification_manage=classification manage
-attribute_manage=attribute manage
 area_manage=area manage
-isp_manage=isp manage
 feature_scope_manage=feature scope manage
 special_tasks=special tasks
 label_manage=label manage
@@ -95,12 +93,9 @@ log_search=log search
 sysService_manage=system service manage
 service_manage=service type manage
 system_service_manage=system service type manage
-specific_service_cfg=specific service cfg
 features_area=features area
 attribute_manage=attribute manage
 isp_manage=isp manage
-feature_scope_manage=feature scope manage
-plaintext_manage=plaintext manage
 ip_multiple_control=ip multiple control
 ip_port_control=ip port control
 website_multiple_control=website multiple control
@@ -148,8 +143,7 @@ desc=description
 parent_id=parentid
 is_leaf=whether subnode
 is_valid=whether valid
-create_time=createtime
-edit_time=edittime
+create_time=create time
 superior_config=superior configuration
 config_content=configuration content

@@ -295,7 +289,6 @@ audit_time=audit time
 yes=yes
 no=no
 deleted=deleted
-cancel_approved=cancel approved

 #==========youjianguankong end=====================

--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -19,6 +19,7 @@ show=\u67e5\u770b
 edit=\u4fee\u6539
 hi=\u4f60\u597d
 exit=\u9000\u51fa
+choose=\u9009\u62e9

 #==========menu begin=====================
 requestInfo=\u6765\u51fd\u4fe1\u606f
@@ -139,7 +140,6 @@ parent_id=\u7236ID
 is_leaf=\u662f\u5426\u53f6\u5b50\u8282\u70b9
 is_valid=\u6709\u6548\u6807\u5fd7
 create_time=\u521b\u5efa\u65f6\u95f4
-edit_time=\u4fee\u6539\u65f6\u95f4
 superior_config=\u4e0a\u7ea7\u914d\u7f6e
 config_content=\u914d\u7f6e\u5185\u5bb9

@@ -169,7 +169,6 @@ begin_date=\u5f00\u59cb\u65f6\u95f4
 end_date=\u7ed3\u675f\u65f6\u95f4
 delete=\u5220\u9664
 special_task=\u4e13\u9879\u4efb\u52a1
-cancel_approved=\u914d\u7f6e\u53d6\u6d88
 task_name=\u4e13\u9879\u540d\u79f0
 task_org=\u62a5\u9001\u5355\u4f4d
 task_time=\u62a5\u9001\u65f6\u95f4
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -43,8 +43,8 @@
 			return true;
 		}
 		// 正常打开	
-		top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}", "选择${title}", 320, 420, {
-			ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"<spring:message code='ok'/>":"ok", ${allowClear?"\"<spring:message code='clear'/>\":\"clear\", ":""}"<spring:message code='close'/>":true}, submit:function(v, h, f){
+		top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}", "<spring:message code='choose'/>${title}", 320, 420, {
+			ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"ok":"ok", ${allowClear?"\"clear\":\"clear\", ":""}"close":true}, submit:function(v, h, f){
 				if (v=="ok"){
 					var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
 					var ids = [], names = [], nodes = [];
--- a/src/main/webapp/WEB-INF/views/sys/officeForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/officeForm.jsp
@@ -29,142 +29,170 @@
 	</script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/sys/office/list?id=${office.parent.id}&parentIds=${office.parentIds}">机构列表</a></li>
-		<li class="active"><a href="${ctx}/sys/office/form?id=${office.id}&parent.id=${office.parent.id}">机构<shiro:hasPermission name="sys:office:edit">${not empty office.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:office:edit">查看</shiro:lacksPermission></a></li>
-	</ul><br/>
+<div class="page-content">
+<div class="row">
+		<div class="col-md-12">
+			<div class="portlet box blue">
+				<div class="portlet-title">
+					<div class="caption">
+						<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="edit"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add"/></c:if></div>
+				</div>
+			<div class="portlet-body form">
+
+<!-- 	<ul class="nav nav-tabs"> -->
+<%-- 		<li><a href="${ctx}/sys/office/list?id=${office.parent.id}&parentIds=${office.parentIds}">机构列表</a></li> --%>
+<%-- 		<li class="active"><a href="${ctx}/sys/office/form?id=${office.id}&parent.id=${office.parent.id}">机构<shiro:hasPermission name="sys:office:edit">${not empty office.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:office:edit">查看</shiro:lacksPermission></a></li> --%>
+<!-- 	</ul><br/> -->
+	
+	
 	<form:form id="inputForm" modelAttribute="sysOffice" action="${ctx}/sys/office/saveOrUpdate" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<sys:message content="${message}"/>
-		<div class="control-group">
-			<label class="control-label">上级机构:</label>
-			<div class="controls">
+	<div class="form-body">
+		<div class="form-group">
+			<label class="col-md-3 control-label">上级机构:</label>
+			<div class="col-md-4">
                <sys:treeselect id="office" name="parent.id" value="${office.parent.id}" labelName="parent.name" labelValue="${office.parent.name}"
-					title="机构" url="/sys/office/treeData" extId="${office.id}" cssClass="" allowClear="${office.currentUser.admin}"/>
+					title="机构" url="/sys/office/treeData" extId="${office.id}" cssClass="form-control" allowClear="${office.currentUser.admin}"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">归属区域:</label>
-			<div class="controls">
+		<div class="form-group">
+			<label class="col-md-3 control-label">归属区域:</label>
+			<div class="col-md-4">
                <sys:treeselect id="area" name="area.id" value="${office.area.id}" labelName="area.name" labelValue="${office.area.name}"
-					title="区域" url="/sys/area/treeData" cssClass="required"  allowClear="${office.currentUser.admin}"/>
-					<font color="red">*</font>
+					title="区域" url="/sys/area/treeData" cssClass="required form-control"  allowClear="${office.currentUser.admin}"/>
 			</div>
+					<span class="help-inline"><font color="red">*</font></span>
 		</div>
-		<div class="control-group">
-			<label class="control-label">机构名称:</label>
-			<div class="controls">
-				<form:input path="name" htmlEscape="false" maxlength="50" class="required"/>
+		<div class="form-group">
+			<label class="col-md-3 control-label">机构名称:</label>
+			<div class="col-md-4">
+				<form:input path="name" htmlEscape="false" maxlength="50" class="required form-control"/>
+			</div>
 				<span class="help-inline"><font color="red">*</font> </span>
+		</div>
+		<div class="form-group">
+			<label class="col-md-3 control-label">机构编码:</label>
+			<div class="col-md-4">
+				<form:input path="code" htmlEscape="false" maxlength="50" class="form-control"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">机构编码:</label>
-			<div class="controls">
-				<form:input path="code" htmlEscape="false" maxlength="50"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">机构类型:</label>
-			<div class="controls">
-				<form:select path="type" class="input-medium">
+		<div class="form-group">
+			<label class="col-md-3 control-label">机构类型:</label>
+			<div class="col-md-4">
+				<form:select path="type" class="selectpicker select2 form-control">
 					<form:options items="${fns:getDictList('SYS_OFFICE_TYPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
 				</form:select>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">机构级别:</label>
-			<div class="controls">
-				<form:select path="grade" class="input-medium">
+		<div class="form-group">
+			<label class="col-md-3 control-label">机构级别:</label>
+			<div class="col-md-4">
+				<form:select path="grade" class="selectpicker select2 form-control">
 					<form:options items="${fns:getDictList('SYS_OFFICE_GRADE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
 				</form:select>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">机构职责分类:</label>
-			<div class="controls">
-				<form:select path="jobType" class="input-medium">
+		<div class="form-group">
+			<label class="col-md-3 control-label">机构职责分类:</label>
+			<div class="col-md-4">
+				<form:select path="jobType" class="selectpicker select2 form-control">
 					<form:options items="${fns:getDictList('SYS_JOB_TYPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
 				</form:select>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">是否可用:</label>
-			<div class="controls">
-				<form:select path="useable">
+		<div class="form-group">
+			<label class="col-md-3 control-label">是否可用:</label>
+			<div class="col-md-4">
+				<form:select path="useable" class="selectpicker select2">
 					<form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
 				</form:select>
 				<span class="help-inline">“是”代表此账号允许登陆，“否”则表示此账号不允许登陆</span>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">主负责人:</label>
-			<div class="controls">
+		<div class="form-group">
+			<label class="col-md-3 control-label">主负责人:</label>
+			<div class="col-md-4">
 				 <sys:treeselect id="primaryPerson" name="primaryPerson.id" value="${office.primaryPerson.id}" labelName="office.primaryPerson.name" labelValue="${office.primaryPerson.name}"
-					title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true"/>
+					title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">副负责人:</label>
-			<div class="controls">
+		<div class="form-group">
+			<label class="col-md-3 control-label">副负责人:</label>
+			<div class="col-md-4">
 				 <sys:treeselect id="deputyPerson" name="deputyPerson.id" value="${office.deputyPerson.id}" labelName="office.deputyPerson.name" labelValue="${office.deputyPerson.name}"
-					title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true"/>
+					title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">联系地址:</label>
-			<div class="controls">
-				<form:input path="address" htmlEscape="false" maxlength="50"/>
+		<div class="form-group">
+			<label class="col-md-3 control-label">联系地址:</label>
+			<div class="col-md-4">
+				<form:input path="address" htmlEscape="false" maxlength="50" class="form-control"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">邮政编码:</label>
-			<div class="controls">
-				<form:input path="zipCode" htmlEscape="false" maxlength="50"/>
+		<div class="form-group">
+			<label class="col-md-3 control-label">邮政编码:</label>
+			<div class="col-md-4">
+				<form:input path="zipCode" htmlEscape="false" maxlength="50" class="form-control"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">负责人:</label>
-			<div class="controls">
-				<form:input path="master" htmlEscape="false" maxlength="50"/>
+		<div class="form-group">
+			<label class="col-md-3 control-label">负责人:</label>
+			<div class="col-md-4">
+				<form:input path="master" htmlEscape="false" maxlength="50" class="form-control"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">电话:</label>
-			<div class="controls">
-				<form:input path="phone" htmlEscape="false" maxlength="50"/>
+		<div class="form-group">
+			<label class="col-md-3 control-label">电话:</label>
+			<div class="col-md-4">
+				<form:input path="phone" htmlEscape="false" maxlength="50" class="form-control"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">传真:</label>
-			<div class="controls">
-				<form:input path="fax" htmlEscape="false" maxlength="50"/>
+		<div class="form-group">
+			<label class="col-md-3 control-label">传真:</label>
+			<div class="col-md-4">
+				<form:input path="fax" htmlEscape="false" maxlength="50" class="form-control"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">邮箱:</label>
-			<div class="controls">
-				<form:input path="email" htmlEscape="false" maxlength="50"/>
+		<div class="form-group">
+			<label class="col-md-3 control-label">邮箱:</label>
+			<div class="col-md-4">
+				<form:input path="email" htmlEscape="false" maxlength="50" class="form-control"/>
 			</div>
 		</div>
-		<div class="control-group">
-			<label class="control-label">备注:</label>
-			<div class="controls">
-				<form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge"/>
+		<div class="form-group">
+			<label class="col-md-3 control-label">备注:</label>
+			<div class="col-md-4">
+				<form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge form-control"/>
 			</div>
 		</div>
+			<div class="form-group">
 		<c:if test="${empty office.id}">
-			<div class="control-group">
-				<label class="control-label">快速添加下级部门:</label>
-				<div class="controls">
+				<label class="col-md-3 control-label">快速添加下级部门:</label>
+				<div class="col-md-4">
+				<div class="mt-checkbox-inline">
 					<form:checkboxes path="childDeptList" items="${fns:getDictList('SYS_OFFICE_COMMON')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
+					<span> </span>
+				</div>
 				</div>
-			</div>
 		</c:if>
+			</div>
+		</div>
 		<div class="form-actions">
-			<shiro:hasPermission name="sys:office:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
-			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+		<div class="row">
+			<div class="col-md-offset-3 col-md-9">
+			<shiro:hasPermission name="sys:office:edit">
+			<button type="submit" class="btn blue"><spring:message code="submit"></spring:message></button>
+			</shiro:hasPermission>
+			<button type="button" class="btn blue btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
+		</div>
+		</div>
 		</div>
 	</form:form>
+</div>
+</div>
+</div>
+</div>
+</div>
 </body>
 </html>
--- a/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp
@@ -7,23 +7,40 @@
 <style type="text/css">
 		.ztree {overflow:auto;margin:0;_margin-top:10px;padding:10px 0 0 10px;}
 </style>
-<link href="${ctxStatic}/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.min.css" rel="stylesheet" type="text/css"/>
-<script src="${ctxStatic}/jquery-ztree/3.5.12/js/jquery.ztree.all-3.5.min.js" type="text/javascript"></script>
+<link href="${ctxStatic}/global/plugins/jquery-ztree/3.5.12/css/zTreeStyle/zTreeStyle.min.css" rel="stylesheet" type="text/css"/>
+<script src="${ctxStatic}/global/plugins/jquery-ztree/3.5.12/js/jquery.ztree.all-3.5.min.js" type="text/javascript"></script>
+<script src="${pageContext.request.contextPath}/global/scripts/mustache.js" type="text/javascript"></script>
 </head>
 <body>
+<div class="page-content">
+<div class="theme-panel hidden-xs hidden-sm">
+		<button type="button" class="btn btn-primary"
+			onClick="javascript:window.location='${ctx}/sys/office/form?itType=${itType}'">
+			<i class="fa fa-plus"></i>
+			<spring:message code="add"></spring:message></button>
+	</div>
+	
+	<h3 class="page-title">
+	<spring:message code="officeManage"></spring:message>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+<h5 class="page-header"></h5>
+
 	<sys:message content="${message}"/>
 	<div id="content" class="row-fluid">
-		<div id="left" class="accordion-group">
+		<div id="left" class="accordion-group" style="display:inline-block;">
 			<div class="accordion-heading">
 		    	<a class="accordion-toggle">组织机构<i class="icon-refresh pull-right" onclick="refreshTree();"></i></a>
 		    </div>
 			<div id="ztree" class="ztree"></div>
-		</div>
 		<div id="openClose" class="close">&nbsp;</div>
-		<div id="right">
+		</div>
+		
+		<div id="right"  style="display: inline-block">
 			<iframe id="officeContent" src="${ctx}/sys/office/list?id=&parentIds=" frameborder="no" width="100%" height="91%"></iframe>
 		</div>
 	</div>
+	</div>
 	<script type="text/javascript">
 		
 	$(document).ready(function(){
@@ -65,7 +82,8 @@
 			$(".ztree").width(leftWidth - 10).height(frameObj.height() - 46);
 		}
 	</script>
-	<script src="${ctxStatic}/common/wsize.min.js" type="text/javascript"></script>
+<script src="${pageContext.request.contextPath}/static/global/scripts/wsize.min.js" type="text/javascript"></script>
+<%-- 	<script src="${ctxStatic}/common/wsize.min.js" type="text/javascript"></script> --%>
 </body>


--- a/src/main/webapp/WEB-INF/views/sys/officeList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/officeList.jsp
@@ -5,8 +5,9 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>机构管理</title>
-<link href="${ctxStatic}/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
-<script src="${ctxStatic}/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
+<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
+<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
+<script src="${ctxStatic}/global/scripts/mustache.min.js" type="text/javascript"></script>
 <script type="text/javascript">
 	$(document).ready(function() {
 		var tpl = $("#treeTableTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
@@ -23,10 +24,9 @@
 	

 	function addRow(list, tpl, data, pid, root){
-		
+
 		for (var i=0; i<data.length; i++){
 			var row = data[i];
-			
 			var value = ${fns:jsGetVal('row.parentId')};
 			if(!value){
 				value = 0;
@@ -50,16 +50,30 @@
 </script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/sys/office/list?id=${sysOffice.id}&parentIds=${sysOffice.parentIds}">机构列表</a></li>
-		<shiro:hasPermission name="sys:office:edit"><li><a href="${ctx}/sys/office/form?parent.id=${sysOffice.id}">机构添加</a></li></shiro:hasPermission>
-	</ul>
+<div class="page-content">
+	
+	<div class="row">
+	<div class="col-md-12">
+			<div class="portlet">
+	
+				<div class="portlet-body">

+<!-- 	<ul class="nav nav-tabs"> -->
+<%-- 		<li class="active"><a href="${ctx}/sys/office/list?id=${sysOffice.id}&parentIds=${sysOffice.parentIds}">机构列表</a></li> --%>
+<%-- 		<shiro:hasPermission name="sys:office:edit"><li><a href="${ctx}/sys/office/form?parent.id=${sysOffice.id}">机构添加</a></li></shiro:hasPermission> --%>
+<!-- 	</ul> -->
+<div class="table-responsive">
 	<sys:message content="${message}"/>
 	<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><shiro:hasPermission name="sys:office:edit"><th>操作</th></shiro:hasPermission></tr></thead>
 		<tbody id="treeTableList"></tbody>
 	</table>
+	</div>
+	</div>
+	</div>
+	</div>
+	</div>
+	</div>
 	<script type="text/template" id="treeTableTpl">
 		<tr id="{{row.id}}" pId="{{pid}}">
 			<td><a href="${ctx}/sys/office/form?id={{row.id}}">{{row.name}}</a></td>