gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.来函信息删除序号列

Browse Source 
2.treeselect插件按钮国际化
This commit is contained in:
zhanghongqing
2018-03-27 11:10:22 +08:00
parent b631b890fd
commit 8faf83ba36
6 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/resources/messages/message_en.properties
View File

@@ -220,6 +220,20 @@ maxlength_128=The maxlength is 128\uff01
maxlength_256=The maxlength is 256\uff01
maxlength_512=The maxlength is 512\uff01
maxlength_4000=The maxlength is 4000\uff01
ok=ok
clear=clear
close=close
reselect=please re-select
no_root=Root node can not be selected
no_parent=Parent node can not be selected
no_public_model=The public model can not be selected
no_outside_column=You can not select the other column models except the current column
send_org=please select the sending organization
department=department
sendind_org=sending organization
no_node=Node can not be selected
select_icon=select icon
nothing=nothing
#==========message end=====================
#==========yewuliexingguanli begin=====================

14
src/main/resources/messages/message_zh_CN.properties
View File

@@ -209,6 +209,20 @@ maxlength_128=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f 128\u
maxlength_256=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f256\u7684\u5b57\u7b26\u4e32\uff01
maxlength_512=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f512\u7684\u5b57\u7b26\u4e32\uff01
maxlength_4000=\u8bf7\u8f93\u5165\u4e00\u4e2a\u957f\u5ea6\u6700\u591a\u662f4000\u7684\u5b57\u7b26\u4e32\uff01
ok=\u786e\u5b9a
clear=\u6e05\u9664
close=\u5173\u95ed
reselect=\u8bf7\u91cd\u65b0\u9009\u62e9
no_root=\u4e0d\u80fd\u9009\u62e9\u6839\u8282\u70b9
no_parent=\u4e0d\u80fd\u9009\u62e9\u7236\u8282\u70b9
no_public_model=\u4e0d\u80fd\u9009\u62e9\u516c\u5171\u6a21\u578b
no_outside_column=\u4e0d\u80fd\u9009\u62e9\u5f53\u524d\u680f\u76ee\u4ee5\u5916\u7684\u680f\u76ee\u6a21\u578b
send_org=\u8bf7\u9009\u62e9\u4e0b\u53d1\u5355\u4f4d
department=\u90e8\u95e8
sendind_org=\u4e0b\u53d1\u5355\u4f4d
no_node=\u4e0d\u80fd\u9009\u62e9\u8282\u70b9
select_icon=\u9009\u62e9\u56fe\u6807
nothing=\u65e0
#==========message end=====================
#==========yewuliexingguanli begin=====================

10
src/main/webapp/WEB-INF/tags/sys/iconselect.tag
View File

@@ -3,12 +3,12 @@
<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
<%@ attribute name="name" type="java.lang.String" required="true" description="输入框名称"%>
<%@ attribute name="value" type="java.lang.String" required="true" description="输入框值"%>
<i id="${id}Icon" class="icon-${not empty value?value:' hide'}"></i>&nbsp;<label id="${id}IconLabel">${not empty value?value:'无'}</label>&nbsp;
<input id="${id}" name="${name}" type="hidden" value="${value}"/><a id="${id}Button" href="javascript:" class="btn">选择</a>&nbsp;&nbsp;
<i id="${id}Icon" class="icon-${not empty value?value:' hide'}"></i>&nbsp;<label id="${id}IconLabel">${not empty value?value:'null'}</label>&nbsp;
<input id="${id}" name="${name}" type="hidden" value="${value}"/><a id="${id}Button" href="javascript:" class="btn"><spring:message code='select'/></a>&nbsp;&nbsp;
<script type="text/javascript">
$("#${id}Button").click(function(){
top.$.jBox.open("iframe:${ctx}/tag/iconselect?value="+$("#${id}").val(), "选择图标", 700, $(top.document).height()-180, {
buttons:{"确定":"ok", "清除":"clear", "关闭":true}, submit:function(v, h, f){
top.$.jBox.open("iframe:${ctx}/tag/iconselect?value="+$("#${id}").val(), "<spring:message code='select_icon'/>", 700, $(top.document).height()-180, {
buttons:{"<spring:message code='ok'/>":"ok", "<spring:message code='clear'/>":"clear", "<spring:message code='close'/>":true}, submit:function(v, h, f){
if (v=="ok"){
var icon = h.find("iframe")[0].contentWindow.$("#icon").val();
$("#${id}Icon").attr("class", "icon-"+icon);
@@ -16,7 +16,7 @@
$("#${id}").val(icon);
}else if (v=="clear"){
$("#${id}Icon").attr("class", "icon- hide");
$("#${id}IconLabel").text("无");
$("#${id}IconLabel").text("<spring:message code='nothing'/>");
$("#${id}").val("");
}
}, loaded:function(h){

14
src/main/webapp/WEB-INF/tags/sys/treeselect.tag
View File

@@ -44,7 +44,7 @@
}
// 正常打开
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:{"确定":"ok", ${allowClear?"\"清除\":\"clear\", ":""}"关闭":true}, submit:function(v, h, f){
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){
if (v=="ok"){
var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
var ids = [], names = [], nodes = [];
@@ -58,22 +58,22 @@
continue; // 如果为复选框选择，则过滤掉父节点
}//</c:if><c:if test="${notAllowSelectRoot}">
if (nodes[i].level == 0){
top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
top.$.jBox.tip("<spring:message code='no_root'/>（"+nodes[i].name+"）<spring:message code='reselect'/>");
return false;
}//</c:if><c:if test="${notAllowSelectParent}">
if (nodes[i].isParent){
top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
top.$.jBox.tip("<spring:message code='no_parent'/>（"+nodes[i].name+"）<spring:message code='reselect'/>");
return false;
}//</c:if><c:if test="${not empty module && selectScopeModule}">
if (nodes[i].module == ""){
top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
top.$.jBox.tip("<spring:message code='no_public_model'/>（"+nodes[i].name+"）<spring:message code='reselect'/>");
return false;
}else if (nodes[i].module != "${module}"){
top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
top.$.jBox.tip("<spring:message code='no_outside_column'/>，<spring:message code='reselect'/>");
return false;
}//</c:if><c:if test="${selectDepartment}">
if (nodes[i].name=="请选择下发单位" || nodes[i].name=="部门" ||nodes[i].name=="下发单位"){
top.$.jBox.tip("不能选择节点（"+nodes[i].name+"）请重新选择。");
if (nodes[i].name=="<spring:message code='send_org'/>" || nodes[i].name=="<spring:message code='department'/>" ||nodes[i].name=="<spring:message code='sendind_org'/>"){
top.$.jBox.tip("<spring:message code='no_node'/>（"+nodes[i].name+"）<spring:message code='reselect'/>");
return false;
}//</c:if>
ids.push(nodes[i].id);//<c:if test="${showParentName}">

2
src/main/webapp/WEB-INF/views/cfg/requestForm.jsp
View File

@@ -68,7 +68,7 @@
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<button type="submit" class="btn btn-circle green"><spring:message code="submit"></spring:message></button>
<button type="submit" class="btn btn-circle blue"><spring:message code="submit"></spring:message></button>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
</div>
</div>

8
src/main/webapp/WEB-INF/views/cfg/requestList.jsp
View File

@@ -175,7 +175,6 @@
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="seq"></spring:message></th>
<th><spring:message code="request_number"></spring:message></th>
<th><spring:message code="request_organization"></spring:message></th>
<th><spring:message code="request_time"></spring:message></th>
@@ -196,7 +195,6 @@
<c:forEach items="${page.list}" var="requestInfo">
<tr>
<td><input type="checkbox" class="i-checks" id="${requestInfo.id}" value="${requestInfo.isAudit}"></td>
<td>${requestInfo.id }</td>
<td>${requestInfo.requestNumber }</td>
<td>${requestInfo.requestOrg }</td>
<td><fmt:formatDate value="${requestInfo.requestTime }" pattern="yyyy-MM-dd"/></td>
@@ -241,7 +239,7 @@
if("${requestInfo.requestContent}"){
$("#intype").val("${requestInfo.requestContent}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
$("#intype").attr("placeholder","<spring:message code='input'/>"+$("#seltype").find("option:selected").text());
}
//筛选功能初始化
filterActionInit();
@@ -251,7 +249,7 @@
});
$("#seltype").change(function(){
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
$("#intype").attr("placeholder","<spring:message code='input'/>"+$(this).find("option:selected").text());
});
//全选及取消
$("#checkAll").change(function(){
@@ -281,7 +279,7 @@
});
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
$("#intype").attr("placeholder","<spring:message code='input'/> "+"<spring:message code='title'/>");
$("#intype").attr("placeholder","<spring:message code='input'/>"+"<spring:message code='title'/>");
}