问题修改

WebUI/CallCenterWeb.UI/accessManagement/afterDischarge.html

@@ -123,7 +123,7 @@
 									<th data-field="ZY_DAYS" data-width="100" data-align="center">住院天数</th>
 									<th data-field="PA_ADDRESS" data-width="100" data-align="center">联系地址</th>
 									<th data-field="ZY_AGE" data-width="100" data-align="center">年龄</th>
-									<th data-field="PAT_PHONE" data-width="100" data-align="center" data-formatter="callout">本人联系电话</th>
+									<th data-field="PAT_PHONE" data-width="150" data-align="center" data-formatter="callout">本人联系电话</th>
 									<!-- <th data-field="JB_NAME" data-width="100" data-align="center">疾病描述（名称）</th> -->
 									<th data-field="CY_ZD" data-width="100" data-align="center">出院诊断</th>
 									<!-- <th data-field="IS_OP" data-width="100" data-align="center">是否手术</th> -->

WebUI/CallCenterWeb.UI/accessManagement/js/afterDischarge.js

@@ -29,8 +29,7 @@ $(function() {
 		return lastmonth;
 	}
 
-
-	if ($('#startTime').val() == "") {
+	if($('#startTime').val() == "") {
 		function p(s) {
 			return s < 10 ? '0' + s : s;
 		}
@@ -39,7 +38,7 @@ $(function() {
 		var currentDate = new Date().getDate();
 		var prevCurrentYear = 0;
 		var prevCurrentMonth = 0;
-		if (currentMonth == 1) {
+		if(currentMonth == 1) {
 			prevCurrentYear = currentYear - 1;
 			prevCurrentMonth = 12;
 		} else {
@@ -51,8 +50,7 @@ $(function() {
 		// var lastmonth = prevCurrentYear + "-" + p(prevCurrentMonth) + "-" + p(currentDate)
 		var a = getPreDatetime(3600 * 1000 * 24 * 30);
 		$('#startTime').val(getPreDatetime(3600 * 1000 * 24 * 30) + " ~ " + current)
-
-		initTable();
+//		initTable();
 	}
 	//TAB切换
 	$('#tab_head_left li').click(function() {
@@ -77,7 +75,7 @@ function getdept() {
 		success: function(data) {
 
 			var leveldata = []
-			if (data.state.toLowerCase() == 'success') {
+			if(data.state.toLowerCase() == 'success') {
 				console.log(data)
 				leveldata = data.data
 				$(leveldata).each(function(q, p) {
@@ -128,7 +126,7 @@ function initTable() {
 				yqinfo: $("#projectid").val(),
 				sendmydcent: $("#myd").val(),
 				deptname: $("#deptname").val(),
-				state:$("#state").val(),
+				state: $("#state").val(),
 				stime: $('#startTime').val() && $('#startTime').val().split(' ~ ')[0], //开始时间
 				etime: $('#startTime').val() && $('#startTime').val().split(' ~ ')[1], //结束时间
 			};
@@ -141,7 +139,7 @@ function initTable() {
 			var goInputWidth = 45; //输入框默认宽度
 			var maxLen = ("" + totalPages).length;
 			//根据总页数设定跳转页面输入框宽度
-			if (totalPages > 999)
+			if(totalPages > 999)
 				goInputWidth = maxLen * 10 + 15;
 			var $pageGo = $('<span style="padding-left: 5px;">跳转到<input type="number" maxlength="' +
 				maxLen + '" min="1" max="' + totalPages +
@@ -158,16 +156,16 @@ function initTable() {
 			//页码范围限定(部分浏览器min~max失效时)
 			$pageGo.change(function() {
 				var goPage = $('#c_jump-to-page').val();
-				if (goPage < 1)
+				if(goPage < 1)
 					$('#c_jump-to-page').val(1);
-				if (goPage > totalPages)
+				if(goPage > totalPages)
 					$('#c_jump-to-page').val(totalPages);
 			});
 			//跳转到
 			$go.click(function() {
 				var goPage = parseInt($('#c_jump-to-page').val());
 				console.log(totalPages)
-				if (goPage != pageNumber)
+				if(goPage != pageNumber)
 					$tableLeft.bootstrapTable('selectPage', parseInt(goPage));
 			});
 			$shou.click(function() {
@@ -180,7 +178,7 @@ function initTable() {
 		},
 		onLoadSuccess: function(data) { //加载成功时执行
 			//判断 住院患者和门诊患者展示信息
-			if (f_State == '住院患者') {
+			if(f_State == '住院患者') {
 				$tableLeft.bootstrapTable('showColumn', 'ZY_NO'); //显示
 				// $tableLeft.bootstrapTable('showColumn', 'NAME');//显示
 				// $tableLeft.bootstrapTable('showColumn', 'SEX');//显示
@@ -228,9 +226,9 @@ function initTable() {
 			newDataL.rows = data.data.rows;
 			newDataL.total = data.data.total;
 
-			for(var i=0;i<newDataL.rows.length;i++){
-				if(newDataL.rows[i].PAT_PHONE==null){
-					newDataL.rows[i].PAT_PHONE='';
+			for(var i = 0; i < newDataL.rows.length; i++) {
+				if(newDataL.rows[i].PAT_PHONE == null) {
+					newDataL.rows[i].PAT_PHONE = '';
 				}
 			}
 			$tableLeft.bootstrapTable('load', newDataL);
@@ -252,7 +250,7 @@ function projectName() {
 	$("#projectid").empty();
 	$("#projectid").append("<option value=''>请选择医院</option>");
 	$.getJSON(huayi.config.callcenter_url + "equipmentapi/api/ProjectInfo/getlistdrop", function(result) {
-		if (result.state.toLowerCase() == "success") {
+		if(result.state.toLowerCase() == "success") {
 			var content = result.data;
 
 			$(content).each(function(i, n) {
@@ -265,7 +263,7 @@ function projectName() {
 
 //格式化操作
 function formatterOperate(val, row) {
-	if (f_State == "门诊患者") {
+	if(f_State == "门诊患者") {
 		{
 			var str = '<ul class="tool_downs">' +
 				'<li><a class="aBtn" authorize="yes" id="HY_discharge_' + row.id + '" onclick="btn_myd(\'' + row.id +
@@ -293,13 +291,45 @@ function formatterOperate(val, row) {
 }
 // // 外呼  
 function callout(val, row) {
-    var str='<div>'+ val+ '</div>';
-	return str
+	if(val == '') {
+		var str = '<div>' + val + '</div>';
+		return str;
+	} else {
+		var str = '<div>' + val +
+			'<img src="../img/extensionnumber_icons.png" style="width:20px;height:20px;padding-left:5px;padding-bottom:5px" onclick= "callPhone('+val+')"/>' +
+			'</div>'
+		return str
+	}
+}
+//外呼
+function callPhone(val) {
+	console.log('号码',val)
+	if(val) {
+		$.ajax({
+			type: "get",
+			url: huayi.config.call_url + "CallOutOpt/GetCallOutprefix",
+			async: true,
+			dataType: 'json',
+			data: {
+				phone: val
+			},
+			success: function(result) {
+				//result = $.parseJSON(result);
+				if(result.state.toLowerCase() == "success") {
+					top.scoketDatas = {
+						"Type": "MakeCall",
+						"AgentID": window.localStorage.getItem('userCode'),
+						"AgentExten": window.localStorage.getItem("extno"),
+						"Header": result.data.fix, //号码前缀 用于截断前缀得到真实号码
+						"DestinationNumber": result.data.phone, //
+					};
+					top.Send();
+				}
+
+			}
+		});
+	}
 }
-// function callout(val, row) {
-//     var str='<div>'+ val+'<img src="./img/extensionnumber_icons.png" style="width:15px;height:15px;display:block" />'+ '</div>'
-// 	return str
-// }
 
 function btn_myd(sendmyeds) {
 	layer.open({
@@ -344,35 +374,30 @@ function sendmsg() {
 	});
 }
 
-
-
 function showAuto() {
 	sendmsg()
 }
 
-
 // 导出
 $("#HY_export").click(function() {
 
-
-	if (f_State == '住院患者') {
+	if(f_State == '住院患者') {
 		var key = $("#key").val() //关键字
 		var yqinfo = $('#projectid').val()
 
 		var sendmydcent = $('#myd').val() //满意度
 		var deptname = $('#deptname').val() //科室名称
 		var iszyormz = f_State
-		var state=$('#state').val()
+		var state = $('#state').val()
 		var stime = $('#startTime').val() && $('#startTime').val().split(' ~ ')[0] //开始时间
 		var etime = $('#startTime').val() && $('#startTime').val().split(' ~ ')[1] //结束时间
 
-
 		window.location.href = huayi.config.callcenter_url +
 			"testusertypeapi/api/Test/exportexcel?sendmydcent=" +
 			sendmydcent + "&stime=" + stime + "&etime=" + etime + "+&key=" + key + "&deptname=" + deptname +
 			"&yqinfo=" +
 			yqinfo + "&iszyormz=" +
-			iszyormz+"&state=" +
+			iszyormz + "&state=" +
 			state
 	} else {
 		$.ajax({
@@ -386,57 +411,53 @@ $("#HY_export").click(function() {
 				yqinfo: $("#projectid").val(),
 				sendmydcent: $("#myd").val(),
 				deptname: $("#deptname").val(),
-				state:$("#state").val(),
+				state: $("#state").val(),
 				stime: $('#startTime').val() && $('#startTime').val().split(' ~ ')[0], //开始时间
 				etime: $('#startTime').val() && $('#startTime').val().split(' ~ ')[1], //结束时间
 			},
 			success: function(data) {
 
-
-				if (data.state.toLowerCase() == 'success') {
-
-
-
+				if(data.state.toLowerCase() == 'success') {
 
 					//要导出的json数据
 					const jsonData = data.data
-					for (var i = 0; i < jsonData.length; i++) {
-						  if(jsonData[i].replaycenters==null){
-							  jsonData[i].replaycenters=''
-						  }
-						  if(jsonData[i].sendmyeds==null){
-						  							  jsonData[i].sendmyeds=''
-						  }
-						  if(jsonData[i].senddate==null){
-						  							  jsonData[i].senddate=''
-						  }
-						  if(jsonData[i].ZY_NO==null){
-						  							  jsonData[i].ZY_NO=''
-						  }
-						  if(jsonData[i].NAME==null){
-						  							  jsonData[i].NAME=''
-						  }
-						  if(jsonData[i].SEX==null){
-						  							  jsonData[i].SEX=''
-						  }
-						  if(jsonData[i].PAT_PHONE==null){
-						  							  jsonData[i].PAT_PHONE=''
-						  }
-						  if(jsonData[i].CLINIC_DIAG_NAME==null){
-						  							  jsonData[i].CLINIC_DIAG_NAME=''
-						  }
-						  if(jsonData[i].dept_name==null){
-						  							  jsonData[i].dept_name=''
-						  }
-						  if(jsonData[i].CLINIC_DATE==null){
-						  							  jsonData[i].CLINIC_DATE=''
-						  }
-						  if(jsonData[i].statesissuccess==null){
-						  							  jsonData[i].statesissuccess=''
-						  }
-						  if(jsonData[i].nomybecause==null){
-						  							  jsonData[i].nomybecause=''
-						  }
+					for(var i = 0; i < jsonData.length; i++) {
+						if(jsonData[i].replaycenters == null) {
+							jsonData[i].replaycenters = ''
+						}
+						if(jsonData[i].sendmyeds == null) {
+							jsonData[i].sendmyeds = ''
+						}
+						if(jsonData[i].senddate == null) {
+							jsonData[i].senddate = ''
+						}
+						if(jsonData[i].ZY_NO == null) {
+							jsonData[i].ZY_NO = ''
+						}
+						if(jsonData[i].NAME == null) {
+							jsonData[i].NAME = ''
+						}
+						if(jsonData[i].SEX == null) {
+							jsonData[i].SEX = ''
+						}
+						if(jsonData[i].PAT_PHONE == null) {
+							jsonData[i].PAT_PHONE = ''
+						}
+						if(jsonData[i].CLINIC_DIAG_NAME == null) {
+							jsonData[i].CLINIC_DIAG_NAME = ''
+						}
+						if(jsonData[i].dept_name == null) {
+							jsonData[i].dept_name = ''
+						}
+						if(jsonData[i].CLINIC_DATE == null) {
+							jsonData[i].CLINIC_DATE = ''
+						}
+						if(jsonData[i].statesissuccess == null) {
+							jsonData[i].statesissuccess = ''
+						}
+						if(jsonData[i].nomybecause == null) {
+							jsonData[i].nomybecause = ''
+						}
 						jsonData[i].replaycenters.replace(/[\r\n]/g, "")
 						jsonData[i].sendmyeds.replace(/[\r\n]/g, "")
 						jsonData[i].senddate.replace(/[\r\n]/g, "")
@@ -449,13 +470,13 @@ $("#HY_export").click(function() {
 						jsonData[i].CLINIC_DATE.replace(/[\r\n]/g, "")
 						jsonData[i].statesissuccess.replace(/[\r\n]/g, "")
 						jsonData[i].nomybecause.replace(/[\r\n]/g, "")
-//console.log(jsonData[i].CLINIC_DIAG_NAME)
+						//console.log(jsonData[i].CLINIC_DIAG_NAME)
 					}
 					//列标题，逗号隔开，每一个逗号就是隔开一个单元格
 					var str = `回复内容,满意度,发送时间,住院号,病人姓名,病人性别,联系电话,就诊内容,就诊科室,就诊时间,发送状态,备注\n`;
 					//增加\t为了不让表格显示科学计数法或者其他格式
-					for (let i = 0; i < jsonData.length; i++) {
-						for (let item in jsonData[i]) {
+					for(let i = 0; i < jsonData.length; i++) {
+						for(let item in jsonData[i]) {
 							str += `${jsonData[i][item].replace(/[\r\n]/g, "") + '\t'},`;
 						}
 						str += '\n';
@@ -471,13 +492,10 @@ $("#HY_export").click(function() {
 					link.click();
 					document.body.removeChild(link);
 
-
 				}
 
 			}
 		});
 	}
 
-
-})
-
+})

WebUI/CallCenterWeb.UI/callScreen/callScreen.html

@@ -199,8 +199,8 @@
 				<div class="ldtp-cr col-sm-9">
 					<ul class="ld-service clearfix">
 						<li style="border-bottom:1px solid #1AB394;" class="cr-click">新增工单</li>
-						<li style="border-bottom:1px solid #243747;">历史记录</li>
-						<li style="border-bottom:1px solid #67aefe;" class="KF">历史工单</li>
+						<!--<li style="border-bottom:1px solid #243747;">历史记录</li>-->
+						<!--<li style="border-bottom:1px solid #67aefe;" class="KF">历史工单</li>-->
 					</ul>
 					<div class="ld-sercon">
 						<!--新增工单-->

WebUI/CallCenterWeb.UI/js/index.js

@@ -97,6 +97,8 @@ $(document).ready(function() {
 	//外呼呼出
 	$(".CallOut").click(function(event) {
 		// 813811115503
+		debugger
+		console.log("号码",$("#hidwhtype").val())
 		event.stopPropagation();
 		if ($("#Result").val()) {
 			$.ajax({

ZY/.project

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ZY</name>
+	<comment>Create By HBuilder</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1622085802357</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.orFilterMatcher</id>
+				<arguments>
+					<matcher>
+						<id>org.eclipse.ui.ide.multiFilter</id>
+						<arguments>1.0-projectRelativePath-matches-false-false-bin</arguments>
+					</matcher>
+					<matcher>
+						<id>org.eclipse.ui.ide.multiFilter</id>
+						<arguments>1.0-projectRelativePath-matches-false-false-setting</arguments>
+					</matcher>
+				</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

ZY/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title></title>
+	</head>
+	<body>
+		
+	</body>
+</html>