Merge branch 'master' of http://192.168.1.222:3000/lihai/PingAnYeXianSZCG_Web

CallCenterWeb.UI/Questionnaire/Table.html

@@ -19,33 +19,31 @@
 				color: #fff!important;
 			}
 			
-			#Task thead td {
-				color: #fff;
-				background-color: #1ab394;
-				text-align: center;
-			}
-			
-			.table-head table thead {
-				width: calc( 100% - 5px);
-			}
-			/*table thead,
-			tbody tr {
-				display: table;
-				width: 100%;
-				table-layout: fixed;
-				text-align: center;
-			}*/
-			
 			.table {
 				margin-bottom: 0;
 			}
 			
 			.table-body {
 				width: 100%;
-				height: 515px;
-				overflow-y: scroll;
+				/*height: 300px;
+				overflow-y: scroll;*/
 				overflow-x: scroll;
 			}
+			.tds{
+				background-color: #1ab394!important;
+				color: #fff;
+				padding: ;
+			}
+			.hwbb tbody td {
+				min-width: 100px;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+			
+			.hwbb td {
+				text-align: center;
+			}
 		</style>
 	</head>
 
@@ -74,111 +72,26 @@
 
 								</select>
 							</li>
-							<li>留言时间：<input class="photo x-color laydate-icon" type="text" id="lysj" /></li>
-							<li>处理时间：<input class="laydate-icon photo x-color " type="text" id="clsj" /></li>
-
 							<li>
 								<a class="sc_btn seach">搜索</a>
 							</li>
+							<li>
+								<a class=" sc_btn  export ">导出</a>
+							</li>
 						</ul>
 					</div>
 				</div>
 			</div>
 			<div style="width: 100%;padding: 10px;">
-				<div class="table-head">
-					<table id="Task" class="table table-hover table-striped table-bordered table-condensed">
-						<colgroup>
-							<col style="width: 80px;" />
-							<col/>
-						</colgroup>
-						<thead>
-							<tr>
-								<td>测试测试</td>
-								<td colspan="4">测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-							</tr>
-						</thead>
-					</table>
-				</div>
+
 				<div class="table-body">
 					<table class="thTable hwbb table table-hover table-striped table-bordered table-condensed">
-						<colgroup>
-							<col style="width: 80px;" />
-							<col/>
-						</colgroup>
-						<tbody>
+						<thead>
 							<tr>
-								<td>测试测试</td>
-								<td colspan="4" style="text-align: center;">测试测试</td>
-								<td colspan="4" style="text-align: center;">测试测试</td>
-								<td colspan="4" style="text-align: center;">测试测试</td>
-								<td colspan="2" style="text-align: center;">测试测试</td>
-								<td colspan="3" style="text-align: center;">测试测试</td>
-
-							</tr>
-							<tr style="border:1px solid #E0EEFE" align="center">
-								<td ></td>
-								<td>A</td>
-								<td>B</td>
-								<td>B</td>
-								<td>D</td>
-								<td>A</td>
-								<td>B</td>
-								<td>B</td>
-								<td>D</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								
-								
-							</tr>
 
-							<tr style="border:1px solid #E0EEFE" align="center">
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-							</tr>
-
-							<tr style="border:1px solid #E0EEFE" align="center">
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-							</tr>
-							<tr style="border:1px solid #E0EEFE" align="center">
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
-								<td>测试测试</td>
 							</tr>
+						</thead>
+						<tbody>
 
 						</tbody>
 					</table>
@@ -188,101 +101,134 @@
 		>
 		<script>
 			$(document).ready(function() {
-				Task();
-				Questionnaire();
-				$(".sc_btn").click(function() {
-					GetColumnList();
-					Number()
-				})
-				///查询条件中获取任务列表
-				function Task() {
-					$.ajax({
-						type: "get",
-						url: huayi.config.callcenter_url + "Questionnaire/GetTaskList",
-						dataType: 'json',
-						data: {
-							token: $.cookie("token")
-						},
-						async: true,
-						success: function(data) {
-							var Count = data.data;
-							$("<option value=''>--全部--</option>").appendTo($("#cljg"));
-							for(var i = 0; i < Count.length; i++) {
-								console.log(Count[i].F_UserName);
-								$("<option value='" + Count[i].F_TaskName + "'>" + Count[i].F_TaskName + "</option>").appendTo($("#cljg"));
-
+					Task();
+					Questionnaire();
+					$(".sc_btn").click(function() {
+						GetColumnList();
+						Number()
+					}) ///查询条件中获取任务列表
+					function Task() {
+						$.ajax({
+							type: "get",
+							url: huayi.config.callcenter_url + "Questionnaire/GetTaskList",
+							dataType: 'json',
+							data: {
+								token: $.cookie("token")
+							},
+							async: true,
+							success: function(data) {
+								var Count = data.data;
+								$("<option value=''>--全部--</option>").appendTo($("#cljg"));
+								for(var i = 0; i < Count.length; i++) {
+									console.log(Count[i].F_UserName);
+									$("<option value='" + Count[i].F_TaskName + "'>" + Count[i].F_TaskName + "</option>").appendTo($("#cljg"));
+								}
 							}
-							console.log(Count)
-						}
-					});
-				}
-				///查询条件问题任务列表
-				function Questionnaire() {
-					$.ajax({
-						type: "get",
-						url: huayi.config.callcenter_url + "Questionnaire/GetQList",
-						dataType: 'json',
-						data: {
-							token: $.cookie("token")
-						},
-						async: true,
-						success: function(data) {
-							var Count = data.data;
-							$("<option value=''>--全部--</option>").appendTo($("#Wt"));
-							for(var i = 0; i < Count.length; i++) {
-								console.log(Count[i].F_UserName);
-								$("<option value='" + Count[i].F_Title + "'>" + Count[i].F_Title + "</option>").appendTo($("#Wt"));
-
+						});
+					}
+					///查询条件问题任务列表
+					function Questionnaire() {
+						$.ajax({
+							type: "get",
+							url: huayi.config.callcenter_url + "Questionnaire/GetQList",
+							dataType: 'json',
+							data: {
+								token: $.cookie("token")
+							},
+							async: true,
+							success: function(data) {
+								var Count = data.data;
+								$("<option value=''>--全部--</option>").appendTo($("#Wt"));
+								for(var i = 0; i < Count.length; i++) {
+									console.log(Count[i].F_UserName);
+									$("<option value='" + Count[i].F_Title + "'>" + Count[i].F_Title + "</option>").appendTo($("#Wt"));
+								}
 							}
-							console.log(Count)
-						}
-					});
-				}
-				//任务查询获取表头
-				function GetColumnList() {
-					$("#Task thead tr").empty();
-					$.ajax({
-						type: "get",
-						url: huayi.config.callcenter_url + "Questionnaire/GetColumnList",
-						dataType: 'json',
-						data: {
-							taskname: $("#cljg").val(),
-							question: $("#Wt").val(),
-							token: $.cookie("token")
-						},
-						async: true,
-						success: function(data) {
-							var Count = data.data;
-							for(var i = 0; i < Count.length; i++) {
-								$('<td>' + Count[i].wenti + ' </td>').appendTo("#Task thead tr");
-
+						});
+					}
+					//任务查询获取表头
+					function GetColumnList() {
+						$(".hwbb thead tr").empty();
+						$.ajax({
+							type: "get",
+							url: huayi.config.callcenter_url + "Questionnaire/GetColumnList",
+							dataType: 'json',
+							data: {
+								taskname: $("#cljg").val(),
+								question: $("#Wt").val(),
+								token: $.cookie("token")
+							},
+							async: true,
+							success: function(data) {							
+								var Count = data.data;
+								if( Count.length>0){
+
+								$('<td class="tds"> </td>').appendTo(".hwbb thead tr");
+								for(var i = 0; i < Count.length; i++) {
+									$('<td class="tds" colspan="' + Count[i].fenxiangshu + '">' + Count[i].wenti + ' </td>').appendTo(".hwbb thead tr");
+								}
+								}
+								console.log(Count)
 							}
-							console.log(Count)
-						}
-					});
-				}
-
-				function Number() {
-					$.ajax({
-						type: "get",
-						url: huayi.config.callcenter_url + "Questionnaire/GetDataList",
-						dataType: 'json',
-						data: {
-							taskname: $("#cljg").val(),
-							question: $("#Wt").val(),
-							token: $.cookie("token")
-						},
-						async: true,
-						success: function(data) {
-							var Count = data.data;
-
-							console.log(Count)
-						}
-					});
+						});
+					}
+
+					function Number() {
+						$(".hwbb tbody ").empty()
+						$.ajax({
+							type: "get",
+							url: huayi.config.callcenter_url + "Questionnaire/GetDataList",
+
+							dataType: 'json',
+							data: {
+								taskname: $("#cljg").val(),
+								question: $("#Wt").val(),
+								token: $.cookie("token")
+							},
+							async: true,
+							success: function(data) {
+								var Count = data.data;
+								if(Count.length > 1) {
+
+									var html = "";
+									$(Count).each(function(i, n) {
+										html += '<tr>';
+										$(n).each(function(j, k) {
+
+											html += '<td colspan="" class="td">' + k + ' </td>';
+
+										})
+										html += '</tr>';
+
+									})
+									$(html).appendTo(".hwbb tbody");
+
+								}
+								console.log(Count)
+							}
+						});
+					}
+
+					function LimitNumber(txt, idName) {
+						var str = txt;
+						console.log(str);
+						str = str.substr(0, 20) + '...';
+						var id = document.getElementsByClassName('td');
+						id.innerText = str;
+					}
+					//导出功能
+              	$('.export').click(function() {
+					dcexcel(this);
+				})
+		   function dcexcel(obj) {
+            var url = huayi.config.callcenter_url + "Questionnaire/GetDataListExpt?token=" + $.cookie("token");
+                url += "&taskname=" + $("#cljg").val() + "&question=" + $("#Wt").val();
+                obj.href = url;
+       		 }
+		
 				}
-			})
 
-			//音频
+			)
 		</script>
 
 	</body>

CallCenterWeb.UI/Questionnaire/Tasks.html

@@ -73,6 +73,9 @@
 							<li>
 								<a class="sc_btn seach">搜索</a>
 							</li>
+							<li>
+								<a class="sc_btn export">导出</a>
+							</li>
 						</ul>
 					</div>
 				</div>
@@ -115,7 +118,7 @@
 
 				$(".sc_btn").click(function() {
 					GetColumnList();
-					Number()
+
 				})
 				///查询条件中获取任务列表
 				function Task() {
@@ -146,6 +149,7 @@
 					$.ajax({
 						type: "get",
 						url: huayi.config.callcenter_url + "/Questionnaire/GetReport?",
+
 						dataType: 'json',
 						data: {
 							taskname: $("#cljg").val(),
@@ -167,24 +171,17 @@
 						}
 					});
 				}
-				//获取数据
-				function Number(){
-					$.ajax({
-						type: "get",
-						url: huayi.config.callcenter_url + "Questionnaire/GetDataList",
-						dataType: 'json',
-						data: {
-							taskname: $("#cljg").val(),
-							token: $.cookie("token")
-						},
-						async: true,
-						success: function(data) {
-							var Count = data.data;
-
-							console.log(Count)
-						}
-					});
-				}
+				
+				       //导出功能
+	              	$('.export').click(function() {
+						dcexcel(this);
+					})
+			   function dcexcel(obj) {
+	            var url = huayi.config.callcenter_url + "/Questionnaire/GetReportExpt?token=" + $.cookie("token");
+	                url += "&taskname=" + $("#cljg").val();
+	                obj.href = url;
+	                console.log(url);
+	       		 }
 			})
 
 			//音频

CallCenterWeb.UI/keHuManager/js/keHuManger.js

@@ -44,13 +44,7 @@
 		var khmc = $(".add_name").val();
 		var khbh = $(".add_code").val();
 		var tel1 = $(".add_ph1").val();
-		if(!khmc) {
-			layer.confirm('请输入客户名称！', {
-				btn: ['确定']
-			});
-			return;
-		}
-		alert($(' input[name="autoflag"]:checked ').val())
+
 		$.post(huayi.config.callcenter_url + 'Customer/AddCustomer', {
 			name: khmc,
 			code: khbh,