Merge branch 'test'

application/api_broker/service/PerformanceService.php

@@ -885,10 +885,11 @@ class PerformanceService
         if (!$params)
             return [ "code" => 101, "date" => "传入的参数错误" ];
 
-        $field     = "a.id,a.create_time,a.trade_type,a.scale_fee,a.agent_id,c.internal_address,d.user_phone,d.user_name,b.id as order_id";
+        $field     = "a.id,a.father_id,a.create_time,a.trade_type,a.scale_fee,a.agent_id,c.internal_address,d.user_phone,d.user_name,b.id as order_id";
         $m_bargain = new OBargainModel();
         $list      = $m_bargain->getBargainSumList($field, $params, $page_size, $page_no, $request_source_type);
         foreach ($list as $key => $val) {
+            $list[$key]['bargain_id']    = $val["father_id"] == 0 ? $val["id"] : $val["father_id"];//成交报告ID
             $list[$key]["internal_address"]  = $val["internal_address"] ? $val["internal_address"] : '';
             $list[$key]["user_name"]  = $val["user_name"] ? $val["user_name"] : '';
             $list[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);

application/index/controller/Finance.php

@@ -400,13 +400,14 @@ class Finance extends Basic
 
         if (empty($this->params['id'])) {
             $data['code'] = 101;
-            $data['msg']  = 'Id is null.';
+            $data['msg'] = 'Id is null.';
         } else {
-            $fields        = 'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.is_open,a.order_id,a.report_id,';
-            $fields        .= 'a.trade_type,a.house_number,a.commission,a.content,d.shop_type,a.industry_type,a.price,a.estimated_receipt_date,';
-            $fields        .= 'b.user_id,d.id as house_id';
+            $fields = 'a.id,a.father_id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.is_open,a.order_id,a.report_id,';
+            $fields .= 'a.trade_type,a.house_number,a.commission,a.content,d.shop_type,a.industry_type,a.price,a.estimated_receipt_date,';
+            $fields .= 'b.user_id,d.id as house_id';
             $where['a.id'] = $this->params['id'];
-            $data['data']  = $this->m_bargain->getBargainInfo($fields, $where);
+            $data['data'] = $this->m_bargain->getBargainInfo($fields, $where);
+            $data['data']['bargain_id'] = $data['data']["father_id"] == 0 ? $data['data']["id"] : $data['data']["father_id"];//成交报告ID
         }
 
         return $this->response($data['code'], $data['msg'], $data['data']);
@@ -3536,7 +3537,7 @@ class Finance extends Basic
         $pay_data = [];
         try {
             $m_pay = new OPayLogModel();
-            $pay_fields = 'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,bargain_id,';
+            $pay_fields = 'id,order_id,agent_name,create_time,income_time,house_number,type,real_money,income_time,transfer_name,bargain_id,agent_id,';
             $pay_fields .= 'transaction_fee,is_dividend,receipt_number,source,pay_type,last_transfer_time,money,industry_type,received_money,type_ext';
             $pay_data = $m_pay->selectReceiptImgList($pay_fields, ['id'=>$this->params['pay_id']]);
             $pay_data = $pay_data[0];
@@ -3596,6 +3597,12 @@ class Finance extends Basic
                     $pay_data['current_agent_name'] = empty($current_agent_name[0]['report_agent_name']) ? "" : $current_agent_name[0]['report_agent_name'];
                 }
             }
+
+            $pay_data['site_id'] =  '';
+            if ($pay_data['agent_id']) {
+                $m_agent = new AAgents();
+                $pay_data['site_id'] = $m_agent->getPhoneById($pay_data['agent_id'], 'site_id');
+            }
         } catch (\Exception $e) {
             $msg = '内部错误:'.$e->getMessage();
         }

application/index/view/global/footer_tpl.html

-<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=20190688' charset='utf-8'></script>
+<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=201906882' charset='utf-8'></script>

public/app/dist/index.html

@@ -23,4 +23,4 @@
 				if(!doc.addEventListener) return;
 				win.addEventListener(resizeEvt, recalc, false);
 				doc.addEventListener('DOMContentLoaded', recalc, false);
-			})(document, window);</script><link href=./static/css/app.b47eea8f23ae7d782907c33d77a7e49c.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.d4bc73ef5022e12a38c8.js></script></body></html>
+			})(document, window);</script><link href=./static/css/app.ba9292d575ceadaa57e809a89ee8a0ae.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.228a57f0017ee9fb5146.js></script></body></html>
\ No newline at end of file

public/appnew/src/components/achieveMain/achieveFork.vue

@@ -146,8 +146,8 @@
 				let _this = this;
 				_this.axios({
 					method: 'get',
-					url: '/broker/getSiteListApp',
-//					url: '/broker/getAgentSiteList',
+//					url: '/broker/getSiteListApp',
+					url: '/broker/getAgentSiteList',
 					responseType: 'json',
 					data: {
 						'AuthToken': _this.token,
@@ -159,13 +159,14 @@
 						if(response.data.data){
 							localStorage.setItem('tlAppSiteList',encodeURIComponent(JSON.stringify(response.data.data)));
 							let _tempSiteId = _this.$route.query.siteId;
+//							let _tempSiteId = '10001';//默认上海
 							let _tempAgentId = localStorage.getItem('userid');
 //							console.log(_tempSiteId);
 							if(!_tempSiteId){
 								//如果app里没传siteid，则默认为上海
 								_tempSiteId = '10001';
 							};
-							
+							//注释
 							let _tempArr = response.data.data.filter((v, i) => (v.site_id == _tempSiteId));//找出列表里站点site_id和url里相同的一项
 							if(_tempArr.length === 0){
 								let _tempArr2 = response.data.data.filter((v, i) => (v.id == _tempAgentId));//找出列表里经纪人id和缓存里相同的一项

public/appnew/src/components/achieveMain/achieveRegion.vue

@@ -92,6 +92,7 @@
 					'isBack': true
 				},
 				datasiteid: localStorage.getItem('tlSiteid'),
+//				datasiteid: '10001',
 				token: '',
 				startDate: '',
 				endDate: '',
@@ -154,6 +155,7 @@
 		},
 		created() {
 			let _this = this;
+//			localStorage.setItem('tlSiteid', '10001');
 			_this.common.duringRequest({
 				'urlStr': '/broker/storePerformanceBySearch',
 				startAction() {

public/appnew/src/components/achieveMain/citySelect.vue

@@ -29,8 +29,8 @@
 			changeCity(e) {
 				let _this = this;
 				let _tempValue = JSON.parse(e.target.value);
-//				localStorage.setItem('tlSiteid', _tempValue.site_id);
-				localStorage.setItem('tlSiteid', _tempValue.id);
+				localStorage.setItem('tlSiteid', _tempValue.site_id);
+//				localStorage.setItem('tlSiteid', _tempValue.id);
 				localStorage.setItem('tlYjAgentId', _tempValue.id);//业绩里业务员id会变
 				_this.$emit('changeCity', _tempValue.site_id);
 			}

public/appnew/src/components/publicEg/entrance.vue

@@ -20,7 +20,7 @@
 					'nameCustom': '业绩总入口',
 					'query': {
 						'token': _token,
-						'siteId': '10004'
+						'siteId': '10002'
 					}
 				},
 				{

public/resource/js/getCollection.js

@@ -1331,11 +1331,11 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 		
 		getValueFunction : function(data){
 	    var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
-			if(user_info_obj.site_id == 10001){
+			if(data.site_id == 10001){//根据收款详情的 site_id判断
 				$('.shanghai').show();
 				$('.hangzhou').hide();
 				$('.shenzheng').hide();
-			}else if(user_info_obj.site_id == 10002){
+			}else if(data.site_id == 10002){
 				$('.shanghai').hide();
 				$('.hangzhou').show();
 				$('.shenzheng').hide();

public/resource/template/real_time_performance_template_tpl.html

@@ -302,6 +302,7 @@
     [% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %]
     <tr>
 		<th class="text-center">成交报告ID</th>
+		<th class="text-center">分佣ID</th>
 		<th class="text-center">提交时间</th>
 		<th class="text-center">商铺地址</th>
 		<th class="text-center">成交业务员</th>
@@ -313,6 +314,7 @@
 	</tr>
     [% for(var item in it){ %]
     <tr data-id="[%= it[item]['id'] %]" data-orderid="[%= it[item]['order_id'] %]">
+        <td class="text-center">[%= it[item]['bargain_id'] %]</td>
         <td class="text-center">[%= it[item]['id'] %]</td>
         <td class="text-center">[%= it[item]['create_time'] %]</a></td>
         <td class="text-left">[%= hideStr(it[item]['internal_address']) %]</td>