报告更改

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -625,7 +625,15 @@ public class ProjectcontentinfoController extends BaseController {
 			projectReportData.setType(dictType);
 			if (projectcontentinfo.getView().equals("reportChangeForm")){
 				projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
-			}else if(projectcontentinfo.getView().contains("reportChangeView")){
+			}else if(projectcontentinfo.getView().equals("reportChangeViewGzr")){
+				projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
+				if(StringUtils.isNotBlank(projectReportData.getProcessInstanceId())){
+					Act act = getByAct(projectReportData.getProcessInstanceId());
+					projectReportData.setAct(act);
+				}
+				ProjectReportData beforeEntity = projectReportChangeService.getBefore(projectReportData.getBeforeEntity().getId());
+				projectReportData.setBeforeEntity(beforeEntity);
+			}else if(projectcontentinfo.getView().equals("reportChangeView")){
 				projectReportData = projectReportChangeService.get(projectcontentinfo.getProjectReportData().getId());
 				ProjectReportData beforeEntity = projectReportChangeService.getBefore(projectReportData.getBeforeEntity().getId());
 				projectReportData.setBeforeEntity(beforeEntity);

src/main/webapp/webpage/modules/projectcontentinfo/reportChangeView.jsp

@@ -362,6 +362,24 @@
 						</table>
 					</div>
 				</div>
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>审批意见</h2></div>
+					<div class="layui-item layui-col-xs12 with-textarea" >
+						<label class="layui-form-label">审批意见：</label>
+						<div class="layui-input-block">
+							<textarea name="projectReportData.act.comment" class="form-control" rows="4" maxlength="127" ></textarea>
+						</div>
+					</div>
+				</div>
+				<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
+					<div class="form-group layui-row">
+						<div class="form-group-label"><h2>审批流程</h2></div>
+						<div class="layui-item layui-col-xs12 form-table-container" >
+							<act:flowChart procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
+							<act:histoicFlow procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
+						</div>
+					</div>
+				</c:if>
 				<div class="form-group layui-row page-end"></div>
 			</div>
 			<div id="tab-2" class="tab-pane">

src/main/webapp/webpage/modules/projectcontentinfo/reportForm.jsp

@@ -15,18 +15,21 @@
         var dataList;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-				var info = false;
-				for (var i=0; i<dataList.length; i++){
-					console.log($("#audit"+dataList[i].id).val())
-				    if($("#audit"+dataList[i].id).val() == 0){
-				    info = true;
-				    }
-				}
-				if (info){
-					parent.layer.msg("请先确认质量符合内容!", {icon: 2});
-					return false;
-				}
                 if(obj == 1){
+					var info = false;
+					if(dataList == undefined){
+						dataList = ${fns:toJson(projectcontentinfo.projectReportData.projectReviewList)}
+					}
+					for (var i=0; i<dataList.length; i++){
+						console.log($("#audit"+dataList[i].id).val())
+						if($("#audit"+dataList[i].id).val() == 0){
+							info = true;
+						}
+					}
+					if (info){
+						parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+						return false;
+					}
                     $("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/saveReport?view=report");
                 }else{
                     $("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/save?view=report");

src/main/webapp/webpage/modules/projectcontentinfo/reportView.jsp

@@ -344,6 +344,15 @@
 				</table>
 			</div>
 		</div>
+		<div class="form-group layui-row">
+			<div class="form-group-label"><h2>审批意见</h2></div>
+			<div class="layui-item layui-col-xs12 with-textarea" >
+				<label class="layui-form-label">审批意见：</label>
+				<div class="layui-input-block">
+					<textarea name="projectReportData.act.comment" class="form-control" rows="4" maxlength="127" ></textarea>
+				</div>
+			</div>
+		</div>
 		<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>审批流程</h2></div>