实收明细

application/index/view/finance/commission.html

@@ -105,8 +105,8 @@
                                                 <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>
                                                 <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">
-	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" 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="">
+	                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_address" 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="">
 	                                            <select name="district_id" class="form-control btn4 ld-Marheight">
                                                     <option value="">分佣方所属部门</option>
                                                 </select>
@@ -133,9 +133,9 @@
                                     <th class="text-center">收佣日期</th>
                                     <th class="text-center">所属门店</th>
                                     <th class="text-center">业务员</th>
-                                    <th class="text-center">商铺地址</th>
+                                    <th class="text-center">房源地址</th>
                                     <th class="text-center">分佣角色</th>
-                                    <th class="text-center">商铺号</th>
+                                    <th class="text-center">房源号</th>
                                     <th class="text-center">分佣比例</th>
                                     <th class="text-center">应分佣金（元）</th>
                                     <th class="text-center">实收佣金（元）</th>

public/resource/js/commission.js

@@ -5,6 +5,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 		pageSize: 10,
 		/*每页显示多少条*/
 		mainTabIndex: 0,
+		listUrl:'/index/partialCommissionList',//业绩明细url
 		bargain_id: '',
 		father_id:'',
 		order_id: 0,//订单id
@@ -57,13 +58,17 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 					e.preventDefault();
 					e.stopPropagation();
 					var _this = $(this);
+					bargain.mainTabIndex = $(this).index();
 					_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
-					if($(this).index() == 0){
-						
-					}else if($(this).index() == 1){
-						
+					if($(this).index() == 0){//商铺
+						bargain.listUrl = '/index/partialCommissionList';
+					}else if($(this).index() == 1){//办公楼
+						bargain.listUrl = '/office_index/partialCommissionList';
 					}
+					console.log(555)
+					bargain.getList(1);
 				});
+				
 				$("#search").click(function() {
 				bargain.getList(1);
 			});
@@ -72,18 +77,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 				bargain.agent_id_phone='';
 				
 			});
-			//主页面一级审核，二级审核，三级审核，结单四个tab的点击事件
-			//专员审核 总监审核 经理审核 出纳审核
-			_doc.on('click', '.maintable-top-sub-tr>a', function(e){
-				e.preventDefault();
-				e.stopPropagation();
-				var _this = $(this);
 			
-				_this.removeClass('btn-default').addClass('btn-info').siblings().removeClass('btn-info').addClass('btn-default');
-				bargain.mainTabIndex = _this.index();
-				console.log(bargain.mainTabIndex);
-				bargain.getList(1);
-			});
 			$("#export").click(function() { //导出列表
 				bargain.exportList();
 			});
@@ -139,7 +133,11 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 				var _id = $(this).attr("data-id");
 				bargain.bargain_id = _id;
 				bargain.father_id = $(this).closest('tr').attr("data-fatherid");
+				if(bargain.mainTabIndex == 0){//商铺
 				    $('.iframe-bargaininfo-static').attr('src', '/app_broker/bargaininfo_detail_static_pc?otherbtn=no&orderid='+_id).load;
+				}else{//办公楼
+				    $('.iframe-bargaininfo-static').attr('src', '/app_broker/bargaininfo_detail_static_pc_office?orderid='+_id+'&otherbtn=no').load;
+				}
 			});
 			
 			
@@ -149,8 +147,11 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 				e.stopPropagation();
 				var _this = $(this);
 				var _id = _this.closest('tr').data('orderid');
-				console.log(_id);
+				if(bargain.mainTabIndex == 0){//商铺
 				    $('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+_id);
+				}else{//办公楼
+					$('.iframe-time-line').attr('src', '/app_broker/timeline_pc_financial?order_id='+_id);
+				}
 			});
 		},
 		getDepart: function(s, fn){
@@ -251,7 +252,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 			params.district_id = $("select[name='district_id'] option:selected").val();//部门
 			params.store_id = $("select[name='store_id'] option:selected").val();//门店
 			$.ajax({
-				url: '/index/partialCommissionList', //获取列表
+				url: bargain.listUrl, //获取列表
 				type: 'GET',
 				async: true,
 				data: params,
@@ -272,7 +273,6 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
 			});
 		},
 		exportList: function(pageNo) {
-					console.log(6);
 			//导出分佣提成列表
 			bargain.pageNo = pageNo;
 			var create_time = $('#create_time').val();