Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp

@@ -7,6 +7,7 @@
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -57,18 +58,19 @@
 		  return false;
 		}
 		$(document).ready(function() {
-			var name=$(this).find("td").eq(0).find("input").eq(0).val();
-			var tiao="."+name;
-			var span=$(this).find("td").eq(2).find("input");
-			var ss=$(span).val().split(" ")[4];
-			$(span).toggle(function () {
-				$(tiao).hide();
-				$(span).val("  +  "+ss)
-			},function () {
-				$(tiao).show();
-				$(span).val("  -  "+ss)
-
-			});
+			$(".listTr").click(function(){
+				var name=$(this).find("td").eq(0).find("input").eq(0).val();
+				var tiao="."+name;
+				var span=$(this).find("td").eq(2);
+				var ss=$(span).val().split(" ")[4];
+				$(span).toggle(function () {
+					$(tiao).hide();
+					$(span).find("span").attr("class","treeTable-icon")
+				},function () {
+					$(tiao).show();
+					$(span).find("span").attr("class","treeTable-icon open")
+				});
+			})
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -158,6 +160,7 @@
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">归档批次号：</label>
 						<div class="layui-input-block">
+
 							<form:input path="filingBatch" id="filingBatch"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
@@ -299,8 +302,9 @@
 											<input id="projectFilingbatchRelations${index.index}_status" name="projectFilingbatchRelations[${index.index}].status" type="hidden" value=""/>
 										</td>
 										<td style="background-color: #f1f1f1;">
+											<span class="treeTable-icon open" style="padding-left: 10px;"><i class="layui-icon layui-icon-triangle-d"></i></span>  ${project.projectId}
 <%--											<span style="padding-left: 10px;padding-right: 10px;float: left">-</span>${project.projectId}--%>
-											<input style="cursor:Pointer" type="text" value="  -  ${project.projectId}" readonly="readonly"  class="form-control"/>
+<%--											<input style="cursor:Pointer" type="text" value="  -  ${project.projectId}" readonly="readonly"  class="form-control"/>--%>
 										</td>
 										<td>
 											<input id="projectFilingbatchRelations${index.index}_projectName" type="text" value="${project.projectName}" readonly="readonly"  class="form-control"/>