Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -3761,13 +3761,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	@Transactional(readOnly = false)
 	public String auditSaveCaseBase(RuralProjectRecords records, List<User> auditUsers){
 		int projectStatus = records.getProjectStatus();
-		String taskDefKey = records.getAct().getTaskDefKey();  //？？？？？？？？？？？↓
+		String taskDefKey = records.getAct().getTaskDefKey();
 		//modifyApply 调整        taskDefKey 是节点    是zjl审批就签收，不是就是自己添加flag，因为重新申请没有yes/no
 		if (!"modifyApply".equals(taskDefKey) && !taskDefKey.contains("audit") ) {
 			actTaskService.claim(records.getAct().getTaskId(), UserUtils.getUser().getId());  //签收任务
 
 		}else {
-			records.getAct().setFlag("yes");      //审核意见
+			records.getAct().setFlag("yes");      //审核意见  下两行可以不要
 			records.setModifyFlag("1");
 			records.setProjectStatus(5);
 //			super.save(records);    //   projectstatus：2              xxxxx
@@ -3778,7 +3778,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		if ( projectStatus == ProjectStatusEnum.REJECTED.getValue()) {          //环节：已驳回  = 4
 			comment = ("yes".equals(records.getAct().getFlag())?"[重新申请] ":"[已撤销] ");
 		}else {
-			comment = ("yes".equals(records.getAct().getFlag())?"[同意] ":"[驳回] ");
+			comment = ("yes".equals(records.getAct().getFlag())?"[同意] ":"[驳回] ")+records.getAct().getComment();
 		}
 
 		//yes 的时候状态为审核通过 否则为未通过

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -2311,8 +2311,9 @@ public class RuralCostProjectMessageController extends BaseController {
 
     //审核
     @RequestMapping("saveAudit")
-    public String saveAudit(RuralProjectRecords records,RedirectAttributes redirectAttributes,Act act,String projectId)  {
+    public String saveAudit(RuralProjectRecords records,RedirectAttributes redirectAttributes,Act act,String opinion)  {
         String home = "home";
+        act.setComment(records.getAct().getComment());
         try {
             records.setAct(act); // 任务定义Key（任务环节标识）
 

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

@@ -8769,7 +8769,7 @@ public class WorkProjectNotifyController extends BaseController {
 				} else {
 					model.addAttribute("type", "0");
 				}
-				return "modules/ruralprojectrecords/ruralProjectRecordsCaseAudit";
+				return "modules/ruralprojectrecords/ruralProjectRecordsCaseModify";
 			} else {
 				projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 				projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -234,6 +234,100 @@
 			});
 		}
 
+		// function caseBaseDialogres(title,url,deleteUrl,width,height,target) {
+		// 	parent.index = "";
+		// 	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+		// 		width='auto';
+		// 		height='auto';
+		// 	}else{//如果是PC端，根据用户设置的width和height显示。
+		//
+		// 	}
+		// 	top.layer.open({
+		// 		type: 2,
+		// 		area: [width, height],
+		// 		title: title,
+		// 		maxmin: true, //开启最大化最小化按钮
+		// 		content: url ,
+		// 		skin: 'three-btns',
+		// 		btn: ['重新申请','作废', '关闭'],
+		// 		btn1: function (index, layero) {
+		// 			var body = top.layer.getChildFrame('body', index);
+		// 			var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+		// 			var inputForm = body.find('#inputForm');
+		// 			var top_iframe;
+		// 			if (target) {
+		// 				top_iframe = target;//如果指定了iframe，则在改frame中跳转
+		// 			} else {
+		// 				top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+		// 			}
+		// 			inputForm.attr("target", top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+		// 			if (iframeWin.contentWindow.doSubmit(3)) {
+		// 				top.layer.close(index);//关闭对话框。
+		// 				setTimeout(function () {
+		// 					top.layer.close(index)
+		// 				}, 100);//延时0.1秒，对应360 7.1版本bug
+		// 			}
+		// 		},
+		// 		btn2:function(index,layero){
+		// 			top.layer.confirm("将该案例项目信息申请作废？", {icon: 3, title:'系统提示'}, function(index){
+		// 				$.ajax({
+		// 					type:'post',
+		// 					url:deleteUrl,
+		// 					success:function(data){
+		// 						top.layer.closeAll();//关闭所有对话框。
+		// 						if(data.code == 1){
+		// 							top.layer.msg(data.msg, {icon: 1});
+		// 						}else{
+		// 							top.layer.msg(data.msg, {icon: 0});
+		// 						}
+		// 						window.location.reload();
+		// 					}
+		// 				})
+		// 			});
+		// 			return false;
+		// 		},cancel: function(index){
+		// 		}
+		// 	});
+		// }
+
+		function openDialogreNew(title,url,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			var split = buttons.split(",");
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				skin: 'three-btns',
+				content: url,
+				btn: split,
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn3: function (index) {
+				}
+			});
+		}
+
 		function openDialogreReportSwitch(title,url,width,height,target,buttons) {
 
 			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
@@ -590,6 +684,11 @@
 					if(d.caseType != 1 && d.caseStatus ==2){
 						xml+="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateCaseBase?projectId=" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-red\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'  > 撤销案例项目申请</a>";
 					}
+					if(d.caseType != 1){
+						if(d.caseStatus == 4){
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreNew('重新申请案例项目','${ctx}/workprojectnotify/workProjectNotify/form?notifyId=" + d.id + "&type=152&remarks=重新申请','95%', '95%','','重新申请,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'  > 重新申请案例项目</a>";
+						}
+					}
 				}
 
 				//报告签发操作

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsCaseAudit.jsp

@@ -66,22 +66,72 @@
 		<%--	return false;--%>
 		<%--}--%>
 		var validateForm;
+		// function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+		// 	if(validateForm.form()){
+		// 		if(obj == 1){
+		//
+		// 			$('#flag').val('yes');
+		// 		}else{
+		// 			$('#flag').val('no');
+		// 		}
+		// 		$("#inputForm").submit();
+		// 		return true;
+		// 	}else {
+		// 		parent.layer.msg("信息未填写完整!", {icon: 5});
+		// 	}
+		//
+		// 	return false;
+		// }
+
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
+			$("#opinion").val(ss);
 			if(validateForm.form()){
-				if(obj == 1){
-
-					$('#flag').val('yes');
-				}else{
-					$('#flag').val('no');
+				if(obj == 1) {
+					// var flags=judgment();
+					var flags=true;
+					$(".judgment").each(function(){
+						var zhi=$(this).val();
+						var s=$(this).parent().html();
+						if (''==zhi || null == zhi){
+							// if(!$("#"+this.id).is(":hidden")){
+							$(this).css("border","1px solid red")
+							flags=false;
+							// }
+						}else{
+							$(this).css("border","1px solid #f1f1f1")
+						}
+					});
+					if (!flags){
+						parent.layer.msg("信息未填写完整!", {icon: 5});
+					}
+					if (flags){
+						$("#flag").val("yes");
+					}else{
+						return flags;
+					}
+					/*var technicistRemarks = $("#technicistRemarks").val();
+                    var type = $("#type").val();
+                    if( type==4 && (undefined == technicistRemarks || null ==technicistRemarks || '' ==technicistRemarks)){
+                        top.layer.msg("请填写技术负责人审核意见！", {icon: 0});
+                        return false;
+                    }*/
+				}else {
+					if(obj == 2){
+						$("#flag").val("no1");
+					}else {
+						$("#flag").val("no2");
+					}
 				}
 				$("#inputForm").submit();
 				return true;
-			}else {
+			}else{
 				parent.layer.msg("信息未填写完整!", {icon: 5});
 			}
 
 			return false;
 		}
+
 		$(document).ready(function() {
 			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
 			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
@@ -189,6 +239,7 @@
 			<input type="hidden" id="projectId" name="projectId" value="${projectRecords.projectId}"/>
 			<input type="hidden" id="projectName" name="projectName" value="${projectRecords.projectName}"/>
 			<input type="hidden" id="processInstanceId" name="processInstanceId" value="${projectRecords.processInstanceId}"/>
+			<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
 
 <%--			<form:hidden path="id"/>--%>
 			<form:hidden path="type"/>
@@ -204,7 +255,7 @@
 			<form:hidden id="flag" path="act.flag"/>
 			<form:hidden path="referenceAttachmentId"/>
 			<form:hidden path="catalogueAttachmentId"/>
-			<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
+			<input type="hidden" id="opinion" name="comment" value="" maxlength="250">
 			<sys:message content="${message}"/>
 			<div class="form-group layui-row first lw12">
 				<div class="tapfixed" style="width: 80%;">
@@ -1863,13 +1914,13 @@
 						</div>
 					</div>
 
-<%--					<div  class="form-group layui-row">--%>
-<%--						<div class="form-group-label">--%>
-<%--							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>--%>
-<%--							<h2>审批意见</h2>--%>
-<%--						</div>--%>
-<%--						<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>--%>
-<%--					</div>--%>
+					<div  class="form-group layui-row">
+						<div class="form-group-label">
+							<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>
+							<h2>审批意见</h2>
+						</div>
+						<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
+					</div>
 
 				</div>
 			</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -299,6 +299,44 @@
 			}
 		}
 
+		function openDialogreNew(title,url,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			var split = buttons.split(",");
+			top.layer.open({
+				type: 2,
+				area: [width, height],
+				title: title,
+				maxmin: true, //开启最大化最小化按钮
+				skin: 'three-btns',
+				content: url,
+				btn: split,
+				btn1: function(index, layero){
+					var body = top.layer.getChildFrame('body', index);
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var inputForm = body.find('#inputForm');
+					var top_iframe;
+					if(target){
+						top_iframe = target;//如果指定了iframe，则在改frame中跳转
+					}else{
+						top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+					}
+					inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+					if(iframeWin.contentWindow.doSubmit(1) ){
+						// top.layer.close(index);//关闭对话框。
+						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+					}
+				},
+				btn3: function (index) {
+				}
+			});
+		}
+
 		//打开对话框(查看)
 		function openDialogReportView(title,url,id,width,height){
 
@@ -917,6 +955,11 @@
 								if(d.caseType != 1 && d.caseStatus ==2){
 									xml+="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateCaseBase?projectId=" + d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤销案例项目申请</a>";
 								}
+								if(d.caseType != 1){
+									if(d.caseStatus == 4){
+										xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreNew('重新申请案例项目','${ctx}/workprojectnotify/workProjectNotify/form?notifyId=" + d.id + "&type=152&remarks=重新申请','95%', '95%','','重新申请,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\"  > 重新申请案例项目</a>";
+									}
+								}
 							}
 							//报告签发操作
 							if(d.projectReportStatus == 5 && d.emergencyProject != 1){

src/main/webapp/webpage/modules/sys/sysHome.jsp

@@ -177,6 +177,62 @@
             });
         }
 
+        function caseBaseDialogres(title,url,deleteUrl,width,height,target) {
+            parent.index = "";
+            if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+                width='auto';
+                height='auto';
+            }else{//如果是PC端，根据用户设置的width和height显示。
+
+            }
+            top.layer.open({
+                type: 2,
+                area: [width, height],
+                title: title,
+                maxmin: true, //开启最大化最小化按钮
+                content: url ,
+                skin: 'three-btns',
+                btn: ['重新申请','作废', '关闭'],
+                btn1: function (index, layero) {
+                    var body = top.layer.getChildFrame('body', index);
+                    var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                    var inputForm = body.find('#inputForm');
+                    var top_iframe;
+                    if (target) {
+                        top_iframe = target;//如果指定了iframe，则在改frame中跳转
+                    } else {
+                        top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+                    }
+                    inputForm.attr("target", top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+                    if (iframeWin.contentWindow.doSubmit(3)) {
+                        top.layer.close(index);//关闭对话框。
+                        setTimeout(function () {
+                            top.layer.close(index)
+                        }, 100);//延时0.1秒，对应360 7.1版本bug
+                    }
+                },
+                btn2:function(index,layero){
+                    top.layer.confirm("将该案例项目信息申请作废？", {icon: 3, title:'系统提示'}, function(index){
+                        $.ajax({
+                            type:'post',
+                            url:deleteUrl,
+                            success:function(data){
+                                top.layer.closeAll();//关闭所有对话框。
+                                if(data.code == 1){
+                                    top.layer.msg(data.msg, {icon: 1});
+                                }else{
+                                    top.layer.msg(data.msg, {icon: 0});
+                                }
+                                window.location.reload();
+                            }
+                        })
+                    });
+                    return false;
+                },cancel: function(index){
+                }
+            });
+        }
+
 
         function masterCheck(title,url,width,height,target){
             parent.index = "";
@@ -944,9 +1000,12 @@
                         <c:when test="${workProjectNotify.type eq 39 && (workProjectNotify.projectType eq 1 || workProjectNotify.projectType eq 2)}">
                             xml = "<a  href=\"javascript:void(0)\" onclick=\"projectDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id=${workProjectNotify.id}','95%','95%')\">";
                         </c:when>
-                        <c:when test="${workProjectNotify.type eq 16 || workProjectNotify.type eq 152}">
+                        <c:when test="${workProjectNotify.type eq 16}">
                             xml = "<a  href=\"javascript:void(0)\" onclick=\"projectDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id=${workProjectNotify.id}','95%','95%')\">";
                         </c:when>
+                        <c:when test="${workProjectNotify.type eq 152}">
+                        xml = "<a  href=\"javascript:void(0)\" onclick=\"caseBaseDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/cancellationNotify?id=${workProjectNotify.id}','95%','95%')\">";
+                        </c:when>
                         <%--删除--%>
                         <c:when test="${workProjectNotify.type eq 92 || workProjectNotify.type eq 89 || workProjectNotify.type eq 21 || workProjectNotify.type eq 13 || workProjectNotify.type eq 139}">
                             xml = "<a  href=\"javascript:void(0)\" onclick=\"deleteDialogres('重新申请', '${ctx}/workprojectnotify/workProjectNotify/form?id=${workProjectNotify.id}','${ctx}/workprojectnotify/workProjectNotify/deleteNotify?id=${workProjectNotify.id}','95%','95%')\">";