恢复1

application/app_broker/view/index/customerinfo_details_new.html

@@ -159,7 +159,7 @@
 
 		<script type="text/javascript" src="/app/js/jquery-1122-min.js"></script>
 		<script src="/app/js/common.js?new42" charset="utf-8"></script>
-		<script src="/app/js/customerinfo_details_new.js?new53"></script>
+		<script src="/app/js/customerinfo_details_new.js?new54"></script>
 
 	</body>
 

public/app/js/customerinfo_details_new.js

@@ -391,27 +391,24 @@ function loadMain(){
 		e.preventDefault();
 		e.stopPropagation();
 		var _this = $(this);
+//		if((_this.attr('data-markid') == '1') || (_this.attr('data-markid') == '4')){
+//			//如果选择了未打通，或取消拨打，则直接关闭
+//			if(_this.parent().parent().index() === 0){
+//				//只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
+//				_genjinModal.hide();//跟进模态框关闭
+//				return false;
+//			}
+//		};
 		if(!_this.hasClass('genjin-mark-active')){
 			_this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active');
 		};
-		if(_this.attr('data-markid') == '1'){
-			//如果选择了未打通，则直接关闭
-			if(_this.parent().parent().index() === 0){
-				//只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
-				genjinSave('sp1');
-				return false;
-			}
-		};
 	});
 	
 	//跟进的提交按钮点击事件
 	_btnSave.click(function(e){
 		e.preventDefault();
 		e.stopPropagation();
-		genjinSave();
-	});
 		
-	function genjinSave(type){
 		var	_genjinMarkOBj = $('.genjin-mark-area-zhuangtai .genjin-mark-active'),
 			_genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'),
 			_beizhuObjVal = $.trim(_beizhuObj.val()),
@@ -427,14 +424,20 @@ function loadMain(){
 //			return false;
 //		};
 		
-		if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){
+//		if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){
+//			
+//		}else{
+//			if(_genjinMarkOBj.length == 0){
+//				layerTipsX('请选择状态跟进标签');
+//				return false;
+//			};
+//		};
 		
-		}else{
 		if(_genjinMarkOBj.length == 0){
 			layerTipsX('请选择状态跟进标签');
 			return false;
 		};
-		};
+		
 		var _data = {
 	    	'AuthToken': _token,
 	    	'content': _beizhuObjVal,
@@ -442,17 +445,6 @@ function loadMain(){
 	    	'agent_id': _userId,
 	    	'user_status': _genjinMarkOBj.attr('data-markid')
 	   	};
-	   	if(type === 'sp1'){
-			if(_beizhuObjVal){
-				
-			}else{
-				_data['content'] = '未打通';
-			};
-			
-			if(_genjinMarkOBj.length == 0){
-				_data['user_status'] = '-1';
-			};
-		};
 		if(isCallFlag){
 			//电话跟进
 			if(_genjinMarkOBj2.length == 0){
@@ -518,7 +510,8 @@ function loadMain(){
 		        };
 		    }
 		});
-	}
+		
+	});
 	
 	function freePhone(obj){
 		$.ajax({