ソースを参照

Merge remote-tracking branch 'origin/master'

user5 3 年 前
コミット
3601df8a10
23 ファイル変更523 行追加240 行削除
  1. 11 0
      src/main/java/com/jeeplus/modules/identification/web/AuditTemplateController.java
  2. 21 1
      src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java
  3. 1 1
      src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineView.jsp
  4. 1 1
      src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineform.jsp
  5. 95 0
      src/main/webapp/webpage/modules/iframeView/reference.jsp
  6. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp
  7. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp
  8. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp
  9. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordUrgentModify.jsp
  10. 162 5
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp
  11. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp
  12. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModifyApply.jsp
  13. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply.jsp
  14. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp
  15. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp
  16. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp
  17. 166 168
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp
  18. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp
  19. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp
  20. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp
  21. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp
  22. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp
  23. 51 49
      src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

+ 11 - 0
src/main/java/com/jeeplus/modules/identification/web/AuditTemplateController.java

@@ -110,6 +110,17 @@ public class AuditTemplateController extends BaseController {
         return "modules/iframeView/opinion";
     }
     /**
+     * 审核-备考表
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "referenceView")
+    public String referenceView(AuditTemplate auditTemplate, Model model) {
+        List<AuditTemplate> auditTemplates=auditTemplateService.findByIdentification(auditTemplate);
+        model.addAttribute("auditTemplates",auditTemplates);
+        return "modules/iframeView/reference";
+    }
+    /**
      * 审核模板-删除
      * @param model
      * @return

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

@@ -4112,11 +4112,31 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取总审人员
 					User user=UserUtils.get(projectReportData.getBzshbUserId());
 					model.addAttribute("bzshbUserName",user.getName());
+					//质量复核标准展示
+					String review="";
+					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+						review="1";
+					};
+					List<WorkReviewAudit> workReviewAuditList = projectContentDataService.findListReview(review,"质量复核");
+					WorkReviewAudit revAudit = new WorkReviewAudit();
+					String type = "4";
+					revAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+					revAudit.setType(type);
+					revAudit.setReportId(projectReportData.getId());
+					List<WorkReviewAudit> reaudits = workReviewStandardService.findAuditList(revAudit);
+					for(WorkReviewAudit reAudit:workReviewAuditList){
+						for (WorkReviewAudit audit:reaudits){
+							if (reAudit.getId().equals(audit.getStandardId())){
+								reAudit.setDeductOption(audit.getDeductOption());
+								break;
+							}
+						}
+					}
+					model.addAttribute("datalist", workReviewAuditList);
 
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						//展示
 						WorkReviewAudit workReviewAudit = new WorkReviewAudit();
-						String type = "4";
 						workReviewAudit.setCompanyId(UserUtils.getSelectCompany().getId());
 						workReviewAudit.setType(type);
 						workReviewAudit.setReportId(projectReportData.getId());

+ 1 - 1
src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineView.jsp

@@ -866,7 +866,7 @@
 						</div>
 					</div>
 							<div class="form-group layui-row">
-								<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+								<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">

+ 1 - 1
src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineform.jsp

@@ -918,7 +918,7 @@
 						</div>
 					</div>
 							<div class="form-group layui-row">
-								<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+								<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">

+ 95 - 0
src/main/webapp/webpage/modules/iframeView/reference.jsp

@@ -0,0 +1,95 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>Title</title>
+    <script src="${ctxStatic}/iSignature/js/jquery-1.4.2.min.js"></script>
+    <script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+</head>
+<body>
+<div class="single-form">
+    <div class="container">
+        <form class="layui-form">
+            <div class="form-group layui-row">
+                <div class="layui-item layui-col-sm8 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;position: relative">
+                        <textarea placeholder="请输入意见:" path="" id="opinion" class="form-control" rows="4" style="width: 100%;height: 80%;border: 1px solid #f1f1f1;padding: 5px;" maxlength="245"></textarea>
+                        <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;" class="layui-col-sm8">
+                            <select id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+                                <option value=""></option>
+                                <c:forEach items="${auditTemplates}" var="var">
+                                    <option value="${var.content}">${var.content}</option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+<script>
+    function opinion(){
+        var op=$("opinion").val();
+        return op;
+    }
+    $(document).ready(function() {
+        var val = parent.document.getElementById("iframe").innerHTML;
+        if (val!=''){
+            $("#opinion").val(val)
+        }
+
+        $("#clearOpinon").click(function(){
+            var s=$("input[name='sh']").length;
+            for(var i=0;i<s;i++){
+                $("input[name='sh']").attr("checked",false)
+                layui.form.render();
+            }
+            $("#opinion").val("");
+            window.parent.f1("");
+        })
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            //下拉框监听器
+            layui.form.on('select(opinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    var opinion=$("#opinion").val()+span
+                    if (opinion.length<250){
+                        $("#opinion").val(opinion);
+                        window.parent.f1(opinion);
+                    }else if (opinion.length>=250){
+                        top.layer.msg('意见长度不能大于250字符!', {icon: 0});
+                    }
+                }
+            });
+            layui.form.on('checkbox(raopinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    $(this).attr("checked",false)
+                    var opinion=$("#opinion").val()+span
+                    if (opinion.length<250){
+                        $("#opinion").val(opinion);
+                        window.parent.f1(opinion);
+                    }else if (opinion.length>=250){
+                        top.layer.msg('意见长度不能大于250字符!', {icon: 0});
+                    }
+                }
+            });
+        });
+    });
+</script>
+</body>
+</html>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1678,7 +1678,7 @@
 				<div class="form-group layui-row">
 					<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗?', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
 						<%--<div style="float: right"> <a href="javascript:void(0)" onclick="preview('预览','${ctx}/workfullmanage/workFullManage/preViewMassControl?id=${projectReportData.id}','80%','80%')">预览流程单</a></div>--%>
-					<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+					<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" style="padding-left:0px;">
 							<a class="nav-btn nav-btn-add"

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -1132,7 +1132,7 @@
 				</div>
 			</div>--%>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+				<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">
 						<div class="layui-item nav-btns" style="padding-left:0px;">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -1011,7 +1011,7 @@
 				</div>
 			</div>--%>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+				<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">
 						<div class="layui-item nav-btns" style="padding-left:0px;">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordUrgentModify.jsp

@@ -499,7 +499,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+				<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">
 						<div class="layui-item nav-btns" style="padding-left:0px;">

+ 162 - 5
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -990,7 +990,7 @@
 					<div class="form-group layui-row">
 						<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗?', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
 							<%--<div style="float: right"> <a href="javascript:void(0)" onclick="preview('预览','${ctx}/workfullmanage/workFullManage/preViewMassControl?id=${projectReportData.id}','80%','80%')">预览流程单</a></div>--%>
-						<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+						<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 class="table table-bordered table-condensed can-edit">
@@ -1037,11 +1037,168 @@
 							</div>
 						</div>
 					</div>
+					<c:if test="${projectRecords.submitMoney=='2'}">
+						<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>
+											</tr>
+										</c:forEach>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
+
+					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="issueView">
-					<div class="topMar">
-						<h2>B级紧急项目无报告签发信息</h2>
-					</div>
+					<c:if test="${projectRecords.submitMoney=='1'}">
+						<div class="topMar">
+							<h2>B级紧急项目无报告签发信息</h2>
+						</div>
+					</c:if>
+					<c:if test="${projectRecords.submitMoney=='2'}">
+						<div class="form-group layui-row first lw12">
+							<div class="form-group-label">
+									<%--							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>--%>
+								<h2>质量复核信息</h2>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">报告号:</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="reviewFee" path="projectReportData.number" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">送审价(元):</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">审定价(元):</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">合同类别:</label>
+								<div class="layui-input-block with-icon">
+									<div style="overflow: hidden">
+										<input type="radio" title="金额合同" lay-filter="jine"  id="jineer" value="0"  disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='0'}">checked</c:if>>
+										<input type="radio" title="费率合同" lay-filter="jine" id="jineer1" value="1" disabled <c:if test="${projectcontentinfo.projectReportData.contractCategory=='1'}">checked</c:if>>
+											<%--							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>--%>
+									</div>
+									<span style="font-size: 12px;color: red;">施工合同</span>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">合同价(元):</label>
+								<div class="layui-input-block with-icon">
+									<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false" readonly="true" class="form-control layui-input number"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6" style="display: none;">
+								<label class="layui-form-label">费率(%):</label>
+								<div class="layui-input-block with-icon">
+									<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减额(元):</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyFee" path="projectReportData.verifyFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">核增核减率(%):</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="verifyRate" path="projectReportData.verifyRate" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">咨询标的额(元):</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="consultFee" path="projectReportData.consultFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建造价(元):</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingFee" path="projectReportData.buildingFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装造价(元):</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">土建比例(%):</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="buildingRate" path="projectReportData.buildingRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">安装比例(%):</label>
+								<div class="layui-input-block with-icon">
+									<form:input id="installRate" path="projectReportData.installRate" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
+								</div>
+							</div>
+
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">工作开始日期:</label>
+								<div class="layui-input-block with-icon">
+									<input class=" form-control layui-input" readonly="readonly"  value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label">工作结束日期:</label>
+								<div class="layui-input-block with-icon">
+									<input class=" form-control layui-input" readonly="readonly" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6 lw7">
+								<label class="layui-form-label double-line">造价咨询营业收入(万元):</label>
+								<div class="layui-input-block">
+									<form:input path="projectReportData.ZiXunShouRu"  readonly="true" cssStyle="background-color: #f1f1f1" htmlEscape="false" onkeyup="num(this)" class="form-control layui-input"/>
+								</div>
+							</div>
+						</div>
+					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
 					<div class="form-group layui-row">
@@ -1530,7 +1687,7 @@
 					</div>
 				</div>
 			</c:if>
-			<c:if test="${type=='1'}">
+			<c:if test="${type=='1' && projectRecords.submitMoney=='1'}">
 				<div style="overflow:hidden;">
 					<div class="form-group-label">
 						<h2>质量复核内容</h2>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp

@@ -499,7 +499,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+				<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">
 						<div class="layui-item nav-btns" style="padding-left:0px;">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModifyApply.jsp

@@ -473,7 +473,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+				<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">
 						<div class="layui-item nav-btns" style="padding-left:0px;">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply.jsp

@@ -488,7 +488,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+				<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">
 						<div class="layui-item nav-btns" style="padding-left:0px;">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -1676,7 +1676,7 @@
 				<div class="form-group layui-row">
 					<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗?', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
 						<%--<div style="float: right"> <a href="javascript:void(0)" onclick="preview('预览','${ctx}/workfullmanage/workFullManage/preViewMassControl?id=${projectReportData.id}','80%','80%')">预览流程单</a></div>--%>
-					<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+					<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" style="padding-left:0px;">
 							<a class="nav-btn nav-btn-add"

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -1678,7 +1678,7 @@
 				<div class="form-group layui-row">
 					<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗?', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
 						<%--<div style="float: right"> <a href="javascript:void(0)" onclick="preview('预览','${ctx}/workfullmanage/workFullManage/preViewMassControl?id=${projectReportData.id}','80%','80%')">预览流程单</a></div>--%>
-					<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+					<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" style="padding-left:0px;">
 							<a class="nav-btn nav-btn-add"

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

@@ -1601,7 +1601,7 @@
 				</div>
 				<div>
 					<div class="form-group layui-row">
-						<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+						<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">

+ 166 - 168
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -253,137 +253,139 @@
 					</div>
 				</div>
 			</div>
-			<div style="margin-top: 50px">
+			<div style="margin-top: 50px;overflow:hidden;">
 				<div class="form-group layui-row first" id="projectInfo">
 						<%--				<div class="form-group-label"><h2>项目基本信息</h2></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.projectName}"/>
-								</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.projectName}"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<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="${projectRecords.projectId}"/>
-											<%--							<form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>--%>
-										<span class="input-group-btn">
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<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="${projectRecords.projectId}"/>
+										<%--							<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 projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
 							 </span>
-									</div>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">项目所在地:</label>
-								<div class="layui-input-block">
-									<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 lw6">
+							<label class="layui-form-label">项目所在地:</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">投资性质:</label>
-								<div class="layui-input-block">
-									<c:if test="${projectRecords.projectProperties==null}">
-										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">投资性质:</label>
+							<div class="layui-input-block">
+								<c:if test="${projectRecords.projectProperties==null}">
+									<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+								</c:if>
+								<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+									<c:if test="${v.value==projectRecords.projectProperties}">
+										<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
 									</c:if>
-									<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
-										<c:if test="${v.value==projectRecords.projectProperties}">
-											<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
-										</c:if>
-									</c:forEach>
-								</div>
-							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">建设地点:</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
-								</div>
+								</c:forEach>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">创建人:</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
-								</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">建设地点:</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">项目责任人:</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false" style="background-color: #f1f1f1" 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" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">所属部门:</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false" style="background-color: #f1f1f1" 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" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">项目负责人:</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.projectMasterName}"/>
-								</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">所属部门:</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">工程类型:</label>
-								<div class="layui-input-block">
-									<select disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
-											<%--										<option items="${engineeringInfo}" itemLabel="engineeringName" itemValue="id" htmlEscape="false"/>--%>
-										<c:forEach items="${projectEngineeringInfo}" varStatus="index" var="info">
-											<option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
-										</c:forEach>
-									</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" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.projectMasterName}"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">项目等级:</label>
-								<div class="layui-input-block">
-									<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
-										<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">工程类型:</label>
+							<div class="layui-input-block">
+								<select disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
+										<%--										<option items="${engineeringInfo}" itemLabel="engineeringName" itemValue="id" htmlEscape="false"/>--%>
+									<c:forEach items="${projectEngineeringInfo}" varStatus="index" var="info">
+										<option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
 									</c:forEach>
-								</div>
+								</select>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label double-line">送审规模(万元):</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.submitScale}"/>
-								</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">项目等级:</label>
+							<div class="layui-input-block">
+								<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
+									<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+								</c:forEach>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label double-line">工作开始日期:</label>
-								<div class="layui-input-block">
-									<input class="form-control layui-input  "  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
-								</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label double-line">送审规模(万元):</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.submitScale}"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label double-line">工作结束日期:</label>
-								<div class="layui-input-block">
-									<input class="form-control layui-input  "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
-								</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label double-line">工作开始日期:</label>
+							<div class="layui-input-block">
+								<input class="form-control layui-input  "  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 							</div>
-							<div class="layui-item layui-col-sm6 lw6">
-								<label class="layui-form-label">创建日期:</label>
-								<div class="layui-input-block">
-									<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
-								</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label double-line">工作结束日期:</label>
+							<div class="layui-input-block">
+								<input class="form-control layui-input  "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 							</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"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
-								</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">创建日期:</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6 with-textarea">
-								<label class="layui-form-label">工程概况:</label>
-								<div class="layui-input-block">
-									<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
-								</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"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
 							</div>
-							<div class="layui-item layui-col-sm6 lw6 with-textarea">
-								<label class="layui-form-label">备注:</label>
-								<div class="layui-input-block">
-									<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
-								</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6 with-textarea">
+							<label class="layui-form-label">工程概况:</label>
+							<div class="layui-input-block">
+								<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
 							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6 with-textarea">
+							<label class="layui-form-label">备注:</label>
+							<div class="layui-input-block">
+								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
+							</div>
+						</div>
+					</div>
 				</div>
 				<div class="form-group layui-row first hide" id="subProjectInfo">
 					<table class="oa-table layui-table" id="contentTable1">
@@ -1222,11 +1224,6 @@
 						</div>
 					</div>
 				</div>
-<%--				<div class="form-group layui-row first hide" id="issueView">--%>
-<%--					<div class="topMar">--%>
-<%--						<h2>暂无报告签发信息</h2>--%>
-<%--					</div>--%>
-<%--				</div>--%>
 				<div class="form-group layui-row first hide" id="AccessoryView">
 					<div class="form-group layui-row">
 						<div class="form-group-label"><h2>成果文件</h2></div>
@@ -1638,66 +1635,67 @@
 						</div>
 					</div>
 				</div>
+
+			</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 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>--%>
+					<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>
-									</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>
+								</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 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 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>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -737,7 +737,7 @@
                 </div>
             </div>--%>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+                <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">
                         <div class="layui-item nav-btns" style="padding-left:0px;">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -1063,7 +1063,7 @@
 				</div>
 			</div>--%>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+				<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">
 						<div class="layui-item nav-btns" style="padding-left:0px;">

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

@@ -807,7 +807,7 @@
 						</div>
 					</div>
 		<div class="form-group layui-row">
-			<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+			<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="bankinfo" class="table table-bordered table-condensed can-edit">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -738,7 +738,7 @@
                 </div>
             </div>--%>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+                <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">
                         <div class="layui-item nav-btns" style="padding-left:0px;">

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

@@ -462,7 +462,7 @@
 				</div>
 			</div>--%>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+				<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="bankinfo" class="table table-bordered table-condensed can-edit">

+ 51 - 49
src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -325,7 +325,7 @@
 			<div class="form-group layui-row">
 				<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗?', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
 				<%--<div style="float: right"> <a href="javascript:void(0)" onclick="preview('预览','${ctx}/workfullmanage/workFullManage/preViewMassControl?id=${projectReportData.id}','80%','80%')">预览流程单</a></div>--%>
-				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
+				<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="bankinfo" class="table table-bordered table-condensed can-edit">
@@ -376,59 +376,61 @@
 					</div>
 				</div>
 			</div>
-			<div>
-				<div class="form-group-label">
-					<h2>质量复核内容</h2>
-				</div>
+			<c:if test="${projectRecords.submitMoney==2}">
 				<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="25%">序号</th>--%>
-								<th width="40%">符合内容及评分标准</th>
-								<th width="10%">自校</th>
-<%--								<th width="10%">最高分</th>--%>
-<%--								<th width="10%">扣分</th>--%>
-								<th >意见</th>
+					<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="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 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>
+										<%--<th width="15%">操作</th>--%>
 								</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>
+								</thead>
+								<tbody>
+								<c:forEach items="${list}" 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>
+									<%--							<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>
+			</c:if>
 			<c:if test="${not empty processInstanceId}">
 				<div class="form-group layui-row">
 					<div class="form-group-label"><h2>审批流程</h2></div>