Browse Source

线上归档页签调整

[user3] 3 năm trước cách đây
mục cha
commit
9fa8c79bd7

+ 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());

+ 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>

+ 161 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -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>

+ 0 - 5
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -1224,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>