修改

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -339,7 +339,7 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		}else {
 			this.save(projectReportData);
 		}
-		List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());
+		List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,user.getOffice().getId(),"12",projectReportData.getCreateBy());
 //		List<User> bzshbygs = UserUtils.getByRoleActivityEnname("bzshbyg",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
 		List<User> bzshbs = UserUtils.getByRoleActivityEnname("bzshb",3,recordsOffice.getId(),"12",projectReportData.getCreateBy());
 //		List<User> fglds = UserUtils.getByRoleActivityEnname("fgld",2,recordsOffice.getId(),"12",projectReportData.getCreateBy());

src/main/java/com/jeeplus/modules/workcontractrev/web/WorkContractReController.java

@@ -161,7 +161,7 @@ public class WorkContractReController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/workcontractre/workContractRe/?repage";
 	}
 	/**
-	 * 保存职级调整
+	 * 保存调整
 	 */
 	@RequiresPermissions(value={"workcontractre:workContractRe:add","workcontractre:workContractRe:edit"},logical=Logical.OR)
 	@RequestMapping(value = "store")
@@ -226,12 +226,12 @@ public class WorkContractReController extends BaseController {
 			}else  if ("fgld".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workContractRe.getProcessInstanceId(),3);
 				if (users==null )
-					users = UserUtils.getByRoleActivityEnname("zjl", 3, workContractRe.getOfficeId(), "66", workContractRe.getCreateBy());
+					users = UserUtils.getByRoleActivityEnname("fzjl", 3, workContractRe.getOfficeId(), "66", workContractRe.getCreateBy());
 
 			}else  if ("zjl".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workContractRe.getProcessInstanceId(),3);
 				if (users==null )
-					users = UserUtils.getByRoleActivityEnname("zjl", 3, workContractRe.getOfficeId(), "66", workContractRe.getCreateBy());
+					users = UserUtils.getByRoleActivityEnname("fzjl", 3, workContractRe.getOfficeId(), "66", workContractRe.getCreateBy());
 
 			}
 			else if ("modifyApply".equals(taskDefKey)){

src/main/resources/jeeplus.properties

@@ -6,11 +6,13 @@
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
-jdbc.url=jdbc:mysql://192.168.2.4:3306/hp_total_process?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://47.114.188.201:3306/hp_total_process?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://192.168.2.4:3306/hp_total_process?useUnicode=true&characterEncoding=utf-8
 #jdbc.url=jdbc:mysql://127.0.0.1:3306/hp_total_pocess?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 #jdbc.password=123456
-jdbc.password=root
+jdbc.password=jsjy2020.
+#jdbc.password=root
 
 #pool settings
 jdbc.pool.init=20

src/main/webapp/static/common/js/common.js

@@ -6,7 +6,7 @@ var pos=curWwwPath.indexOf(pathName);
 //获取主机地址，如： http://localhost:8083
 var localhostPaht=curWwwPath.substring(0,pos);
 //获取带"/"的项目名，如：/myproj
-var projectName=pathName.substring(0,pathName.substr(1).indexOf('/')+1);
+var projectName=pathName.substring(0,pathName.substr(1).indexOf('/')+1)=== '/a'?'':pathName.substring(0,pathName.substr(1).indexOf('/')+1);
 //得到了 http://localhost:8083/myproj
 var realPath=localhostPaht+projectName;
 

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

@@ -240,26 +240,26 @@
 						<div style="    clear:both;"></div>
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw9">
-						<div class="layui-item query athird">
-							<label class="layui-form-label">工作内容类型：</label>
-							<div class="layui-input-block">
-								<form:select path="projectReportData.type"  htmlEscape="false"   class="form-control simple-select">
-									<form:option value="" label=""/>
-									<optgroup label="决策阶段"/>
-									<form:options items="${fns:getContentTypeList('1')}" itemLabel="typeName" itemValue="typeId"></form:options>
-									<optgroup label="设计阶段"/>
-									<form:options items="${fns:getContentTypeList('2')}" itemLabel="typeName" itemValue="typeId"></form:options>
-									<optgroup label="发承包阶段"/>
-									<form:options items="${fns:getContentTypeList('3')}" itemLabel="typeName" itemValue="typeId"></form:options>
-									<optgroup label="实施阶段"/>
-									<form:options items="${fns:getContentTypeList('4')}" itemLabel="typeName" itemValue="typeId"></form:options>
-									<optgroup label="竣工阶段"/>
-									<form:options items="${fns:getContentTypeList('5')}" itemLabel="typeName" itemValue="typeId"></form:options>
-									<optgroup label="运营阶段"/>
-									<form:options items="${fns:getContentTypeList('6')}" itemLabel="typeName" itemValue="typeId"></form:options>
-								</form:select>
-							</div>
-						</div>
+						<%--<div class="layui-item query athird">--%>
+							<%--<label class="layui-form-label">工作内容类型：</label>--%>
+							<%--<div class="layui-input-block">--%>
+								<%--<form:select path="projectReportData.type"  htmlEscape="false"   class="form-control simple-select">--%>
+									<%--<form:option value="" label=""/>--%>
+									<%--<optgroup label="决策阶段"/>--%>
+									<%--<form:options items="${fns:getContentTypeList('1')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+									<%--<optgroup label="设计阶段"/>--%>
+									<%--<form:options items="${fns:getContentTypeList('2')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+									<%--<optgroup label="发承包阶段"/>--%>
+									<%--<form:options items="${fns:getContentTypeList('3')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+									<%--<optgroup label="实施阶段"/>--%>
+									<%--<form:options items="${fns:getContentTypeList('4')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+									<%--<optgroup label="竣工阶段"/>--%>
+									<%--<form:options items="${fns:getContentTypeList('5')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+									<%--<optgroup label="运营阶段"/>--%>
+									<%--<form:options items="${fns:getContentTypeList('6')}" itemLabel="typeName" itemValue="typeId"></form:options>--%>
+								<%--</form:select>--%>
+							<%--</div>--%>
+						<%--</div>--%>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">报告编号：</label>
 							<div class="layui-input-block">

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

@@ -15,7 +15,7 @@
         var dataList;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-                if(obj == 1){
+                // if(obj == 1){
 					// var info = false;
 					<%--if(dataList == undefined){--%>
 						<%--dataList = ${fns:toJson(projectcontentinfo.projectReportData.projectReviewList)}--%>
@@ -30,10 +30,10 @@
 					// 	parent.layer.msg("请先确认质量符合内容!", {icon: 2});
 					// 	return false;
 					// }
-                    $("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/saveReport?view=report");
-                }else{
-                    $("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/save?view=report");
-                }
+                    <%--$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/saveReport?view=report");--%>
+                <%--}else{--%>
+                    <%--$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectcontentinfo/save?view=report");--%>
+                <%--}--%>
                 $("#inputForm").submit();
                 return true;
             }
@@ -291,13 +291,20 @@
 <body>
 <div class="single-form">
 	<div class="container${container}">
-		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/projectcontentinfo/projectcontentinfo/save?view=report" method="post" class="form-horizontal">
-		<form:hidden path="id"/>
-		<form:hidden path="name"/>
-		<form:hidden path="parentIds"/>
-		<form:hidden path="edit"/>
-		<form:hidden path="projectReportData.id"/>
-		<form:hidden path="projectReportData.createBy.id"/>
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/projectcontentinfo/projectcontentinfo/reportAudit?view=reportModify" method="post" class="form-horizontal">
+			<form:hidden path="id"/>
+			<form:hidden path="name"/>
+			<form:hidden path="home"/>
+			<form:hidden path="parentIds"/>
+			<form:hidden path="edit"/>
+			<form:hidden path="projectReportData.id"/>
+			<form:hidden path="projectReportData.createBy.id"/>
+			<form:hidden path="projectReportData.act.taskId"/>
+			<form:hidden path="projectReportData.act.taskName"/>
+			<form:hidden path="projectReportData.act.taskDefKey"/>
+			<form:hidden path="projectReportData.act.procInsId"/>
+			<form:hidden path="projectReportData.act.procDefId"/>
+			<form:hidden id="flag" path="projectReportData.act.flag"/>
 		<sys:message content="${message}"/>
 		<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>基本信息</h2></div>

src/main/webapp/webpage/modules/workcontractre/workContractReForm.jsp

@@ -17,10 +17,10 @@
         function doSubmit(obj){
             // 回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-				if(obj == 1){
-					$('#flag').val('yes');
-				}else{
-					$('#flag').val('no');
+				if(obj == 2){
+					$("#inputForm").attr("action","${ctx}/workcontractre/workContractRe/store");
+				}else if(obj == 1){
+					$("#inputForm").attr("action","${ctx}/workcontractre/workContractRe/save");
 				}
                 // if($("#timeRequirements").val()==''){
                 //     top.layer.alert('合同评审信息中时间要求不能为空！', {icon: 0});

src/main/webapp/webpage/modules/workcontractre/workContractReList.jsp

@@ -318,6 +318,44 @@
             }
         });
     }
+
+    function openDialogremodify(title,url,width,height,target){
+
+        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,
+            skin: 'two-btns',
+            maxmin: true, //开启最大化最小化按钮
+            content: url ,
+            btn: ['重新申请','关闭'],
+            yes: 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() ){
+                    top.layer.close(index);//关闭对话框。
+                    //setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                }
+
+            }
+
+        });
+    }
 </script>
 </body>
 </html>

src/main/webapp/webpage/modules/workcontractre/workContractReModifyApply.jsp

@@ -540,8 +540,15 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="workContractRe" enctype="multipart/form-data"  action ="${ctx}/workcontractre/workContractRe/save" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="workContractRe" enctype="multipart/form-data"  action ="${ctx}/workcontractre/workContractRe/saveAudit" method="post" class="form-horizontal">
 			<form:hidden path="id"/>
+			<form:hidden path="home"/>
+			<form:hidden path="act.taskId"/>
+			<form:hidden path="act.taskName"/>
+			<form:hidden path="act.taskDefKey"/>
+			<form:hidden path="act.procInsId"/>
+			<form:hidden path="act.procDefId"/>
+			<form:hidden id="flag" path="act.flag"/>
 			<%--创建人--%>
 			<form:hidden path="createBy.name" htmlEscape="false"  readonly="true" value="${fns:getUser().name}" class="form-control "/>
 			<div class="tabs-container">