Преглед на файлове

项目新增报告审核页面和展示页面修改

user5 преди 4 години
родител
ревизия
9e5915c1c0

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

@@ -14,9 +14,9 @@
         var validateForm;
         function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
             if(validateForm.form()){
+				var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
+				$("#opinion").val(ss);
                 if(obj == 1) {
-					var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
-					$("#opinion").val(ss);
 					var flags=judgment();
 					if (flags){
 						$("#flag").val("yes");

+ 3 - 3
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -852,12 +852,12 @@
 			</div>
 
 
-			<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
+			<c:if test="${not empty processInstanceId}">
 				<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}"/>
+						<act:flowChart procInsId="${processInstanceId}"/>
+						<act:histoicFlow procInsId="${processInstanceId}"/>
 					</div>
 				</div>
 			</c:if>