Pārlūkot izejas kodu

B类项目的电子归档审核流程,总审审核环节,将审核意见框挪至档案信息tab页

user5 3 gadi atpakaļ
vecāks
revīzija
dad37e2631

+ 1 - 1
src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -302,7 +302,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		List<ProjectRecords> recordsList = dao.workInvoiceFindList(projectRecords);
 		//查询负责人信息
 		for (ProjectRecords records : recordsList) {
-			this.queryContractInfos(records);
+			//this.queryContractInfos(records);
 			List<User> users = workProjectUserDao.queryProjectUsers(records.getId(), "1");
 			records.setProjectLeaders(users);
 			records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));

+ 10 - 7
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -339,13 +339,7 @@
 									</div>
 								</div>
 							</c:if>
-							<div  class="form-group layui-row">
-								<div class="form-group-label">
-									<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
-									<h2>审批意见</h2>
-								</div>
-								<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
-							</div>
+
 				</div>
 				<div class="form-group layui-row first hide" id="subProjectInfo">
 					<table class="oa-table layui-table" id="contentTable1">
@@ -1838,6 +1832,15 @@
 							</table>
 						</div>
 					</div>
+
+					<div  class="form-group layui-row">
+						<div class="form-group-label">
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
+							<h2>审批意见</h2>
+						</div>
+						<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+					</div>
+
 				</div>
 			</div>