Преглед на файлове

归档、上报样式修改

user5 преди 4 години
родител
ревизия
b76d6ad433

+ 5 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -110,6 +110,8 @@ public class RuralProjectMessageController extends BaseController {
     private ProjectFilingbatchRelationDao projectFilingbatchRelationDao;
     @Autowired
     private ProjectFilingBatchDao projectFilingBatchDao;
+    @Autowired
+    private RuralProjectRecordsService ruralProjectRecordsService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -527,7 +529,9 @@ public class RuralProjectMessageController extends BaseController {
                 }
 
             }
-        /*}*/
+        /*}*/projectcontent.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileAttachmentList()));
+        projectcontent.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileGistdataList()));
+        projectcontent.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontent.getFileOtherList()));
 
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();

+ 6 - 6
src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -271,10 +271,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -344,10 +344,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -419,10 +419,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:otherwise>
 										</c:choose>
 									</div>

+ 139 - 55
src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordView.jsp

@@ -5,6 +5,7 @@
 	<title>合同归档管理</title>
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
 	<style>
 		label.error:nth-child(2){
 			top:40px;
@@ -24,7 +25,26 @@
 		}
 	</style>
 	<script type="text/javascript">
-
+		$(document).ready(function() {
+			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交,请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误,请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+		});
 	</script>
 </head>
 <body>
@@ -181,32 +201,52 @@
 			<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 			<span id="attachment_title"></span>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-				<table id="upTable" class="table table-bordered table-condensed details">
+				<table id="upTable" class="table table-bordered table-hover list-table">
 					<thead>
 					<tr>
-						<%-- <th>序号</th>--%>
-						<th>电子件名称</th>
-						<th width="100px">最大容量(M)</th>
-						<th width="18%">类型限制</th>
-						<th>文件名</th>
-						<th width="150px">操作</th>
+						<th width="40%">文件类型</th>
+						<th width="">文件名</th>
+						<th width="100px">操作</th>
 					</tr>
 					</thead>
 					<tbody id="file_attachment">
 					<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-						<tr>
-							<td style="display:none">${fileAttachment.id}</td>
-							<td>${fileAttachment.attachName}</td>
-							<td>${fileAttachment.attachLength}</td>
-							<td>${fileAttachment.attachTypes}</td>
-							<td>
-								<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-									<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-								</c:forEach>
+						<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
+							<c:choose>
+								<c:when test="${fileAttachment.mustFlag == 1}">
+									<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+								</c:when>
+								<c:otherwise>
+									<c:choose>
+										<c:when test="${fileAttachment.flag == 0}">
+											<td>${fileAttachment.attachName}</td>
+										</c:when>
+										<c:otherwise>
+											<td></td>
+										</c:otherwise>
+									</c:choose>
+								</c:otherwise>
+							</c:choose>
+							<td style="text-align:center;">
+								<c:choose>
+									<c:when test="${fileAttachment.flag == 0}">
+										${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}
+									</c:when>
+									<c:otherwise>
+										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>
+									</c:otherwise>
+								</c:choose>
 							</td>
-							<td class="op-td">
+							<td class="op-td" style="text-align:center;">
 								<div class="op-btn-box" >
-									<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+									<c:choose>
+										<c:when test="${fileAttachment.flag == 0}">
+											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:when>
+										<c:otherwise>
+											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:otherwise>
+									</c:choose>
 								</div>
 							</td>
 						</tr>
@@ -230,35 +270,57 @@
 			<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 			<span id="gistdata_title"></span>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-				<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+				<table id="gistdata_upTable" class="table table-bordered table-hover list-table">
 					<thead>
 					<tr>
-						<%-- <th>序号</th>--%>
-						<th>电子件名称</th>
-						<th width="100px">最大容量(M)</th>
-						<th width="18%">类型限制</th>
-						<th>文件名</th>
-						<th width="150px">操作</th>
+						<th width="40%">文件类型</th>
+						<th width="">文件名</th>
+						<th width="100px">操作</th>
 					</tr>
 					</thead>
 					<tbody id="file_gistdata">
 					<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-						<tr>
+						<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
 								<%-- <td>${status.index + 1}</td>--%>
-							<td style="display:none">${fileGistdata.id}</td>
-							<td>${fileGistdata.attachName}</td>
-							<td>${fileGistdata.attachLength}</td>
-							<td>${fileGistdata.attachTypes}</td>
-							<td>
-								<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-									<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-								</c:forEach>
+							<c:choose>
+								<c:when test="${fileGistdata.mustFlag == 1}">
+									<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+								</c:when>
+								<c:otherwise>
+									<c:choose>
+										<c:when test="${fileGistdata.flag == 0}">
+											<td>${fileGistdata.attachName}</td>
+										</c:when>
+										<c:otherwise>
+											<td></td>
+										</c:otherwise>
+									</c:choose>
+								</c:otherwise>
+							</c:choose>
+							<td style="text-align:center;">
+								<c:choose>
+									<c:when test="${fileGistdata.flag == 0}">
+										${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+									</c:when>
+									<c:otherwise>
+										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>
+									</c:otherwise>
+								</c:choose>
 							</td>
-							<td class="op-td">
+							<td class="op-td"  style="text-align:center;">
 								<div class="op-btn-box" >
-									<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+									<c:choose>
+										<c:when test="${fileGistdata.flag == 0}">
+											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:when>
+										<c:otherwise>
+											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:otherwise>
+									</c:choose>
 								</div>
 							</td>
+							<td style="display:none">${fileGistdata.id}</td>
+							<td style="display:none">${fileGistdata.mustFlag}</td>
 						</tr>
 					</c:forEach>
 					</tbody>
@@ -280,35 +342,57 @@
 			<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 			<span id="other_title"></span>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-				<table id="upTable_other" class="table table-bordered table-condensed details">
+				<table id="upTable_other" class="table table-bordered table-hover list-table">
 					<thead>
 					<tr>
-						<%-- <th>序号</th>--%>
-						<th>电子件名称</th>
-						<th width="100px">最大容量(M)</th>
-						<th width="18%">类型限制</th>
-						<th>文件名</th>
-						<th width="150px">操作</th>
+						<th width="40%">文件类型</th>
+						<th width="">文件名</th>
+						<th width="100px">操作</th>
 					</tr>
 					</thead>
 					<tbody id="file_other">
 					<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-						<tr>
+						<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
 								<%-- <td>${status.index + 1}</td>--%>
-							<td style="display:none">${fileOther.id}</td>
-							<td>${fileOther.attachName}</td>
-							<td>${fileOther.attachLength}</td>
-							<td>${fileOther.attachTypes}</td>
-							<td>
-								<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-									<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-								</c:forEach>
+							<c:choose>
+								<c:when test="${fileOther.mustFlag == 1}">
+									<td><span style="color: red">* </span>${fileOther.attachName}</td>
+								</c:when>
+								<c:otherwise>
+									<c:choose>
+										<c:when test="${fileOther.flag == 0}">
+											<td>${fileOther.attachName}</td>
+										</c:when>
+										<c:otherwise>
+											<td></td>
+										</c:otherwise>
+									</c:choose>
+								</c:otherwise>
+							</c:choose>
+							<td style="text-align:center;">
+								<c:choose>
+									<c:when test="${fileOther.flag == 0}">
+										${fileOther.attachLength}M;  ${fileOther.attachTypes}
+									</c:when>
+									<c:otherwise>
+										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>
+									</c:otherwise>
+								</c:choose>
 							</td>
-							<td class="op-td">
+							<td class="op-td" style="text-align:center;">
 								<div class="op-btn-box" >
-									<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+									<c:choose>
+										<c:when test="${fileOther.flag == 0}">
+											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:when>
+										<c:otherwise>
+											<a href="javascript:void(0)"  onclick="openBill3('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:otherwise>
+									</c:choose>
 								</div>
 							</td>
+							<td style="display:none">${fileOther.id}</td>
+							<td style="display:none">${fileOther.mustFlag}</td>
 						</tr>
 					</c:forEach>
 					</tbody>

+ 6 - 6
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp

@@ -514,10 +514,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -583,10 +583,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -654,10 +654,10 @@
 									<div class="op-btn-box" >
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:when>
 											<c:otherwise>
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 											</c:otherwise>
 										</c:choose>
 									</div>

+ 148 - 52
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -4,8 +4,37 @@
 <head>
 	<title>报告详情管理</title>
 	<meta name="decorator" content="default"/>
+	<%@include file="/webpage/include/treetable.jsp" %>
 	<script type="text/javascript">
-
+		$(document).ready(function() {
+			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交,请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误,请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			$("#attachment_btn").click(function () {
+				$("#attachment_file").click();
+			});
+			$("#gistdata_btn").click(function () {
+				$("#gistdata_file").click();
+			});
+			$("#other_btn").click(function () {
+				$("#other_file").click();
+			});
+		});
 	</script>
 </head>
 
@@ -360,31 +389,52 @@
 				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details">
+					<table id="upTable" class="table table-bordered table-hover list-table">
 						<thead>
 						<tr>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
-							<th width="150px">操作</th>
+							<th width="40%">文件类型</th>
+							<th width="">文件名</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr>
-								<td style="display:none">${fileAttachment.id}</td>
-								<td>${fileAttachment.attachName}</td>
-								<td>${fileAttachment.attachLength}</td>
-								<td>${fileAttachment.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
+							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
+								<c:choose>
+									<c:when test="${fileAttachment.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fileAttachment.flag == 0}">
+												<td>${fileAttachment.attachName}</td>
+											</c:when>
+											<c:otherwise>
+												<td></td>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+								<td style="text-align:center;">
+									<c:choose>
+										<c:when test="${fileAttachment.flag == 0}">
+											${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}
+										</c:when>
+										<c:otherwise>
+											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>
+										</c:otherwise>
+									</c:choose>
 								</td>
-								<td class="op-td">
+								<td class="op-td" style="text-align:center;">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<c:choose>
+											<c:when test="${fileAttachment.flag == 0}">
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											</c:when>
+											<c:otherwise>
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											</c:otherwise>
+										</c:choose>
 									</div>
 								</td>
 							</tr>
@@ -407,33 +457,57 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+					<table id="gistdata_upTable" class="table table-bordered table-hover list-table">
 						<thead>
 						<tr>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
-							<th width="150px">操作</th>
+							<th width="40%">文件类型</th>
+							<th width="">文件名</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr>
-								<td style="display:none">${fileGistdata.id}</td>
-								<td>${fileGistdata.attachName}</td>
-								<td>${fileGistdata.attachLength}</td>
-								<td>${fileGistdata.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
+							<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
+									<%-- <td>${status.index + 1}</td>--%>
+								<c:choose>
+									<c:when test="${fileGistdata.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fileGistdata.flag == 0}">
+												<td>${fileGistdata.attachName}</td>
+											</c:when>
+											<c:otherwise>
+												<td></td>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+								<td style="text-align:center;">
+									<c:choose>
+										<c:when test="${fileGistdata.flag == 0}">
+											${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+										</c:when>
+										<c:otherwise>
+											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>
+										</c:otherwise>
+									</c:choose>
 								</td>
-								<td class="op-td">
+								<td class="op-td"  style="text-align:center;">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<c:choose>
+											<c:when test="${fileGistdata.flag == 0}">
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											</c:when>
+											<c:otherwise>
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											</c:otherwise>
+										</c:choose>
 									</div>
 								</td>
+								<td style="display:none">${fileGistdata.id}</td>
+								<td style="display:none">${fileGistdata.mustFlag}</td>
 							</tr>
 						</c:forEach>
 						</tbody>
@@ -454,31 +528,53 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details">
+					<table id="upTable_other" class="table table-bordered table-hover list-table">
 						<thead>
 						<tr>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
-							<th width="150px">操作</th>
+							<th width="40%">文件类型</th>
+							<th width="">文件名</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr>
-								<td style="display:none">${fileOther.id}</td>
-								<td>${fileOther.attachName}</td>
-								<td>${fileOther.attachLength}</td>
-								<td>${fileOther.attachTypes}</td>
-								<td>
-									<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-									</c:forEach>
+							<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
+									<%-- <td>${status.index + 1}</td>--%>
+								<c:choose>
+									<c:when test="${fileOther.mustFlag == 1}">
+										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fileOther.flag == 0}">
+												<td>${fileOther.attachName}</td>
+											</c:when>
+											<c:otherwise>
+												<td></td>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+								<td style="text-align:center;">
+									<c:choose>
+										<c:when test="${fileOther.flag == 0}">
+											${fileOther.attachLength}M;  ${fileOther.attachTypes}
+										</c:when>
+										<c:otherwise>
+											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>
+										</c:otherwise>
+									</c:choose>
 								</td>
-								<td class="op-td">
+								<td class="op-td" style="text-align:center;">
 									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										<c:choose>
+											<c:when test="${fileOther.flag == 0}">
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											</c:when>
+											<c:otherwise>
+												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+											</c:otherwise>
+										</c:choose>
 									</div>
 								</td>
 							</tr>

+ 148 - 51
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportView.jsp

@@ -4,8 +4,38 @@
 <head>
 	<title>报告详情管理</title>
 	<meta name="decorator" content="default"/>
+	<%@include file="/webpage/include/treetable.jsp" %>
 	<script type="text/javascript">
 
+		$(document).ready(function() {
+			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
+			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交,请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误,请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			$("#attachment_btn").click(function () {
+				$("#attachment_file").click();
+			});
+			$("#gistdata_btn").click(function () {
+				$("#gistdata_file").click();
+			});
+			$("#other_btn").click(function () {
+				$("#other_file").click();
+			});
+		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
 
@@ -458,31 +488,52 @@
 			<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
 			<span id="attachment_title"></span>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-				<table id="upTable" class="table table-bordered table-condensed details">
+				<table id="upTable" class="table table-bordered table-hover list-table">
 					<thead>
 					<tr>
-						<th>电子件名称</th>
-						<th width="100px">最大容量(M)</th>
-						<th width="18%">类型限制</th>
-						<th>文件名</th>
-						<th width="150px">操作</th>
+						<th width="40%">文件类型</th>
+						<th width="">文件名</th>
+						<th width="100px">操作</th>
 					</tr>
 					</thead>
 					<tbody id="file_attachment">
 					<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-						<tr>
-							<td style="display:none">${fileAttachment.id}</td>
-							<td>${fileAttachment.attachName}</td>
-							<td>${fileAttachment.attachLength}</td>
-							<td>${fileAttachment.attachTypes}</td>
-							<td>
-								<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
-									<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-								</c:forEach>
+						<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
+							<c:choose>
+								<c:when test="${fileAttachment.mustFlag == 1}">
+									<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+								</c:when>
+								<c:otherwise>
+									<c:choose>
+										<c:when test="${fileAttachment.flag == 0}">
+											<td>${fileAttachment.attachName}</td>
+										</c:when>
+										<c:otherwise>
+											<td></td>
+										</c:otherwise>
+									</c:choose>
+								</c:otherwise>
+							</c:choose>
+							<td style="text-align:center;">
+								<c:choose>
+									<c:when test="${fileAttachment.flag == 0}">
+										${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}
+									</c:when>
+									<c:otherwise>
+										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>
+									</c:otherwise>
+								</c:choose>
 							</td>
-							<td class="op-td">
+							<td class="op-td" style="text-align:center;">
 								<div class="op-btn-box" >
-									<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+									<c:choose>
+										<c:when test="${fileAttachment.flag == 0}">
+											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:when>
+										<c:otherwise>
+											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileAttachment.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:otherwise>
+									</c:choose>
 								</div>
 							</td>
 						</tr>
@@ -505,33 +556,57 @@
 			<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 			<span id="gistdata_title"></span>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-				<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+				<table id="gistdata_upTable" class="table table-bordered table-hover list-table">
 					<thead>
 					<tr>
-						<th>电子件名称</th>
-						<th width="100px">最大容量(M)</th>
-						<th width="18%">类型限制</th>
-						<th>文件名</th>
-						<th width="150px">操作</th>
+						<th width="40%">文件类型</th>
+						<th width="">文件名</th>
+						<th width="100px">操作</th>
 					</tr>
 					</thead>
 					<tbody id="file_gistdata">
 					<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-						<tr>
-							<td style="display:none">${fileGistdata.id}</td>
-							<td>${fileGistdata.attachName}</td>
-							<td>${fileGistdata.attachLength}</td>
-							<td>${fileGistdata.attachTypes}</td>
-							<td>
-								<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
-									<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-								</c:forEach>
+						<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
+								<%-- <td>${status.index + 1}</td>--%>
+							<c:choose>
+								<c:when test="${fileGistdata.mustFlag == 1}">
+									<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+								</c:when>
+								<c:otherwise>
+									<c:choose>
+										<c:when test="${fileGistdata.flag == 0}">
+											<td>${fileGistdata.attachName}</td>
+										</c:when>
+										<c:otherwise>
+											<td></td>
+										</c:otherwise>
+									</c:choose>
+								</c:otherwise>
+							</c:choose>
+							<td style="text-align:center;">
+								<c:choose>
+									<c:when test="${fileGistdata.flag == 0}">
+										${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+									</c:when>
+									<c:otherwise>
+										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>
+									</c:otherwise>
+								</c:choose>
 							</td>
-							<td class="op-td">
+							<td class="op-td"  style="text-align:center;">
 								<div class="op-btn-box" >
-									<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+									<c:choose>
+										<c:when test="${fileGistdata.flag == 0}">
+											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:when>
+										<c:otherwise>
+											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileGistdata.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:otherwise>
+									</c:choose>
 								</div>
 							</td>
+							<td style="display:none">${fileGistdata.id}</td>
+							<td style="display:none">${fileGistdata.mustFlag}</td>
 						</tr>
 					</c:forEach>
 					</tbody>
@@ -552,31 +627,53 @@
 			<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 			<span id="other_title"></span>
 			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-				<table id="upTable_other" class="table table-bordered table-condensed details">
+				<table id="upTable_other" class="table table-bordered table-hover list-table">
 					<thead>
 					<tr>
-						<th>电子件名称</th>
-						<th width="100px">最大容量(M)</th>
-						<th width="18%">类型限制</th>
-						<th>文件名</th>
-						<th width="150px">操作</th>
+						<th width="40%">文件类型</th>
+						<th width="">文件名</th>
+						<th width="100px">操作</th>
 					</tr>
 					</thead>
 					<tbody id="file_other">
 					<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-						<tr>
-							<td style="display:none">${fileOther.id}</td>
-							<td>${fileOther.attachName}</td>
-							<td>${fileOther.attachLength}</td>
-							<td>${fileOther.attachTypes}</td>
-							<td>
-								<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
-									<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>
-								</c:forEach>
+						<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
+								<%-- <td>${status.index + 1}</td>--%>
+							<c:choose>
+								<c:when test="${fileOther.mustFlag == 1}">
+									<td><span style="color: red">* </span>${fileOther.attachName}</td>
+								</c:when>
+								<c:otherwise>
+									<c:choose>
+										<c:when test="${fileOther.flag == 0}">
+											<td>${fileOther.attachName}</td>
+										</c:when>
+										<c:otherwise>
+											<td></td>
+										</c:otherwise>
+									</c:choose>
+								</c:otherwise>
+							</c:choose>
+							<td style="text-align:center;">
+								<c:choose>
+									<c:when test="${fileOther.flag == 0}">
+										${fileOther.attachLength}M;  ${fileOther.attachTypes}
+									</c:when>
+									<c:otherwise>
+										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>
+									</c:otherwise>
+								</c:choose>
 							</td>
-							<td class="op-td">
+							<td class="op-td" style="text-align:center;">
 								<div class="op-btn-box" >
-									<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+									<c:choose>
+										<c:when test="${fileOther.flag == 0}">
+											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:when>
+										<c:otherwise>
+											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentView?attachmentId=${fileOther.parent.id}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+										</c:otherwise>
+									</c:choose>
 								</div>
 							</td>
 						</tr>