Merge remote-tracking branch 'origin/master'

happy-job-base-system/src/main/webapp/webpage/modules/cmcandidate/cmCandidateBaseInfo.jsp

@@ -70,7 +70,7 @@
 	}
 	//编辑信息
 	function editInfo(id,candidateId,candidateCategory){//编辑
-		  jp.openSaveDialog('个人信息', "${ctx}/cmcandidate/cmUserInformation/form?candidateTrackId="+id+"&candidateId="+candidateId+"&candidateCategory="+candidateCategory, '500PX', '700px');
+		  jp.openSaveDialog('个人信息', "${ctx}/cmcandidate/cmUserInformation/form?candidateTrackId="+id+"&candidateId="+candidateId+"&candidateCategory="+candidateCategory+"&fromInfoFlag=true", '500PX', '700px');
 	  }
 	</script>
 	<style>

happy-job-base-system/src/main/webapp/webpage/modules/cmcandidate/cmCandidateContactDetailForm.jsp

@@ -19,6 +19,14 @@
                 jp.loading();
                 jp.post("${ctx}/cmcandidate/cmCandidateContactDetail/save",$('#inputForm').serialize(),function(data){
                     if(data.success){
+                        if('${fromInfoFlag}'== 'true'){
+                            var candidateTrackId = "${cmCandidateContactDetail.candidateTrackId}";
+                            var candidateCategory = "${candidateCategory}";
+                            var candidateId = "${candidateId}";
+                            var action = "${ctx}/cmcandidate/cmCandidateTrack/baseInfo?id="+candidateTrackId+"&candidateCategory="+candidateCategory+"&candidateId="+candidateId;
+                            $("#iframe_tab").attr("action",action);
+                            $("#iframe_tab").attr("target","candidateInfoIframe");
+                        }
                         $("#iframe_tab").submit();
                         var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
                         parent.layer.close(dialogIndex);

happy-job-base-system/src/main/webapp/webpage/modules/cmcandidate/cmCandidateInfoList.jsp

@@ -44,7 +44,9 @@
 	
 	//新建跟进
   	function follow(candidateTrackId){//跟进
-		  jp.openSaveDialog('跟进', "${ctx}/cmcandidate/cmCandidateContactDetail/form?candidateTrackId="+candidateTrackId, '500PX', '500px');
+        var candidateCategory = "${cmCandidateTrack.candidateCategory}";
+        var candidateId = "${cmCandidateTrack.candidateId}";
+		jp.openSaveDialog('跟进', "${ctx}/cmcandidate/cmCandidateContactDetail/form?candidateTrackId="+candidateTrackId+"&candidateCategory="+candidateCategory+"&candidateId="+candidateId+"&fromInfoFlag=true", '500PX', '500px');
 	 }
 	
   //移入公海

happy-job-base-system/src/main/webapp/webpage/modules/cmcandidate/cmUserInformationForm.jsp

@@ -92,6 +92,14 @@
                 jp.loading();
                 jp.post("${ctx}/cmcandidate/cmUserInformation/save",$('#inputForm').serialize(),function(data){
                     if(data.success){
+                        if('${fromInfoFlag}'== 'true'){
+                            var candidateTrackId = "${candidateTrackId}";
+                            var candidateCategory = "${cmUserInformation.candidateCategory}";
+                            var candidateId = "${cmUserInformation.candidateId}";
+                            var action = "${ctx}/cmcandidate/cmCandidateTrack/baseInfo?id="+candidateTrackId+"&candidateCategory="+candidateCategory+"&candidateId="+candidateId;
+                            $("#iframe_tab").attr("action",action);
+                            $("#iframe_tab").attr("target","candidateInfoIframe");
+                        }
                         $("#iframe_tab").submit();
                         var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
                         parent.layer.close(dialogIndex);

happy-job-module-crm/src/main/java/com/jeeplus/modules/cmcandidate/web/CmCandidateContactDetailController.java

@@ -97,6 +97,9 @@ public class CmCandidateContactDetailController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(CmCandidateContactDetail cmCandidateContactDetail, Model model, HttpServletRequest request) {
 		model.addAttribute("cmCandidateContactDetail", cmCandidateContactDetail);
+		model.addAttribute("candidateCategory", request.getParameter("candidateCategory"));
+		model.addAttribute("candidateId", request.getParameter("candidateId"));
+		model.addAttribute("fromInfoFlag", request.getParameter("fromInfoFlag"));
 		return "modules/cmcandidate/cmCandidateContactDetailForm";
 	}
 

happy-job-module-crm/src/main/java/com/jeeplus/modules/cmcandidate/web/CmUserInformationController.java

@@ -74,6 +74,8 @@ public class CmUserInformationController extends BaseController {
 		}
 		model.addAttribute("cmUserInformation", cmUserInformation);
 		model.addAttribute("expectationAddressList", expectationAddressList);
+		model.addAttribute("fromInfoFlag", request.getParameter("fromInfoFlag"));
+		model.addAttribute("candidateTrackId", request.getParameter("candidateTrackId"));
 		return "modules/cmcandidate/cmUserInformationForm";
 	}