1

application/index/view/officeBuilding/account_statement_office.html

@@ -1393,15 +1393,6 @@
 					</tr>
 					<!--中介费-->
 					<tr class="zhongjiefei">
-						<td>
-							<span class="span-width-90">是否开业：</span>
-							<!--<span class="shop-is-open">是</span>-->
-							<select class="shop-is-open">
-								<option value="3">请选择</option> 
-								<option value="1">是</option> 
-								<option value="0">否</option>
-							</select>
-						</td>
 						<td>
 							<span class="span-width-90">是否分红：</span>
 							<select class="commission-type-zhongjie">
@@ -1410,6 +1401,14 @@
 								<option value="2">否</option>
 							</select>
 						</td>
+						<td>
+							<!--<span class="span-width-90">是否开业：</span>
+							<select class="shop-is-open">
+								<option value="3">请选择</option> 
+								<option value="1">是</option> 
+								<option value="0">否</option>
+							</select>-->
+						</td>
 					</tr>
 					<tr class="zhongjiefei">
 						<td>

application/index/view/officeBuilding/getCollectionOffice.html

@@ -593,13 +593,13 @@
 						</div>
 						<div class="col-xs-6 choose_topic_1">
 							<div class="form-group">
-								<strong><span class="col-xs-4 ld-Marheight">是否开业:</span></strong>
+								<!--<strong><span class="col-xs-4 ld-Marheight">是否开业:</span></strong>-->
 								<div class="col-xs-6">
-									<select class="form-control " id="change_kaiye">
+									<!--<select class="form-control " id="change_kaiye">
 										<option value="3">请选择</option>		
 										<option value="0">否</option>		
 										<option value="1">是</option>	
-									</select>
+									</select>-->
 								</div>
 							</div>
 						</div>

public/resource/js/financial_manager_daily_list.js

@@ -1867,7 +1867,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 			if (!params) {
 				return false ;
 			}
-			$.post('/index/refundPayLog',params,function(data){
+			if(bargain.isOffice == 1){
+					bargain.isOfficeUrl = '/index/refundPayLog';//商铺
+				}else{
+					bargain.isOfficeUrl = '/office_index/refundPayLog';//办公楼
+			}
+			$.post(bargain.isOfficeUrl,params,function(data){
 				if(data.code == 200) {
 					$('#modal-back').modal("hide")
 					bargain.getList();

public/resource/js/getCollectionOffice.js

@@ -1032,7 +1032,7 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home
 			var params = {
 				'order_id' : that.order_id ,
 				'order_no' : that.order_no,
-//				'agent_id' : that.agent_id,
+				'AuthToken' : JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).AuthToken,
 				'agent_id' : JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))).id,
 				'report_id' : that.report_id,
 				'industry_type' : that.yetai ? that.yetai : '' ,
@@ -1098,12 +1098,12 @@ define(['doT', 'text!temp/office_receivables_template_tpl.html', 'css!style/home
 				if($('#change_fenhong').text()){//分红
 					params.is_dividend = $('#change_fenhong').val()
 				};
-				if($('#change_kaiye').val() == 3){//中介费 案场费
-						alert('请选择是否开业');
-						return;
-				}else{
-						params.is_open = $('#change_kaiye').val();
-				}
+//				if($('#change_kaiye').val() == 3){//中介费 案场费
+//						alert('请选择是否开业');
+//						return;
+//				}else{
+//						params.is_open = $('#change_kaiye').val();
+//				}
 				
 			}
 			

public/resource/js/realtimePerformanceOffice.js

@@ -1029,17 +1029,23 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text
 		//部门-新增房源-弹出框-详情
 		getnewshopNumberDetails: function(pageNo){
 			var params = {
-				'id': realtime.district_store_agent_id,
-				'type': realtime.switchType,
-				'start_time': realtime.time_search_start,
-				'end_time': realtime.time_search_end,
-				'AuthToken':user_info_obj.AuthToken,
-				'page_no':1,
-				'page_size':9999
+				'create_time_start': realtime.time_search_start,
+				'create_time_end': realtime.time_search_end,
+				'pageNo':1,
+				'pageSize':9999
 			};
+			if(realtime.district_id){
+				params.dish_district_id = realtime.district_id;
+			}
+			if(realtime.store_id){
+				params.dish_store_id = realtime.store_id;
+			}
+			if(realtime.agents_id){
+				params.dish_id = realtime.agents_id;
+			}
 			$.ajax({
 				type: 'GET',
-				url: '/office/housingResourcePcInfo',
+				url: '/office_index/getRoomList',
 				data: params,
 				timeout: 30000,
 				dataType: 'json',
@@ -1083,7 +1089,7 @@ define(['doT', 'text!temp/real_time_performance_office_template_tpl.html', 'text
 			};
 			$.ajax({
 				type: 'GET',
-				url: '/office/userResourcePcInfo',
+				url: '/broker/userResourcePcInfo',
 				data: params,
 				timeout: 30000,
 				dataType: 'json',

public/resource/js/reportListOffice.js

@@ -983,7 +983,7 @@ define(['doT', 'text!temp/reportList_office_template_tpl.html', 'css!style/home.
 //          	alert('请填写是否开业');
 //          	return;
 //          }
-            params.is_open=$('.shop-is-open').val();//是否开业
+//          params.is_open=$('.shop-is-open').val();//是否开业
             
             $.ajax({
                 'type': 'POST',