报告审核页展示报告编号信息

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

@@ -2942,6 +2942,7 @@ public class WorkProjectNotifyController extends BaseController {
 							projectcontentinfo.setChargeCriterionList(chargeCriterionList);
 						}
 					}
+					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
 					RuralProjectRecords projectRecordPlans = this.planView(projectReportDataTwo.getProject().getId());
 					model.addAttribute("processInstanceId", projectReportDataTwo.getProcessInstanceId());
 					model.addAttribute("projectId", projectReportDataTwo.getProject().getId());

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -242,6 +242,19 @@
 							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 						</div>
 					</div>
+
+					<div class="layui-item layui-col-sm6 lw8">
+						<label class="layui-form-label">报告编号：</label>
+						<div class="layui-input-block">
+							<div class="input-group">
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectReportData.number}"/>
+									<%--							<form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>--%>
+								<span class="input-group-btn">
+									<label class="form-status"><c:choose><c:when test="${not empty projectcontentinfo.projectReportData.number}">${fns:getDictLabel(projectcontentinfo.projectReportData.status, 'audit_state', '')}</c:when><c:otherwise>暂无</c:otherwise></c:choose></label>
+								 </span>
+							</div>
+						</div>
+					</div>
 					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">投资性质：</label>
 						<div class="layui-input-block">
@@ -289,6 +302,12 @@
 							</div>
 						</div>--%>
 					<div class="layui-item layui-col-sm6 lw8">
+						<label class="layui-form-label">项目责任人：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">项目类型：</label>
 						<div class="layui-input-block">
 							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
@@ -300,12 +319,6 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6 lw8">
-						<label class="layui-form-label">项目责任人：</label>
-						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">所属部门：</label>
 						<div class="layui-input-block">
 							<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -235,6 +235,19 @@
 							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 						</div>
 					</div>
+
+					<div class="layui-item layui-col-sm6 lw8">
+						<label class="layui-form-label">报告编号：</label>
+						<div class="layui-input-block">
+							<div class="input-group">
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectcontentinfo.projectReportData.number}"/>
+									<%--							<form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>--%>
+								<span class="input-group-btn">
+							<label class="form-status"><c:choose><c:when test="${not empty projectcontentinfo.projectReportData.number}">${fns:getDictLabel(projectcontentinfo.projectReportData.status, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
+						 </span>
+							</div>
+						</div>
+					</div>
 					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">投资性质：</label>
 						<div class="layui-input-block">
@@ -298,6 +311,13 @@
 								<%--						</form:select>--%>
 						</div>
 					</div>
+
+					<div class="layui-item layui-col-sm6 lw8">
+						<label class="layui-form-label">所属部门：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+						</div>
+					</div>
 					<div class="layui-item layui-col-sm6 lw8">
 						<label class="layui-form-label">创建人：</label>
 						<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageTwoView.jsp

@@ -169,29 +169,35 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">项目类型：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+							<%--						<form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectTypeId}" readonly="true">--%>
+							<%--							&lt;%&ndash;<form:option value=""/>--%>
+							<%--                            <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>&ndash;%&gt;--%>
+							<%--							<form:options items="${fns:getProjectType()}" itemLabel="typeName" itemValue="typeId" readonly="true"></form:options>--%>
+							<%--						</form:select>--%>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目责任人：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所属部门：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+					</div>
+				</div>
 					<%--<div class="layui-item layui-col-sm6 lw6">
                         <label class="layui-form-label">项目类型：</label>
                         <div class="layui-input-block">
                             <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectTypeId}"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
-					<label class="layui-form-label">项目类型：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
-							<%--						<form:select path="projectTypeId" class="form-control editable-select layui-input" id="projectTypeId" value="${projectTypeId}" readonly="true">--%>
-							<%--							&lt;%&ndash;<form:option value=""/>--%>
-							<%--                            <form:options items="${fns:getProjectType()}" itemLabel="label" itemValue="label" htmlEscape="false"/>&ndash;%&gt;--%>
-							<%--							<form:options items="${fns:getProjectType()}" itemLabel="typeName" itemValue="typeId" readonly="true"></form:options>--%>
-							<%--						</form:select>--%>
-					</div>
-				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">