备考表添加自定义模板

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -3878,12 +3878,66 @@ public class WorkProjectNotifyController extends BaseController {
 
 						}
 					projectReportRecord.setUploadMode(uploadMode);
+					//获取项目基础信息
+					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+					//工程咨询
+					List<MainDictDetail> mainDictList = Lists.newArrayList();
+					if("1".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+						//造价审核
+					} else if("2".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+					}
+					if(StringUtils.isNotBlank(ruralProjectRecords.getAttachmentProjectSort())){
+						//处理项目类别
+						for (MainDictDetail info: mainDictList) {
+							if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+								ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+								break;
+							}
+						}
+					}
 					model.addAttribute("projectcontentinfo", projectcontentinfo);
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					model.addAttribute("projectReportData", projectReportData);
 					model.addAttribute("workContractInfo", workContractInfo);
 					model.addAttribute("projectReportRecord", projectReportRecord);
 					model.addAttribute("project", projectReportRecord.getReport().getProject());
+					//tap页
+					//查询所有的工程类型
+					List<ProjectEngineeringInfo> projectEngineeringInfo=engineeringService.findList(new ProjectEngineeringInfo());
+					model.addAttribute("projectEngineeringInfo",projectEngineeringInfo);
+					//项目计划
+					RuralProjectRecords projectRecordPlans = this.planView(ruralProjectRecords.getId());
+					model.addAttribute("projectRecordPlans", projectRecordPlans);
+					//获取质量复核项目组成员
+					List<RuralReportConsultant> consultantinfo =this.qualityView(ruralProjectRecords,projectReportData);
+					model.addAttribute("consultantinfo", consultantinfo);
+					//获取总审人员
+					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())) {
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));

src/main/webapp/webpage/modules/iframeView/reference.jsp

@@ -16,16 +16,13 @@
             <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>
+                        <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>
@@ -67,10 +64,10 @@
                 var span=data.value;
                 if(span!=""){
                     var opinion=$("#opinion").val()+span
-                    if (opinion.length<250){
+                    if (opinion.length<450){
                         $("#opinion").val(opinion);
                         window.parent.f1(opinion);
-                    }else if (opinion.length>=250){
+                    }else if (opinion.length>=450){
                         top.layer.msg('意见长度不能大于250字符！', {icon: 0});
                     }
                 }
@@ -80,11 +77,11 @@
                 if(span!=""){
                     $(this).attr("checked",false)
                     var opinion=$("#opinion").val()+span
-                    if (opinion.length<250){
+                    if (opinion.length<450){
                         $("#opinion").val(opinion);
                         window.parent.f1(opinion);
-                    }else if (opinion.length>=250){
-                        top.layer.msg('意见长度不能大于250字符！', {icon: 0});
+                    }else if (opinion.length>=450){
+                        top.layer.msg('内容长度不能大于450字符！', {icon: 0});
                     }
                 }
             });

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit.jsp

@@ -28,6 +28,8 @@
 			var fileNumTow =  $("#fileNumTow").val();
 			var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
 			$("#opinion").val(ss);
+			var referenceView= document.getElementById("referenceView").contentWindow.document.getElementById("opinion").value
+			$("#referenceRemarks").val(referenceView);
             if(validateForm.form()){
                 if(obj == 1){
 					/*if(fileNum == ''|| fileNum == undefined){
@@ -1678,11 +1680,15 @@
 
 			<c:if test="${type != '1'}">
 				<div class="form-group layui-row">
-					<div class="form-group-label"><h2>备考表</h2></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=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">
-							<form:textarea placeholder="请输入备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control"/>
+							<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>
@@ -1761,6 +1767,8 @@
 			btn1: function(index, layero){
 				top.layer.close(index)
 				document.getElementById('iframe').contentWindow.location.reload();
+				document.getElementById('referenceView').contentWindow.location.reload();
+
 			}
 		});
 	}