Merge remote-tracking branch 'origin/0731-v3.3.6' into 0731-v3.3.6

application/index/view/finance/commission_total.html

@@ -96,7 +96,13 @@
 						<div class="table-responsive">
 							<table class="table table-striped table-bordered table-hover table-condensed">
 								<thead>
-									
+									<!--区分办公楼 商铺-->
+									<tr>
+										<td colspan="14" class="maintable-top-sub-tr">
+											<a class="btn btn-info liudan_pic_btn">商铺</a>
+											<a class="btn btn-default liudan_pic_btn">公楼</a>
+										</td>
+								    </tr>
 									<tr>
 										<td colspan="10">
 											<form id="form_search">
@@ -104,11 +110,11 @@
 												<div class="clear">
 													
 												</div>
-												<select class="form-control ld-Marheight btn4" name="" id="maintable_shop_type_yeji">
+												<!--<select class="form-control ld-Marheight btn4" name="" id="maintable_shop_type_yeji">
 													<option value="">房源类型</option>
 													<option value="0">商铺</option>
 													<option value="1">办公楼</option>
-											    </select>
+											    </select>-->
 												<span class="fore-span ld-Marheight">收佣日期/开票日期:</span>
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time" name="start_date" type="date">
 												<span class="fore-span ld-Marheight">-</span>

public/resource/js/commission.js

@@ -6,6 +6,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 		/*每页显示多少条*/
 		mainTabIndex: 0,
 		listUrl:'/index/partialCommissionList',//业绩明细url
+		exportUrl:'/index/exportExcel',//导出
 		bargain_id: '',
 		father_id:'',
 		order_id: 0,//订单id
@@ -62,8 +63,13 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 					_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
 					if($(this).index() == 0){//商铺
 						bargain.listUrl = '/index/partialCommissionList';
+						bargain.exportUrl = '/index/exportExcel';
+						
+						
 					}else if($(this).index() == 1){//办公楼
 						bargain.listUrl = '/office_index/partialCommissionList';
+						bargain.exportUrl = '/office_index/exportExcel';
+						
 					}
 					console.log(555)
 					bargain.getList(1);
@@ -284,7 +290,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 			var house_number = $('#internal_num').val();
 			var bargain_id = $('#bargain_id').val();
 			
-			window.open('/index/exportExcel?create_time=' + create_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&partial_id=' + partial_id + '&district_id=' + district_id + '&house_number=' + house_number + '&bargain_id=' + bargain_id + '&store_id=' + store_id);
+			window.open(bargain.exportUrl + '?create_time=' + create_time + '&end_time=' + end_time + '&internal_address=' + internal_address + '&partial_id=' + partial_id + '&district_id=' + district_id + '&house_number=' + house_number + '&bargain_id=' + bargain_id + '&store_id=' + store_id);
 
 		},
 			getDistrict: function(fn) {

public/resource/js/commissionTotal.js

@@ -5,6 +5,8 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 		/*第几页*/
 		pageSize: 10,
 		/*每页显示多少条*/
+		mainTabIndex: 0,
+		listUrl:'/index/getCommissionTotalList',//业绩明细url
 		id: '',
 		house_id: '',
 		type: '',
@@ -95,6 +97,21 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 					};
 				});
             });
+            //商铺 办公楼切换
+				_doc.on('click', '.maintable-top-sub-tr>a', function(e){
+					e.preventDefault();
+					e.stopPropagation();
+					var _this = $(this);
+					business.mainTabIndex = $(this).index();
+					_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
+					if($(this).index() == 0){//商铺
+						business.listUrl = '/index/getCommissionTotalList';
+					}else if($(this).index() == 1){//办公楼
+						business.listUrl = '/office_index/getCommissionTotalList';
+					}
+					console.log(555)
+					business.getList(1);
+				});
 			_doc.on('input', '#create_time, #end_time', function(){
 				$('#create_ticketTime').val($('#create_time').val());
 				$('#end_ticketTime').val($('#end_time').val())
@@ -454,7 +471,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 			params.store_id = $('#guest_stores').val();
 			console.log(params)
 			$.ajax({
-				url: '/index/getCommissionTotalList', //获取列表
+				url: business.listUrl, //获取列表
 				type: 'GET',
 				async: true,
 				data: params,
@@ -524,7 +541,7 @@ define(['doT', 'text!temp/commissionTotal_template_tpl.html', 'css!style/home.cs
 			var district_id = $("#district_id").val(); //部门id 添加字段
 			var store_id = $('#guest_stores').val();
 			var confirm_date=$('#confirm_commission').val();
-			var str = '/index/getCommissionTotalList?excel=1';
+			var str = business.listUrl + '?excel=1';
 			if (name) {
 				str += '&name=' + name;
 			}