管理员修改，以及项目列表中查看项目、项目计划查看项目页面信息修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -269,6 +269,14 @@ public class RuralCostProjectRecordsController extends BaseController {
 	public String adminModify(RuralProjectRecords projectRecords, Model model) {
 		projectRecords=projectRecordsService.get(projectRecords.getId());
 		projectRecordsService.queryProjectDetail(projectRecords);
+		ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+		projectPlanInfo.setProjectId(projectRecords.getId());
+		//获取项目计划信息
+		List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+		//项目计划附件信息
+		List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
+		projectRecords.setProjectPlanList(projectPlanList);
+		projectRecords.setWorkAttachments(projectPlanAttachment);
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify";
 	}

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -273,6 +273,14 @@ public class RuralProjectRecordsController extends BaseController {
 	public String adminModify(RuralProjectRecords projectRecords, Model model) {
 		projectRecords=projectRecordsService.get(projectRecords.getId());
 		projectRecordsService.queryProjectDetail(projectRecords);
+		ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+		projectPlanInfo.setProjectId(projectRecords.getId());
+		//获取项目计划信息
+		List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+		//项目计划附件信息
+		List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
+		projectRecords.setProjectPlanList(projectPlanList);
+		projectRecords.setWorkAttachments(projectPlanAttachment);
 		model.addAttribute("projectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralProjectRecordsAdminModify";
 	}

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1147,6 +1147,14 @@ public class WorkProjectNotifyController extends BaseController {
 					}else {
 						if (ruralProjectRecords != null && StringUtils.isNotBlank(ruralProjectRecords.getId())) {
 							ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+							ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+							projectPlanInfo.setProjectId(ruralProjectRecords.getId());
+							//获取项目计划信息
+							List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+							//项目计划附件信息
+							List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(ruralProjectRecords.getId());
+							ruralProjectRecords.setProjectPlanList(projectPlanList);
+							ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
 						}
 						ruralProjectRecords.setAct(getByAct(ruralProjectRecords.getProcessInstanceId()));
 						ruralProjectRecords.setHome("home");

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify.jsp

@@ -949,6 +949,76 @@
                 </div>
             </div>
 
+
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目报告</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="upTable" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th width="25%">报告编号</th>
+                            <th width="25%">报告名称</th>
+                            <th width="20%">工作内容类型</th>
+                            <th width="10%">签章类型</th>
+                            <th width="10%">创建日期</th>
+                            <th width="10%">状态</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:choose>
+                            <c:when test="${not empty projectRecords.projectReportData}">
+                                <c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+                                    <tr>
+                                        <td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+                                                ${projectReportData.number}
+                                        </a></td>
+                                        <td>
+                                                ${projectReportData.name}
+                                        </td>
+                                        <td title="${fns:getContentTypeName(projectReportData.type,"")}">
+                                                ${fns:getContentTypeName(projectReportData.type,"")}
+                                        </td>
+                                        <td title="${projectReportData.reportType}">
+                                                ${projectReportData.reportType}
+                                        </td>
+                                        <td>
+                                            <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+                                        </td>
+                                        <td class="op-td">
+                                                <%--<c:choose>--%>
+                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:when>--%>
+                                                <%--<c:otherwise>--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:otherwise>--%>
+                                                <%--</c:choose>--%>
+                                            <div style="text-align: center" id="status_td_${index.index+1}">
+                                            </div>
+                                            <script>
+                                                initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+                                            </script>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </c:when>
+                            <c:otherwise>
+                                <tr>
+                                    <td colspan="7">
+                                        暂无数据
+                                    </td>
+                                </tr>
+                            </c:otherwise>
+                        </c:choose>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>
                 <div id="addFile_attachment" style="display: none" class="upload-progress">
@@ -969,6 +1039,7 @@
                             <th width="25%">文件</th>
                             <th width="25%">上传人</th>
                             <th width="25%">上传时间</th>
+                            <th width="25%">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
@@ -995,7 +1066,11 @@
                                     </c:otherwise>
                                 </c:choose>
                                 <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                <td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
+                                <td  class="op-td">
+                                    <a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                        <%--<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>--%>
+                                </td>
                             </tr>
                         </c:forEach>
                         </tbody>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsView.jsp

@@ -414,73 +414,6 @@
 				</div>
 			</div>
 
-			<c:if test="${not empty projectRecords.workAttachments}">
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
-				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">
-						<thead>
-						<tr>
-							<th width="25%">文件预览</th>
-							<th width="25%">上传人</th>
-							<th width="25%">上传时间</th>
-							<th width="25%">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">
-							<tr>
-									<%--<td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
-											</c:when>
-											<c:otherwise>
-												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
-								<td  class="op-td">
-									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-									<%--<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>--%>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			</c:if>
-			<script>
-                var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                $(document).ready(function() {
-                    var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
-                    for (var i=0; i<data.length; i++){
-                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                    }
-                    var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
-                    for (var i=0; i<dataBank.length; i++){
-                        addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
-                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
-                    }
-                });
-
-			</script>
-
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目报告</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
@@ -504,7 +437,7 @@
 												${projectReportData.number}
 										</a></td>
 										<td>
-													${projectReportData.name}
+												${projectReportData.name}
 										</td>
 										<td title="${fns:getContentTypeName(projectReportData.type,"")}">
 												${fns:getContentTypeName(projectReportData.type,"")}
@@ -549,7 +482,72 @@
 					</table>
 				</div>
 			</div>
+
 			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th width="25%">文件预览</th>
+							<th width="25%">上传人</th>
+							<th width="25%">上传时间</th>
+							<th width="25%">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_attachment">
+						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">
+							<tr>
+									<%--<td>${status.index + 1}</td>--%>
+								<c:choose>
+									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
+											</c:when>
+											<c:otherwise>
+												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+								<td>${workClientAttachment.createBy.name}</td>
+								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
+								<td  class="op-td">
+									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+									<%--<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>--%>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+			<script>
+                var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                $(document).ready(function() {
+                    var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
+                    for (var i=0; i<data.length; i++){
+                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                    }
+                    var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
+                    for (var i=0; i<dataBank.length; i++){
+                        addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
+                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
+                    }
+                });
+
+			</script>
+			<%--<div class="form-group layui-row">
 			<div class="form-group-label"><h2>项目计划列表</h2></div>
 			<div class="layui-item layui-col-sm12 lw7">
 				<div class="layui-item nav-btns">
@@ -600,7 +598,7 @@
 					</script>
 				</div>
 			</div>
-		</div>
+		</div>--%>
 
 			<div class="form-group layui-row page-end"></div>
 		</form:form>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAdminModify.jsp

@@ -948,6 +948,75 @@
                 </script>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>项目报告</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <table id="upTable" class="table table-bordered table-condensed details">
+                        <thead>
+                        <tr>
+                            <th width="25%">报告编号</th>
+                            <th width="25%">报告名称</th>
+                            <th width="20%">工作内容类型</th>
+                            <th width="10%">签章类型</th>
+                            <th width="10%">创建日期</th>
+                            <th width="10%">状态</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <c:choose>
+                            <c:when test="${not empty projectRecords.projectReportData}">
+                                <c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+                                    <tr>
+                                        <td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+                                                ${projectReportData.number}
+                                        </a></td>
+                                        <td>
+                                                ${projectReportData.name}
+                                        </td>
+                                        <td title="${fns:getContentTypeName(projectReportData.type,"")}">
+                                                ${fns:getContentTypeName(projectReportData.type,"")}
+                                        </td>
+                                        <td title="${projectReportData.reportType}">
+                                                ${projectReportData.reportType}
+                                        </td>
+                                        <td>
+                                            <fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+                                        </td>
+                                        <td class="op-td">
+                                                <%--<c:choose>--%>
+                                                <%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:when>--%>
+                                                <%--<c:otherwise>--%>
+                                                <%--<div style="text-align: center">--%>
+                                                <%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+                                                <%--</div>--%>
+                                                <%--</c:otherwise>--%>
+                                                <%--</c:choose>--%>
+                                            <div style="text-align: center" id="status_td_${index.index+1}">
+                                            </div>
+                                            <script>
+                                                initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+                                            </script>
+                                        </td>
+                                    </tr>
+                                </c:forEach>
+                            </c:when>
+                            <c:otherwise>
+                                <tr>
+                                    <td colspan="7">
+                                        暂无数据
+                                    </td>
+                                </tr>
+                            </c:otherwise>
+                        </c:choose>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
 
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>项目计划附件信息</h2></div>
@@ -969,6 +1038,7 @@
                             <th width="25%">文件</th>
                             <th width="25%">上传人</th>
                             <th width="25%">上传时间</th>
+                            <th width="25%">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
@@ -995,7 +1065,11 @@
                                     </c:otherwise>
                                 </c:choose>
                                 <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+                                <td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
+                                <td  class="op-td">
+                                    <a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                        <%--<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>--%>
+                                </td>
                             </tr>
                         </c:forEach>
                         </tbody>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsAudit.jsp

@@ -470,6 +470,75 @@
 			</div>
 
 			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>项目报告</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="upTable" class="table table-bordered table-condensed details">
+						<thead>
+						<tr>
+							<th width="25%">报告编号</th>
+							<th width="25%">报告名称</th>
+							<th width="20%">工作内容类型</th>
+							<th width="10%">签章类型</th>
+							<th width="10%">创建日期</th>
+							<th width="10%">状态</th>
+						</tr>
+						</thead>
+						<tbody>
+						<c:choose>
+							<c:when test="${not empty projectRecords.projectReportData}">
+								<c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+									<tr>
+										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/projectcontentinfo/projectcontentinfo/form1?id=${projectReportData.id}','95%', '95%')">
+												${projectReportData.number}
+										</a></td>
+										<td>
+												${projectReportData.name}
+										</td>
+										<td title="${fns:getContentTypeName(projectReportData.type,"")}">
+												${fns:getContentTypeName(projectReportData.type,"")}
+										</td>
+										<td title="${projectReportData.reportType}">
+												${projectReportData.reportType}
+										</td>
+										<td>
+											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+										</td>
+										<td class="op-td">
+												<%--<c:choose>--%>
+												<%--<c:when test="${empty projectReportData.status || projectReportData.status eq 1}">--%>
+												<%--<div style="text-align: center">--%>
+												<%--<a href="javascript:void(0)" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+												<%--</div>--%>
+												<%--</c:when>--%>
+												<%--<c:otherwise>--%>
+												<%--<div style="text-align: center">--%>
+												<%--<a href="javascript:void(0)" onclick="openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=${id}&projectReportData.id=${projectReportData.id}&type=1','95%','95%')" class="op-btn op-btn-trace" >${fns:getDictLabel(projectReportData.status, 'audit_state', '')}</a>--%>
+												<%--</div>--%>
+												<%--</c:otherwise>--%>
+												<%--</c:choose>--%>
+											<div style="text-align: center" id="status_td_${index.index+1}">
+											</div>
+											<script>
+												initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+											</script>
+										</td>
+									</tr>
+								</c:forEach>
+							</c:when>
+							<c:otherwise>
+								<tr>
+									<td colspan="7">
+										暂无数据
+									</td>
+								</tr>
+							</c:otherwise>
+						</c:choose>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
+			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsModify.jsp

@@ -733,13 +733,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input class="laydate-icondate required form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -414,73 +414,6 @@
 				</div>
 			</div>
 
-			<c:if test="${not empty projectRecords.workAttachments}">
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
-				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">
-						<thead>
-						<tr>
-							<th width="25%">文件预览</th>
-							<th width="25%">上传人</th>
-							<th width="25%">上传时间</th>
-							<th width="25%">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">
-							<tr>
-									<%--<td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
-											</c:when>
-											<c:otherwise>
-												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
-								<td  class="op-td">
-									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-									<%--<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>--%>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			</c:if>
-			<script>
-                var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
-                $(document).ready(function() {
-                    var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
-                    for (var i=0; i<data.length; i++){
-                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                    }
-                    var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
-                    for (var i=0; i<dataBank.length; i++){
-                        addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
-                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
-                    }
-                });
-
-			</script>
-
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目报告</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
@@ -504,7 +437,7 @@
 												${projectReportData.number}
 										</a></td>
 										<td>
-													${projectReportData.name}
+												${projectReportData.name}
 										</td>
 										<td title="${fns:getContentTypeName(projectReportData.type,"")}">
 												${fns:getContentTypeName(projectReportData.type,"")}
@@ -549,7 +482,72 @@
 					</table>
 				</div>
 			</div>
+
 			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th width="25%">文件预览</th>
+							<th width="25%">上传人</th>
+							<th width="25%">上传时间</th>
+							<th width="25%">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_attachment">
+						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">
+							<tr>
+									<%--<td>${status.index + 1}</td>--%>
+								<c:choose>
+									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
+											</c:when>
+											<c:otherwise>
+												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+								<td>${workClientAttachment.createBy.name}</td>
+								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
+								<td  class="op-td">
+									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+									<%--<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>--%>
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+			<script>
+                var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                $(document).ready(function() {
+                    var data = ${fns:toJson(projectRecords.workClientLinkmanList)};
+                    for (var i=0; i<data.length; i++){
+                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
+                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                    }
+                    var dataBank = ${fns:toJson(projectRecords.workConstructionLinkmanList)};
+                    for (var i=0; i<dataBank.length; i++){
+                        addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
+                        workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
+                    }
+                });
+
+			</script>
+			<%--<div class="form-group layui-row">
 				<div class="form-group-label"><h2>项目计划列表</h2></div>
 				<div class="layui-item layui-col-sm12 lw7">
 					<div class="layui-item nav-btns">
@@ -600,7 +598,7 @@
 						</script>
 					</div>
 				</div>
-			</div>
+			</div>--%>
 
 			<div class="form-group layui-row page-end"></div>
 		</form:form>