Просмотр исходного кода

Merge branch 'master' of http://192.168.1.222:3000/yuqian/ZYKJ_UI

zhangshuangnan лет назад: 8
Родитель
Сommit
04d24accae

Разница между файлами не показана из-за своего большого размера
+ 570 - 569
CallCenterWeb.UI/SystemManager/js/yongHuManger.js


+ 6 - 7
CallCenterWeb.UI/clickcall/Details.html

@@ -382,15 +382,14 @@
382 382
                                         top.Send();
383 383
                                         $(".WH").addClass("hidens");
384 384
 
385
-                                        //更新外呼号码状态
386
-                                        $.ajax({
387
-                                            type: "post", url: huayi.config.callcenter_url + "CallPlan/UpdateCallState",
388
-                                            dataType: "json", data: { id: id },
389
-                                            success: function (res) { }
390
-                                        })
391
-
392 385
                                     }
393 386
 
387
+                                    //更新外呼号码状态
388
+                                    $.ajax({
389
+                                        type: "post", url: huayi.config.callcenter_url + "CallPlan/UpdateCallState",
390
+                                        dataType: "json", data: { id: id },
391
+                                        success: function (res) { }
392
+                                    })
394 393
                                 }
395 394
                             });
396 395
 

+ 12 - 2
CallCenterWeb.UI/clickcall/phoneresultlist.html

@@ -318,6 +318,7 @@
318 318
 						theadDataLength = theadData.length,
319 319
 						resultData1 = returnValue.data.datalist,
320 320
 						resultData1Length = resultData1.length;
321
+                        recordCount = returnValue.data.recordcount;
321 322
                         //加载头部
322 323
 
323 324
                         for (var i = 0; i < theadDataLength; i++) {
@@ -338,8 +339,11 @@
338 339
                         }
339 340
                         //console.log(arrData);
340 341
                         //debugger;
342
+
343
+
341 344
                         layui.use('table', function () {
342 345
                             var table = layui.table;
346
+                            var laypage = layui.laypage;
343 347
                             //展示已知数据
344 348
                             table.render({
345 349
                                 elem: '#table1',
@@ -348,8 +352,14 @@
348 352
                                 //skin: 'line', //表格风格
349 353
                                 even: true,
350 354
                                 page: true //是否显示分页
351
-                                //,limits: [5, 7, 10]
352
-                                //,limit: 5 //每页默认显示的数量
355
+                                , limits: [20]
356
+                                , limit: 20 //每页默认显示的数量
357
+                                , curr: 1
358
+
359
+                            });
360
+
361
+                            laypage.render({
362
+                                count: recordCount
353 363
                             });
354 364
                         });
355 365
                     } else {

+ 204 - 208
CallCenterWeb.UI/huJiaoManger/CustomerField.html

@@ -1,9 +1,7 @@
1
-<!DOCTYPE html>
1
+<!DOCTYPE html>
2 2
 <html>
3
-
4 3
 <head>
5 4
     <meta charset="UTF-8">
6
-
7 5
     <link href="../css/Table/table1.css" rel="stylesheet" />
8 6
     <link rel="stylesheet" href="../css/eid/bootstrap-editable.css" />
9 7
     <link href="../css/init.css" rel="stylesheet" />
@@ -53,15 +51,16 @@
53 51
         .btns {
54 52
             margin-left: 0;
55 53
         }
56
-        .tables tr td,.tables tr th{
57
-        	border: 0!important;
54
+
55
+        .tables tr td, .tables tr th {
56
+            border: 0 !important;
58 57
         }
59
-          .tables{
60
-        	    margin-top: 35px!important;
58
+
59
+        .tables {
60
+            margin-top: 35px !important;
61 61
         }
62 62
     </style>
63 63
 </head>
64
-
65 64
 <body>
66 65
     <body class="gray-bg">
67 66
         <div class="daoHang clearfix">
@@ -76,16 +75,13 @@
76 75
             </div>
77 76
         </div>
78 77
         <div class="wrapper wrapper-content animated ">
79
-
80 78
             <!--<div class="th-box">
81 79
                 <div class="th-bar">
82 80
                 </div>
83 81
             </div>-->
84 82
             <div class="clearFix">
85
-
86 83
                 <div style="width: 30%;padding: 10px; float: left;">
87 84
                     <p><button class="btns" onclick="leftMove()">移入<i class="fa fa-angle-double-right" style="margin-left: 5px;"></i></button></p>
88
-
89 85
                     <table id="list" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
90 86
                         <thead>
91 87
                             <tr>
@@ -99,7 +95,6 @@
99 95
                         <tbody id="tbody"></tbody>
100 96
                     </table>
101 97
                 </div>
102
-
103 98
                 <div style="width: 70%;padding: 10px;float: right;">
104 99
                     <p>
105 100
                         <button class="btns" onclick="rightMove()"><i class="fa fa-angle-double-left" style="margin-right: 5px;"></i>移出</button>
@@ -290,56 +285,56 @@
290 285
                         },
291 286
                         columns: [{
292 287
                             checkbox: true,
293
-                             formatter: function (value, row, index) {
294
-                        		if(row.F_FieldType==0){
295
-                        			 return {
296
-						                disabled: true
297
-//						                checked: true
298
-						            }
299
-                        		}else{
300
-                        			 return {
301
-//						                disabled: true;
302
-						                checkbox: true
303
-						            }
304
-                        			
305
-                        		}
288
+                            formatter: function (value, row, index) {
289
+                                if (row.F_FieldType == 0) {
290
+                                    return {
291
+                                        disabled: true
292
+                                        //						                checked: true
293
+                                    }
294
+                                } else {
295
+                                    return {
296
+                                        //						                disabled: true;
297
+                                        checkbox: true
298
+                                    }
299
+
300
+                                }
306 301
                             }
307 302
                         }, {
308 303
                             //									field: "length",
309 304
                             title: "操作",
310 305
                             formatter: function (value, row, index) {
311
-                        		if(row.F_FieldType==0){
312
-                        			return '<div></div>'
313
-                        		}else{
314
-                        			 return '<div><a class="getOut" title="点击移出" onclick="goLeft(' + row.F_Id + ')"><i class="fa fa-arrow-left"></i></a></div>'
315
-                        		}
316
-                               
306
+                                if (row.F_FieldType == 0) {
307
+                                    return '<div></div>'
308
+                                } else {
309
+                                    return '<div><a class="getOut" title="点击移出" onclick="goLeft(' + row.F_Id + ')"><i class="fa fa-arrow-left"></i></a></div>'
310
+                                }
311
+
317 312
                             }
318 313
 
319 314
                         }, {
320 315
                             field: "F_FieldType",
321 316
                             title: "字段类型",
322 317
                             formatter: function (value, row, index) {
323
-                            	var str='';
324
-                            	if(value==0){
325
-                            		str='系统字段';
326
-                            		
327
-                            	}else{
328
-                            		str='自定义字段';
329
-                            	}
330
-                                return '<div>'+ str +'</div>'
318
+                                var str = '';
319
+                                if (value == 0) {
320
+                                    str = '系统字段';
321
+
322
+                                } else {
323
+                                    str = '自定义字段';
324
+                                }
325
+                                return '<div>' + str + '</div>'
331 326
                             }
332 327
 
333 328
                         }, {
334 329
                             field: "F_Name",
335 330
                             title: "字段表头名称",
336 331
                             formatter: function (value, row, index) {
337
-                            	var str1='';
338
-                            	if(row.F_FieldType==0){
339
-                            		str1="<span href=\"#\" title=\"点击修改\"  name='" + value + "'  data-id=\"" + row.F_Id + "\">" + value + "</span>";
340
-                            	}else{
341
-                            		str1="<a href=\"#\" class=\"F_Name\" title=\"点击修改\"  name='" + value + "'  data-id=\"" + row.F_Id + "\">" + value + "</a>";
342
-                            	}
332
+                                var str1 = '';
333
+                                if (row.F_FieldType == 0) {
334
+                                    str1 = "<span href=\"#\" title=\"点击修改\"  name='" + value + "'  data-id=\"" + row.F_Id + "\">" + value + "</span>";
335
+                                } else {
336
+                                    str1 = "<a href=\"#\" class=\"F_Name\" title=\"点击修改\"  name='" + value + "'  data-id=\"" + row.F_Id + "\">" + value + "</a>";
337
+                                }
343 338
                                 return str1
344 339
                             }
345 340
                         }, {
@@ -353,9 +348,12 @@
353 348
                             {
354 349
                                 field: "F_Sort",
355 350
                                 title: "排序",//可修改
356
-                                 formatter: function (value, row, index) {
357
-                                return "<a href=\"#\" class=\"F_Sort\" title=\"点击修改\"  name='" + value + "' data-sort=\"" + row.F_Sort + "\"  data-id=\"" + row.F_Id + "\" >" + value + "</a>";
358
-                            }
351
+                                formatter: function (value, row, index) {
352
+                                    if (row.F_FieldType == 0)
353
+                                        return value;
354
+                                    return "<a href=\"#\" class=\"F_Sort\" title=\"点击修改\"  name='" + value + "' data-sort=\"" + row.F_Sort + "\"  data-id=\"" + row.F_Id + "\" >" + value + "</a>";
355
+
356
+                                }
359 357
                             },
360 358
                             {
361 359
                                 field: "F_CharLength",
@@ -364,88 +362,87 @@
364 362
                             {
365 363
                                 field: "F_IsNecessary",
366 364
                                 title: " 是否必填",//可修改
367
-                                 formatter: function (value, row, index) {
368
-                                 	var str='';
369
-	                            	if(value==0){
370
-	                            		str='否';
371
-	                            	}else{
372
-	                            		str='是';
373
-	                            	}
374
-                                return "<a href=\"#\" class=\"F_IsNecessary\" title=\"点击修改\" onclick=\"yesOrNo(this,'IsNecessary')\"  name='" + value + "' data-id=\"" + row.F_Id + "\" data-parameter=\"IsNecessary\" >" + str + "</a>";
375
-                            }
365
+                                formatter: function (value, row, index) {
366
+                                    var str = '';
367
+                                    if (value == 0) {
368
+                                        str = '否';
369
+                                    } else {
370
+                                        str = '是';
371
+                                    }
372
+                                    return "<a href=\"#\" class=\"F_IsNecessary\" title=\"点击修改\" onclick=\"yesOrNo(this,'IsNecessary')\"  name='" + value + "' data-id=\"" + row.F_Id + "\" data-parameter=\"IsNecessary\" >" + str + "</a>";
373
+                                }
376 374
                             },
377 375
                             {
378 376
                                 field: "F_IsExportOrInput",
379 377
                                 title: "是否需要导入导出",//可修改
380
-                                 formatter: function (value, row, index) {
381
-                                 		var str='';
382
-	                            	if(value==0){
383
-	                            		str='否';
384
-	                            		
385
-	                            	}else{
386
-	                            		str='是';
387
-	                            	}
388
-                                 	
389
-                                return "<a href=\"#\" class=\"F_IsExportOrInput\" title=\"点击修改\" onclick=\"yesOrNo(this,'IsExportOrInput')\" name='" + value + "'  data-id=\"" + row.F_Id + "\" data-parameter=\"IsExportOrInput\" >" + str + "</a>";
390
-                            }
378
+                                formatter: function (value, row, index) {
379
+                                    var str = '';
380
+                                    if (value == 0) {
381
+                                        str = '否';
382
+
383
+                                    } else {
384
+                                        str = '是';
385
+                                    }
386
+
387
+                                    return "<a href=\"#\" class=\"F_IsExportOrInput\" title=\"点击修改\" onclick=\"yesOrNo(this,'IsExportOrInput')\" name='" + value + "'  data-id=\"" + row.F_Id + "\" data-parameter=\"IsExportOrInput\" >" + str + "</a>";
388
+                                }
391 389
                             },
392 390
                             {
393 391
                                 field: "F_IsShowOnList",
394 392
                                 title: " 是否在列表中显示",//可修改
395
-                                 formatter: function (value, row, index) {
396
-                                 		var str='';
397
-	                            	if(value==0){
398
-	                            		str='否';
399
-	                            		
400
-	                            	}else{
401
-	                            		str='是';
402
-	                            	}
403
-                                return "<a href=\"#\" class=\"F_IsShowOnList\" title=\"点击修改\" onclick=\"yesOrNo(this,'IsShowOnList')\" name='" + value + "' data-sort=\"" + row.F_Sort + "\"  data-id=\"" + row.F_Id + "\" data-parameter=\"IsShowOnList\">" + str + "</a>";
404
-                            }
393
+                                formatter: function (value, row, index) {
394
+                                    var str = '';
395
+                                    if (value == 0) {
396
+                                        str = '否';
397
+
398
+                                    } else {
399
+                                        str = '是';
400
+                                    }
401
+                                    return "<a href=\"#\" class=\"F_IsShowOnList\" title=\"点击修改\" onclick=\"yesOrNo(this,'IsShowOnList')\" name='" + value + "' data-sort=\"" + row.F_Sort + "\"  data-id=\"" + row.F_Id + "\" data-parameter=\"IsShowOnList\">" + str + "</a>";
402
+                                }
405 403
                             },
406 404
                             {
407 405
                                 field: "F_IsShowOnScrean",
408 406
                                 title: " 是否在弹屏页面中显示",//可修改
409
-                                 formatter: function (value, row, index) {
410
-                                 		var str='';
411
-	                            	if(value==0){
412
-	                            		str='否';
413
-	                            		
414
-	                            	}else{
415
-	                            		str='是';
416
-	                            	}
417
-                                return "<a href=\"#\" class=\"F_IsShowOnScrean\" title=\"点击修改\" onclick=\"yesOrNo(this,'IsShowOnScrean')\"  name='" + value + "' data-sort=\"" + row.F_Sort + "\"  data-id=\"" + row.F_Id + "\" data-parameter=\"IsShowOnScrean\">" + str + "</a>";
418
-                            }
407
+                                formatter: function (value, row, index) {
408
+                                    var str = '';
409
+                                    if (value == 0) {
410
+                                        str = '否';
411
+
412
+                                    } else {
413
+                                        str = '是';
414
+                                    }
415
+                                    return "<a href=\"#\" class=\"F_IsShowOnScrean\" title=\"点击修改\" onclick=\"yesOrNo(this,'IsShowOnScrean')\"  name='" + value + "' data-sort=\"" + row.F_Sort + "\"  data-id=\"" + row.F_Id + "\" data-parameter=\"IsShowOnScrean\">" + str + "</a>";
416
+                                }
419 417
                             },
420 418
                             {
421 419
                                 field: "F_Search",
422 420
                                 title: " 搜索类型",//可修改
423 421
                                 formatter: function (value, row, index) {
424
-                                	var strs='';
425
-                                	switch(value)
426
-											{
427
-											case 0:
428
-											  strs="不查询";
429
-											  break;
430
-											case 1:
431
-											  strs="精确查询";
432
-											  break;
433
-											case 2:
434
-											  strs="模糊查询";
435
-											  break;
436
-											case 3:
437
-											  strs="范围查询";
438
-											  break;
439
-											default:
440
-											 strs=''
441
-											}
442
-                                return "<a href=\"#\" class=\"F_Search\" title=\"点击修改\"  onclick=\"searchType(this)\" name='" + value + "' data-sort=\"" + row.F_Sort + "\"  data-id=\"" + row.F_Id + "\" data-IsNecessary=\"" + row.F_IsNecessary + "\" data-IsExportOrInput=\"" + row.F_IsExportOrInput + "\" data-IsShowOnList=\"" + row.F_IsShowOnList + "\" data-IsShowOnScrean=\"" + row.F_IsShowOnScrean + "\" data-Search=\"" + row.F_Search + "\">" + strs + "</a>";
443
-                            }
422
+                                    var strs = '';
423
+                                    switch (value) {
424
+                                        case 0:
425
+                                            strs = "不查询";
426
+                                            break;
427
+                                        case 1:
428
+                                            strs = "精确查询";
429
+                                            break;
430
+                                        case 2:
431
+                                            strs = "模糊查询";
432
+                                            break;
433
+                                        case 3:
434
+                                            strs = "范围查询";
435
+                                            break;
436
+                                        default:
437
+                                            strs = ''
438
+                                    }
439
+                                    return "<a href=\"#\" class=\"F_Search\" title=\"点击修改\"  onclick=\"searchType(this)\" name='" + value + "' data-sort=\"" + row.F_Sort + "\"  data-id=\"" + row.F_Id + "\" data-IsNecessary=\"" + row.F_IsNecessary + "\" data-IsExportOrInput=\"" + row.F_IsExportOrInput + "\" data-IsShowOnList=\"" + row.F_IsShowOnList + "\" data-IsShowOnScrean=\"" + row.F_IsShowOnScrean + "\" data-Search=\"" + row.F_Search + "\">" + strs + "</a>";
440
+                                }
444 441
                             }
445 442
                         ],
446 443
                         onClickRow: function (row, $element) {
447 444
                             var curRow = row.id;
448
-//                          console.log(curRow);
445
+                            //                          console.log(curRow);
449 446
                             //								//请求方法
450 447
                             //								$.ajax({       
451 448
                             //									type: 'POST',
@@ -476,9 +473,9 @@
476 473
                                         url: huayi.config.callcenter_url + "CustomerField/CreateOrUpdate",
477 474
                                         data: {
478 475
                                             id: id,
479
-//                                          name: params.value,
476
+                                            //                                          name: params.value,
480 477
                                             token: $.cookie("token"),
481
-                                            Name:params.value,		//字段表头名称
478
+                                            Name: params.value,		//字段表头名称
482 479
                                         },
483 480
                                         dataType: 'JSON',
484 481
                                         success: function (data, textStatus, jqXHR) {
@@ -502,9 +499,9 @@
502 499
                                         url: huayi.config.callcenter_url + "CustomerField/CreateOrUpdate",
503 500
                                         data: {
504 501
                                             id: id,
505
-//                                          name: params.value,
502
+                                            //                                          name: params.value,
506 503
                                             token: $.cookie("token"),
507
-											Sort:params.value			//排序
504
+                                            Sort: params.value			//排序
508 505
                                         },
509 506
                                         dataType: 'JSON',
510 507
                                         success: function (data, textStatus, jqXHR) {
@@ -524,102 +521,102 @@
524 521
                     });
525 522
 
526 523
                 }
527
-                
528
-                 var bianJi = '<table class="table tables">' +
529
-					            '<tr>' +
530
-					            '<th style="text-align: right;"><b>搜索类型:</b></th>' +
531
-					            '<td>' +
532
-					            '<select name="" id="tks" class="select">' +
533
-					                '<option value="0">不查询</option>' +
534
-                                    '<option value="1">精确查询</option>' +
535
-                                   ' <option value="2">模糊查询</option>' +
536
-                                    '<option value="3">范围查询</option>' +
537
-					            '</select></td>' +
538
-					            '</tr>' +
539
-					            '</table>'
540
-                function searchType(a){
541
-                	var name = $(a).attr("name");
524
+
525
+                var bianJi = '<table class="table tables">' +
526
+                               '<tr>' +
527
+                               '<th style="text-align: right;"><b>搜索类型:</b></th>' +
528
+                               '<td>' +
529
+                               '<select name="" id="tks" class="select">' +
530
+                                   '<option value="0">不查询</option>' +
531
+                                   '<option value="1">精确查询</option>' +
532
+                                  ' <option value="2">模糊查询</option>' +
533
+                                   '<option value="3">范围查询</option>' +
534
+                               '</select></td>' +
535
+                               '</tr>' +
536
+                               '</table>'
537
+                function searchType(a) {
538
+                    var name = $(a).attr("name");
542 539
                     var id = $(a).attr("data-id");
543
-                	 var bjLay = layer.open({
544
-			                type: 1,
545
-			                skin: 'layui-layer-demo', //加上边框
546
-			                area: ['40%', '50%'], //宽高
547
-			                btn: ['确定', '取消'],
548
-			                
549
-			                yes: function (index, layero) {
550
-			                    $.ajax({
551
-			                        type: "post",
552
-			                        url: huayi.config.callcenter_url + "CustomerField/CreateOrUpdate",
553
-			                        async: true,
554
-			                        dataType: 'json',
555
-			                        data: {
556
-			                            id: id,
557
-                                        token: $.cookie("token"),
558
-										Search :$('#tks').val(),//是否在弹屏页面中显示
559
-			                        },
560
-			                        success: function (data) {
561
-			                            if (data.state.toLowerCase() == "success") {
562
-			                            	layer.close(bjLay);
563
-			                               $('#lists').bootstrapTable('refresh');
564
-			                            }
565
-			                        }
566
-			                    });
567
-			                },
568
-			                btn2: function () {
569
-			                    layer.close(bjLay)
570
-			                },
571
-			                content: bianJi
572
-			            });
573
-			           $('#tks').val(name);       	
540
+                    var bjLay = layer.open({
541
+                        type: 1,
542
+                        skin: 'layui-layer-demo', //加上边框
543
+                        area: ['40%', '50%'], //宽高
544
+                        btn: ['确定', '取消'],
545
+
546
+                        yes: function (index, layero) {
547
+                            $.ajax({
548
+                                type: "post",
549
+                                url: huayi.config.callcenter_url + "CustomerField/CreateOrUpdate",
550
+                                async: true,
551
+                                dataType: 'json',
552
+                                data: {
553
+                                    id: id,
554
+                                    token: $.cookie("token"),
555
+                                    Search: $('#tks').val(),//是否在弹屏页面中显示
556
+                                },
557
+                                success: function (data) {
558
+                                    if (data.state.toLowerCase() == "success") {
559
+                                        layer.close(bjLay);
560
+                                        $('#lists').bootstrapTable('refresh');
561
+                                    }
562
+                                }
563
+                            });
564
+                        },
565
+                        btn2: function () {
566
+                            layer.close(bjLay)
567
+                        },
568
+                        content: bianJi
569
+                    });
570
+                    $('#tks').val(name);
574 571
                 }
575
-                
576
-                 var yesNo = '<table class="table tables">' +
577
-					            '<tr>' +
578
-					            '<th style="text-align: right;"><b>搜索类型:</b></th>' +
579
-					            '<td>' +
580
-					            '<select name="" id="yes" class="select">' +
581
-					                '<option value="0">否</option>' +
582
-                                    '<option value="1">是</option>' +
583
-					            '</select></td>' +
584
-					            '</tr>' +
585
-					            '</table>'
586
-                
587
-                function yesOrNo(a,b){
588
-                	var name = $(a).attr("name");
572
+
573
+                var yesNo = '<table class="table tables">' +
574
+                               '<tr>' +
575
+                               '<th style="text-align: right;"><b>搜索类型:</b></th>' +
576
+                               '<td>' +
577
+                               '<select name="" id="yes" class="select">' +
578
+                                   '<option value="0">否</option>' +
579
+                                   '<option value="1">是</option>' +
580
+                               '</select></td>' +
581
+                               '</tr>' +
582
+                               '</table>'
583
+
584
+                function yesOrNo(a, b) {
585
+                    var name = $(a).attr("name");
589 586
                     var id = $(a).attr("data-id");
590
-                	 var yns= layer.open({
591
-			                type: 1,
592
-			                skin: 'layui-layer-demo', //加上边框
593
-			                area: ['40%', '50%'], //宽高
594
-			                btn: ['确定', '取消'],
595
-			                yes: function (index, layero) {
596
-			                	var obj={id: id,token: $.cookie("token")};
597
-                   				    obj[b]=$('#yes').val();
598
-			                    $.ajax({
599
-			                        type: "post",
600
-			                        url: huayi.config.callcenter_url + "CustomerField/CreateOrUpdate",
601
-			                        async: true,
602
-			                        dataType: 'json',
603
-//			                        data: {
604
-//			                            id: id,
605
-//                                      token: $.cookie("token"),
606
-//										Search :$('#yes').val(),//是否在弹屏页面中显示
607
-//			                        },
608
-			                        data: obj,
609
-			                        success: function (data) {
610
-			                            if (data.state.toLowerCase() == "success") {
611
-			                            	layer.close(yns);
612
-			                               $('#lists').bootstrapTable('refresh');
613
-			                            }
614
-			                        }
615
-			                    });
616
-			                },
617
-			                btn2: function () {
618
-			                    layer.close(yns)
619
-			                },
620
-			                content: yesNo
621
-			            });
622
-			           $('#yes').val(name); 
587
+                    var yns = layer.open({
588
+                        type: 1,
589
+                        skin: 'layui-layer-demo', //加上边框
590
+                        area: ['40%', '50%'], //宽高
591
+                        btn: ['确定', '取消'],
592
+                        yes: function (index, layero) {
593
+                            var obj = { id: id, token: $.cookie("token") };
594
+                            obj[b] = $('#yes').val();
595
+                            $.ajax({
596
+                                type: "post",
597
+                                url: huayi.config.callcenter_url + "CustomerField/CreateOrUpdate",
598
+                                async: true,
599
+                                dataType: 'json',
600
+                                //			                        data: {
601
+                                //			                            id: id,
602
+                                //                                      token: $.cookie("token"),
603
+                                //										Search :$('#yes').val(),//是否在弹屏页面中显示
604
+                                //			                        },
605
+                                data: obj,
606
+                                success: function (data) {
607
+                                    if (data.state.toLowerCase() == "success") {
608
+                                        layer.close(yns);
609
+                                        $('#lists').bootstrapTable('refresh');
610
+                                    }
611
+                                }
612
+                            });
613
+                        },
614
+                        btn2: function () {
615
+                            layer.close(yns)
616
+                        },
617
+                        content: yesNo
618
+                    });
619
+                    $('#yes').val(name);
623 620
                 }
624 621
                 //编辑
625 622
                 function shtype(val, row, index) {
@@ -650,7 +647,7 @@
650 647
                     var changes = $.map($('#lists').bootstrapTable('getSelections'), function (row) {
651 648
                         return row.F_Id;
652 649
                     });
653
-//                  changes=changes.toString();
650
+                    //                  changes=changes.toString();
654 651
                     if (changes.length <= 0) {
655 652
                         layer.confirm('请选择一项移出!', {
656 653
                             btn: ['确定']
@@ -665,5 +662,4 @@
665 662
 
666 663
             </script>
667 664
     </body>
668
-
669 665
 </html>

+ 13 - 12
CallCenterWeb.UI/js/main.js

@@ -70,7 +70,7 @@ function Connect() {
70 70
                         case "linestate": LineStateBack(data); break;//线路状态
71 71
                         case "motorsetstate": SayFreeBack(); break;//班长置闲
72 72
                         case "linestateagent": LineStateAgentBack(data); break;//线路状态通知
73
-                            //case "callid": CallIDBack(data); break;//获取callid  此方法无用
73
+                        case "callid": CallIDBack(data); break;//获取callid  此方法无用
74 74
                         case "recordpath": RecordPathBack(data); break;//录音返回
75 75
                     }
76 76
                 }
@@ -257,10 +257,11 @@ function IncomingBack(data) {
257 257
     $(".Bacha").hide();
258 258
 }
259 259
 
260
-//CallID 在 type=Incoming 时就已经返回了,此方法无用
261
-//function CallIDBack(data) {
262
-//    //$(".hidCallID").val(data.CurrID);
263
-//}
260
+//CallID 在 type=Incoming 时就已经返回了,此方法无用(自动外呼)
261
+//点击外呼需要
262
+function CallIDBack(data) {
263
+    $(".hidCallID").val(data.CurrID);
264
+}
264 265
 //挂断
265 266
 function DropCallBack() {
266 267
     $("#top-search li i").removeClass("active");
@@ -325,13 +326,13 @@ function LineStateAgentBack(data) {
325 326
     if (data.State == '6') {
326 327
         $(".hwzt").text('通话中');//左下角状态显示
327 328
         $(".fwzt").removeClass("bl").addClass("br");
328
-        if ($(".hidTel").val() && $(".hidCallID").val()) {
329
-            $.post(huayi.config.callcenter_url + 'CallInScreen/UpdateZJ', { callid: $(".hidCallID").val(), "token": $.cookie("token") }, function (result) {
330
-                result = JSON.parse(result);
331
-                if (result.state.toLowerCase() == "success") {
332
-                }
333
-            })
334
-        }
329
+        //if ($(".hidTel").val() && $(".hidCallID").val()) {
330
+        $.post(huayi.config.callcenter_url + 'CallInScreen/UpdateZJ', { callid: $(".hidCallID").val(), "token": $.cookie("token") }, function (result) {
331
+            result = JSON.parse(result);
332
+            if (result.state.toLowerCase() == "success") {
333
+            }
334
+        })
335
+        //}
335 336
 
336 337
         $(".td-call").show();
337 338
         n = 0;

+ 188 - 189
CallCenterWeb.UI/keHuManager/customerList.html

@@ -1,6 +1,5 @@
1
-<!DOCTYPE html>
1
+<!DOCTYPE html>
2 2
 <html>
3
-
4 3
 <head>
5 4
     <meta charset="UTF-8">
6 5
     <script src="../Script/Common/huayi.load.js"></script>
@@ -158,77 +157,78 @@
158 157
         .ysc {
159 158
             background: #ef2e18;
160 159
         }
161
-        .layui-layer-title{
162
-        	color: #fff!important;
163
-        	background:  #019587!important;
160
+
161
+        .layui-layer-title {
162
+            color: #fff !important;
163
+            background: #019587 !important;
164 164
         }
165 165
     </style>
166 166
 </head>
167 167
 <body>
168
-	<form class="container-fluid" enctype="multipart/form-data">
169
-    <div class="container-fluid">
170
-        <div class="daoHang clearfix">
171
-            <div class="dhLeft">
172
-                <sapn>
173
-                    <i class="syIcon"></i>位置:
174
-                    <a id="ReIndex" href="javaScript:;">首页</a>&gt;
175
-                    <a href="javaScript:;">客户管理</a>&gt;
176
-                    <a href="javaScript:;" style="color: #000;">客户列表</a>
177
-                </sapn>
178
-            </div>
179
-        </div>
180
-        <div class="tcon">
181
-            <div class="tool clearfix">
182
-                <!--<div class="searchbox col-sm-2">
183
-                    <div class="secon">
184
-                        <b>号码</b>
185
-                        <p class="secl"><input type="text" placeholder="号码" class="phone" /></p>
186
-                    </div>
187
-                </div>-->
168
+    <form class="container-fluid" enctype="multipart/form-data">
169
+        <div class="container-fluid">
170
+            <div class="daoHang clearfix">
171
+                <div class="dhLeft">
172
+                    <sapn>
173
+                        <i class="syIcon"></i>位置:
174
+                        <a id="ReIndex" href="javaScript:;">首页</a>&gt;
175
+                        <a href="javaScript:;">客户管理</a>&gt;
176
+                        <a href="javaScript:;" style="color: #000;">客户列表</a>
177
+                    </sapn>
178
+                </div>
188 179
             </div>
189
-            <div class="anniu layui-btn-group demoTable" style="margin: 20px 0;">
190
-                <button class="btns search layui-btn" type="button"><i class="fa fa-search"></i>查询</button>
191
-                <a class="btns layui-btn" id="addto"><i class="fa fa-plus"></i>添加</a>
192
-                <a class="btns layui-btn" id="remove" data-type="getCheckData"><i class="fa fa-remove"></i>批量删除</a>
180
+            <div class="tcon">
181
+                <div class="tool clearfix">
182
+                    <!--<div class="searchbox col-sm-2">
183
+                        <div class="secon">
184
+                            <b>号码</b>
185
+                            <p class="secl"><input type="text" placeholder="号码" class="phone" /></p>
186
+                        </div>
187
+                    </div>-->
188
+                </div>
189
+                <div class="anniu layui-btn-group demoTable" style="margin: 20px 0;">
190
+                    <button class="btns search layui-btn" type="button"><i class="fa fa-search"></i>查询</button>
191
+                    <a class="btns layui-btn" id="addto"><i class="fa fa-plus"></i>添加</a>
192
+                    <a class="btns layui-btn" id="remove" data-type="getCheckData"><i class="fa fa-remove"></i>批量删除</a>
193
+                </div>
194
+                <table class="layui-hide" id="table1" lay-filter="demo"></table>
193 195
             </div>
194
-            <table class="layui-hide" id="table1" lay-filter="demo"></table>
195 196
         </div>
196
-    </div>
197
-   </form>
197
+    </form>
198 198
     <script type="text/html" id="barDemo">
199
-		  <!--<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>-->
200
-		  <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
201
-		  <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
202
-	</script>
199
+        <!--<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>-->
200
+        <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
201
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
202
+    </script>
203 203
     <script src="../js/layui/layui.js"></script>
204 204
     <script src="../js/jquery.form.min.js"></script>
205 205
     <script>
206
-    	$.ajax({
207
-    		type:"get",
208
-    		url:huayi.config.callcenter_url + 'Customer/GetList',
209
-    		async:true,
210
-    		dataType:'json',
211
-    		data:{
212
-    		        token: token,	
213
-    		},
214
-    		success:function(res){
215
-    			 searchBar=res.data.search;
216
-						//搜索条件
217
-						$('.tool').html('');
218
-						$(searchBar).each(function(k,q){
219
-							if(q.F_Search>0){
220
-								$('<div class="searchbox col-sm-2">'+
221
-				                    '<div class="secon">'+
222
-				                       '<b>'+q.F_Name +':</b>'+
223
-				                        '<p class="secl"><input type="text" class="phone"  name="'+q.F_DBFieldName+'"/></p>'+
224
-				                    '</div>'+
225
-				               '</div>').appendTo('.tool')
226
-							}
227
-						})
228
-    		}
229
-    	});
230
-    	
231
-    	
206
+        $.ajax({
207
+            type: "get",
208
+            url: huayi.config.callcenter_url + 'Customer/GetSearchFields',
209
+            async: true,
210
+            dataType: 'json',
211
+            data: {
212
+                token: token,
213
+            },
214
+            success: function (res) {
215
+                searchBar = res.data.search;
216
+                //搜索条件
217
+                $('.tool').html('');
218
+                $(searchBar).each(function (k, q) {
219
+                    if (q.F_Search > 0) {
220
+                        $('<div class="searchbox col-sm-2">' +
221
+                            '<div class="secon">' +
222
+                               '<b>' + q.F_Name + ':</b>' +
223
+                                '<p class="secl"><input type="text" class="phone"  name="' + q.F_DBFieldName + '"/></p>' +
224
+                            '</div>' +
225
+                       '</div>').appendTo('.tool')
226
+                    }
227
+                })
228
+            }
229
+        });
230
+
231
+
232 232
         var sear;
233 233
         var token = $.cookie("token");
234 234
 
@@ -236,17 +236,17 @@
236 236
         $('.search').click(function () {
237 237
             initTable();
238 238
         });
239
- 		//添加
239
+        //添加
240 240
         $('#addto').click(function () {
241
-//         top.$("iframe:visible")[0].src = "keHuManager/customerListAdd.html";
242
-			layer.open({
243
-				type: 2,
244
-				content: "../keHuManager/customerListAdd.html", //iframe的url,no代表不显示滚动条
245
-				title: '客户列表添加',
246
-				area: ['75%', '80%'], //宽高
247
-			});
241
+            //         top.$("iframe:visible")[0].src = "keHuManager/customerListAdd.html";
242
+            layer.open({
243
+                type: 2,
244
+                content: "../keHuManager/customerListAdd.html", //iframe的url,no代表不显示滚动条
245
+                title: '客户列表添加',
246
+                area: ['75%', '80%'], //宽高
247
+            });
248 248
         });
249
- 
249
+
250 250
         initTable()
251 251
         function initTable() {
252 252
             var colsData = [];
@@ -255,36 +255,36 @@
255 255
 			.attr("method", "get")
256 256
 			.attr("action", huayi.config.callcenter_url + "Customer/GetSearch")
257 257
 			.attr("enctype", "multipart/form-data");
258
-		$(".container-fluid").ajaxSubmit({
259
-			dataType: "json",
260
-			data: {
261
-				token: token
262
-			},
263
-			success: function(returnValue) {
264
-				//debugger;
265
-				if(returnValue.state.toLowerCase() == "success") {
266
-					  //异步获取数据
258
+            $(".container-fluid").ajaxSubmit({
259
+                dataType: "json",
260
+                data: {
261
+                    token: token
262
+                },
263
+                success: function (returnValue) {
264
+                    //debugger;
265
+                    if (returnValue.state.toLowerCase() == "success") {
266
+                        //异步获取数据
267 267
                         var theadData = returnValue.data.headlist,
268 268
 							 resultData1 = returnValue.data.datalist;
269 269
                         //加载头部
270
-                        $(theadData).each(function(i,n){
271
-                        	var obj1 = {};
270
+                        $(theadData).each(function (i, n) {
271
+                            var obj1 = {};
272 272
                             obj1['field'] = 'items' + i;
273 273
                             obj1['title'] = theadData[i];
274 274
                             colsData.push(obj1);
275 275
                         })
276
-                          colsData.push({fixed: 'right', align:'center', toolbar: '#barDemo'});
277
-                          colsData.unshift({checkbox: true, fixed: true});
276
+                        colsData.push({ fixed: 'right', align: 'center', toolbar: '#barDemo' });
277
+                        colsData.unshift({ checkbox: true, fixed: true });
278 278
                         //表身数据
279
-                        $(resultData1).each(function(j,m){
280
-                        	var obj={};
281
-                        	obj['id'] = m.id;
282
-                        	$(m.dataarr).each(function(y,g){
283
-                        		 obj['items' + y + ''] = g;
284
-                        	})
285
-                        	arrData.push(obj);
279
+                        $(resultData1).each(function (j, m) {
280
+                            var obj = {};
281
+                            obj['id'] = m.id;
282
+                            $(m.dataarr).each(function (y, g) {
283
+                                obj['items' + y + ''] = g;
284
+                            })
285
+                            arrData.push(obj);
286 286
                         })
287
-                        
287
+
288 288
                         layui.use('table', function () {
289 289
                             var table = layui.table;
290 290
                             //展示已知数据
@@ -299,105 +299,104 @@
299 299
                                 //,limit: 5 //每页默认显示的数量
300 300
                             });
301 301
                         });
302
-					
303
-				} 
304 302
 
305
-			}
306
-		});
303
+                    }
304
+
305
+                }
306
+            });
307 307
         }
308
-          layui.use('table', function () {
309
-                  var table = layui.table;
310
-           	 //操作
311
-                    table.on('tool(demo)', function(obj){
312
-                    	console.log(obj)
313
-					    var data = obj.data;
314
-					    var srr=[];
315
-//					    if(obj.event === 'detail'){
316
-//					      layer.msg('ID:'+ data.id + ' 的查看操作');
317
-//					    } else 
318
-					    if(obj.event === 'del'){
319
-					      layer.confirm('确定删除吗?', function(index){
320
-					      	srr.push(data.id);
321
-					        $.ajax({
322
-					        	type:"post",
323
-					        	url: huayi.config.callcenter_url + 'Customer/DelCustomer',
324
-					        	async:true,
325
-					        	dataType:'json',
326
-					        	data:{
327
-					        		token: token,
328
-					        		ids:srr
329
-					        	},
330
-					        	success:function(res){
331
-					        		if(res.state.toLowerCase()=='success'){
332
-					        			  layer.close(index);
333
-					        			  layer.msg('删除成功!');
334
-					        			   initTable();
335
-					        		}
336
-					        		
337
-					        	}
338
-					        });
339
-					      });
340
-					    } else if(obj.event === 'edit'){
341
-						    	layer.open({
342
-										type: 2,
343
-										content: "../keHuManager/customerListEdit.html?id="+data.id, //iframe的url,no代表不显示滚动条
344
-										title: '客户列表修改',
345
-										area: ['75%', '80%'], //宽高
346
-								});
347
-//					      layer.alert('编辑行:<br>'+ JSON.stringify(data))
348
-					    }
349
-				  });
350
-				  
351
-				  
352
-				    
353
-    
354
-    //批量删除
355
-		    var $ = layui.$, active = {
356
-		    getCheckData: function(){ //获取选中数据
357
-		      var checkStatus = table.checkStatus('table1').data;
358
-		      var arr=[];
359
-		      $(checkStatus).each(function(k,y){
360
-		      		arr.push(y.id)
361
-		      })
362
-		      if(arr.length <=0){
363
-		      	 layer.msg('请选择要删除的行!');
364
-		      }else{
365
-		       	 layer.confirm('确定删除吗?', function(index){
366
-					        $.ajax({
367
-					        	type:"post",
368
-					        	url: huayi.config.callcenter_url + 'Customer/DelCustomer',
369
-					        	async:true,
370
-					        	dataType:'json',
371
-					        	data:{
372
-					        		token: token,
373
-					        		ids:arr
374
-					        	},
375
-					        	success:function(res){
376
-					        		if(res.state.toLowerCase()=='success'){
377
-					        			  layer.close(index);
378
-					        			  layer.msg('删除成功!');
379
-					        			   initTable();
380
-					        		}
381
-					        		
382
-					        	}
383
-					        });
384
-					      });
385
-		    }
386
-		      }
387
-		      
388
-		  };
389
-		    $('.demoTable #remove').on('click', function(){
390
-			    var type = $(this).data('type');
391
-			    active[type] ? active[type].call(this) : '';
392
-		  });  
393
-				  
394
-       });
395
-    
396
-
397
-	  
398
-    
399
-    
308
+        layui.use('table', function () {
309
+            var table = layui.table;
310
+            //操作
311
+            table.on('tool(demo)', function (obj) {
312
+                console.log(obj)
313
+                var data = obj.data;
314
+                var srr = [];
315
+                //					    if(obj.event === 'detail'){
316
+                //					      layer.msg('ID:'+ data.id + ' 的查看操作');
317
+                //					    } else
318
+                if (obj.event === 'del') {
319
+                    layer.confirm('确定删除吗?', function (index) {
320
+                        srr.push(data.id);
321
+                        $.ajax({
322
+                            type: "post",
323
+                            url: huayi.config.callcenter_url + 'Customer/DelCustomer',
324
+                            async: true,
325
+                            dataType: 'json',
326
+                            data: {
327
+                                token: token,
328
+                                ids: srr
329
+                            },
330
+                            success: function (res) {
331
+                                if (res.state.toLowerCase() == 'success') {
332
+                                    layer.close(index);
333
+                                    layer.msg('删除成功!');
334
+                                    initTable();
335
+                                }
336
+
337
+                            }
338
+                        });
339
+                    });
340
+                } else if (obj.event === 'edit') {
341
+                    layer.open({
342
+                        type: 2,
343
+                        content: "../keHuManager/customerListEdit.html?id=" + data.id, //iframe的url,no代表不显示滚动条
344
+                        title: '客户列表修改',
345
+                        area: ['75%', '80%'], //宽高
346
+                    });
347
+                    //					      layer.alert('编辑行:<br>'+ JSON.stringify(data))
348
+                }
349
+            });
350
+
351
+
352
+
353
+
354
+            //批量删除
355
+            var $ = layui.$, active = {
356
+                getCheckData: function () { //获取选中数据
357
+                    var checkStatus = table.checkStatus('table1').data;
358
+                    var arr = [];
359
+                    $(checkStatus).each(function (k, y) {
360
+                        arr.push(y.id)
361
+                    })
362
+                    if (arr.length <= 0) {
363
+                        layer.msg('请选择要删除的行!');
364
+                    } else {
365
+                        layer.confirm('确定删除吗?', function (index) {
366
+                            $.ajax({
367
+                                type: "post",
368
+                                url: huayi.config.callcenter_url + 'Customer/DelCustomer',
369
+                                async: true,
370
+                                dataType: 'json',
371
+                                data: {
372
+                                    token: token,
373
+                                    ids: arr
374
+                                },
375
+                                success: function (res) {
376
+                                    if (res.state.toLowerCase() == 'success') {
377
+                                        layer.close(index);
378
+                                        layer.msg('删除成功!');
379
+                                        initTable();
380
+                                    }
381
+
382
+                                }
383
+                            });
384
+                        });
385
+                    }
386
+                }
387
+
388
+            };
389
+            $('.demoTable #remove').on('click', function () {
390
+                var type = $(this).data('type');
391
+                active[type] ? active[type].call(this) : '';
392
+            });
393
+
394
+        });
395
+
396
+
397
+
398
+
399
+
400 400
     </script>
401 401
 </body>
402
-
403 402
 </html>

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
CallCenterWeb.UI/zuoXiTable.html