时间轴 成交报告

application/app_broker/view/index/bargaininfo_detail_static_pc.html

@@ -21,10 +21,14 @@
 				<section v-show="mainInit == 0">
 					<div class="sec1-area1 oh">
 						<ul>
-							<li>
-								<div>商铺类型：</div>
+							<li v-if='is_office != 2'>
+								<div>房源类型：</div>
 								<div>{{detailData.shop_type=='1'?'街铺':'商场'}}</div>
 							</li>
+							<li v-if='is_office == 2'>
+								<div>房源类型：</div>
+								<div>{{detailData.type}}</div>
+							</li>
 							<li>
 								<div>商铺地址：</div>
 								<div>{{detailData.internal_address}}<button v-if="otherBtn!='no'" class="btn-pc btn-info-pc btn-show-shop-detail" @click.stop.prevent="showShopDetail">商铺</button></div>

application/index/view/finance/daily_details.html

@@ -1081,7 +1081,7 @@
 						<div class="col-xs-3">
 							<div class="form-group">
 								<strong><span>成交报告ID:</span></strong>
-								<span id="chengjiaobaogaoId">45122</span>
+								<span id="chengjiaobaogaoId"></span>
 							</div>
 						</div>
 						<div class="col-xs-3">
@@ -1101,7 +1101,7 @@
 						<div class="col-xs-6">
 							<div class="form-group">
 								<strong><span class="col-xs-3 ld-Marheight">房源地址:</span></strong>
-								<span id="address" class="col-xs-6 ld-Marheight">上海市南京东路123号</span>
+								<span id="address" class="col-xs-6 ld-Marheight"></span>
 							</div>
 						</div>
 					</div>

application/index/view/office_room/officeEdit.html

@@ -202,7 +202,7 @@
 										</div>
 										<div class="col-xs-4 p-t-10">
 											<label class="">房号: </label>
-											<input type="number" class="form-control input-100-width" id="room_number" placeholder="请输入" data-alert="请输入房号！">&nbsp;&nbsp;
+											<input type="text" class="form-control input-100-width" id="room_number" placeholder="请输入" data-alert="请输入房号！">&nbsp;&nbsp;
 										</div>
 										
 										<div class="col-xs-4 p-t-10">

public/app/js/bargaininfo_detail_static_pc.js

@@ -3,6 +3,9 @@ require(['vue', 'css!style/bargaininfo_detail_static_pc.css', 'jquery0325', 'com
 	var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
 	var order_id = getUrlParam('orderid'); //获取订单id
 	var other_btn = getUrlParam('otherbtn');//是否显示其他按钮，如商铺详情等
+	var isOffice = getUrlParam('type'); //获取办公楼 商铺
+	var isOfficeUrl = ''; //获取办公楼 商铺接口
+	
 	console.log(other_btn);
 	var _doc = $(document);
 	console.log(user_info_obj);
@@ -15,7 +18,8 @@ require(['vue', 'css!style/bargaininfo_detail_static_pc.css', 'jquery0325', 'com
 			otherBtn: other_btn,
 			detailData: {},
 			fenyongData: [],
-			shuifeiData: []
+			shuifeiData: [],
+			is_office:isOffice
 		},
 		created: function() {
 			var _thisV = this;
@@ -47,11 +51,18 @@ require(['vue', 'css!style/bargaininfo_detail_static_pc.css', 'jquery0325', 'com
 				};
 			},
 			getFenyong() {
-				//获取分佣提成
 				let _thisV = this;
+				//获取分佣提成
+				if(isOffice == 2){
+					isOfficeUrl = '/office_index/commissionList';
+					_thisV.otherBtn = 'no';
+				}else{
+					isOfficeUrl = '/index/commissionList';
+				}
+
 				$.ajax({
 					'type': 'GET',
-					'url': '/index/commissionList',
+					'url': isOfficeUrl,
 					data: {
 						'id': order_id
 					},
@@ -103,9 +114,17 @@ require(['vue', 'css!style/bargaininfo_detail_static_pc.css', 'jquery0325', 'com
 			getShuifei() {
 				//获取开票税费
 				let _thisV = this;
+				if(isOffice == 2){
+					isOfficeUrl = '/office_index/getTallAge';
+					_thisV.otherBtn = 'no';
+					
+				}else{
+					isOfficeUrl = '/index/getTallAge';
+				}
+
 				$.ajax({
 					'type': 'GET',
-					'url': '/index/getTallAge',
+					'url': isOfficeUrl,
 					data: {
 						'bargain_id': order_id
 					},
@@ -124,9 +143,17 @@ require(['vue', 'css!style/bargaininfo_detail_static_pc.css', 'jquery0325', 'com
 			getDeatil() {
 				//获取成交信息
 				let _thisV = this;
+				if(isOffice == 2){
+					isOfficeUrl = '/office_index/bargainInfo';
+					_thisV.otherBtn = 'no';
+					
+				}else{
+					isOfficeUrl = '/index/bargainInfo';
+				}
+
 				$.ajax({
 					'type': 'GET',
-					'url': '/index/bargainInfo',
+					'url': isOfficeUrl,
 					data: {
 						'id': order_id
 					},
@@ -163,6 +190,31 @@ require(['vue', 'css!style/bargaininfo_detail_static_pc.css', 'jquery0325', 'com
 						break;
 				}
 			},
+			dealfangyuanType(n) {
+				switch(String(n)) {
+					case '1':
+						return '写字楼';
+						break;
+					case '2':
+						return '商住两用';
+						break;
+					case '3':
+						return '园区';
+						break;
+					case '4':
+						return '洋房';
+						break;
+					case '5':
+						return '联合办公';
+						break;
+					case '6':
+						return '厂房';
+						break;
+					default:
+						return '';
+						break;
+				}
+			},
 			getInfoType(r) {
 				switch(Number(r)) {
 					case 1:

public/app/js/timeline_pc.js

 'use strict';
 require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vue, VConsole){
 	var order_id = getUrlParam('order_id');
+	var isOffice = getUrlParam('type');
+	var urlOffice = '';
+	var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
 	var vm = new Vue({
 		el: '#app',
 		data: {
@@ -9,12 +12,17 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
 		created: function() {
 			var _this = this;
 			document.body.style.display = 'block';
+			if(isOffice == 2){
+				urlOffice ="/office/selectReportAll";
+			}else{
+				urlOffice ="/index/selectReportAll";
+			}
 			$.ajax({
 			    type: 'POST',
-//			    url: ServerHostTempC + '/index/selectReportAll',
-			    url: '/index/selectReportAll',
+			    url: urlOffice,
 			    data: {
-			    	'order_id': order_id
+			    	'order_id': order_id,
+			    	'AuthToken': user_info_obj.AuthToken,
 			    },
 			    timeout: 30000,
 			    dataType: 'json',

public/resource/js/financial_manager_daily_list.js

@@ -528,14 +528,16 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
 			//点击成交报告ID，获取报告详情
 			_doc.on('click', '.details-btn-liu', function() {
 				var _id = $(this).attr("data-id");
-				$('.iframe-bargaininfo-static').attr('src', '/app_broker/bargaininfo_detail_static_pc?orderid='+_id).load;
+				var _type = $(this).attr("data-typeC");
+				$('.iframe-bargaininfo-static').attr('src', '/app_broker/bargaininfo_detail_static_pc?orderid='+_id+'&type='+ _type).load;
 			});
 			//时间轴点击事件
 			_doc.on('click', 'a[href="#modal-time-liu"]', function(e){
 				e.preventDefault();
 				e.stopPropagation();
 				var _id = $(this).attr("data-id");
-				$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+_id);
+				var _type = $(this).attr("data-typeC");
+				$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+_id+'&type='+ _type);
 			});
 			//获取调整详情
 			$(document).on('click','.add-pic-liu',function(e){