复核标准页面调整

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

@@ -2889,7 +2889,20 @@ public class WorkProjectNotifyController extends BaseController {
 					projectReportDataTwo.setAct(act);
 					Projectcontentinfo projectcontentinfo = new Projectcontentinfo();
 					projectcontentinfo.setProjectReportData(data);
+					//获取自检的质量复核标准
+					String reviewId="";
+					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+						reviewId="1";
+					}else{
+						reviewId="";
+					}
+					List<WorkReviewAudit> workReview = projectContentDataService.findListIssue(reviewId,"自检");
+					if (null!=workReview){
+						projectReportDataTwo.setProjectReviewList(workReview);
+					}
+
 					projectcontentinfo.setProjectReportDataTwo(projectReportDataTwo);
+					model.addAttribute("workReviews",workReview);
 					//添加当前文件服务器类型
 					projectcontentinfo.setUploadMode(uploadMode);
 					List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");

src/main/webapp/webpage/modules/projectcontentinfo/reportAudit.jsp

@@ -20,15 +20,18 @@
                     $("#flag").val("yes");
                     var info = false;
                     var dataList = ${fns:toJson(list)};
-                    for (var i=0; i<dataList.length; i++){
-                        if($("#audit"+dataList[i].id).val() == 0){
-                            info = true;
-                        }
-                    }
-                    if (info){
-                        parent.layer.msg("请先确认质量符合内容!", {icon: 2});
-                        return false;
-                    }
+					if (null!==dataList){
+						for (var i=0; i<dataList.length; i++){
+							if($("#audit"+dataList[i].id).val() == 0){
+								info = true;
+							}
+						}
+						if (info){
+							parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+							return false;
+						}
+					}
+
                     if('${not empty projectcontentinfo.projectReportData.act.taskDefKey && projectcontentinfo.projectReportData.act.taskDefKey eq 'glyda'}' == 'true' && ($("#number").val()==null || $("#number").val()=='' || $("#number").val() == undefined)){
                         parent.layer.msg("请先输入报告编号!", {icon: 2});
                         return false;

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

@@ -157,15 +157,17 @@
 						if(dataList == undefined){
 							dataList = ${fns:toJson(workReviewAudits)}
 						}
-						for (var i=0; i<dataList.length; i++){
-							console.log($("#audit"+dataList[i].id).val())
-							if($("#audit"+dataList[i].id).val() == 0){
-								info = true;
+						if (null != dataList){
+							for (var i=0; i<dataList.length; i++){
+								console.log($("#audit"+dataList[i].id).val())
+								if($("#audit"+dataList[i].id).val() == 0){
+									info = true;
+								}
+							}
+							if (info){
+								parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+								return false;
 							}
-						}
-						if (info){
-							parent.layer.msg("请先确认质量符合内容!", {icon: 2});
-							return false;
 						}
 						var flags=judgment();
 						if (flags){

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

@@ -148,16 +148,21 @@
 				if(dataList == undefined){
 					dataList = ${fns:toJson(projectcontentinfo.projectReportData.projectReviewList)}
 				}
-				for (var i=0; i<dataList.length; i++){
-					console.log($("#audit"+dataList[i].id).val())
-					if($("#audit"+dataList[i].id).val() == 0){
-						info = true;
+				if (null!==dataList){
+					if (null != dataList){
+						for (var i=0; i<dataList.length; i++){
+							console.log($("#audit"+dataList[i].id).val())
+							if($("#audit"+dataList[i].id).val() == 0){
+								info = true;
+							}
+						}
+						if (info){
+							parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+							return false;
+						}
 					}
 				}
-				if (info){
-					parent.layer.msg("请先确认质量符合内容!", {icon: 2});
-					return false;
-				}
+
 				if(boolFlag){
 					if(obj == 1){
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/reportAudit");

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

@@ -100,16 +100,19 @@
                 if(dataList == undefined){
                     dataList = ${fns:toJson(projectcontentinfo.projectReportData.projectReviewList)}
                 }
-                for (var i=0; i<dataList.length; i++){
-                    console.log($("#audit"+dataList[i].id).val())
-                    if($("#audit"+dataList[i].id).val() == 0){
-                        info = true;
+                if (null!==dataList){
+                    for (var i=0; i<dataList.length; i++){
+                        console.log($("#audit"+dataList[i].id).val())
+                        if($("#audit"+dataList[i].id).val() == 0){
+                            info = true;
+                        }
+                    }
+                    if (info){
+                        parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+                        return false;
                     }
                 }
-                if (info){
-                    parent.layer.msg("请先确认质量符合内容!", {icon: 2});
-                    return false;
-                }
+
                 if(boolFlag) {
                     if (obj == 1) {
                         $("#flag").val("yes");

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo.jsp

@@ -23,6 +23,7 @@
             });
         }
         var validateForm;
+        var dataList;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
                 var projectId = '${projectcontentinfo.project.id}';
@@ -35,6 +36,22 @@
                     parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
                     return false;
                 }
+                var info = false;
+                if(dataList == undefined){
+                    dataList = ${fns:toJson(workReviews)}
+                }
+                if (null!==dataList){
+                    for (var i=0; i<dataList.length; i++){
+                        console.log($("#audit"+dataList[i].id).val())
+                        if($("#audit"+dataList[i].id).val() == 0){
+                            info = true;
+                        }
+                    }
+                    if (info){
+                        parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+                        return false;
+                    }
+                }
                 for(var i=0; i<leng; i++) {
                     var numberStr = $("#file_attachment tr").eq(i).find("td:first").find(".faid").html();
                     var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
@@ -90,6 +107,8 @@
                         }
                     }
                 }
+
+
                 if(boolFlag) {
                     if (obj == 1) {
                         $("#flag").val("yes");
@@ -956,7 +975,7 @@
                         </tr>
                         </thead>
                         <tbody id="projectContentDataList2">
-                        <c:forEach items="${projectcontentinfo.projectReportDataTwo.projectReviewList}" var="projectReview" varStatus="index">
+                        <c:forEach items="${workReviews}" var="projectReview" varStatus="index">
                             <tr>
                                 <td>
                                     <input type="checkbox" class="checks" lay-skin="primary" title=" ">

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

@@ -102,16 +102,19 @@
 							if(dataList == undefined){
 								dataList = ${fns:toJson(workReviewAudits)}
 							}
-							for (var i=0; i<dataList.length; i++){
-								console.log($("#audit"+dataList[i].id).val())
-								if($("#audit"+dataList[i].id).val() == 0){
-									info = true;
+							if (null!==dataList){
+								for (var i=0; i<dataList.length; i++){
+									console.log($("#audit"+dataList[i].id).val())
+									if($("#audit"+dataList[i].id).val() == 0){
+										info = true;
+									}
+								}
+								if (info){
+									parent.layer.msg("请先确认质量符合内容!", {icon: 2});
+									return false;
 								}
 							}
-							if (info){
-								parent.layer.msg("请先确认质量符合内容!", {icon: 2});
-								return false;
-							}
+
 							$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessageNew/saveReport");
 						}
 					}else{

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportFormTwo.jsp

@@ -98,16 +98,19 @@
 						if(dataList == undefined){
 							dataList = ${fns:toJson(projectcontentinfo.projectReportDataTwo.projectReviewList)}
 						}
-						for (var i=0; i<dataList.length; i++){
-							console.log($("#audit"+dataList[i].id).val())
-							if($("#audit"+dataList[i].id).val() == 0){
-								info = true;
+						if (null!==dataList){
+							for (var i=0; i<dataList.length; i++){
+								console.log($("#audit"+dataList[i].id).val())
+								if($("#audit"+dataList[i].id).val() == 0){
+									info = true;
+								}
+							}
+							if (info){
+								parent.layer.msg("请先确认报告签发符合内容!", {icon: 2});
+								return false;
 							}
 						}
-						if (info){
-							parent.layer.msg("请先确认报告签发符合内容!", {icon: 2});
-							return false;
-						}
+
 						var flags=judgment();
 						if (!flags){
 							return flags;

src/main/webapp/webpage/modules/workreview/workReviewStandardFormFu.jsp

@@ -0,0 +1,88 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>复核标准管理</title>
+	<meta name="decorator" content="default"/>
+	<style>
+		label.error{
+			top:40px;
+			left:0;
+		}
+		#standardDetail-error{
+			top:82px;
+			left:0;
+		}
+	</style>
+	<script type="text/javascript">
+		var validateForm;
+		function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+		  if(validateForm.form()){
+			  $("#inputForm").submit();
+			  return true;
+		  }
+	
+		  return false;
+		}
+		$(document).ready(function() {
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+            var edit = "${workReviewStandard.id}";
+            if(edit!=null && edit!=''){
+                $("#reviewParentButton").attr("disabled","disabled");
+            }
+            setParentInfo($("#reviewParentId").val());
+		});
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="container">
+		<form:form id="inputForm" modelAttribute="workReviewStandard" action="${ctx}/workreview/workReviewStandard/save" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>复核信息</h2></div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label"><span class="require-item">*</span>上级节点：</label>
+					<div class="layui-input-block with-icon">
+						<sys:treeselectReview id="reviewParent" name="parent.id" value="${workReviewStandard.parent.id}" labelName="parent.name" labelValue="${workReviewStandard.parent.standardDetail}"
+											  title="复核标准" url="/workreview/workReviewStandard/treeData" extId="${workReviewStandard.id}"  cssClass="form-control required layui-input" allowClear="${workReviewStandard.currentUser.admin}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12 with-textarea">
+					<label class="layui-form-label"><span class="require-item">*</span>标准内容：</label>
+					<div class="layui-input-block">
+						<form:textarea path="standardDetail" htmlEscape="false"  rows="4" style="resize:none;" class="form-control required"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label"><span class="require-item">*</span>最多扣分：</label>
+					<div class="layui-input-block">
+						<form:input path="maxDeduct" htmlEscape="false" max="100" min="0" class="form-control digits required layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm12">
+					<label class="layui-form-label">序号：</label>
+					<div class="layui-input-block">
+						<form:input path="orderNum" htmlEscape="false"  readonly="true"  class="form-control layui-input"/>
+					</div>
+				</div>
+			</div>
+		</form:form>
+	</div>
+</div>
+</body>
+</html>