Merge branch '0618-v3.3.2' of https://gitee.com/zwyjjc/tl_estate into 0618-v3.3.2

application/api_broker/service/OfficePerformanceService.php

@@ -104,7 +104,7 @@ class OfficePerformanceService
         $params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time);
         if (!$params)
             return [ "code" => 101, "date" => "传入的参数错误" ];
-        $field           = "a.id,a.user_name,a.user_phone,a.predict_see_time,a.create_time,a.report_agent_name,c.internal_title as house_title,c.shop_type,e.store_name,b.id as order_id";
+        $field           = "a.id,a.user_name,a.user_phone,a.predict_see_time,a.create_time,a.report_agent_name,d.title as house_title,d.type,e.store_name,b.id as order_id";
         $reportList      = $this->reportModel->getAddReportListPcInfo($params, $field, $page_no, $page_size);
         $reportListTotal = $this->reportModel->getAddReportListPcInfoTotal($params, $field);
         foreach ($reportList as $key => $val) {

application/app_broker/view/index/bargaininfo_detail_static_pc_office.html

@@ -21,17 +21,19 @@
 				<section v-show="mainInit == 0">
 					<div class="sec1-area1 oh">
 						<ul>
-							<li v-if='is_office != 2'>
-								<div>房源类型：</div>
-								<div>{{detailData.shop_type=='1'?'街铺':'商场'}}</div>
+							<li>
+								<!--<div>房源类型：</div>
+								<div>{{detailData.shop_type=='1'?'街铺':'商场'}}</div>-->
 							</li>
-							<li v-if='is_office == 2'>
+							<!--<li v-if='is_office == 2'>
 								<div>房源类型：</div>
 								<div>{{detailData.type}}</div>
-							</li>
+							</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>
+								<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>
 							</li>
 							<li>
 								<div>业态：</div>
@@ -55,7 +57,7 @@
 								
 							</li>
 							<li>
-								<div>商铺号：</div>
+								<div>楼盘号：</div>
 								<div>{{detailData.house_number}}</div>
 							</li>
 							<li>
@@ -64,7 +66,9 @@
 							</li>
 							<li>
 								<div>客户电话：</div>
-								<div>{{hidePhone(detailData.user_phone)}}<button v-if="otherBtn!='no'" class="btn-pc btn-info-pc btn-show-customer-detail" @click.stop.prevent="showCustomerDetail">客户</button></div>
+								<div>{{hidePhone(detailData.user_phone)}}
+									<button v-if="otherBtn!='no'" class="btn-pc btn-info-pc btn-show-customer-detail" @click.stop.prevent="showCustomerDetail">客户</button>
+								</div>
 							</li>
 							<li>
 								<div>成交日期：</div>

application/index/service/OfficeRoomService.php

@@ -499,20 +499,34 @@ class OfficeRoomService
 
                     $date = date('Y-m-d');
                     foreach ($agent_id_arr as $v3) {
-                        $agent_data = $this->agent->verifyUser('id,store_id,district_id,name', '', ['id' => $v3]); //新增人信息
+                        $agent_data = $this->agent->getAgentInfo('id,store_id,district_id,name', $v3); //新增人信息
                         $sum->updateTotalByAgentId($agent_data['id'], $agent_data['store_id'], $agent_data['district_id'], $date, $site_id);
                     }
 
                     foreach ($del_agent_id as $v4) {
-                        $agent_data = $this->agent->verifyUser('id,store_id,district_id,name', '', ['id' => $v4]); //被删除人信息
+                        $agent_data = $this->agent->getAgentInfo('id,store_id,district_id,name', $v4); //新增人信息
                         $sum->updateTotalByAgentId($agent_data['id'], $agent_data['store_id'], $agent_data['district_id'], $date, $site_id);
                     }
                 }
-
                 if (!empty($remark)) {
                     $records->record($operation_id, 1, $remark, $house_id);
                 }
             }
+
+            if ($type == 3) {
+                $remark = '';
+                if ($del_agent_name) {
+                    $remark .= '删除独家方:' . implode(',', $del_agent_name) . ',';
+                }
+
+                if ($agent_id_arr) {
+                    $agent_name = $this->agent->getAgentsByWhereColumn(['id' => ['in', $agent_id_arr]], 'name');
+                    $remark     .= '新增独家方:' . implode(',', $agent_name);
+                }
+                if (!empty($remark)) {
+                    $records->record($operation_id, 2, $remark, $house_id);
+                }
+            }
             $result['status'] = 'successful';
         } catch (\Exception $e) {
             $result['status'] = 'fail';
@@ -1660,11 +1674,15 @@ class OfficeRoomService
             }
         }
 
-        if (strtotime($room_data['agent_start_time']) != strtotime($data['agent_start_time'])) {
+        if (empty($room_data['agent_start_time'])) {
+            $remark[] = '新增独家开始时间('.$data['agent_start_time'].')';
+        } elseif (strtotime($room_data['agent_start_time']) != strtotime($data['agent_start_time'])) {
             $remark[] = '独家开始时间由('.$room_data['agent_start_time'].')改为('.$data['agent_start_time'].')';
         }
 
-        if (strtotime($room_data['agent_end_time']) != strtotime($data['agent_end_time'])) {
+        if (empty($room_data['agent_end_time'])) {
+            $remark[] = '新增独家结束时间('.$data['agent_end_time'].')';
+        } elseif (strtotime($room_data['agent_end_time']) != strtotime($data['agent_end_time'])) {
             $remark[] = '独家结束时间由('.$room_data['agent_end_time'].')改为('.$data['agent_end_time'].')';
         }
 

application/route.php

@@ -270,6 +270,7 @@ Route::group('index', [
     'getTallAgeList'                     => ['index/Finance/getTallAgeList', ['method' => 'GET']], //税费承担明细表
     'getCommissionTotalList'             => ['index/Finance/getCommissionTotalList', ['method' => 'GET']], //分佣提成汇总表
     'getCollection'                      => ['index/Finance/getCollection', ['method' => 'post|get']],//收款记录
+    'getCollectionDaily'                 => ['index/Finance/getCollection', ['method' => 'post|get']],//收款记录(财务日报用)
     'getCollectionExcel'                 => ['index/Finance/getCollectionExcel', ['method' => 'post|get']],//收款记录
     'addRealMoney'                       => ['index/Finance/addRealMoney', ['method' => 'post|get']],//新增实收
     'visitShop'                          => ['index/Supervise/visitShop', ['method' => 'get']],//门店拜访

public/app/js/bargaininfo_detail_static_pc.js

@@ -53,12 +53,6 @@ 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',
@@ -114,17 +108,10 @@ 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': isOfficeUrl,
+					'url': '/index/getTallAge',
 					data: {
 						'bargain_id': order_id
 					},
@@ -143,17 +130,9 @@ 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': isOfficeUrl,
+					'url': '/index/bargainInfo',
 					data: {
 						'id': order_id
 					},

public/app/js/bargaininfo_detail_static_pc_office.js

@@ -53,13 +53,6 @@ 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': '/office_index/commissionList',
@@ -114,14 +107,6 @@ 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': isOfficeUrl,
@@ -143,17 +128,9 @@ 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': isOfficeUrl,
+					'url': '/office_index/bargainInfo',
 					data: {
 						'id': order_id
 					},

public/resource/js/waitBackoutOffice.js

@@ -83,7 +83,7 @@ define(['doT', 'text!temp/wait_backout_office_template_tpl.html', 'text!temp/rep
 				var _id = $(this).closest('tr').attr("data-id");
 				bargain.bargain_id = _id;
 				bargain.father_id = $(this).closest('tr').attr("data-fatherid");
-				$('.iframe-bargaininfo-static').attr('src', '/app_broker/bargaininfo_detail_static_pc?otherbtn=no&orderid='+_id).load;
+				$('.iframe-bargaininfo-static').attr('src', '/app_broker/bargaininfo_detail_static_pc_office?otherbtn=no&orderid='+_id).load;
 			});