关闭来电弹屏置闲，双汇app办事出筛选，用户头像默认显示

CallCenterWeb.UI/js/contabs.min.js

@@ -126,7 +126,7 @@ $(function() {
 		if(k) {
 			if(o == './TelCall/SeatMonitor.html' || o.substring(0,28) == './callScreen/callScreen.html') {
 				console.log(o)
-				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
+				var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle close_call"></i></a>';
 				$(".J_menuTab").removeClass("active");
 				var n = '<iframe class="J_iframe J_iframeNew" name="iframe' + m + '" width="100%" height="100%" src="' + o + '" frameborder="0" data-id="' + o + '" seamless></iframe>';
 				$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(n);

CallCenterWeb.UI/js/index.js

@@ -87,6 +87,18 @@ $(document).ready(function() {
 		$(".WH").removeClass("fadeInDown").addClass("fadeOutUp");
 		$(".WH").addClass("hidens");
 	})
+	
+	$(".J_menuTabs").on("click",".close_call", function(){
+		alert("!")
+		$(".SayBusy").addClass("active");
+        $(".SayFree").removeClass("active");
+        $(".zxzt").removeClass("br").removeClass("by").addClass("bl");
+        $(".hwzt").text('空闲');
+        $("#isml").val(0);
+      	obj.Type = "SayFree";
+		Send();
+	})
+
 	//键盘事件外呼
 	document.onkeydown = function(e) {
 		var theEvent = window.event || e;

CallCenterWeb.UI/js/main.js

@@ -248,7 +248,7 @@ function LogoutBack() {
 //来电
 function IncomingBack(data) {
 	if(data.CallID!=0){
-		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"></i></a>';
+		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>';
 		$(".J_menuTab").removeClass("active");
 		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>';
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
@@ -258,7 +258,7 @@ function IncomingBack(data) {
 		hidActionID=data.ActionID;
 	}else{
 		var timestamp = Date.parse(new Date());
-		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"></i></a>';
+		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>';
 		$(".J_menuTab").removeClass("active");
 		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>';
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
@@ -418,7 +418,7 @@ function MakeCallBack(data) {
 	
 	//外呼弹屏
 	if(data.CallID!=0){
-		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"></i></a>';
+		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>';
 		$(".J_menuTab").removeClass("active");
 		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>';
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
@@ -428,7 +428,7 @@ function MakeCallBack(data) {
 		hidActionID=data.ActionID;
 	}else{
 		var timestamp = Date.parse(new Date());
-		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"></i></a>';
+		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>';
 		$(".J_menuTab").removeClass("active");
 		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>';
 		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);

双汇APP-andriod/Common/js/portrait.js

@@ -32,7 +32,7 @@ mui.plusReady(function() {
 			}
 			$(".rolname").val(data.data.user.F_UserCode);
 			$(".password").val(data.data.user.F_Password);
-			if(!data.data.FileUrl[0].F_Url) {
+			if(!data.data.FileUrl[0]) {
 				$(".feedback .image-item").css("background-image", "url(../img/3.png)")
 			} else {
 				$(".feedback .image-item").css("background-image", "url(" + data.data.FileUrl[0].F_Url + ")")

双汇APP-andriod/js/personal.js

@@ -185,13 +185,4 @@ $(".work-class").on('tap', function() {
 		}
 	});
 })
-//常见问题
-//document.getElementById('Report').addEventListener('tap', function() {
-//	var nwaiting = plus.nativeUI.showWaiting();
-//	webviewShow = plus.webview.create("Work-Add.html"); //后台创建webview并打开show.html  
-//	webviewShow.addEventListener("loaded", function() { //注册新webview的载入完成事件  
-//		nwaiting.close(); //新webview的载入完毕后关闭等待框  
-//		webviewShow.show("slide-in-right", 300); //把新webview窗体显示出来，显示动画效果为速度300毫秒的右侧移入动画
-//	}, false);
-//
-//});
+

双汇APP-andriod/workOrder/js/Work-list.js

@@ -124,7 +124,7 @@ window.onload = function() {
 								'<span class="areaOffice">大区办事处:'+data.rows[i].F_AreaName +"-"+data.rows[i].F_OfficName+'</span>' +
 								' </p>'
 							}
-							$('<li class="mui-table-view-cell">' +
+							$('<li class="mui-table-view-cell orderLi">' +
 								'<div class="mui-table order" data-index="' + data.rows[i].F_Id + '">' +
 								'<div class="mui-table-cell mui-col-xs-12">' +
 								'<h5 class="mui-ellipsis new_title" >' + data.rows[i].F_QualityProblem + '</h5>' +
@@ -189,6 +189,8 @@ window.onload = function() {
 
 		function Ajax() {
 			$(".orderLi").remove();
+			page=1;
+			pageSize=10;
 			mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
 				data: {
 					token: token,
@@ -197,8 +199,8 @@ window.onload = function() {
 					extensionphone: 1,
 					keywords:keyw,
 					offce:$("#DWResult").attr("data-index"),
-					pageindex: page,
-					pagesize: pageSize
+					pageindex: 1,
+					pagesize: 10
 				},
 				dataType: 'json', //服务器返回json格式数据
 				type: 'get', //HTTP请求类型
@@ -212,7 +214,6 @@ window.onload = function() {
 						total = 0;
 						$(".noWork").show();
 					}
-					
 					var imgnum;
 					$(".class-icon img").hide()
 					$(".Totle").text('(' + total + ')');

双汇APP/Common/js/portrait.js

@@ -32,7 +32,7 @@ mui.plusReady(function() {
 			}
 			$(".rolname").val(data.data.user.F_UserCode);
 			$(".password").val(data.data.user.F_Password);
-			if(!data.data.FileUrl[0].F_Url) {
+			if(!data.data.FileUrl[0]) {
 				$(".feedback .image-item").css("background-image", "url(../img/3.png)")
 			} else {
 				$(".feedback .image-item").css("background-image", "url(" + data.data.FileUrl[0].F_Url + ")")

双汇APP/workOrder/js/Work-list.js

@@ -106,7 +106,7 @@ window.onload = function() {
 						for(var i = 0; i < data.rows.length; i++) {
 							var a = data.rows[i].F_Content;
 							var c = data.rows[i].F_WorkState;
-							var time = data.rows[i].F_CreateTime.substring(0, data.rows[i].F_CreateTime.indexOf(' '));
+							var time = data.rows[i].F_CreateTime;
 							if(data.rows[i].F_DealTimely == "Ⅰ级") {
 								imgnum = '<img src="../img/class-img1.png"/>';
 							} else if(data.rows[i].F_DealTimely == "Ⅱ级") {
@@ -124,7 +124,7 @@ window.onload = function() {
 								'<span class="areaOffice">大区办事处:'+data.rows[i].F_AreaName +"-"+data.rows[i].F_OfficName+'</span>' +
 								' </p>'
 							}
-							$('<li class="mui-table-view-cell">' +
+							$('<li class="mui-table-view-cell orderLi">' +
 								'<div class="mui-table order" data-index="' + data.rows[i].F_Id + '">' +
 								'<div class="mui-table-cell mui-col-xs-12">' +
 								'<h5 class="mui-ellipsis new_title" >' + data.rows[i].F_QualityProblem + '</h5>' +
@@ -148,8 +148,6 @@ window.onload = function() {
 								$(".class-icon img").eq(1).show()
 							} else if(data.rows[i].F_DealTimely = "普通工单") {
 								$(".class-icon img").eq(2).show()
-							} else if(index == 10) {
-								$(".mui-btn-submit").hide();
 							}
 							if(index == 0 || index == 6) {
 								//待提交
@@ -160,6 +158,8 @@ window.onload = function() {
 							} else if(index == 3 || index == 4) {
 								//待处理
 								$(".mui-btn-submit").text("处理")
+							}else if(index == 10) {
+								$(".mui-btn-submit").hide();
 							}
 						}
 						
@@ -189,6 +189,8 @@ window.onload = function() {
 
 		function Ajax() {
 			$(".orderLi").remove();
+			page=1;
+			pageSize=10;
 			mui.ajax(huayi.config.callcenter_url + 'WorkorderApp/GetList', {
 				data: {
 					token: token,
@@ -197,8 +199,8 @@ window.onload = function() {
 					extensionphone: 1,
 					keywords:keyw,
 					offce:$("#DWResult").attr("data-index"),
-					pageindex: page,
-					pagesize: pageSize
+					pageindex: 1,
+					pagesize: 10
 				},
 				dataType: 'json', //服务器返回json格式数据
 				type: 'get', //HTTP请求类型
@@ -218,7 +220,7 @@ window.onload = function() {
 					for(var i = 0; i < data.rows.length; i++) {
 						var a = data.rows[i].F_Content;
 						var c = data.rows[i].F_WorkState;
-						var time = data.rows[i].F_CreateTime.substring(0, data.rows[i].F_CreateTime.indexOf(' '));
+						var time = data.rows[i].F_CreateTime;
 						var areaOffice;
 						if (!data.rows[i].F_AreaName) {
 							areaOffice='';