资料缺失说明流程展示修改

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

@@ -2004,13 +2004,23 @@ public class RuralCostProjectMessageController extends BaseController {
     @RequestMapping(value = "getReportedProcess")
     public String getReportedProcess(RuralProjectRecordsReported reported,Model model) {
         model.addAttribute("processInstanceId", reported.getProcessInstanceId());
+        return "modules/workreimbursement/workReimbursementTrack";
+    }
+
+    /**
+     * 读取单个实体流程
+     * @return
+     */
+    @RequestMapping(value = "getReportedProcessInformation")
+    public String getReportedProcessInformation(RuralProjectRecordsReported reported,Model model) {
+        model.addAttribute("processInstanceId", reported.getProcessInstanceId());
         //根据报告好查询资料缺失说明
         ProjectMaterialDefectRecord projectMaterialDefectRecord = new ProjectMaterialDefectRecord();
         if(StringUtils.isNotBlank(reported.getReportId())){
             projectMaterialDefectRecord = ruralProjectMessageService.getDeficiencyRemarks(reported.getReportId());
         }
         model.addAttribute("projectMaterialDefectRecord", projectMaterialDefectRecord);
-        return "modules/workreimbursement/workReimbursementTrack";
+        return "modules/workreimbursement/workReimbursementInformationTrack";
     }
 
     @RequestMapping(value = "getReportedView")

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

@@ -1287,7 +1287,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if (d.defectRecordStatus>0){
-							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcessInformation?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
 						}
                         return xml;
                     }}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -943,7 +943,7 @@
 						}
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						if (d.defectRecordStatus>0){
-							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcessInformation?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
 						}
 						return xml;
                     }}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -861,7 +861,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if (d.defectRecordStatus>0){
-							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcessInformation?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
 						}
                         return xml;
                     }}

src/main/webapp/webpage/modules/workreimbursement/workReimbursementInformationTrack.jsp

@@ -0,0 +1,41 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>报销流程</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+</head>
+<body class="gray-bg">
+<div class="container form layui-form">
+		<act:flowChart procInsId="${processInstanceId}"/>
+		<act:histoicFlow procInsId="${processInstanceId}"/>
+</div>
+<div class="single-form">
+	<div class="container view-form">
+		<form:form id="inputForm" modelAttribute="projectMaterialDefectRecord" class="form-horizontal layui-form">
+		<form:hidden path="id"/>
+		<div class="form-group layui-row first">
+			<div class="layui-item layui-col-sm12  with-textarea">
+				<label class="layui-form-label double-line">资料缺失说明：</label>
+				<div class="layui-input-block">
+					<form:textarea path="remarks" htmlEscape="false" rows="8" maxlength="255" readonly="true" class="form-control"/>
+				</div>
+			</div>
+
+
+
+			<div class="form-group layui-row page-end"></div>
+			</form:form>
+		</div>
+	</div>
+</div>
+	<%--<div class="wrapper wrapper-content">--%>
+		<%--<act:flowChart procInsId="${processInstanceId}"/>--%>
+        <%--<act:histoicFlow procInsId="${processInstanceId}"/>--%>
+	<%--</div>--%>
+
+</body>
+</html>
+

src/main/webapp/webpage/modules/workreimbursement/workReimbursementTrack.jsp

@@ -4,33 +4,12 @@
 <head>
 	<title>报销流程</title>
 	<meta name="decorator" content="default"/>
-	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 </head>
 <body class="gray-bg">
 <div class="container form layui-form">
 		<act:flowChart procInsId="${processInstanceId}"/>
 		<act:histoicFlow procInsId="${processInstanceId}"/>
 </div>
-<div class="single-form">
-	<div class="container view-form">
-		<form:form id="inputForm" modelAttribute="projectMaterialDefectRecord" class="form-horizontal layui-form">
-		<form:hidden path="id"/>
-		<div class="form-group layui-row first">
-			<div class="layui-item layui-col-sm12  with-textarea">
-				<label class="layui-form-label double-line">资料缺失说明：</label>
-				<div class="layui-input-block">
-					<form:textarea path="remarks" htmlEscape="false" rows="8" maxlength="255" readonly="true" class="form-control"/>
-				</div>
-			</div>
-
-
-
-			<div class="form-group layui-row page-end"></div>
-			</form:form>
-		</div>
-	</div>
-</div>
 	<%--<div class="wrapper wrapper-content">--%>
 		<%--<act:flowChart procInsId="${processInstanceId}"/>--%>
         <%--<act:histoicFlow procInsId="${processInstanceId}"/>--%>