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

1.修改来函专项管理取消审核状态数据可修改bug。2.修改文件摘要配置查询条件。

Browse Source
This commit is contained in:
zhangwq
2018-11-09 19:47:03 +08:00
parent 301fa50606
commit b5c69a3dad
4 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
View File

@@ -261,6 +261,10 @@
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
return;
}
if(cked.val()==3){
top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
return;
}
if(cked.length==1){
window.location = "${ctx}/basics/taskInfo/form?id="+cked.attr("id");
}else{

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

@@ -263,7 +263,7 @@
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="harm_level"/></label>
<div class="col-md-6">
<select name="cfdsLevel" data-live-search="true" class="selectpicker form-control required">
<option value="0" ><spring:message code="selected"/></option>
<%-- <option value="0" ><spring:message code="selected"/></option> --%>
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
<option value="${configdenceC.itemCode}" <c:if test="${_cfg.cfdsLevel==configdenceC.itemCode || (_cfg.cfdsLevel==null && configdenceC.itemCode eq 90)}">selected</c:if>><spring:message code="${configdenceC.itemValue}"/></option>
</c:forEach>

46
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
View File

@@ -10,16 +10,40 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.cfdsLevel}"){
$("#intype").val("${cfg.cfdsLevel}");
}else if("${cfg.compileId}"){
$("#intype").val("${cfg.compileId}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
// 处理cfdsLevel查询条件 --->
if($("#seltype").val() == "cfdsLevel"){
$("#intype").hide();// 隐藏输入框
$("#isValid").selectpicker("hide");
$("#actionSelect").selectpicker("hide");
}else{
$("#cfdsLevel").selectpicker("hide");
}
$("#seltype").change(function(){
if($(this).val() == "cfdsLevel"){
$("#intype").hide();// 隐藏输入框
$("#intype").val("");// 清空input条件
$("#cfdsLevel").find("option").removeAttr("selected",false);
$("#cfdsLevel").selectpicker("refresh");
$("#cfdsLevel").selectpicker("show");
$("#action").selectpicker("hide");
$("#isValid").selectpicker("hide");
}else if($(this).val() == "action"){
$("#cfdsLevel").selectpicker("hide");
}else if($(this).val() == "isValid"){
$("#cfdsLevel").selectpicker("hide");
}else{
$("#cfdsLevel").find("option:first").attr("selected",true);// 清空action条件
$("#cfdsLevel").selectpicker("hide");// 隐藏下拉框
}
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
// 处理cfdsLevel查询条件 --->
//筛选功能初始化
filterActionInit();
$("#isAudit").change(function(){
@@ -27,6 +51,16 @@
});
//reset
$("#resetBtn").on("click",function(){
if($("#seltype").find("option:first").val() == "cfdsLevel"){
$("#intype").hide();
$("#cfdsLevel").selectpicker("show");
return false;
}
if($("#seltype").val() == "cfdsLevel"){
$("#intype").show();
$("#intype").attr("placeholder",$.validator.messages.input+$("#seltype").find("option:first").text());
$("#cfdsLevel").selectpicker("hide");
};
$("select.selectpicker").each(function(){
$(this).selectpicker('val',$(this).find('option:first').val());
$(this).find("option").attr("selected",false);
@@ -142,7 +176,7 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="cfdsLevel"><spring:message code="cfds_level"/></form:option>
<form:option value="cfdsLevel"><spring:message code="harm_level"/></form:option>
<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -162,6 +196,12 @@
<form:option value="1"><spring:message code="yes"/></form:option>
<form:option value="0"><spring:message code="no"/></form:option>
</form:select>
<form:select id="cfdsLevel" path="cfdsLevel" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
<form:option value="${configdenceC.itemCode}"><spring:message code="${configdenceC.itemValue}"/></form:option>
</c:forEach>
</form:select>
</div>
</div>
</div>

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

@@ -300,6 +300,10 @@
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
return;
}
if(cked.val()==3){
top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
return;
}
if(cked.length==1){
window.location = "${ctx}/cfg/request/form?id="+cked.attr("id");
}else{