动态时间轴修改

public/app/js/customerinfo_details_new.js

@@ -277,6 +277,11 @@ function loadMain(){
 		e.preventDefault();
 		e.stopPropagation();
 		var _this = $(this);
+		if((_this.attr('data-markid') == '1') || (_this.attr('data-markid') == '4')){
+			//如果选择了未打通，或取消拨打，则直接关闭
+			_genjinModal.hide();//跟进模态框关闭
+			return false;
+		};
 		if(!_this.hasClass('genjin-mark-active')){
 			_this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active');
 		};
@@ -286,14 +291,20 @@ function loadMain(){
 	_btnSave.click(function(e){
 		e.preventDefault();
 		e.stopPropagation();
+		
+		
+		
 		var	_genjinMarkOBj = $('.genjin-mark-area-zhuangtai .genjin-mark-active'),
 			_genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'),
 			_beizhuObjVal = $.trim(_beizhuObj.val()),
 			_isFreeFlag = true;//是否释放
-//		if(_beizhuObjVal == '' && _genjinMarkOBj.length == 0){
-//			layerTipsX('请填写跟进内容或选择跟进标签');
-//			return false;
-//		};
+		
+		if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){
+			//如果选择了未打通，或取消拨打，则直接关闭
+			_genjinModal.hide();//跟进模态框关闭
+			return false;
+		};
+		
 		if(_genjinMarkOBj.length == 0){
 			layerTipsX('请选择状态跟进标签');
 			return false;
@@ -325,7 +336,7 @@ function loadMain(){
 			}
 		};
 		
-		if(isCallFlag && ((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4'))){
+		if(isCallFlag){
 			if(_isFreeFlag) {
 				freePhone();
 			};