liuyifan il y a 5 ans
Parent
commit
9a595d7279

+ 5 - 5
CallCenterWeb.UI/CallOut.html

@@ -12,12 +12,12 @@
12 12
 		<link href="./css/style.min862f.css?v=4.1.0" rel="stylesheet">
13 13
 		<link  href="./css/Table/table1.css" rel="stylesheet"/>
14 14
 		<link href="./css/animate.css" rel="stylesheet">
15
-		<link href="./css/wh.css" rel="stylesheet">	
15
+		<link href="./css/wh.css" rel="stylesheet">
16 16
 		<script src="./js/jquery.min.js?v=2.1.4"></script>
17
-	<script src="./js/bootstrap.min.js"></script>
18
-	<script src="./js/bootstrap-table.js"></script>
19
-	<script src="./js/bootstrap-table-zh-CN.js"></script>
20
-	 <script src="./js/wh.js"></script>
17
+		<script src="./js/bootstrap.min.js"></script>
18
+		<script src="./js/bootstrap-table.js"></script>
19
+		<script src="./js/bootstrap-table-zh-CN.js"></script>
20
+		<script src="./js/wh.js"></script>
21 21
 	<style>
22 22
 		
23 23
 	</style>

+ 2 - 0
CallCenterWeb.UI/SystemManager/js/shuJuZiDian.js

@@ -214,6 +214,7 @@ function cunZiDian(token) {
214 214
                 $('.inps4').val('');
215 215
                 $('.chanzdz').val('');
216 216
                 $('.changeCode').val('');
217
+                bs = '';
217 218
             }
218 219
         }
219 220
     });
@@ -362,6 +363,7 @@ function getzdv(token, rlag) {
362 363
             $('.chanList_zdz').val(con.name);
363 364
             $('.chanList_remark').val(con.remark);
364 365
             $('.chanList_sort').val(con.sort);
366
+            rlag = '';
365 367
         }
366 368
     });
367 369
 }

+ 1 - 1
CallCenterWeb.UI/TelCall/css/contactsAddModify.css

@@ -1,4 +1,4 @@
1
- ul li {
1
+ul li {
2 2
     float: initial;
3 3
     list-style: none;
4 4
 }

+ 284 - 0
CallCenterWeb.UI/TelCall/js/outboundPlan.js

@@ -0,0 +1,284 @@
1
+var recordsCallOutId = 0;
2
+$(document).ready(function () {
3
+	//加载列表
4
+	initTable();
5
+	
6
+	//搜索
7
+	$(".search").on("click", function(){
8
+		initTable();
9
+	})
10
+	//添加
11
+	$(".add").on("click", function(){
12
+		btnAdd();
13
+	})
14
+	//修改
15
+	$(".modify").on("click", function(){
16
+		btnModify();
17
+    })
18
+    timingCallOut()
19
+})
20
+
21
+//列表
22
+function initTable() {
23
+    //先销毁表格
24
+    $('#workorderlist').bootstrapTable('destroy');
25
+    //初始化表格,动态从服务器加载数据
26
+    $("#workorderlist").bootstrapTable({
27
+        method: "get",  //使用get请求到服务器获取数据
28
+        url: huayi.config.callcenter_url + "RegRecordsCallOut/GetList", //获取数据的Servlet地址
29
+        contentType: 'application/x-www-form-urlencoded',
30
+        striped: true,  //表格显示条纹
31
+        pagination: true, //启动分页
32
+        pageSize: 10,  //每页显示的记录数
33
+        pageNumber: 1, //当前第几页
34
+        pageList: [10, 20, 50, 100],  //记录数可选列表
35
+        search: false,  //是否启用查询
36
+        showColumns: false,  //显示下拉框勾选要显示的列
37
+        showRefresh: false,  //显示刷新按钮
38
+        sidePagination: "server", //表示服务端请求
39
+        //设置为undefined可以获取pageNumber,pageSize,searchText,sortName,sortOrder
40
+        //设置为limit可以获取limit, offset, search, sort, order
41
+        queryParamsType: "undefined",
42
+        queryParams: function queryParams(params) { //设置查询参数
43
+			var param = {
44
+				token: $.cookie("token"),
45
+				keywords: $("#searchBlurry").val(), //模糊搜索
46
+				pageindex: params.pageNumber, //页码
47
+				pagesize: params.pageSize, //条数
48
+			};
49
+			return param;
50
+		},
51
+        onLoadSuccess: function () {  //加载成功时执行
52
+            //layer.msg("加载成功");
53
+        },
54
+        onLoadError: function () {  //加载失败时执行
55
+            //layer.msg("加载数据失败", { time: 1500, icon: 2 });
56
+        }
57
+    });
58
+}
59
+
60
+//添加
61
+function btnAdd () {
62
+	layer.open({
63
+		type: 2,
64
+		title: '添加',
65
+		maxmin: true, //开启最大化最小化按钮
66
+		area: ['80%', '70%'],
67
+		content: "./contactsAdd.html?",
68
+	});
69
+}
70
+
71
+//修改
72
+function btnModify () {
73
+	var ids = $.map($("#workorderlist").bootstrapTable('getSelections'), function (row) {
74
+        return row.id;
75
+    });
76
+    var id = ids.toString();
77
+    if (ids.length != 1) {
78
+    	layer.confirm('请选择一行进行修改!', {
79
+            btn: ['确定']
80
+        });
81
+        return;
82
+    } else {
83
+		layer.open({
84
+			type: 2,
85
+			title: '修改',
86
+			maxmin: true, //开启最大化最小化按钮
87
+			area: ['80%', '70%'],
88
+			content: "./contactsModify.html?id=" + id,
89
+		});    	
90
+    }
91
+}
92
+
93
+//删除
94
+$('.delete').click(function () {
95
+    var ids = $.map($("#workorderlist").bootstrapTable('getSelections'), function (row) {
96
+		console.log("row", row)
97
+        return row.id;
98
+    });
99
+    console.log("ids",ids);
100
+    if (ids.length <= 0) {
101
+        layer.confirm('请选择要删除的行!', {
102
+            btn: ['确定']
103
+        });
104
+        return;
105
+    } else {
106
+        var laye = layer.confirm('您确定要删除吗?', {
107
+            btn: ['确定', '取消'] //可以无限个按钮
108
+        }, function () {
109
+            //按钮【按钮一】的回调
110
+            $.ajax({
111
+                type: "post",
112
+                url: huayi.config.callcenter_url + "AddressBook/DelAddressBook",
113
+                async: true,
114
+                dataType: "json",
115
+                data: {
116
+                    token: $.cookie("token"),
117
+                    ids: ids
118
+                },
119
+                success: function (data) {
120
+                    if (data.state.toLowerCase() == 'success') {
121
+                        layer.msg("删除成功!");
122
+                        $("#workorderlist").bootstrapTable('refresh');
123
+                    }
124
+                }
125
+            });
126
+        }, function (index) {
127
+            //按钮【按钮二】的回调
128
+            layer.close(laye)
129
+        });
130
+    }
131
+})
132
+
133
+//按enter搜索
134
+$('#searchBlurry').bind('keypress', function (event) {
135
+  if (event.keyCode == "13") {
136
+  		initTable();
137
+   		return false;
138
+	}
139
+});
140
+
141
+//呼叫状态
142
+function formatterRecCode(val) {
143
+    var formatterRecCodeTypeArr = ["待呼叫", "呼叫中", "已呼叫"]
144
+    return formatterRecCodeTypeArr[val]
145
+}
146
+
147
+//登记类型
148
+function formatterRegisterType(val, row) {
149
+    var formatterRegisterTypeArr = ["", "咨询", "投诉", "求助", "其他"]
150
+    return formatterRegisterTypeArr[val]
151
+}
152
+
153
+//登记状态
154
+function formatterRegisterStatus(val, row) {
155
+    var formatterRegisterStatusArr = ["转移中", "已接收", "已退回",]
156
+    return formatterRegisterStatusArr[val]
157
+}
158
+
159
+//呼叫方向
160
+function formatterRegisterDirection(val, row) {
161
+    var formatterRegisterDirectionArr = ["呼入", "呼出"]
162
+    return formatterRegisterDirectionArr[val]
163
+}
164
+
165
+//登记信息
166
+function formatterOperating(val, row) {
167
+    return '<ul class="tool_downs">' +
168
+        '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_outbound_' + row.F_ID + '" onclick="btn_outbound(\'' + row.F_userPhone + '\',' + '\''+ row.F_ID +'\')" title="外呼">外呼</a></li>' +
169
+        '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_call_' + row.F_ID + '" onclick="btn_end_call(\'' + row.F_userPhone + '\',' + '\''+ row.F_ID +'\')" title="结束通话">结束通话</a></li>' +
170
+		'</ul>';
171
+}
172
+
173
+//外呼
174
+function btn_outbound(phone, id) {
175
+    recordsCallOutId = id;
176
+    if(phone) {
177
+        $.ajax({
178
+            type: "get",
179
+            url: huayi.config.callcenter_url + "CallOutOpt/GetCallOutprefix",
180
+            async: true,
181
+            dataType: 'json',
182
+            data: {
183
+                token: $.cookie("token"),
184
+                phone: phone
185
+            },
186
+            success: function(result) {
187
+                //  result = $.parseJSON(result);
188
+                if(result.state.toLowerCase() == "success") {
189
+                    var guid = uuid();
190
+                    parent.obj.Type = 'MakeCall';
191
+                    parent.obj.DestinationNumber = result.data.phone;
192
+                    parent.obj.Header = result.data.fix;
193
+                    parent.obj.TaskType = "0"; //0:拨号外呼;1:95005回访外呼;2:电销回访外呼
194
+                    parent.obj.TaskPhoneID = ""; //回访的电话ID
195
+                    parent.obj.TaskID = guid; //回访记录编号
196
+                    parent.Send();
197
+                    parent.iframeOutbound = 1;
198
+                }
199
+            }
200
+        });
201
+    }
202
+}
203
+
204
+
205
+function recordsCallOut () {
206
+    $.ajax({
207
+        type: "get",
208
+        url: huayi.config.callcenter_url + "RegRecordsCallOut/Update",
209
+        async: true,
210
+        dataType: 'json',
211
+        data: {
212
+            token: $.cookie("token"),
213
+            id: recordsCallOutId
214
+        },
215
+        success: function(result) {
216
+            // if(result.state.toLowerCase() == "success") {
217
+            // }
218
+        }
219
+    });
220
+}
221
+
222
+setInterval(function() {
223
+    judgmentCallOut()
224
+},10000);
225
+
226
+function timingCallOut() {
227
+    $.ajax({
228
+        type: "get",
229
+        url: huayi.config.callcenter_url + "RegRecordsCallOut/GetList",
230
+        async: true,
231
+        dataType: 'json',
232
+        data: {
233
+            token: $.cookie("token"),
234
+        },
235
+        success: function(result) {
236
+            if(result.state.toLowerCase() == "success") {
237
+                var res = result.rows[0]
238
+                if (res.F_RecCode === "0") {
239
+                    btn_outbound(res.F_userPhone, res.F_ID)
240
+                } else {
241
+                    $('.tool_downs').find('[id*="HY_outbound_"]').hide();
242
+                }
243
+            }
244
+        }
245
+    });
246
+}
247
+
248
+function judgmentCallOut() {
249
+    $.ajax({
250
+        type: "get",
251
+        url: huayi.config.callcenter_url + "RegRecordsCallOut/GetFlag",
252
+        async: true,
253
+        dataType: 'json',
254
+        data: {
255
+            token: $.cookie("token"),
256
+        },
257
+        success: function(result) {
258
+            if(result.state.toLowerCase() == "success") {
259
+                if(result.data == true) {
260
+                    timingCallOut()
261
+                }
262
+            }
263
+        }
264
+    });
265
+}
266
+
267
+//结束通话
268
+function btn_end_call(phone) {
269
+    $.ajax({
270
+        type: "get",
271
+        url: huayi.config.callcenter_url + "RegRecordsCallOut/Update2",
272
+        async: true,
273
+        dataType: 'json',
274
+        data: {
275
+            token: $.cookie("token"),
276
+            phone: phone,
277
+        },
278
+        success: function(result) {
279
+            if(result.state.toLowerCase() == "success") {
280
+                // $("#workorderlist").bootstrapTable('refresh');
281
+            }
282
+        }
283
+    });
284
+}

+ 89 - 0
CallCenterWeb.UI/TelCall/outboundPlan.html

@@ -0,0 +1,89 @@
1
+<!DOCTYPE html>
2
+<html>
3
+<head>
4
+    <meta charset="UTF-8">
5
+    <title>外呼计划</title>
6
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
+    <script src="../Script/Common/huayi.load.js"></script>
8
+	<script src="../Script/Common/huayi.config.js"></script>
9
+    <link href="../css/init.css" rel="stylesheet" />
10
+    <style>
11
+        ul li {
12
+            float: initial;
13
+            list-style: none;
14
+        }
15
+        .tool_downs {
16
+            padding: 0;
17
+            margin: 0;
18
+        }
19
+
20
+        .tool_downs li {
21
+            float: none;
22
+            display: inline-block;
23
+        }
24
+        .tool_downs li .aBtn {
25
+            color: #337ab7;
26
+            width: auto;
27
+            padding: 0 3px;
28
+            display: inline-block;
29
+            font-size: 14px;
30
+        }
31
+    </style>
32
+</head>
33
+<body class="gray-bg">
34
+    <div class="wrapper wrapper-content animated fadeInRight">
35
+        <div class="daoHang clearfix">
36
+            <div class="dhLeft">
37
+                <sapn><i class="syIcon"></i>位置:<a href="javaScript:;" id="ReIndex">首页</a>&gt;<a href="javaScript:;">话务管理</a>&gt;<a href=""class="nowPosition">外呼计划</a></sapn>
38
+            </div>
39
+            <div class="dhRight">
40
+            	<a href="#" title="刷新"><i class="fa fa-refresh"></i></a>
41
+            </div>
42
+        </div>
43
+        <div class="wrapper wrapper-content animated fadeInRight">
44
+			<!-- <div class="toolBox">
45
+				<div class="th-bar clearfix">
46
+					<div class="pull-left">
47
+						<div class="form-inline">
48
+							<div class="time-box form-group">
49
+								<span>
50
+									关键字:
51
+									<input class="form-control" type="text" id="searchBlurry" placeholder="请输入关键字">
52
+								</span>
53
+							</div>
54
+							<button class="btns search">搜索</button>
55
+						</div>
56
+					</div>
57
+
58
+					<div class="pull-right">
59
+						<button class="btns add">添加</button>
60
+						<button class="btns modify">修改</button>
61
+						<button class="btns delete">删除</button>
62
+					</div>
63
+				</div>
64
+			</div> -->
65
+		</div>
66
+        <div style="width: 100%;padding: 10px;">
67
+			<table id="workorderlist" class="market" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
68
+                <thead>
69
+                    <tr>
70
+                        <th data-field="F_userName" data-align="center">姓名</th>
71
+                        <th data-field="F_userPhone" data-align="center">联系电话</th>
72
+                        <th data-field="F_Direction" data-align="center" data-formatter="formatterRegisterDirection">呼叫方向</th>
73
+                        <th data-field="F_CreateBy" data-align="center">创建人</th>
74
+                        <th data-field="F_Remark" data-align="center">备注</th>
75
+                        <th data-field="F_CreateOn" data-align="center">创建时间</th>
76
+                        <th data-field="F_RecCode" data-formatter="formatterRecCode" data-align="center">呼叫状态</th>
77
+                        <th data-field="" data-align="center" data-formatter="formatterOperating">操作</th>
78
+					</tr>
79
+                </thead>
80
+            </table>
81
+        </div>
82
+    </div>    
83
+    <!-- <script src="../js/main.js?v=1.5"></script> -->
84
+    <!-- <script src="../js/index.js?v=2.0"></script> -->
85
+    <!-- <script src="../js/plugins/cropper/cropper.min.js"></script> -->
86
+    <script src="../js/guid.js"></script>
87
+    <script src="./js/outboundPlan.js"></script>
88
+</body>
89
+</html>

+ 3 - 2
CallCenterWeb.UI/callScreen/call.js

@@ -2,6 +2,7 @@
2 2
 //来电时传输的数据
3 3
 var Number = helper.request.queryString("Number");
4 4
 var CallID = helper.request.queryString("CallID");
5
+var callDirection = helper.request.queryString("callDirection");
5 6
 $(document).ready(function () {
6 7
     //获取省
7 8
     getProvinceCounty($("#formProvince"), 0, "请选择省")
@@ -703,7 +704,7 @@ function saveCustomer() {
703 704
         data: {
704 705
             token: $.cookie("token"),
705 706
             cusid: $("#khid").val(), //档案id
706
-            direction: 0, // 0来电,1去电
707
+            direction: callDirection, // 0来电,1去电
707 708
             type: $('#formRegistrationType input[name="type"]:checked').val(), //登记类型
708 709
             userName: $("#formName").val(), //姓名
709 710
             userPhone: $("#formTel").val(), //电话
@@ -731,7 +732,7 @@ function saveCustomer() {
731 732
                 layer.msg("保存成功!");
732 733
                 Clean();
733 734
                 $('.customerSubmit').attr("disabled", false);
734
-	            $('.customerSubmit').text('新建');
735
+                $('.customerSubmit').text('新建');
735 736
             } else {
736 737
             	$('.customerSubmit').attr("disabled", false);
737 738
 	            $('.customerSubmit').text('新建');

+ 1 - 1
CallCenterWeb.UI/callScreen/callScreen.html

@@ -589,7 +589,7 @@
589 589
 				<!--右侧内容-->
590 590
 				<div class="ldtp-cr col-sm-9">
591 591
 					<ul class="ld-service clearfix">
592
-						<li style="border-bottom:1px solid #f95a83;" itemtype="0" class="cr-click">来电登记</li>
592
+						<li style="border-bottom:1px solid #f95a83;" itemtype="0" class="cr-click">登记信息</li>
593 593
 						<li style="border-bottom:1px solid #243747;" itemtype="1">历史通话</li>
594 594
                         <li style="border-bottom:1px solid #69cbd0;" itemtype="2" >历史记录</li>
595 595
                         <li style="border-bottom:1px solid #8C1293;" itemtype="3" >关联案件</li>

+ 2 - 1
CallCenterWeb.UI/js/index.js

@@ -128,7 +128,7 @@ $(document).ready(function() {
128 128
 				data: {
129 129
 					token: $.cookie("token"),
130 130
 					phone: $("#Result").val()
131
-				},
131
+				} ,
132 132
 				success: function(result) {
133 133
 					//                		result = $.parseJSON(result);
134 134
 					if(result.state.toLowerCase() == "success") {
@@ -142,6 +142,7 @@ $(document).ready(function() {
142 142
 						Send();
143 143
 						$('#Result').val('');
144 144
 						$(".WH").addClass("hidens");
145
+						iframeOutbound = 0;
145 146
 					}
146 147
 
147 148
 				}

+ 38 - 20
CallCenterWeb.UI/js/main.js

@@ -3,7 +3,7 @@
3 3
 	directType,sendType,mesCont,
4 4
 	eorrorConnect,errorState=false,
5 5
 	makeCallId = "",lockReconnect = false,
6
-	obj = {},cls = 0,
6
+	obj = {},cls = 0,iframeOutbound=0,
7 7
 	lasttime = new Date().getTime(),
8 8
 	reconnecTion,recon,loginOr=false;
9 9
 //创建scoket连接
@@ -105,20 +105,17 @@ function Connect() {
105 105
 							SayFreeBack();
106 106
 							break; //班长置闲
107 107
 						case "linestateagent":
108
-							LineStateAgentBack(data);
109
-							
108
+							LineStateAgentBack(data);							
110 109
 							break; //线路状态通知
111 110
 //						case "agentstateagent":
112 111
 //	                        AgentStateAgentBack(data);
113 112
 //	                        break; //坐席状态通知
114
-	                        
115 113
 						case "callid":
116 114
 							CallIDBack(data);
117 115
 							break; //获取callid
118 116
 						case "recordpath":
119 117
 							RecordPathBack(data);
120 118
 							break; //录音返回
121
-
122 119
 					}
123 120
 				} else {
124 121
 					if(rlt == false) {
@@ -388,7 +385,7 @@ function IncomingBack(data) {
388 385
 	if(data.CallID!=0){
389 386
 		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '">来电弹屏' + data.Number + ' <i class="fa fa-times-circle close_call"></i></a>';
390 387
 		$(".J_menuTab").removeClass("active");
391
-		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ data.CallID  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID=' + data.CallID + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '" seamless></iframe>';
388
+		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ data.CallID  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID=' + data.CallID + '&ActionID=' + data.ActionID + '&callDirection=0" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '" seamless></iframe>';
392 389
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
393 390
 		$(".J_menuTabs .page-tabs-content").append(p);
394 391
 		hidTel=data.Number;
@@ -398,7 +395,7 @@ function IncomingBack(data) {
398 395
 		var timestamp = Date.parse(new Date());
399 396
 		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID='+timestamp+'">来电弹屏' + data.Number + ' <i class="fa fa-times-circle close_call"></i></a>';
400 397
 		$(".J_menuTab").removeClass("active");
401
-		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID='+timestamp+'" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID='+timestamp+'" seamless></iframe>';
398
+		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID='+timestamp+'&callDirection=0" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID='+timestamp+'" seamless></iframe>';
402 399
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
403 400
 		$(".J_menuTabs .page-tabs-content").append(p);
404 401
 		hidTel=data.Number;
@@ -432,6 +429,13 @@ function DropCallBack() {
432 429
 		$(".zxzt").removeClass("bl").addClass("br");
433 430
 		$(".hwzt").text('置忙');
434 431
 	}
432
+	var makeCallPhone = $.cookie("makeCallPhone");
433
+	$(".J_mainContent .J_iframe").each(function() {
434
+		if($(this).attr("src") === "./TelCall/outboundPlan.html") {
435
+			var childWindow = $(this)[0].contentWindow
436
+			childWindow.btn_end_call(makeCallPhone)
437
+		}
438
+	})
435 439
 }
436 440
 //线路状态通知
437 441
 function LineStateAgentBack(data) {
@@ -554,33 +558,47 @@ function MakeCallBack(data) {
554 558
 	var makeCallPhone = $.cookie("makeCallPhone");
555 559
 	$("#top-search li i").removeClass("active");
556 560
 	$(".DropCall").addClass("active");
557
-	
558 561
 	//外呼弹屏
559 562
 	if(data.CallID!=0){
560
-		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '">外呼弹屏' + makeCallPhone + ' <i class="fa fa-times-circle close_call"></i></a>';
561
-		$(".J_menuTab").removeClass("active");
562
-		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ makeCallId  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID=' + makeCallId + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '" seamless></iframe>';
563
-		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
564
-		$(".J_menuTabs .page-tabs-content").append(p);
565
-		hidTel=makeCallPhone;
566
-		hidCallID=makeCallId;
567
-		hidActionID=data.ActionID;
568
-	}else{
563
+		if (iframeOutbound === 0) {
564
+			var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '">外呼弹屏' + makeCallPhone + ' <i class="fa fa-times-circle close_call"></i></a>';
565
+			$(".J_menuTab").removeClass("active");
566
+			var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ makeCallId  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID=' + makeCallId + '&ActionID=' + data.ActionID + '&callDirection=1" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '" seamless></iframe>';
567
+			$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
568
+			$(".J_menuTabs .page-tabs-content").append(p);
569
+			hidTel=makeCallPhone;
570
+			hidCallID=makeCallId;
571
+			hidActionID=data.ActionID;
572
+		} else if (iframeOutbound === 1) {
573
+			var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '">外呼弹屏' + makeCallPhone + ' <i class="fa fa-times-circle close_call"></i></a>';
574
+			$(".J_menuTab").removeClass("active");
575
+			var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ makeCallId  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID=' + makeCallId + '&ActionID=' + data.ActionID + '&callDirection=1" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + makeCallId + '" seamless></iframe>';
576
+			$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
577
+			$(".J_menuTabs .page-tabs-content").append(p);		
578
+			hidTel=makeCallPhone;
579
+			hidCallID=makeCallId;
580
+			hidActionID=data.ActionID;
581
+			$(".J_mainContent .J_iframe").each(function() {
582
+				if($(this).attr("src") === "./TelCall/outboundPlan.html") {
583
+					var childWindow = $(this)[0].contentWindow
584
+					childWindow.recordsCallOut()
585
+				}
586
+			})
587
+		}
588
+	} else {
569 589
 		var timestamp = Date.parse(new Date());
570 590
 		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID='+timestamp+'">外呼弹屏' + makeCallPhone + ' <i class="fa fa-times-circle close_call"></i></a>';
571 591
 		$(".J_menuTab").removeClass("active");
572
-		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID='+timestamp+'" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID='+timestamp+'" seamless></iframe>';
592
+		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID='+timestamp+'&callDirection=1" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID='+timestamp+'" seamless></iframe>';
573 593
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
574 594
 		$(".J_menuTabs .page-tabs-content").append(p);
575 595
 		hidTel=makeCallPhone;
576 596
 		hidCallID=timestamp;
577 597
 	}
578
-	
579 598
 	window.frames['iframe'+ hidCallID +''].window.onload = function(){
580 599
 		var callingFun = window.frames['iframe'+ hidCallID +''].window.calling;
581 600
 		callingFun();
582 601
 	}
583
-
584 602
 	// setTimeout (window.frames['iframe'+ hidCallID +''].calling(),500);
585 603
 	//	window.frames[obj.attr("name")].calling();
586 604
 }

+ 7 - 7
CallCenterWeb.UI/registrationManagement/registrationList/css/registrationList.css

@@ -254,13 +254,13 @@ textarea {
254 254
     line-height: initial;
255 255
 }
256 256
 
257
-    .setwin a {
258
-        position: relative;
259
-        width: 16px;
260
-        height: 16px;
261
-        font-size: 20px;
262
-        color: #fff;
263
-    }
257
+.setwin a {
258
+    position: relative;
259
+    width: 16px;
260
+    height: 16px;
261
+    font-size: 20px;
262
+    color: #fff;
263
+}
264 264
 
265 265
 .shade_content {
266 266
     overflow-y: auto;