bug

application/app_broker/view/index/timeline_pc.html

@@ -52,10 +52,10 @@
 								<p v-if="item.step_name==='report'">约带看人：<span>{{item.report_agent_name}}</span></p>
 								<p v-if="item.step_name==='report'">约带看人电话：<span><a href="javascript:;">{{item.report_agent_phone}}</a></span></p>
 								<p v-if="item.step_name==='report'">预计到场时间：<span>{{item.predict_see_time}}</span></p>
-								<p v-if="item.step_name==='report'">商铺地址：<span>{{item.internal_address}}</span></p>
+								<p v-if="item.step_name==='report'">房源地址：<span>{{item.internal_address}}</span></p>
 								<p v-if="item.step_name==='follow_up_log'">属于哪类客户：<span>{{item.user_type}}</span></p>
 								<p v-if="item.step_name==='follow_up_log'">第一决策人：<span>{{item.decision_maker}}</span></p>
-								<p v-if="item.step_name==='follow_up_log'">租商铺做什么：<span>{{item.industry_type}}</span></p>
+								<p v-if="item.step_name==='follow_up_log'">租房源做什么：<span>{{item.industry_type}}</span></p>
 								<p v-if="item.step_name==='follow_up_log'">对面积的要求：<span>{{item.area_requirement}}</span></p>
 								<p v-if="item.step_name==='follow_up_log'">对价格的要求：<span>{{item.price_requirement}}</span></p>
 								<p v-if="item.step_name==='follow_up_log'">所在区域：<span>{{item.area_detail+' '+item.business_area}}</span></p>
@@ -74,7 +74,7 @@
 								<p v-if="item.step_name==='pay_log'&&item.list[0].type==30">收条编号：<span>{{item.list[0].receipt_number}}</span></p>
 								<p v-if="item.step_name==='pay_log'">入账姓名：<span>{{item.list[0].transfer_name}}</span></p>
 								
-								<p v-if="item.step_name==='pay_log'">商铺号：<span>{{item.list[0].house_number}}</span></p>
+								<p v-if="item.step_name==='pay_log'">房源号：<span>{{item.list[0].house_number}}</span></p>
 								<p v-if="item.step_name==='pay_log'">业态/品牌：<span>{{item.list[0].industry_type}}</span></p>
 								<p v-if="item.step_name==='pay_log' && item.list[0].source == 0">来源：<span>APP</span></p>
 								<p v-if="item.step_name==='pay_log' && item.list[0].source == 1">来源：<span>智能pos机</span></p>
@@ -103,7 +103,7 @@
 								<p v-if="item.step_name==='refund'">户名：<span class="span-active">{{item.name}}</span></p>
 								<p v-if="item.step_name==='refund'">收款人手机：<span class="span-active">{{item.phone}}</span></p>
 								<p v-if="item.step_name==='bargain'">成交类型：<span>{{switchTradeType(item.trade_type)}}</span></p>
-								<p v-if="item.step_name==='bargain'">商铺号：<span>{{item.house_number}}</span></p>
+								<p v-if="item.step_name==='bargain'">房源号：<span>{{item.house_number}}</span></p>
 								<p v-if="item.step_name==='bargain'">业态/品牌：<span>{{item.industry_type}}</span></p>
 								<p v-if="item.step_name==='bargain'">成交价：<span class="span-active">{{item.price}}元</span></p>
 								<p v-if="item.step_name==='bargain'">应收佣金：<span class="span-active">{{item.commission}}元</span></p>

application/index/view/officeBuilding/account_statement_office.html

@@ -216,12 +216,12 @@
 									<tr>
 										<td colspan="14">
 											<form id="maintable_form_search">
-												<span class="fore-span">2商铺类型:</span>
+												<!--<span class="fore-span">商铺类型:</span>
 												<select class="form-control btn2" name="maintable_shop_type" id="maintable_shop_type">
 													<option value="-1">请选择</option>
 													<option value="0">商场</option>
 													<option value="1">街铺</option>
-												</select>
+												</select>-->
 												<span class="fore-span margin-left-10">提交时间:</span>
 												<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="maintable_create_time" name="start_date" type="date">
 												<span class="fore-span margin-left-10">至</span>
@@ -267,8 +267,8 @@
 										<th class="text-center">行号</th>
 										<th class="text-center">ID</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/financial_manager_daily_list.js

@@ -1869,7 +1869,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 		//获取调整详情
 		getAdjustmentDetail : function(id){
 			var that = bargain ;
-			$.get('/index/getAdjustmentDetail',{'id' : id},function(data){
+			if(bargain.isOffice == 1){
+					bargain.isOfficeUrl = '/index/getAdjustmentDetail';//商铺
+				}else{
+					bargain.isOfficeUrl = '/office_index/getAdjustmentDetail';//办公楼
+			}
+			$.get(bargain.isOfficeUrl,{'id' : id},function(data){
 				if(data.code == 200) {
 					that.setValue(data.data);
                 } else {