拨打电话修改

public/resource/js/user_genjing_modal.js

@@ -645,8 +645,8 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'bootstrapJs']
 				if(!_this.hasClass('genjin-mark-active')){
 					_this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active');
 				};
-				if(_this.attr('data-markid') == '1'){
-					//如果选择了未打通，则直接关闭
+				if(_this.attr('data-markid') == '1' || _this.attr('data-markid') == '4'){
+					//如果选择了未打通，或者取消拨打，则直接关闭
 					if(_this.parent().parent().index() === 0){
 						//只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
 						//genjinSave('sp1');
@@ -669,8 +669,13 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'bootstrapJs']
 					_genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'),
 					_beizhuObjVal = $.trim(_beizhuObj.val()),
 					_isFreeFlag = true;//是否释放
-		//取消自动关闭
-				if((_genjinMarkOBj2.attr('data-markid') == '1')){
+					
+				if(_beizhuObjVal == ''){
+					layerTipsX('请填写跟进信息');
+					return false;
+				};
+				
+				if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){
 					//如果选择了未打通，或取消拨打，则直接关闭
 					if(isCallFlag&&_isFreeFlag){
 						//释放
@@ -678,10 +683,6 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'bootstrapJs']
 					};
 					_genjinModal.hide();//跟进模态框关闭
 					return false;
-				};
-				
-				if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){
-					
 				}else{
 					if(_genjinMarkOBj.length == 0){
 						layerTipsX('请选择状态跟进标签');
@@ -695,19 +696,20 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'bootstrapJs']
 			    	'agent_id': _userId,
 			    	'user_status': _genjinMarkOBj.attr('data-markid')
 			   	};
-			   	if(type === 'sp1'){
-					if(_beizhuObjVal){
-						
-					}else{
-						_data['content'] = '未打通';
-					};
-					
-					if(_genjinMarkOBj.length == 0){
-						_data['user_status'] = user.customerInfo.user_status;
-					};
-				};
+//			   	if(type === 'sp1'){
+//					if(_beizhuObjVal){
+//						
+//					}else{
+//						_data['content'] = '未打通';
+//					};
+//					
+//					if(_genjinMarkOBj.length == 0){
+//						_data['user_status'] = user.customerInfo.user_status;
+//					};
+//				};
 				if(isCallFlag){
 					//电话跟进
+					
 					if(_genjinMarkOBj2.length == 0){
 						layerTipsX('请选择普通跟进标签');
 						return false;
@@ -719,12 +721,7 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'bootstrapJs']
 					}
 				}else{
 					//普通跟进
-					if(_beizhuObjVal == ''){
-						layerTipsX('请填写跟进信息');
-						return false;
-					}else{
 					_data['type'] = 1;
-					}
 				};
 				
 				$.ajax({