分佣提成列表修改

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,10 +94,13 @@
 												<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 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="">
@@ -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();

public/resource/js/commissionTotal.js

@@ -18,6 +18,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 					$("body").append(template);
 					business.getList();
 					business.event();
+					 business.getDistrict();
 				},
 				event: function() {
 					var _doc = $(document);
@@ -323,7 +324,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 					params.deal_end_date = $('#end_dealtime').val();
 					params.operation_start_date = $('#create_ticketTime').val();
 					params.operation_end_date = $('#end_ticketTime').val();
-			params.district_id = $('#user_phone').val();
+					params.district_id= $("#qx-store option:selected").val();//部门id 添加字段
 					params.store_name = $('#store_name').val();
 
 					$.ajax({
@@ -343,19 +344,54 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 							add_page(data.data.total, pageNo, business.pageSize, business.getList);
 						}
 					});
+				},
+				getDistrict: function(name) {
+            $.ajax({
+                url: '/index/getDistrictListByName',
+                type: 'GET',
+                async: true,
+                data: {"pageSize":50},
+                dataType: 'json',
+                success: function(data) {
+                    if(data.code == 200) {
+                        var _html = '';
+                        $.each(data.data, function(i, n) {
+                            if (n.district_name == name && (typeof name != undefined)) {
+                                _html += '<option  value="' + n.id + '">' + n.district_name + '</option>';
+							} else {
+                                _html += '<option value="' + n.id + '">' + n.district_name + '</option>';
+							}
+                        });
+                        $("#ss-store").html(_html);
+						$("#qx-store").append(_html);
+                        
+//                      $("#qx-store").html(_html);
+                        
+                    } else {
+                        alert('获取部门信息失败');
+                    }
+                }
+            });
         },
 				exportList: function(pageNo) {
+					console.log(2);
 					business.pageNo = pageNo;
-			var create_time = $('#create_time').val();
-			var end_time = $('#end_time').val();
-			var internal_address = $('#internal_address').val();
-			var agent = $('#user_name').val();
-			var user_phone = $('#user_phone').val();
-			var house_number = $('#internal_num').val();
-			window.open('/index/exportExcel?create_time=' + create_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&name=' + agent + '&phone=' + user_phone + '&house_number=' + house_number);
-
+					var excel_two = 1;
+					var name = $('#user_name').val();
+					var phone = $('#user_phone').val();
+					var commission_start_date = $('#create_time').val();
+					var commission_end_date = $('#end_time').val();
+					var deal_start_date = $('#create_dealtime').val();
+					var deal_end_date = $('#end_dealtime').val();
+					var operation_start_date = $('#create_ticketTime').val();
+					var operation_end_date = $('#end_ticketTime').val();
+//					var district_id = $('#user_phone').val();
+                    var district_id= $("#qx-store option:selected").val();//部门id 添加字段
+					var store_name = $('#store_name').val();
+					window.open('/index/getCommissionTotalList?'+
+							'excel = '+ excel_two +' &name = ' + name + ' &phone = ' + phone + ' &commission_start_date = ' + commission_start_date + '& commission_end_date = ' + commission_end_date + ' &deal_start_date = ' + deal_start_date + ' &deal_end_date = ' + deal_end_date+ ' &operation_start_date = ' + operation_start_date+ ' &operation_end_date = ' + operation_end_date+ ' &district_id = ' + district_id+ ' &store_name = ' + store_name);
 						},
-
 				};
 				return business;
-});
\ No newline at end of file
+			});
+			       
\ No newline at end of file