代码提交

CallCenterWeb.UI/Arrangefollow/arrange.html

@@ -80,14 +80,12 @@
 							<th data-field="Department" data-align="center">科室</th>
 							<th data-field="PTime" data-align="center" data-formatter="oprateTime">时间</th>
 							<th data-field="PatirntName" data-align="center">患者姓名</th>
-							<th data-field="Phone" data-align="center" data-formatter="opratePhone">电话</th>
+							<th data-field="Phone" data-align="center">电话</th>
 							<th data-field="Sex" data-align="center" data-formatter="oprateSex">性别</th>
 							<th data-field="Age" data-align="center">年龄</th>
 							<th data-field="Diagnosis" data-align="center">诊断</th>
 							<th data-field="Doctor" data-align="center">医生</th>
 							<th data-field="FollowUp" data-align="center" data-formatter="oprateFollowUp">随访状态</th>
-							<th data-field="Note" data-align="center">备注</th>
-							<th data-field="Satisfaction" data-align="center" data-formatter="oprateSatisfaction">满意度</th>
 							<th  data-field="WorkOrderID" data-align="center" data-formatter="formatterOprateDeal">操作</th>
 						</tr>
 					</thead>

CallCenterWeb.UI/Arrangefollow/arrangeCall.html

@@ -69,7 +69,6 @@
 				</div>
 
 				<div class="pull-right tool_bars">
-					<button id="HY_import" class="btns">导入</button>
 					<a class="btns" onclick="dcexcel(this)">导出</a>
 					<button class="btns" id="sc_btns">搜索</button>
 					<!-- <a class="btns" onclick="dcexcel(this)">导出</a> -->
@@ -93,7 +92,7 @@
 							<th data-field="Diagnosis" data-align="center">诊断</th>
 							<th data-field="Doctor" data-align="center">医生</th>
 							<th data-field="FollowUp" data-align="center" data-formatter="oprateFollowUp">随访状态</th>
-							<th data-field="FilePath" data-formatter="oprateFile" data-align="center">录音</th>
+							<th data-field="Lvyin" data-formatter="oprateFile" data-align="center">录音</th>
 							<th data-field="Note" data-align="center">备注</th>
 							<th data-field="Satisfaction" data-align="center" data-formatter="oprateSatisfaction">满意度</th>
 							<th  data-field="WorkOrderID" data-align="center" data-formatter="formatterOprateDeal">操作</th>
@@ -120,7 +119,7 @@
 	            </div>
 	        </div>
 	    </div>
-	    
+	    <input type="hidden" id="ptirntID" />
 		<script src="../js/zTree/jquery.ztree.core.js"></script>
 		<script src="../js/bootstrap-select/js/bootstrap-select.js"></script>
 		<script src="../js/bootstrap-select/js/i18n/defaults-zh_CN.js"></script>

CallCenterWeb.UI/Arrangefollow/js/addOrEditArrange.js

@@ -54,21 +54,24 @@ function getDetail() {
 			token: token
 		},
 		success: function(data) {
-			var con = data.data;
-			$("#editId").val(con.F_CustomerId);
-			$("#seatList").selectpicker('val',con.Department) //科室
-			$("#sc_time").val(con.PTime.substring(0, con.PTime.indexOf(" "))); //时间
-			$("#PatirntName").val(con.PatirntName); //患者姓名
-			$("#Phone").val(con.Phone);//电话
-			$('#sexList').selectpicker('val', con.Sex);//性别
-			$("#stateList").selectpicker('val',con.FollowUp) //随访状态
-			$("#Age").val(con.Age); //年龄
-			$("#Diagnosis").val(con.Diagnosis); //诊断
-			$("#Doctor").val(con.Doctor); //医生
+			if (data.state=="success") {
+				var con = data.data;
+				$("#editId").val(con.F_CustomerId);
+				$("#seatList").selectpicker('val',con.Department) //科室
+				$("#sc_time").val(con.PTime.substring(0, con.PTime.indexOf(" "))); //时间
+				$("#PatirntName").val(con.PatirntName); //患者姓名
+				$("#Phone").val(con.Phone);//电话
+				$('#sexList').selectpicker('val', con.Sex);//性别
+				$("#stateList").selectpicker('val',con.FollowUp); //随访状态
+				$("#Age").val(con.Age); //年龄
+				$("#Diagnosis").val(con.Diagnosis); //诊断
+				$("#Doctor").val(con.Doctor); //医生
+			}
+			
 //			if(data.F_TaxID) {
 //					$('#customer_merrige').find("input[type='radio'][value= " + data.F_TaxID + "]").prop("checked", true); //性别
 //			}
-			dtd.resolve(); // 改变Deferred对象的执行状态
+			
 		}
 	});
 	return dtd.promise(); // 返回promise对象

CallCenterWeb.UI/Arrangefollow/js/arrange.js

@@ -147,42 +147,13 @@ function btn_detail(seeid) {
 
 //格式化操作 （待指派）
 function formatterOprateDeal(val, row) {
-	if (row.FollowUp==1) {
-		return '<ul class="tool_downs">' +
-		'<li><a href="javascript:;" class="aBtn" onclick="btn_edit(\'' + row.PatirntID + '\')" title="修改">修改</a></li>' +
-		'<li><a href="javascript:;" class="aBtn" onclick="btn_delete(\'' + row.PatirntID + '\')" title="删除">删除</a></li>' +
-		'</ul>';
-	} else if (row.FollowUp==2) {
-		return '<ul class="tool_downs">' +
-		'<li><a href="javascript:;" class="aBtn" onclick="btn_satisfaction(\'' + row.PatirntID + '\')" title="满意度">满意度</a></li>' +
-		'<li><a href="javascript:;" class="aBtn" onclick="btn_remark(\'' + row.PatirntID + '\')" title="备注">备注</a></li>' +
-		'</ul>';
-	}
+	return '<ul class="tool_downs">' +
+	'<li><a href="javascript:;" class="aBtn" onclick="btn_edit(\'' + row.PatirntID + '\')" title="修改">修改</a></li>' +
+	'<li><a href="javascript:;" class="aBtn" onclick="btn_delete(\'' + row.PatirntID + '\')" title="删除">删除</a></li>' +
+	'</ul>';
 	
 }
 
-//电话格式处理
-function opratePhone (val, row) {
-	if (row.Satisfaction==0&&row.FollowUp==2) {
-        
-        return '<ul class="tool_downs">' +
-		'<li><a href="javascript:;" class="phoneBtn" onclick="phoneCall(\'' + val + '\')" title="满意度">'+val+'</a></li>' +
-		'</ul>';
-            
-    }else{
-    	return val
-    }
-}
-function phoneCall () {
-	layer.confirm('您确定要外呼吗？', {
-		icon: 7,
-		btn: ['确定', '取消'],
-		yes: function(index, layero) {
-			layer.msg("呼叫成功");
-			table.bootstrapTable('refresh');
-		},
-	});
-}
 function btn_edit(changes){
 	console.log(changes)
 	layer.open({
@@ -231,52 +202,7 @@ function oprateFollowUp(val){
 	}
 	
 }
-// 满意度
-function oprateSatisfaction(val, row){
-	if (row.FollowUp!=1) {
-		if (val==0) {
-			return "不满意"
-		} else if (val==1) {
-			return "满意"
-		} else if (val==2) {
-			return "表扬"
-		}
-	}
-	
-}
 
-//满意度
-function btn_satisfaction(changes){
-	console.log(changes)
-	layer.open({
-		type: 2,
-		title: '编辑满意度',
-		shadeClose: true, //是否开启点击遮罩关闭
-		shade: 0.4, //遮罩
-		maxmin: true, //开启最大化最小化按钮
-		moveType: 1, //拖拽类型 默认的拖拽风格正如你所见到的，会有个过度的透明框。但是如果你不喜欢，你可以设定moveType: 1切换到传统的拖拽模式
-		moveOut: false, //拖拽到窗口外
-		//resize: true,//是否允许拉伸
-		area: ['40%', '30%'],
-		content: "template/addOrEditSatisfaction.html?edit_id=" + changes
-	});
-}
-
-//备注
-function btn_remark (changes) {
-	layer.open({
-		type: 2,
-		title: '编辑备注',
-		shadeClose: true, //是否开启点击遮罩关闭
-		shade: 0.4, //遮罩
-		maxmin: true, //开启最大化最小化按钮
-		moveType: 1, //拖拽类型 默认的拖拽风格正如你所见到的，会有个过度的透明框。但是如果你不喜欢，你可以设定moveType: 1切换到传统的拖拽模式
-		moveOut: false, //拖拽到窗口外
-		//resize: true,//是否允许拉伸
-		area: ['40%', '30%'],
-		content: "template/addOrEditRemark.html?edit_id=" + changes
-	});
-}
 //绑定导入 按钮
 $('#HY_import').on('click', btn_import);
 

CallCenterWeb.UI/Arrangefollow/js/arrangeCall.js

@@ -1,11 +1,7 @@
 var proimglist = []; //保存附件数组
-var uploader; //上传实例
-var limitNum = 6; //限制数量
 var token = $.cookie("token");
+var ptirntID;
 var kn_id = ""; //当前节点id
-var pid; //当前父节点ID
-var name = ''; //选择的name
-var pidName; //父节点name
 var keyWord = $('#searCon').val(); //关键字
 var table = $('#table1'); //右边表格
 var followUp = 2;
@@ -101,6 +97,7 @@ function setCode(val, row, index) {
 //格式化操作 （待指派）
 function formatterOprateDeal(val, row) {
 	return '<ul class="tool_downs">' +
+				
 		'<li><a href="javascript:;" class="aBtn" onclick="btn_satisfaction(\'' + row.PatirntID + '\')" title="满意度">满意度</a></li>' +
 		'<li><a href="javascript:;" class="aBtn" onclick="btn_remark(\'' + row.PatirntID + '\')" title="备注">备注</a></li>' +
 		'</ul>';
@@ -157,28 +154,77 @@ function oprateTime(val) {
 }
 //电话格式处理
 function opratePhone (val, row) {
-	console.log(row.Satisfaction)
+	//btn_transfer(\'' + val + '\', false, \''+ row.IsAdminSend +'\')
+	return '<ul class="tool_downs">' +
+	'<li><a href="javascript:;" class="phoneBtn" onclick="phoneCall(\''+val+'\',\''+row.PatirntID+'\')" title="满意度">'+val+'</a></li>' +
+	'</ul>';
 	if (row.Satisfaction==0) {
         
-        return '<ul class="tool_downs">' +
-		'<li><a href="javascript:;" class="phoneBtn" onclick="phoneCall(\'' + val + '\')" title="满意度">'+val+'</a></li>' +
-		'</ul>';
             
     }else{
     	return val
     }
 }
 //点击外呼
-function phoneCall () {
+function phoneCall (val,ptirntID) {
+	$("#ptirntID").val(ptirntID)
 	layer.confirm('您确定要外呼吗？', {
 		icon: 7,
 		btn: ['确定', '取消'],
 		yes: function(index, layero) {
 			layer.msg("呼叫成功");
+			console.log(val)
+			top.obj.Type = "MakeCall";
+			top.obj.DestinationNumber = val;
+			//top.obj.Header = result.data.fix;
+			top.obj.TaskType = "1"; //0:拨号外呼；1:问卷外呼；
+			//top.obj.TaskPhoneID = $("#F_Id").val(); //回访的电话ID
+			top.Send();
+//			$.ajax({
+//              type: "get",
+//              url:huayi.config.callcenter_url + "CallOutOpt/GetCallOutprefix",
+//              async: true,
+//              dataType: "json",
+//              data: {
+//                  token: $.cookie("token"),
+//                  phone: val,
+//              },
+//              success: function (result) {
+//                  //                		result = $.parseJSON(result);
+//                  if (result.state.toLowerCase() == "success") {
+//                  	top.obj.Type = "MakeCall";
+//						top.obj.DestinationNumber = result.data.phone;
+//						top.obj.Header = result.data.fix;
+//						top.obj.TaskType = "1"; //0:拨号外呼；1:问卷外呼；
+//						top.obj.TaskPhoneID = $("#F_Id").val(); //回访的电话ID
+//						top.Send();
+//                      
+//                  }
+//              },
+//          });
+            
 			table.bootstrapTable('refresh');
 		},
 	});
 }
+
+function getCallId (callId,actionID) {
+	
+	console.log($("#ptirntID").val())
+
+	$.post(huayi.config.callcenter_url + "Customer/CallId", {
+		id:$("#ptirntID").val(),
+		callid:callId,
+		actionid:1,
+		token: token
+	}, function(result) {
+		result = JSON.parse(result);
+		if(result.state.toLowerCase() == "success") {
+			layer.msg("成功");
+			table.bootstrapTable('refresh');
+		}
+	})
+}
 //录音
 function oprateFile(val) {
     if (val) {
@@ -218,14 +264,7 @@ function ck(val) {
         '">下载录音</a>'
     ).appendTo(".LY_box");
 }
-//录音
-//function ck(val) {
-//  var path = $(val).attr("item");
-//  $(".t-shade").addClass("cx");
-//  $(".Ly_box").empty();
-//  $(".LY_box").empty();
-//  $('<audio  style="width:100%;"class=" " src="' + path + '" loop="loop" type="audio/v3" controls="controls"></audio>').appendTo(".Ly_box");
-//}
+
 //性别
 function oprateSex(val){
 	if (val=="1") {

CallCenterWeb.UI/js/main.js

@@ -240,6 +240,16 @@ function IncomingBack(data) {
 
 //***************************************************
 function CallIDBack(data) {
+	
+	$('#content-main .J_iframe').each(function(i,n){
+		
+		console.log($(this).attr('src'))
+		if($(this).attr('src') == "./Arrangefollow/arrangeCall.html"){
+			window.frames[0].getCallId(data.CurrID, data.ActionID);
+			
+			
+		}
+	})/*2018-05-24 zhangshuangnan 修改 解决通话中时 坐席监控状态不改变的问题*/
 	//$(".hidCallID").val(data.CurrID);
 }