Преглед на файлове

Merge branch 'develop'

# Conflicts:
#	WebUI/CallCenterWeb.UI/js/index.js
miaofuhao преди 3 години
родител
ревизия
85b4d0a0fc
променени са 2 файла, в които са добавени 32 реда и са изтрити 0 реда
  1. 1 0
      WebUI/CallCenterWeb.UI/home.html
  2. 31 0
      WebUI/CallCenterWeb.UI/js/index.js

+ 1 - 0
WebUI/CallCenterWeb.UI/home.html

@@ -145,6 +145,7 @@
145 145
 											<dt>宁陵</dt>
146 146
 											<dt>民权</dt>
147 147
 											<dt>虞城</dt>
148
+											<dt>省平台</dt>
148 149
 										</dl>
149 150
 									</div>
150 151
 								</ul>

+ 31 - 0
WebUI/CallCenterWeb.UI/js/index.js

@@ -334,6 +334,7 @@ $(document).ready(function () {
334 334
 //  获取转接号码
335 335
     $(".TurnXianDiv dl dt").click(function () {
336 336
     	var xianName=$(this).text();
337
+<<<<<<< HEAD
337 338
     	zjcity=$(this).text();
338 339
     	updateCalllist();
339 340
     	$.ajax({
@@ -373,6 +374,36 @@ $(document).ready(function () {
373 374
                 }
374 375
             }
375 376
         })
377
+=======
378
+    	var telPhone;
379
+    	if(xianName ==="省平台"){
380
+            throunghMethod("037165250863")
381
+    	}else{
382
+    		$.ajax({
383
+	            type: "get",
384
+	            url: huayi.config.callcenter_url + "WorkOrder/GetCityList",
385
+	            async: true,
386
+	            dataType: 'json',
387
+	            data: {
388
+	                token: $.cookie("token"),
389
+		            name:xianName
390
+	            },
391
+	            success: function (result) {
392
+	                if (result.state.toLowerCase() == "success") {
393
+	                   throunghMethod(result.data[0].F_Phone)
394
+	                }
395
+	            }
396
+	        })
397
+    	}
398
+    	
399
+        
400
+    })
401
+	function throunghMethod(telPhone){
402
+		console.log(telPhone)
403
+		$(".hw_through").attr("index",telPhone);
404
+        throungh();
405
+        $(".TurnXianDiv").hide();
406
+>>>>>>> develop
376 407
 	}
377 408
     //话务相关
378 409
     $("#top-search li").click(function () {