Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/XiXianDC_UI

CallCenterWeb.UI/OutboundMessage/Dr.html

@@ -5,10 +5,7 @@
 		<meta charset="UTF-8">
 		<script src="../Script/Common/huayi.load.js"></script>
 		<script src="../Script/Common/huayi.config.js"></script>
-		<script src="../js/visit/ajaxfileupload.js"></script>
-		<link href="../css/Table/table1.css" rel="stylesheet" />
-		<link href="../css/init.css" rel="stylesheet" />
-		<link rel="stylesheet" href="../css/QutboundMessage/QutboundComm.css" />
+		<!--		<script src="../js/visit/ajaxfileupload.js"></script>-->
 		<title>导入号码</title>
 		<style>
 			.btn-success {
@@ -27,10 +24,23 @@
 				background-color: #1ab394;
 			}
 			
+			.btn-success[disabled],
+			.btn-success[disabled]:active,
+			.btn-success[disabled]:focus,
+			.btn-success[disabled]:hover {
+				background-color: #1ab394;
+			}
+			
 			#importNum {
 				width: 130px;
 				margin: 60px auto 0 auto;
 			}
+			
+			.progress {
+				width: 80%;
+				margin: 20px auto 0 auto;
+				display: none;
+			}
 		</style>
 	</head>
 
@@ -53,6 +63,11 @@
 					<span class="excelName"></span>
 				</div>
 			</div>
+			<div class="progress">
+				<div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">
+
+				</div>
+			</div>
 			<div class="form-group text-center">
 				<input type="button" id="importNum" class="form-control btn btn-success" value="导入" />
 			</div>
@@ -76,8 +91,110 @@
 				});
 
 			});
+			//上传Excel文件
+			function upload() {
+				var txtName = $('.excelName').text();
+				if(txtName == '') {
+					layer.confirm('请先上传文件', {
+						icon: 2,
+						btn: ['确定']
+					});
+					return;
+				}
+				//一般情况下，excel后缀是".xls"，在2007以及以后的版本中又增加了".xlsx"。excel的模板文件后缀名是".xlt"，启动宏的工作簿后缀名是".xlsm"。
+				if(txtName.indexOf('.xls') != -1 ||
+					txtName.indexOf('.xlsx') != -1 ||
+					txtName.indexOf('.xlt') != -1 ||
+					txtName.indexOf('.xlsm') != -1
+				) {
+					var formData = new FormData();
+					var Files = document.getElementById("upFile").files;
+					formData.append("upFile", Files[0]);
+					formData.append("taskid", wid);
+					formData.append("token", $.cookie("token"));
+					$.ajax({
+						url: huayi.config.callcenter_url + "CallOutPlan/TelInput",
+						type: "POST",
+						data: formData,
+						/**
+						 *必须false才会自动加上正确的Content-Type
+						 */
+						contentType: false,
+						/**
+						 * 必须false才会避开jQuery对 formdata 的默认处理
+						 * XMLHttpRequest会对 formdata 进行正确的处理
+						 */
+						processData: false,
+						xhr: function() { //这是关键  获取原生的xhr对象  做以前做的所有事情  
+							var xhr = jQuery.ajaxSettings.xhr();
+							xhr.upload.onload = function() {
+								//alert('finish downloading')
+							}
+							xhr.upload.onprogress = function(ev) {
+								//console.log(ev);
+								//if(ev.lengthComputable) {
+								var percent = 100 * ev.loaded / ev.total;
+								//console.log(percent, ev);
+								$('.progress-bar').css('width', percent + '%');
+								$('.progress-bar').text(percent + '%');
+								//}
+							}
+							return xhr;
+						},
+						beforeSend: function(request) {
+							$('.progress').css('display', 'block');
+							$("#importNum").attr("disabled", true);
+							$("#importNum").val('导入中...');
+						},
+						success: function(result) {
+							var r = $.parseJSON(result);
+							$("#importNum").attr("disabled", false);
+							$("#importNum").val('导入');
+							if(r.state.toLowerCase() == "success") {
+								var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+								parent.layer.close(index); //再执行关闭
+								parent.Right(wid);
+								parent.layer.alert(r.message, {
+									icon: 1,
+									btn: ['确定']
+								});
+
+							}
+						},
+						error: function(textStatus) {
+							$('.progress-bar').css('width', '0%');
+							$('.progress-bar').text('0%');
+							layer.confirm('网络繁忙，请稍后再试...', {
+								btn: ['确定'] //按钮
+							});
+							$("#importNum").attr("disabled", false);
+							$("#importNum").val('导入');
+						},
+						complete: function(XMLHttpRequest, textStatus) {
+							//$('.progress-bar').css('width', '0%');
+							//$('.progress-bar').text('0%');
+							if(textStatus == 'timeout') {
+								var xmlhttp = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHttp");
+								xmlhttp.abort();
+								layer.confirm('网络超时，请稍后再试...', {
+									btn: ['确定'] //按钮
+								});　　　　
+							}
+							$("#importNum").attr("disabled", false);
+							$("#importNum").val('导入');
+						},
+					});
 
-			function ajaxFileUpload() {
+				} else {
+					layer.confirm('请上传EXCEL文件', {
+						icon: 2,
+						btn: ['确定']
+					});
+					return;
+				}
+			}
+
+			/*function ajaxFileUpload() {
 				var txtName = $('.excelName').text();
 				if(txtName == '') {
 					layer.confirm('请先上传文件', {
@@ -127,46 +244,7 @@
 				}
 
 			}
-
-			//上传Excel文件
-			function upload() {
-				var formData = new FormData();
-				var Files = document.getElementById("upFile").files;
-				formData.append("taskid", wid);
-				formData.append("token", $.cookie("token"));
-				if(Files.length > 0) {
-					for(var i = 0; i < Files.length; i++) {
-						formData.append('files' + i, Files[i]);
-					}
-					$.ajax({
-						url: huayi.config.callcenter_url + "CallOutPlan/TelInput",
-						type: "POST",
-						data: formData,
-						/**
-						 *必须false才会自动加上正确的Content-Type
-						 */
-						contentType: false,
-						/**
-						 * 必须false才会避开jQuery对 formdata 的默认处理
-						 * XMLHttpRequest会对 formdata 进行正确的处理
-						 */
-						processData: false,
-						beforeSend: function(request) {
-							console.log(request);
-						},
-						success: function(result) {
-							debugger
-							var r = $.parseJSON(result);
-							if(r.state.toLowerCase() == "success") {}
-						},
-						error: function() {},
-					});
-				} else {
-					layer.confirm('请上传文件！', {
-						btn: ['确定']
-					});
-				}
-			}
+*/
 		</script>
 	</body>
 

CallCenterWeb.UI/Questionnaire/AddRight.html

@@ -107,27 +107,13 @@
 			var wid = helper.request.queryString("Str");
 			$(document).ready(function() {
 				autosize($('textarea'));
-				if(wid) {
-					$.ajax({
-						type: "get",
-						url: huayi.config.callcenter_url + "Questionnaire/GetQCategoryAlllist",
-						dataType: 'json',
-						async: true,
-						data: {
-							token: $.cookie("token")
-						},
-						success: function(data) {
-							/*验证请求*/
-							if(data.state == "success") {
-								var html = ''
-								for(var i = 0; i < data.data.length; i++) {
-									html += '<option value="' + data.data[i].F_CategoryId + '">' + data.data[i].F_CategoryName + '</option>'
-								}
-								$(html).appendTo("#Select");
-							}
+				getQCategoryAlllist()
+					.then(function() {
+						if(wid) {
+							$('#Select').val(wid);
 						}
 					});
-				}
+
 			});
 
 			//增加
@@ -174,6 +160,32 @@
 					}
 				});
 			})
+
+			//获取试题分类
+			function getQCategoryAlllist() {
+				var dtd = $.Deferred(); //在函数内部，新建一个Deferred对象
+				$.ajax({
+					type: "get",
+					url: huayi.config.callcenter_url + "Questionnaire/GetQCategoryAlllist",
+					dataType: 'json',
+					async: true,
+					data: {
+						token: $.cookie("token")
+					},
+					success: function(data) {
+						/*验证请求*/
+						if(data.state == "success") {
+							var html = ''
+							for(var i = 0; i < data.data.length; i++) {
+								html += '<option value="' + data.data[i].F_CategoryId + '">' + data.data[i].F_CategoryName + '</option>'
+							}
+							$(html).appendTo("#Select");
+							dtd.resolve(); // 改变Deferred对象的执行状态
+						}
+					}
+				});
+				return dtd.promise(); // 返回promise对象
+			}
 		</script>
 	</body>