pk修改

application/index/view/pkList/pkListCon.html

@@ -80,6 +80,7 @@
 		margin-left: 60px;
 		background-color: #4F66C3;
 		color: #fff;
+		cursor: pointer;
 	}
 	.pk-container-detail-a{
 		margin: 10px 0;
@@ -178,8 +179,16 @@
 					<span class="a-span ld-Marheight" data-id='24'>X</span>
 					<span class="a-span ld-Marheight" data-id='25'>Y</span>
 					<span class="a-span ld-Marheight" data-id='26'>Z</span>
-					<span class="a-span ld-Marheight" data-id='27'>Z1</span>
-					
+					<span class="a-span ld-Marheight" data-id='27'>A1</span>
+					<span class="a-span ld-Marheight" data-id='28'>B1</span>
+					<span class="a-span ld-Marheight" data-id='29'>C1</span>
+					<span class="a-span ld-Marheight" data-id='30'>D1</span>
+					<span class="a-span ld-Marheight" data-id='31'>E1</span>
+					<span class="a-span ld-Marheight" data-id='32'>F1</span>
+					<span class="a-span ld-Marheight" data-id='33'>G1</span>
+					<span class="a-span ld-Marheight" data-id='34'>H1</span>
+					<span class="a-span ld-Marheight" data-id='35'>I1</span>
+					<span class="a-span ld-Marheight" data-id='36'>J1</span>
 				</div>
 				<div class="pk_list_content">
 					<table id="pk_list" class="table">

public/resource/js/pkList.js

@@ -53,27 +53,17 @@ define(['doT', 'text!temp/pk_list_template_tpl.html.html', 'css!style/home.css',
 				$("#pk_list").html(doTtmpl(pkList.mainTabArr[pkList.mainTabIndexTwo]));
 			});
 			
-			$("#export").click(function() { //导出列表
+			$(".export-pk").click(function() { //导出列表
 						pkList.exportList();
 			});
 		},
- //		导出列表
-		exportList: function(pageNo) {
-		console.log(2);
-		follow.pageNo = pageNo;
-		var params = {};
-		var excel_two = 1;
-		var user_name = $.trim($('#customer_name').val());
-		var start_time = $('#start_date').val();
-		var end_time = $('#end_date').val();
-		var internal_title = $('#shop_name').val();
-		var user_phone = $('#customer_phone').val();
-		var id = $('#shop_num').val() * 1;
-		var store_name = $('#store_name').val();
-		var report_phone = $('#applicant_phone').val();
-		var report_name = $('#applicant_name').val();
-		window.open('/index/getCollection?'+
-				'excel='+ excel_two +'&user_name=' + user_name + '&start_time=' + start_time + '&end_time=' + end_time + '&internal_title=' + internal_title + '&user_phone=' + user_phone + '&id=' + id+ '&store_name=' + store_name+ '&report_phone=' + report_phone+ '&report_name=' + report_name);
+        //pk导出列表
+		exportList: function() {
+			var params = {};
+			var position = pkList.mainTabIndex;
+			var AuthToken = user_info_obj.AuthToken;
+			window.open('/index/exportReport?'+
+					'position='+ position +'&AuthToken=' + AuthToken);
 			},
 						
 		getList: function(pageNo) {
@@ -93,9 +83,6 @@ define(['doT', 'text!temp/pk_list_template_tpl.html.html', 'css!style/home.css',
 			    success: function(data) {
 			        if(typeof data === 'object') {
 			        	var _length = data.data.length;
-			        	if(_length >=26){
-			        		_length = 26;
-			        	}
 			        	$(".pk-container-detail-a>span").eq(_length).prevAll().show();
 			            if (data.code == 200) {
 			            	pkList.mainTabArr = data.data;