Sfoglia il codice sorgente

审批页面页签调整

[user3] 3 anni fa
parent
commit
4d63880892

+ 7 - 1
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -3322,6 +3322,12 @@ public class WorkProjectNotifyController extends BaseController {
 					String review="";
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
 						review="1";
+					}else{
+						if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) ||"0".equals(ruralProjectRecords.getEmergencyProject())){
+							review="2";
+						}else{
+							review="3";
+						}
 					};
 					List<WorkReviewAudit> workReviewAuditList = projectContentDataService.findListReview(review,"质量复核");
 					WorkReviewAudit revAudit = new WorkReviewAudit();
@@ -3346,7 +3352,7 @@ public class WorkProjectNotifyController extends BaseController {
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
 						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 						workReviewAudit.setType(type);
-						workReviewAudit.setReportId(workProjectNotify.getNotifyId());
+						workReviewAudit.setReportId(data.getId());
 						List<WorkReviewAudit> audits = workReviewStandardService.findAuditList(workReviewAudit);
 						for(WorkReviewAudit reviewAudit:workReviewAudits){
 							for (WorkReviewAudit audit:audits){

+ 66 - 68
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -324,16 +324,21 @@
 									<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
 								</div>
 							</div>
-							<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="${projectReportRecord.act.procInsId}"/>
-									<act:histoicFlowRecordTwo procInsId="${projectReportRecord.act.procInsId}"  recordId="${projectReportRecord.id}"/>
+							<c:if test="${type != '1'}">
+								<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=referenceRemarks&name=备考表','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 备考表模板列表</a></div>
+										<h2>备考表</h2>
+									</div>
+									<div class="layui-item layui-col-sm11 with-textarea">
+										<label class="layui-form-label "><span class="require-item">*</span>备考表:</label>
+										<div class="layui-input-block">
+											<iframe id="referenceView" src="${ctx}/auditTemplate/auditTemplate/referenceView?identification=referenceRemarks" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+											<form:hidden placeholder="请输入备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control"/>
+										</div>
+									</div>
 								</div>
-							</div>
-
-
-
+							</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="subProjectInfo">
 					<table class="oa-table layui-table" id="contentTable1">
@@ -1087,6 +1092,52 @@
 						</div>
 
 					</c:if>
+
+					<c:if test="${type=='1' && projectRecords.submitMoney=='1'}">
+						<div style="overflow:hidden;">
+							<div class="form-group-label">
+								<h2>质量复核内容</h2>
+							</div>
+							<div>
+								<div class="layui-item layui-col-xs12" >
+									<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
+										<thead>
+										<tr>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+											<th >意见</th>
+										</tr>
+										</thead>
+										<tbody id="projectReviewList">
+										<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+												<td class="hide">
+													<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
+												</td>
+												<td title="${workReviewAudit.standardDetail}">
+														${workReviewAudit.standardDetail}
+												</td>
+												<td>
+													<i class="fa fa-check"></i>
+												</td>
+												<td class="input-td">
+													<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
+												</td>
+											</tr>
+										</c:forEach>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<div>
+						<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="issueView">
 					<c:if test="${projectRecords.submitMoney=='1'}">
@@ -1723,67 +1774,14 @@
 				</div>
 			</div>
 
-			<c:if test="${type != '1'}">
-				<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=referenceRemarks&name=备考表','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 备考表模板列表</a></div>
-						<h2>备考表</h2>
-					</div>
-					<div class="layui-item layui-col-sm11 with-textarea">
-						<label class="layui-form-label "><span class="require-item">*</span>备考表:</label>
-						<div class="layui-input-block">
-							<iframe id="referenceView" src="${ctx}/auditTemplate/auditTemplate/referenceView?identification=referenceRemarks" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
-							<form:hidden placeholder="请输入备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control"/>
-						</div>
-					</div>
-				</div>
-			</c:if>
-			<c:if test="${type=='1' && projectRecords.submitMoney=='1'}">
-				<div style="overflow:hidden;">
-					<div class="form-group-label">
-						<h2>质量复核内容</h2>
-					</div>
-					<div>
-						<div class="layui-item layui-col-xs12" >
-							<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
-								<thead>
-								<tr>
-									<th width="40%">符合内容及评分标准</th>
-									<th width="10%">自校</th>
-									<th >意见</th>
-								</tr>
-								</thead>
-								<tbody id="projectReviewList">
-								<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
-									<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-										<td class="hide">
-											<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
-										</td>
-										<td title="${workReviewAudit.standardDetail}">
-												${workReviewAudit.standardDetail}
-										</td>
-										<td>
-											<i class="fa fa-check"></i>
-										</td>
-										<td class="input-td">
-											<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-			</c:if>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
-		<div>
-		<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 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="${projectReportRecord.act.procInsId}"/>
+				<act:histoicFlowRecordTwo procInsId="${projectReportRecord.act.procInsId}"  recordId="${projectReportRecord.id}"/>
+			</div>
 		</div>
 		</div>
 </div>

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

@@ -1125,6 +1125,136 @@
 							</div>
 						</div>
 					</div>
+					<div class="form-group layui-row">
+						<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员(质量控制流程)</h2></div>
+						<div class="layui-item layui-col-sm12 lw6">
+							<div class="layui-item nav-btns">
+								<table id="bankinfo1" class="table table-bordered table-condensed can-edit">
+									<thead>
+									<tr>
+										<th width="60px">编号</th>
+										<th ><span class="require-item">*</span>成员名称</th>
+										<th >角色</th>
+										<th >注册/资格证号</th>
+										<th >专业</th>
+										<th >本人负责内容</th>
+										<th ><span class="require-item">*</span>审核意见</th>
+											<%--								<th width="100px">操作</th>--%>
+									</tr>
+									</thead>
+									<tbody id="reportedConsultantList">
+									<c:forEach items="${consultantinfo}" var = "info" varStatus="status">
+										<tr>
+											<td width="60px">
+												<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+											</td>
+											<td>
+												<input id="reportedConsultantList${status.index+1}_zixunyuanName" readonly="true" name="reportedConsultantList[${status.index+1}].zixunyuanName" value="${info.zixunyuanName}" class="form-control judgment"/>
+
+													<%--										<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"--%>
+													<%--																	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
+											</td>
+
+											<td>
+												<input id="reportedConsultantList${status.index+1}_role" readonly="true" name="reportedConsultantList[${status.index+1}].role" value="${info.role}" class="form-control"/>
+											</td>
+											<td>
+												<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control"/>
+											</td>
+											<td>
+												<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control"/>
+											</td>
+											<td>
+												<input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
+											</td>
+											<td>
+												<c:choose>
+													<c:when test="${consultantCount == status.index+1}">
+														<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control judgment"/>
+													</c:when>
+													<c:otherwise>
+														<input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}"  placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control judgment"/>
+													</c:otherwise>
+												</c:choose>
+
+											</td>
+
+												<%--									<td class="text-center op-td" width="10">--%>
+												<%--										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>--%>
+												<%--									</td>--%>
+											<td class="hide">
+												<input id="reportedConsultantList${status.index+1}_id" name="reportedConsultantList[${status.index+1}].id" type="hidden" value="${info.id}"/>
+												<input id="reportedConsultantList${status.index+1}_delFlag" name="reportedConsultantList[${status.index+1}].delFlag" type="hidden" value="0"/>
+												<input id="reportedConsultantList${status.index+1}_zhucezigezhKey" name="reportedConsultantList[${status.index+1}].zhucezigezhKey" type="hidden" value="${info.zhucezigezhKey}"/>
+												<input id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" type="hidden" value="${info.zixunyuan}"/>
+											</td>
+										</tr>
+									</c:forEach>
+									</tbody>
+								</table>
+							</div>
+						</div>
+					</div>
+					<div>
+						<div class="form-group-label">
+							<h2>质量复核内容</h2>
+						</div>
+						<div>
+							<div class="layui-item layui-col-xs12" >
+								<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
+									<thead>
+									<tr>
+											<%--<th width="25%">序号</th>--%>
+										<th width="40%">符合内容及评分标准</th>
+										<th width="10%">自校</th>
+											<%--												<th width="10%">最高分</th>--%>
+											<%--												<th width="10%">扣分</th>--%>
+										<th >意见</th>
+
+											<%--<th width="15%">操作</th>--%>
+									</tr>
+									</thead>
+									<tbody id="projectReviewList">
+									<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+										<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+											<td class="hide">
+												<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
+											</td>
+											<td title="${workReviewAudit.standardDetail}">
+													${workReviewAudit.standardDetail}
+											</td>
+											<td>
+												<i class="fa fa-check"></i>
+											</td>
+												<%--													<td class="input-td">--%>
+												<%--														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+												<%--													</td>--%>
+												<%--													<td class="input-td">--%>
+												<%--														<input id="deduct" htmlEscape="false" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
+												<%--													</td>--%>
+											<td class="input-td">
+												<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
+											</td>
+										</tr>
+									</c:forEach>
+										<%--											<tr>--%>
+										<%--												<td colspan="2" style="font-weight: bold">总分</td>--%>
+										<%--												<td id="maxTotal"></td>--%>
+										<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+										<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+										<%--											</tr>--%>
+									</tbody>
+								</table>
+							</div>
+						</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="openDialogre1('个人模板列表', '${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="issueView">
 					<div class="topMar">
@@ -1602,146 +1732,16 @@
 				</div>
 				<div>
 					<div class="form-group layui-row">
-						<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员(质量控制流程)</h2></div>
-						<div class="layui-item layui-col-sm12 lw6">
-							<div class="layui-item nav-btns">
-								<table id="bankinfo1" class="table table-bordered table-condensed can-edit">
-									<thead>
-									<tr>
-										<th width="60px">编号</th>
-										<th ><span class="require-item">*</span>成员名称</th>
-										<th >角色</th>
-										<th >注册/资格证号</th>
-										<th >专业</th>
-										<th >本人负责内容</th>
-										<th ><span class="require-item">*</span>审核意见</th>
-											<%--								<th width="100px">操作</th>--%>
-									</tr>
-									</thead>
-									<tbody id="reportedConsultantList">
-									<c:forEach items="${consultantinfo}" var = "info" varStatus="status">
-										<tr>
-											<td width="60px">
-												<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
-											</td>
-											<td>
-												<input id="reportedConsultantList${status.index+1}_zixunyuanName" readonly="true" name="reportedConsultantList[${status.index+1}].zixunyuanName" value="${info.zixunyuanName}" class="form-control judgment"/>
-
-													<%--										<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"--%>
-													<%--																	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
-											</td>
-
-											<td>
-												<input id="reportedConsultantList${status.index+1}_role" readonly="true" name="reportedConsultantList[${status.index+1}].role" value="${info.role}" class="form-control"/>
-											</td>
-											<td>
-												<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control"/>
-											</td>
-											<td>
-												<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control"/>
-											</td>
-											<td>
-												<input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
-											</td>
-											<td>
-												<c:choose>
-													<c:when test="${consultantCount == status.index+1}">
-														<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control judgment"/>
-													</c:when>
-													<c:otherwise>
-														<input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}"  placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control judgment"/>
-													</c:otherwise>
-												</c:choose>
-
-											</td>
-
-												<%--									<td class="text-center op-td" width="10">--%>
-												<%--										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>--%>
-												<%--									</td>--%>
-											<td class="hide">
-												<input id="reportedConsultantList${status.index+1}_id" name="reportedConsultantList[${status.index+1}].id" type="hidden" value="${info.id}"/>
-												<input id="reportedConsultantList${status.index+1}_delFlag" name="reportedConsultantList[${status.index+1}].delFlag" type="hidden" value="0"/>
-												<input id="reportedConsultantList${status.index+1}_zhucezigezhKey" name="reportedConsultantList[${status.index+1}].zhucezigezhKey" type="hidden" value="${info.zhucezigezhKey}"/>
-												<input id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" type="hidden" value="${info.zixunyuan}"/>
-											</td>
-										</tr>
-									</c:forEach>
-									</tbody>
-								</table>
-							</div>
-						</div>
-					</div>
-					<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="${processInstanceId}"/>
 							<act:histoicFlow procInsId="${processInstanceId}"/>
 						</div>
 					</div>
-					<div>
-						<div class="form-group-label">
-							<h2>质量复核内容</h2>
-						</div>
-						<div>
-							<div class="layui-item layui-col-xs12" >
-								<table id="treeTable2" class="table table-bordered table-condensed reviews no-bottom-margin">
-									<thead>
-									<tr>
-											<%--<th width="25%">序号</th>--%>
-										<th width="40%">符合内容及评分标准</th>
-										<th width="10%">自校</th>
-											<%--												<th width="10%">最高分</th>--%>
-											<%--												<th width="10%">扣分</th>--%>
-										<th >意见</th>
-
-											<%--<th width="15%">操作</th>--%>
-									</tr>
-									</thead>
-									<tbody id="projectReviewList">
-									<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
-										<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-											<td class="hide">
-												<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
-											</td>
-											<td title="${workReviewAudit.standardDetail}">
-													${workReviewAudit.standardDetail}
-											</td>
-											<td>
-												<i class="fa fa-check"></i>
-											</td>
-												<%--													<td class="input-td">--%>
-												<%--														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
-												<%--													</td>--%>
-												<%--													<td class="input-td">--%>
-												<%--														<input id="deduct" htmlEscape="false" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
-												<%--													</td>--%>
-											<td class="input-td">
-												<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
-											</td>
-										</tr>
-									</c:forEach>
-										<%--											<tr>--%>
-										<%--												<td colspan="2" style="font-weight: bold">总分</td>--%>
-										<%--												<td id="maxTotal"></td>--%>
-										<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
-										<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
-										<%--											</tr>--%>
-									</tbody>
-								</table>
-							</div>
-						</div>
-					</div>
 				</div>
 			</div>
 
 		</form:form>
-		<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="openDialogre1('个人模板列表', '${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>

+ 109 - 196
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -1071,49 +1071,50 @@
 							</div>
 						</div>
 					</div>
-					<div style="overflow: hidden">
-						<div class="form-group-label">
-							<h2>质量复核内容</h2>
-						</div>
-						<div>
-							<div class="layui-item layui-col-xs12" >
-								<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
-									<thead>
-									<tr>
-										<th width="40%">符合内容及评分标准</th>
-										<th width="10%">自校</th>
-										<th >意见</th>
-									</tr>
-									</thead>
-									<tbody>
-									<c:forEach items="${datalist}" var="workReviewAudit" varStatus="index">
-										<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-												<%--<td title="${workReviewAudit.orderNum}">--%>
-												<%--${workReviewAudit.orderNum}--%>
-												<%--</td>--%>
-											<td title="${workReviewAudit.standardDetail}">
-													${workReviewAudit.standardDetail}
-											</td>
-											<td>
-												<i class="fa fa-check"></i>
-											</td>
-												<%--									<td class="input-td">--%>
-												<%--										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
-												<%--									</td>--%>
-												<%--									<td class="input-td">--%>
-												<%--										<input id="deduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">--%>
-												<%--									</td>--%>
-											<td class="input-td">
-												<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
-											</td>
+					<c:if test="${projectRecords.submitMoney=='2' || (projectRecords.submitMoney=='1' && (0==projectRecords.emergencyProject || null==projectRecords.emergencyProject))}">
+						<div style="overflow: hidden">
+							<div class="form-group-label">
+								<h2>质量复核内容</h2>
+							</div>
+							<div>
+								<div class="layui-item layui-col-xs12" >
+									<table id="treeTable2" class="table table-bordered table-condensed details no-bottom-margin">
+										<thead>
+										<tr>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+											<th >意见</th>
 										</tr>
-									</c:forEach>
-									</tbody>
-								</table>
+										</thead>
+										<tbody>
+										<c:forEach items="${datalist}" var="workReviewAudit" varStatus="index">
+											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+													<%--<td title="${workReviewAudit.orderNum}">--%>
+													<%--${workReviewAudit.orderNum}--%>
+													<%--</td>--%>
+												<td title="${workReviewAudit.standardDetail}">
+														${workReviewAudit.standardDetail}
+												</td>
+												<td>
+													<i class="fa fa-check"></i>
+												</td>
+													<%--									<td class="input-td">--%>
+													<%--										<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+													<%--									</td>--%>
+													<%--									<td class="input-td">--%>
+													<%--										<input id="deduct" style="text-align: center;background-color: #fff" htmlEscape="false" readonly="true" class="form-control layui-input" value="${workReviewAudit.deduct}">--%>
+													<%--									</td>--%>
+												<td class="input-td">
+													<input id="deductOpinion" style="text-align: center;background-color: #fff" title="${workReviewAudit.deductOption}" readonly="true" name="deductOpinion" value="${workReviewAudit.deductOption}" onclick="readOpenInfo(this.value)" class="form-control layui-input"/>
+												</td>
+											</tr>
+										</c:forEach>
+										</tbody>
+									</table>
+								</div>
 							</div>
 						</div>
-					</div>
-
+					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="issueView">
 					<div class="form-group layui-row first lw12">
@@ -1224,6 +1225,68 @@
 							</div>
 						</div>
 					</div>
+					<div>
+						<div>
+							<div class="form-group-label">
+								<h2>报告签发复核内容</h2>
+							</div>
+							<div style="overflow:hidden;">
+								<div class="layui-item layui-col-xs12" >
+									<table id="" class="table table-bordered table-condensed reviews no-bottom-margin">
+										<thead>
+										<tr>
+												<%--<th width="25%">序号</th>--%>
+											<th width="40%">符合内容及评分标准</th>
+											<th width="10%">自校</th>
+												<%--												<th width="10%">最高分</th>--%>
+												<%--												<th width="10%">扣分</th>--%>
+											<th >意见</th>
+												<%--<th width="15%">操作</th>--%>
+										</tr>
+										</thead>
+										<tbody>
+										<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
+											<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
+												<td class="hide">
+														<%--														<input id="projectReviewList${index.index}_id" name="projectReviewList[${index.index}].id" type="hidden" value="${workReviewAudit.id}"/>--%>
+													<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
+												</td>
+												<td title="${workReviewAudit.standardDetail}">
+														${workReviewAudit.standardDetail}
+												</td>
+												<td>
+													<i class="fa fa-check"></i>
+												</td>
+													<%--													<td class="input-td">--%>
+													<%--														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
+													<%--													</td>--%>
+													<%--													<td class="input-td">--%>
+													<%--														<input id="deduct" htmlEscape="false" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
+													<%--													</td>--%>
+												<td class="input-td">
+													<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
+												</td>
+											</tr>
+										</c:forEach>
+											<%--											<tr>--%>
+											<%--												<td colspan="2" style="font-weight: bold">总分</td>--%>
+											<%--												<td id="maxTotal"></td>--%>
+											<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
+											<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
+											<%--											</tr>--%>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div>
+						<div class="form-group-label">
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${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="AccessoryView">
 					<div class="form-group layui-row">
@@ -1638,165 +1701,15 @@
 				</div>
 
 			</div>
-			<div>
-				<div>
-					<div class="form-group-label">
-						<h2>报告签发复核内容</h2>
-					</div>
-					<div>
-						<div class="layui-item layui-col-xs12" >
-							<table id="" class="table table-bordered table-condensed reviews no-bottom-margin">
-								<thead>
-								<tr>
-										<%--<th width="25%">序号</th>--%>
-									<th width="40%">符合内容及评分标准</th>
-									<th width="10%">自校</th>
-										<%--												<th width="10%">最高分</th>--%>
-										<%--												<th width="10%">扣分</th>--%>
-									<th >意见</th>
-										<%--<th width="15%">操作</th>--%>
-								</tr>
-								</thead>
-								<tbody>
-								<c:forEach items="${list}" var="workReviewAudit" varStatus="index">
-									<tr id="${workReviewAudit.id}" pid="${workReviewAudit.parent.id}">
-										<td class="hide">
-												<%--														<input id="projectReviewList${index.index}_id" name="projectReviewList[${index.index}].id" type="hidden" value="${workReviewAudit.id}"/>--%>
-											<input id="projectReviewList${index.index}_standardId" name="projectReviewList[${index.index}].standardId" type="hidden" value="${workReviewAudit.id}"/>
-										</td>
-										<td title="${workReviewAudit.standardDetail}">
-												${workReviewAudit.standardDetail}
-										</td>
-										<td>
-											<i class="fa fa-check"></i>
-										</td>
-											<%--													<td class="input-td">--%>
-											<%--														<input id="maxDeduct" readonly="true" htmlEscape="false" class="form-control layui-input" style="background-color: #fff;text-align: center" value="${workReviewAudit.maxDeduct}" />--%>
-											<%--													</td>--%>
-											<%--													<td class="input-td">--%>
-											<%--														<input id="deduct" htmlEscape="false" name="projectReviewList[${index.index}].deduct"  class="form-control layui-input number" onChange="if(this.value)reportMaxDeduct(this.value,'${workReviewAudit.id}','${workReviewAudit.parent.id}',this)" placeholder="请输入"/>--%>
-											<%--													</td>--%>
-										<td class="input-td">
-											<input id="deductOpinion" name="projectReviewList[${index.index}].deductOption" placeholder="请输入意见" readonly="true" style="background-color: #FFFFFF;" value="" onclick="openDeductInfo(this.value,'${workReviewAudit.id}',this)" class="form-control layui-input"/>
-										</td>
-									</tr>
-								</c:forEach>
-									<%--											<tr>--%>
-									<%--												<td colspan="2" style="font-weight: bold">总分</td>--%>
-									<%--												<td id="maxTotal"></td>--%>
-									<%--												<td>(扣)&nbsp;<span id="total" style="color: red"></span></td>--%>
-									<%--												<td>(得)&nbsp;<span id="deTotal" style="color: red"></span></td>--%>
-									<%--											</tr>--%>
-								</tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-				<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="${processInstanceId}"/>
-						<act:histoicFlow procInsId="${processInstanceId}"/>
-					</div>
-				</div>
-			</div>
-			<%--<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>咨询质量控制信息</h2></div>
-
-				<c:if test="${type ==3 || type ==4}">
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label">专业咨询员:</label>
-						<div class="layui-input-block  with-icon">
-							<input id="projectReportDataConsultantName" class="form-control layui-input" readonly="readonly" value="${projectReportDataTwo.consultant.name}">
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line">专业咨询员审核意见:</label>
-						<div class="layui-input-block">
-							<form:textarea path="projectReportDataTwo.consultantRemarks" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label">项目负责人:</label>
-						<div class="layui-input-block">
-							<input id="projectReportDataPrincipalName" class="form-control layui-input" readonly="readonly" value="${projectReportDataTwo.principal.name}">
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line">项目负责人审核意见:</label>
-						<div class="layui-input-block">
-							<form:textarea path="projectReportDataTwo.principalRemarks" readonly="true" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
-						</div>
-					</div>
-				</c:if>
-				<c:if test="${type == 4}">
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label"><span class="require-item">*</span>技术负责人:</label>
-						<div class="layui-input-block  with-icon">
-							<sys:treeselect id="consultant" name="projectReportDataTwo.technicist.id" value="${projectReportDataTwo.technicist.id}" labelName="projectReportDataTwo.technicist.name" labelValue="${projectReportDataTwo.technicist.name}"
-											title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
-						</div>
-					</div>
-					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line"><span class="require-item">*</span>技术负责人审核意见:</label>
-						<div class="layui-input-block">
-							<div class="layui-item layui-col-sm6 lw7 with-textarea">
-								<div class="layui-input-block" style="margin-left:0px;position: relative">
-									<form:textarea placeholder="请输入审批意见:" path="projectReportDataTwo.technicistRemarks" id="technicistRemarks" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="255" />
-									<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
-									<input type="file" name="upload_files" style="display: none;">
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm4 lw6 with-textarea">
-								<div class="layui-input-block" style="margin-left:10px;">
-									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
-									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
-									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
-									<div style="padding: 5px 0px;">
-										<form:select path="projectReportDataTwo.technicistRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">
-											<form:option value=""/>
-											<form:options items="${fns:getMainDictListOnProjectAdvent('consultant_comments')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-										</form:select>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</c:if>
-			</div>--%>
-
-
-<%--			<div class="form-group layui-row">--%>
-<%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
-<%--				<div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;position: relative">--%>
-<%--						<form:textarea placeholder="请输入意见:" path="projectReportDataTwo.act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
-<%--						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
-<%--						<input type="file" name="upload_files" style="display: none;">--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--				<div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
-<%--					<div class="layui-input-block" style="margin-left:10px;">--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
-<%--						<div style="padding: 5px 0px;">--%>
-<%--							<form:select path="projectReportDataTwo.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
-<%--								<form:option value=""/>--%>
-<%--								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
-<%--							</form:select>--%>
-<%--						</div>--%>
-<%--					</div>--%>
-<%--				</div>--%>
-<%--			</div>--%>
 
 		</form:form>
-
-		<div class="form-group-label">
-			<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre1('个人模板列表', '${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 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="${processInstanceId}"/>
+				<act:histoicFlow procInsId="${processInstanceId}"/>
+			</div>
 		</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>
 <script>