分佣提成列表修改

application/index/view/finance/commission_total.html

@@ -26,6 +26,11 @@
 		width: 340px;
 		line-height: 36px;
 	}
+	.left-btn{
+		float: left;
+		
+		
+	}
 	
 	.right {
 		line-height: 36px;
@@ -57,6 +62,9 @@
 		height: 500px;
 		overflow-y: scroll;
 	}
+	.clear{
+		clear: both;
+	}
 </style>
 <div id="page-content-wrapper">
 	<div class="container">
@@ -86,11 +94,14 @@
 												<span class="fore-span ld-Marheight">-</span>
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_dealtime" name="end_date" type="date">
 
-												<select class="form-control btn4 ld-Marheight" id="deal_status">
+												<!--<select class="form-control btn4 ld-Marheight" id="deal_status">
 													<option value="-1">请选择部门</option>
 													<option value="10">市场一部</option>
 													<option value="20">市场二部</option>
-												</select>
+												</select>-->
+												<select name="qx-store" class="form-control btn2 ld-Marheight"  id="qx-store">
+                                                <option value="" selected="selected">选择部门</option>
+                                               </select>
 
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="store_name" placeholder="所属门店名称" type="text" value="">
 												<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_num" placeholder="商铺号" type="text" value="">-->
@@ -101,10 +112,11 @@
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_ticketTime" name="start_date" type="date">
 												<span class="fore-span ld-Marheight">-</span>
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_ticketTime" name="end_date" type="date">
+												<div class="clear"></div>
 
-												<span class="btn btn-info btn3" id="search">搜索</span>
-												<span class="btn btn-info btn3" id="reset">重置</span>
-												<span class="btn btn-info btn3" id="export">导出excel</span>
+												<span class="btn btn-info btn3 " id="search">搜索</span>
+												<span class="btn btn-info btn3 " id="reset">重置</span>
+												<span class="btn btn-info btn3 " id="export">导出excel</span>
 											</form>
 										</td>
 									</tr>

public/resource/js/commission.js

@@ -1412,6 +1412,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s
 			});
 		},
 				exportList: function(pageNo) {
+					console.log(6);
 			//导出分佣提成列表
 			bargain.pageNo = pageNo;
 			var create_time = $('#create_time').val();