修改来电时接口请求顺序

CallCenterWeb.UI/js/newtx.js

@@ -762,19 +762,22 @@ $(document).ready(function() {
 							Phone.QueryCallIDOnAgentEx(_UserNo);
 							for(i = 0; i < Phone.CallIDNum; i++) {
 								var _CallId = Phone.GetCallIDByIdx(i);
-								//                        alert(_CallId);
 							}
 							Phone.QueryCallInfoEx(_CallId);
 							var CallId = IVRSelKey;
 							  var NowCallerPhoneCode = Phone.CallInfoEx_Ani;
-//							添加话务日志
-							$.get(huayi.config.callcenter_url + 'CallInScreen/AddCallLogs',{
-										telno:$('#callNumber').val(),
-										Status:status,
-										becallcome:becallcome,
-										hjbh:$('#callId').val(),
+							  	//获取呼叫编号callId
+									$.get(huayi.config.callcenter_url + 'CallInScreen/GetCallIdByPhone',{
+										telphone:NowCallerPhoneCode,
 										"token": $.cookie("token")
-									},function(res){});
+									}, function (res) {
+									    res = JSON.parse(res);
+									    if (res.state == "success") {
+											$('#callId').val(res.data.CallId);
+											$('#BusinessType').val(res.data.BusinessType);
+											updateCallLogs(NowCallerPhoneCode,status,becallcome)
+										}
+									});
 						}catch (e) {
 
             }
@@ -792,34 +795,9 @@ $(document).ready(function() {
 							Phone.QueryCallInfoEx(_CallId);
 							var telphone = Phone.CallInfoEx_Ani;
 							if(becallcome) {
-									var userid = $('#userId').val();
-									var usercode = $('#userCode').val();
-									var username = $('#userName').val();
-									var extnumber = $('#extenNum').val();
-									username = encodeURI(username);
-									//获取呼叫编号callId
-									$.get(huayi.config.callcenter_url + 'CallInScreen/GetCallIdByPhone',{
-										telphone:telphone,
-										userid:userid,
-										usercode:usercode,
-										username:username,
-										extnumber:extnumber,
-										timeno:timeno,
-										"token": $.cookie("token")
-									}, function (res) {
-									    res = JSON.parse(res);
-									    if (res.state == "success") {
-									        document.getElementById("callId").value = res.data.CallId;
-											//$('#callId').val(res.data.CallId);
-											$('#BusinessType').val(res.data.BusinessType);
-											callId = res.data.CallId;
-											console.log(res.data.CallId);
-											updateZL(res.data.CallId);
-											Form_callCommingCaller(telphone, res.data.CallId, res.data.BusinessType);
-										}
-									});
-									console.log($('#callId').val());
-								    //Form_callCommingCaller(telphone, $('#callId').val(),$('#BusinessType').val());
+								console.log($('#callId').val());
+								updateZL($('#callId').val());
+							    Form_callCommingCaller(telphone, $('#callId').val(),$('#BusinessType').val());
 							}
 							becallout = false;
 							becallcome = true;
@@ -833,9 +811,6 @@ $(document).ready(function() {
 									}, function (res) {
 									    console.log("CallInScreen/UpdateZJ");
 									    console.log(res);
-//										if(res.state.toLowerCase() == "success") {
-//											$('#callId').val(res.data.CallId);
-//										}
 									});
 									//改变按钮图片
 							Form_setWinfromenble("True", "false", "false", "false", "True", "True", "True", "false", "false", "false");
@@ -853,7 +828,6 @@ $(document).ready(function() {
 							});
 							Form_setWinfromenble("false", "True", "True", "false", "false", "false", "false", "false", "false", "false");
 							setAgentStatus("空闲");
-							//2014-10-22
 							becallout = false;
 							becallcome = true;
 						}
@@ -868,20 +842,23 @@ $(document).ready(function() {
 				   
 				    $.get(huayi.config.callcenter_url + 'CallInScreen/UpdateZL', {
 				        callid: callids,
-				        //userid:userid,
-				        //usercode:usercode,
-				        //username:username,
-				        //extnumber:extnumber,
-				        //timeno:timeno,
 				        "token": $.cookie("token")
 				    }, function (res) {
 				        console.log("CallInScreen/UpdateZL");
 				        console.log(res);
-				        //										if(res.state.toLowerCase() == "success") {
-				        //										}
 				    });
 
 				}
+				//添加话务日志
+				function updateCallLogs(telNum,status,callcomes){
+					$.get(huayi.config.callcenter_url + 'CallInScreen/AddCallLogs',{
+						telno:telNum,
+						Status:status,
+						becallcome:callcomes,
+						hjbh:$('#callId').val(),
+						"token": $.cookie("token")
+					},function(res){});
+				}
 				//来电弹屏事件
 				function Form_callCommingCaller(callerNum, callid, calledType) {
 				    console.log('callid' + callid + 'calledType' + calledType);
@@ -889,14 +866,11 @@ $(document).ready(function() {
 					becallcome = true;
 					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 + '&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);//转移号码
 					$("#callNumber").val(callerNum);//来电号码
-//					f_addTab('callin_' + CBnumber + callerNum, callerNum + '来电', '../telmanage/callinnew.aspx?callid=' + CBnumber + "&phone=" + callerNum + "&timeno=" + timeno);
-
 				}
 				//录音成功
 				function Form_callComming(callerNum, parth) {