Merge remote-tracking branch 'origin/master'

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

@@ -57,6 +57,18 @@
 		  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)
+
+			});
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -155,8 +167,14 @@
 							<form:input path="createBy.name" id="createBy"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm12 lw7">
-						<label class="layui-form-label">归档信息：</label>
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label">归档名称：</label>
+						<div class="layui-input-block">
+							<form:input path="filingName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm12 lw7 with-textarea">
+						<label class="layui-form-label">归档说明：</label>
 						<div class="layui-input-block">
 							<form:textarea path="information" readonly="true" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
 						</div>
@@ -181,35 +199,65 @@
 						<c:choose>
 							<c:when test="${not empty projectFilingBatch}">
 								<c:forEach items="${projectFilingBatch.project}" var="project" varStatus="index">
-									<tr id="workAccountList${index.index}">
-										<td class="hide">
-											<input id="workAccountList${index.index}_id" name="workAccountList[${index.index}].id" type="hidden" value="${project.id}"/>
-											<input id="workAccountList${index.index}_delFlag" name="workAccountList[${index.index}].delFlag" type="hidden" value="0"/>
-										</td>
-										<td>
-											<input type="text" readonly value="${project.projectId}" class="form-control"/>
-										</td>
-										<td>
-											<input type="text" readonly value="${project.projectName}" class="form-control"/>
-										</td>
-										<td>
-											<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
-										</td>
+									<c:choose>
+										<c:when test="${project.flag ==1}">
+											<tr id="workAccountList${index.index}">
+												<td class="hide">
+													<input id="workAccountList${index.index}_id" name="workAccountList[${index.index}].id" type="hidden" value="${project.id}"/>
+													<input id="workAccountList${index.index}_delFlag" name="workAccountList[${index.index}].delFlag" type="hidden" value="0"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectId}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectName}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+
+												<td>
+													<input id="workAccountList${index.index}_boxNum"  name="workAccountList[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control required layui-input"/>
+												</td>
+												<td>
+													<input id="workAccountList${index.index}_reBoxNum"  name="workAccountList[${index.index}].reBoxNum" maxlength="32" type="text" value="${projectFilingBatch.reBoxNum}"  class="form-control required layui-input"/>
+												</td>
+												<td style="overflow: visible;">
+													<select name="clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select clientType">
+														<option value="" >--是否通过--</option>
+														<option value="5" itemLabel="label">通过</option>
+														<option value="4" itemLabel="label">驳回</option>
+													</select>
+												</td>
+											</tr>
+										</c:when>
+										<c:otherwise>
+											<tr id="workAccountList${index.index}">
+												<td class="hide">
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectId}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectName}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+											</tr>
+										</c:otherwise>
+									</c:choose>
 
-										<td>
-											<input id="workAccountList${index.index}_boxNum"  name="workAccountList[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control required layui-input"/>
-										</td>
-										<td>
-											<input id="workAccountList${index.index}_reBoxNum"  name="workAccountList[${index.index}].reBoxNum" maxlength="32" type="text" value="${projectFilingBatch.reBoxNum}"  class="form-control required layui-input"/>
-										</td>
-										<td style="overflow: visible;">
-											<select name="clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select clientType">
-												<option value="" >--是否通过--</option>
-												<option value="5" itemLabel="label">通过</option>
-												<option value="4" itemLabel="label">驳回</option>
-											</select>
-										</td>
-									</tr>
 								</c:forEach>
 							</c:when>
 							<c:otherwise>
@@ -233,44 +281,72 @@
 							<th style="text-align: center" >归档项目名称</th>
 							<th style="text-align: center">报告号</th>
 							<th style="text-align: center" >案卷号</th>
-							<th style="text-align: center" >确认案卷号</th>
+<%--							<th style="text-align: center" >确认案卷号</th>--%>
 							<th style="text-align: center" >审批</th>
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
 						<c:if test="${not empty projectFilingBatch}">
 							<c:forEach items="${projectFilingBatch.project}" var="project" varStatus="index">
-								<tr id="projectFilingbatchRelations${index.index}">
-									<td class="hide">
-										<input id="projectFilingbatchRelations${index.index}_id" name="projectFilingbatchRelations[${index.index}].id" type="hidden" value="${project.id}"/>
-										<input id="projectFilingbatchRelations${index.index}_delFlag" name="projectFilingbatchRelations[${index.index}].delFlag" type="hidden" value="0"/>
-									</td>
-									<td class="hide">
-										<input id="projectFilingbatchRelations${index.index}_status" name="projectFilingbatchRelations[${index.index}].status" type="hidden" value=""/>
-									</td>
-									<td>
-										<input 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"/>
-									</td>
-									<td>
-										<input type="text" value="${project.projectReportNumber}" readonly="readonly"  class="form-control"/>
-									</td>
-									<td>
-										<input id="projectFilingbatchRelations${index.index}_boxNum"  name="projectFilingbatchRelations[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control layui-input"/>
-									</td>
-									<td>
-										<input id="projectFilingbatchRelations${index.index}_reBoxNum"  name="projectFilingbatchRelations[${index.index}].reBoxNum" maxlength="32" type="text" value="${projectFilingBatch.reBoxNum}"  class="form-control layui-input"/>
-									</td>
-									<td style="overflow: visible;">
-										<select  id="projectFilingbatchRelations${index.index}_clientType" name="projectFilingbatchRelations${index.index}.clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select clientType">
-											<option value="" >--是否通过--</option>
-											<option value="5" itemLabel="label">通过</option>
-											<option value="4" itemLabel="label">驳回</option>
-										</select>
-									</td>
-								</tr>
+								<c:choose>
+								<c:when test="${project.parentId == '0'}">
+									<tr class="listTr" id="projectFilingbatchRelations${index.index}">
+										<td class="hide">
+											<input id="projectFilingbatchRelations${index.index}_id" name="projectFilingbatchRelations[${index.index}].id" type="hidden" value="${project.id}"/>
+											<input id="projectFilingbatchRelations${index.index}_delFlag" name="projectFilingbatchRelations[${index.index}].delFlag" type="hidden" value="0"/>
+										</td>
+										<td class="hide">
+											<input id="projectFilingbatchRelations${index.index}_status" name="projectFilingbatchRelations[${index.index}].status" type="hidden" value=""/>
+										</td>
+										<td style="background-color: #f1f1f1;">
+<%--											<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"/>
+										</td>
+										<td>
+											<input id="projectFilingbatchRelations${index.index}_projectName" type="text" value="${project.projectName}" readonly="readonly"  class="form-control"/>
+										</td>
+										<td>
+											<input type="text" value="${project.projectReportNumber}" readonly="readonly"  class="form-control"/>
+										</td>
+										<td>
+											<input id="projectFilingbatchRelations${index.index}_boxNum"  name="projectFilingbatchRelations[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control layui-input"/>
+										</td>
+<%--										<td>--%>
+<%--											<input id="projectFilingbatchRelations${index.index}_reBoxNum"  name="projectFilingbatchRelations[${index.index}].reBoxNum" maxlength="32" type="text" value="${projectFilingBatch.reBoxNum}"  class="form-control layui-input"/>--%>
+<%--										</td>--%>
+										<td style="overflow: visible;">
+											<select  id="projectFilingbatchRelations${index.index}_clientType" name="projectFilingbatchRelations${index.index}.clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select clientType">
+												<option value="" >--是否通过--</option>
+												<option value="5" itemLabel="label">通过</option>
+												<option value="4" itemLabel="label">驳回</option>
+											</select>
+										</td>
+									</tr>
+								</c:when>
+								<c:otherwise>
+									<tr class="${project.parentId}" id="workAccountList${index.index}">
+										<td class="hide">
+										</td>
+										<td>
+											<input type="text" readonly value="${project.projectId}" style="text-align: center" class="form-control"/>
+										</td>
+										<td>
+											<input type="text" readonly value="${project.projectReportNumber}" style="text-align: center" class="form-control"/>
+										</td>
+										<td>
+											<input type="text" readonly value="" class="form-control"/>
+										</td>
+
+										<td>
+											<input type="text" readonly value="" class="form-control"/>
+										</td>
+										<td>
+											<input type="text" readonly value="" class="form-control"/>
+										</td>
+									</tr>
+								</c:otherwise>
+								</c:choose>
+
 							</c:forEach>
 						</c:if>
 						</tbody>