From b5c69a3dadd2f1ef5bf26d11a9ae2ab270b76ab0 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Fri, 9 Nov 2018 19:47:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9D=A5=E5=87=BD=E4=B8=93?=
 =?UTF-8?q?=E9=A1=B9=E7=AE=A1=E7=90=86=E5=8F=96=E6=B6=88=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE=E5=8F=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?bug=E3=80=822.=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E6=91=98?=
 =?UTF-8?q?=E8=A6=81=E9=85=8D=E7=BD=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/basics/taskInfoList.jsp     |  4 ++
 .../views/cfg/fileTransfer/fileDigestForm.jsp |  2 +-
 .../views/cfg/fileTransfer/fileDigestList.jsp | 46 +++++++++++++++++--
 .../webapp/WEB-INF/views/cfg/requestList.jsp  |  4 ++
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index c1ccf53b3..78bc78da6 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -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{
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
index 927c29225..fb88eccd2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
@@ -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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
index 0f89ffc4f..00fc46166 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 108bc6828..27e7bf193 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -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{