Merge branch 'master' of http://192.168.2.4:3000/user5/simple_xg_total_process_master

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -998,7 +998,28 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
     public void insertProInfo(String[] proInfos,String[] flags,String[] proId,String filingId){
         String pro="";
         JSONObject json = null;
-        if (flags.length!=0 && proId.length==1){
+        boolean tiao=false;
+        for (int i=0;i<flags.length;i++){
+            if (!flags[i].equals("")){
+                tiao=true;
+            }
+        }
+        if(!tiao || proInfos[1].length()>50){
+            Integer count=0;
+            for (int i=0;i<proInfos.length;i++){
+                if (proInfos[i]!=""&& !"".equals(proInfos[i])) {
+                    json = JSONObject.fromObject(proInfos[i]);
+                    ProjectFilingBatchProInfo info = new ProjectFilingBatchProInfo();
+                    info.setId(IdGen.uuid());
+                    info.setProId(json.get("proId").toString());
+                    info.setProInfofilingBatch(json.get("filingId").toString());
+                    info.setProInfoName(json.get("names").toString());
+                    info.setProInfoType(json.get("types").toString());
+                    if(count==0){ DelProInfo(info);count++;}
+                    proInfoDao.proInfoInsert(info);
+                }
+            }
+        }else if (flags.length!=0 && proInfos.length==4 && tiao ){
             int count=0;
             for (int s=0;s< proInfos.length;s++){
                 count++;
@@ -1016,21 +1037,6 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             info.setProInfoType(json.get("types").toString());
             DelProInfo(info);
             proInfoDao.proInfoInsert(info);
-        }else{
-            Integer count=0;
-            for (int i=0;i<proInfos.length;i++){
-                if (proInfos[i]!=""&& !"".equals(proInfos[i])) {
-                    json = JSONObject.fromObject(proInfos[i]);
-                    ProjectFilingBatchProInfo info = new ProjectFilingBatchProInfo();
-                    info.setId(IdGen.uuid());
-                    info.setProId(json.get("proId").toString());
-                    info.setProInfofilingBatch(json.get("filingId").toString());
-                    info.setProInfoName(json.get("names").toString());
-                    info.setProInfoType(json.get("types").toString());
-                    if(count==0){ DelProInfo(info);count++;}
-                    proInfoDao.proInfoInsert(info);
-                }
-            }
         }
 
     }

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -355,7 +355,7 @@ public class ProjectFilingBatchController extends BaseController {
                 if (t.getFilingStatus() == 3 ||t.getFilingStatus()==1){
                     MyBeanUtils.copyBeanNotNull2Bean(projectFilingBatch, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
                     projectFilingBatchService.saveProject(proId,t, ProjectStatusEnum.IN_APRL);//保存
-                    if (proInfos!=null){
+                    if (proInfos.length!=0){
                         projectFilingBatchService.insertProInfo(proInfos,flags,proId,projectFilingBatch.getId());
                     }
 
@@ -370,7 +370,7 @@ public class ProjectFilingBatchController extends BaseController {
                 projectFilingBatch.setFilingStatus(1);
                 projectFilingBatchService.saveProject(proId,projectFilingBatch, ProjectStatusEnum.IN_APRL);//保存
                 //新增项目树形信息
-                if (proInfos!=null) {
+                if (proInfos.length!=0) {
                     projectFilingBatchService.insertProInfo(proInfos, flags, proId,projectFilingBatch.getId());
                 }
             }

src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchProInfoDao.xml

@@ -38,7 +38,7 @@
 
 	<delete id="delete">
 		delete from project_filingbatch_proinfo
-		where filing_batch=#{proInfofilingBatch} and project_id=#{proId}
+		where filing_batch=#{proInfofilingBatch}
 	</delete>
 	<delete id="deleteById">
 		delete from project_filingbatch_proinfo

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -25,6 +25,19 @@
 	</style>
 	<script type="text/javascript">
         var validateForm;
+		function listTr(obj){
+			var name=$(obj).attr("id");
+			var tiao="."+name;
+			var span=$(obj).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")
+			});
+		}
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
 				var projectId = '${project.id}';
@@ -290,9 +303,9 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div class="layui-item nav-btns">
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>
 					<span id="_attachment" ></span>
@@ -309,39 +322,46 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th>类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr>
+							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileAttachment.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileAttachment.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileAttachment.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<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>
-								</td>
+								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${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>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileAttachment.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -377,10 +397,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>依据性资料</h2></div>
-				<div class="layui-item nav-btns">
-						<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--						&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<span id="_gistdata" ></span>
@@ -397,40 +417,48 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th>类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
 						<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr>
+							<tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileGistdata.id}</td>
 								<td style="display:none">${fileGistdata.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileGistdata.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileGistdata.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileGistdata.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<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>
-								</td>
+								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${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>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileGistdata.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+<%--								<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>
@@ -466,10 +494,10 @@
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div class="layui-item nav-btns">
-						<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>
-				</div>
+<%--				<div class="layui-item nav-btns">--%>
+<%--						&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
+<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${project.id}&reviewFee=${projectReportRecord.report.reviewFee}','500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
+<%--				</div>--%>
 				<div id="addFile_other" style="display: none" class="upload-progress">
 					<span id="fileName_other" ></span>
 					<span id="_other" ></span>
@@ -486,40 +514,48 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th>电子件名称</th>
-							<th width="100px">最大容量(M)</th>
-							<th width="18%">类型限制</th>
-							<th>文件名</th>
+							<th width="40%">电子件名称</th>
+<%--							<th width="100px">最大容量(M)</th>--%>
+							<th>类型限制</th>
+<%--							<th>文件名</th>--%>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
 						<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr>
+							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
 									<%-- <td>${status.index + 1}</td>--%>
 								<td style="display:none">${fileOther.id}</td>
 								<td style="display:none">${fileOther.mustFlag}</td>
 								<c:choose>
 									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span><span style="color: red">* </span>${fileOther.attachName}</td>
 									</c:when>
 									<c:otherwise>
-										<td>${fileOther.attachName}</td>
+										<td><span class='treeTable-icon open' style="padding-right: 15px; "><i class="layui-icon layui-icon-triangle-d"></i></span>${fileOther.attachName}</td>
 									</c:otherwise>
 								</c:choose>
-								<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>
-								</td>
+								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${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>
 									</div>
 								</td>
 							</tr>
+							<c:forEach items="${fileOther.workAttachments}" var = "workAttachment" varStatus="status">
+								<tr class="addFile_other_${fileOther.id}_tr">
+									<td></td>
+									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>
+									<td class="op-td">
+										<div class="op-btn-box" >
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+
+												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
+										</div>
+									</td>
+								</tr>
+<%--								<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
+							</c:forEach>
 						</c:forEach>
 						</tbody>
 					</table>

src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectInfoList.jsp

@@ -215,6 +215,7 @@
 </head>
 <body>
 <div class="wrapper wrapper-content">
+	<div style="position: fixed;top: 0;width: 100%;z-index: 100">
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
@@ -243,8 +244,9 @@
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectRecords/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
 <%--		</ul>--%>
 	</div>
+	</div>
 	<sys:message content="${message}"/>
-	<div class="layui-row">
+	<div class="layui-row" style="margin-top: 40px;">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
 				<form:form id="searchForm" modelAttribute="subProjectInfo" action="${ctx}/subProject/subProject/list?parentProId=${subProjectInfo.parentProId}&projectType=${subProjectInfo.projectType}" method="post" class="form-inline">

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp

@@ -53,8 +53,9 @@
 </head>
 <body>
 <div class="single-form">
+	<div style="position: fixed;top: 0;width: 100%;z-index: 100">
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
-		<ul class="list-tabs" >
+		<ul class="list-tabs">
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
 			<c:if test="${projectRecords.workContractInfo.id!=''}">
@@ -81,7 +82,8 @@
 <%--			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
 <%--		</ul>--%>
 	</div>
-	<div class="container${container}">
+	</div>
+	<div class="container${container}" style="margin-top: 40px;">
 		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/saveReport" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<form:hidden path="name"/>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectPlanView.jsp

@@ -139,6 +139,7 @@
 </head>
 <body>
 <div class="single-form">
+    <div style="position: fixed;top: 0;width: 100%;z-index: 100">
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
@@ -167,7 +168,8 @@
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
 <%--        </ul>--%>
     </div>
-    <div class="container">
+    </div>
+    <div class="container" style="margin-top: 40px;">
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/project/projectPlan/save" method="post" class="form-horizontal">
             <form:hidden path="id"/>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -105,7 +105,7 @@
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectMessage/getReportedView?id=${reportedId}&projectId=${projectId}">上报信息详情</a></li>--%>
 <%--			</ul>--%>
 <%--		</div>--%>
-
+	<div style="position: fixed;top: 0;width: 100%;z-index: 100">
 		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 			<ul class="list-tabs" >
 				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
@@ -134,8 +134,9 @@
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
 <%--			</ul>--%>
 		</div>
+	</div>
 <%--	</c:if>--%>
-	<div class="container${container}  view-form">
+	<div class="container${container}  view-form" style="margin-top: 40px;">
 		<form:form id="inputForm" modelAttribute="projectcontentinfo"  method="post" class="form-horizontal">
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp

@@ -77,6 +77,7 @@
 </head>
 <body>
 <div class="single-form">
+    <div style="position: fixed;top: 0;width: 100%;z-index: 100">
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
@@ -105,7 +106,8 @@
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
 <%--        </ul>--%>
     </div>
-    <div class="container">
+    </div>
+    <div class="container" style="margin-top: 40px">
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="ruralProjectRecordsReported" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/auditSaveReported" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>

src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -24,6 +24,7 @@
 </head>
 <body>
 <div class="single-form">
+	<div style="position: fixed;top: 0;width: 100%;z-index: 100">
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
@@ -41,7 +42,8 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
 		</ul>
 	</div>
-	<div class="container view-form">
+	</div>
+	<div class="container view-form" style="margin-top: 40px;">
 		<form:form id="inputForm" modelAttribute="projectRecords" method="post" class="form-horizontal">
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目合同信息</h2></div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/workClientAndContractView.jsp

@@ -13,6 +13,7 @@
 </head>
 <body >
 <div class="single-form view-form">
+    <div style="position: fixed;top: 0;width: 100%;z-index: 100">
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
@@ -41,7 +42,8 @@
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
 <%--        </ul>--%>
     </div>
-    <form class="container">
+    </div>
+    <form class="container" style="margin-top: 40px;">
         <form:form id="inputForm" modelAttribute="workContractInfo"  method="post" class="form-horizontal layui-form">
         <div class="form-group layui-row first">
             <input type="hidden" id="id" value="${workClientInfo.id}">

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -544,7 +544,8 @@
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
                 ,{field:'reportNumber',align:'center', title: '报告号', minWidth:150,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.reportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.projectId + "&view=view','95%', '95%')\">" + d.reportNumber + "</a>";
+						<%--return "<a class=\"attention-info\" title=\"" + d.reportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.projectId + "&view=view','95%', '95%')\">" + d.reportNumber + "</a>";--%>
+						return d.reportNumber;
                     }}
                 ,{field:'areaName',align:'center', title: '项目所在地', minWidth:80,templet:function(d){
                         return "<span title='"+ d.areaName +"'>" + d.areaName + "</span>";

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -543,7 +543,8 @@
 						return "<span title='"+ d.invoiceType +"'>" + d.invoiceType + "</span>";
 					}}
                 ,{field:'reportNumber',align:'center', title: '报告号', minWidth:150,templet:function(d){
-						return "<a class=\"attention-info\" title=\"" + d.reportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.projectId + "&view=view','95%', '95%')\">" + d.reportNumber + "</a>";
+						<%--return "<a class=\"attention-info\" title=\"" + d.reportNumber + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.projectId + "&view=view','95%', '95%')\">" + d.reportNumber + "</a>";--%>
+						return d.reportNumber;
                     }}
                 ,{field:'areaName',align:'center', title: '项目所在地', minWidth:80,templet:function(d){
                         return "<span title='"+ d.areaName +"'>" + d.areaName + "</span>";