修改来电弹屏问题

CallCenterWeb.UI/Script/Common/huayi.http.js

@@ -545,10 +545,9 @@ helper.init = {
 			crossDomain: true == !(document.all)
 		});
 		 if (!!window.ActiveXObject || "ActiveXObject" in window){
-			
 			$.ajaxSetup({
-			cache:false
-		});
+				cache:false
+			});
 		};
 		$(document).on("ajaxStart", function() {
 			if(isload) {

CallCenterWeb.UI/callScreen/callScreen.html

@@ -21,7 +21,7 @@
             
 		</div>
 		<script>
-			var Number = helper.request.queryString("tel"),//来电号码
+			var Number = helper.request.queryString("Number"),//来电号码
 				CallID = helper.request.queryString("CallID"),//callid
 				callType = helper.request.queryString("callType"),//业务类型
 				userCode=top.$('#userCode').val();//工号
@@ -39,6 +39,7 @@
 					}
 				}
 			$('.callIn_iframe').attr('src', 'http://192.168.128.246/400/?logid=' + userCode + '&Telephone=' + Number + '&calltype=' + callType + '&Media=' + CallID)
+//			$('.callIn_iframe').attr('src', 'http://117.158.24.187:8001/400/?logid=' + userCode + '&Telephone=' + Number + '&calltype=' + callType + '&Media=' + CallID)
 		</script>
 	</body>
 

CallCenterWeb.UI/js/newtx.js

@@ -579,7 +579,7 @@ $(document).ready(function() {
                         DialIsOK = Phone.CallOutEx3(5, '', res.data.phone, '', 0, 3, '');
                     }
                     else {   //呼叫外部电话
-                        DialIsOK = Phone.CallOutEx3(5, '', res.data.phone, '', 0, 3, '');
+                        DialIsOK = Phone.CallOutEx3(5, $('.gd_whNum').text(), res.data.phone, '', 0, 3, '');
                     }
                     $('#Result').val('');
 					$(".WH").addClass("hidens");
@@ -598,9 +598,10 @@ $(document).ready(function() {
 	    ///转移
     function PhoneCallZY(tel) {
             try {
+            	 Form_setWinfromenble("false", "false", "false", "false", "false", "false", "false", "false", "false", "false");
                 var callinphone =$("#ZYNumber").val();
             	Phone.TransOutEx2(5, callinphone, tel, 2, 0, '');
-            	 console.log(Phone.GetPromptByErrorCode(Phone.TransOutEx2(5, callinphone, tel, 2, 0, '')))
+            	 console.log('转移'+Phone.GetPromptByErrorCode(Phone.TransOutEx2(5, callinphone, tel, 2, 0, '')))
             }
             catch (e) {
                   layer.msg(e.message);
@@ -613,8 +614,10 @@ $(document).ready(function() {
     ///多方通话
     function PhoneCallDFTH(tel) {
             try {
+            	  Form_setWinfromenble("false", "false", "false", "false", "false", "false", "false", "false", "false", "false");
                 var callinphone = $("#ZYNumber").val();
                 Phone.TransOutEx2(5, callinphone, tel, 4, 0, '');
+                console.log('三方'+Phone.GetPromptByErrorCode(Phone.TransOutEx2(5, callinphone, tel, 4, 0, '')))
             }
             catch (e) {
                   layer.msg(e.message);
@@ -633,9 +636,6 @@ $(document).ready(function() {
 			function MydTransToIVR() {
 				var rtn = Phone.TransToIVR(5, 0, '9999');
 			}
-	
-	
-	
 	//座席置忙 2.1.12
 	function AgentBusy() {
 		//将座席状态设置为忙态。
@@ -649,7 +649,8 @@ $(document).ready(function() {
 		$.get(huayi.config.callcenter_url + 'CallInScreen/AddTelBusyDelgate',{
 			"token": $.cookie("token")
 		},function(res){
-			if(res.state.toLowerCase() == "success") {
+//			if(res.state.toLowerCase() == "success") {
+			if(res.state== "success") {
 				$('#callLogid').val(res.data.calllogid);
 			}
 		});
@@ -868,10 +869,10 @@ $(document).ready(function() {
 				function Form_callCommingCaller(callerNum, callid, calledType) {
 					becallout = false;
 					becallcome = true;
-					var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + callerNum + '&CallID=' + callid + '&callType='+ calledType +'">来电弹屏' + callerNum + ' <i class="fa fa-times-circle"></i></a>';
+					var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '&callType='+ calledType +'">来电弹屏' + callerNum + ' <i class="fa fa-times-circle"></i></a>';
 					$(".J_menuTab").removeClass("active");
 //					var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ callid  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + callerNum + '&CallID=' + callid + '" seamless></iframe>';
-					var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ callid  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + callerNum + '&CallID=' + callid + '" seamless></iframe>';
+					var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ callid  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '&callType='+ calledType +'" frameborder="0" data-id="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '&callType='+ calledType +'" seamless></iframe>';
 					$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
 					$(".J_menuTabs .page-tabs-content").append(p);
 					$("#ZYNumber").val(callerNum);//转移号码