Merge branch 'test'

application/index/controller/CellPhone.php

@@ -95,7 +95,7 @@ class CellPhone extends Basic
                 $where['a.id'] = $this->params['id'];
             }
 
-            $list  = $report->getCallList($pageNo, $pageSize, 'id desc', $field, $where);
+            $list  = $report->getCallList($pageNo, $pageSize, '', $field, $where);
             $m_user = new Users();
             $m_phone_follow = new UPhoneFollowUp($this->siteId);
             if($this->params['end_date'] >= date('Y-m-d',time())){

application/index/controller/Finance.php

@@ -2620,6 +2620,8 @@ class Finance extends Basic
                     if ($v['source'] == 2) {
                         $source_id = $m_pay_adjustment->getFieldColumn('id', ['new_paylog_id'=> $v['id'],'is_del'=>0]);
                         $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
+                        $adjustment_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id'],'is_del'=>0]);
+                        $list[$k]['is_adjustment'] = $adjustment_id ? 1 : 0;
                     } else {
                         $source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id'],'is_del'=>0]);
                         $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
@@ -3500,7 +3502,7 @@ class Finance extends Basic
         $where['paylog_id'] = $new_paylog_id;
         $pay_log_id = $m_pay_adjustment->getFieldColumn('paylog_id', $where);
 
-        if (count($pay_log_id) > 1) {
+        if (count($pay_log_id) > 0) {
             return $this->response($code, '存在调整,不能删除.');
         }
 

application/index/controller/PerformanceReport.php

@@ -74,7 +74,7 @@ class PerformanceReport extends Basic
         $order = "RAgentReport.create_time desc";
 
         $res = $this->rAgentReport->getPerformanceReportList($pageNo, $pageSize, $field, $get_params, $order);
-        $res_total  = $this->rAgentReport->getPerformanceReportListTotal($field,$get_params,$order);
+        // $res_total  = $this->rAgentReport->getPerformanceReportListTotal($field,$get_params,$order);
 
         foreach ($res as $key => $val) {
             $url = 'static/week_work_img/' . $val['img_url'];
@@ -82,7 +82,7 @@ class PerformanceReport extends Basic
         }
 
         $data['list'] = $res;
-        $data['total'] = $res_total;
+        $data['total'] = 40000;
         return $this->response("200", "成功",$data);
     }
 

application/index/view/global/footer_tpl.html

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

public/resource/template/callPhone_template_tpl.html

 <script id="callPhone_list_tpl" type="text/template">
+	[% var delName=function(s){ delete s.user_name; delete s.user_nick;return s}; %]
     [% if(it[0]) { %]
         [% for(var item in it){ %]
         <tr class="text-center">
@@ -59,7 +60,7 @@
             <td width="16%">
 			[% if((check_auth('auth_vip') &&  it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || (check_auth('index/useraction_search') && it[item]['vip'] == 0)) { %]
 				
-			<a class="btn1 caozuo genj_ure btn-success" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a><p style="display: none;">[%= JSON.stringify(it[item]) %]</p>&nbsp;
+			<a class="btn1 caozuo genj_ure btn-success" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a><p style="display: none;">[%= JSON.stringify(delName(it[item])) %]</p>&nbsp;
             <!--<a class="btn1 btn-info is_show" data-toggle="modal" data-id='[%= it[item]["id"] %]'>收藏</a>
 			<a class="btn1 btn-success caozuo" href="#modal-record-edit" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["id"] %]'>客户编辑</a>&nbsp;-->
 			

public/resource/template/my_collection_user_template_tpl.html

 <script id="my_collection_user_list_tpl" type="text/template">
+	[% var delName=function(s){ delete s.user_name; delete s.user_nick;return s}; %]
     [% if(it) { %]
     [% for(var item in it){ %]
     <tr>
@@ -12,7 +13,7 @@
         <td>[%= it[item]["area_demand"] %]</td>
            <td width="16%">
            	[% if((check_auth('auth_vip') &&  it[item]['vip']) || (it[item]['agent_id'] == 0) || (it[item]['agent_id'] == it[item]['current_agent_id']) || (check_auth('index/useraction_search') && it[item]['vip'] == 0)) { %]
-			<a class="btn1 caozuo genj_ure btn-success" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a><p style="display: none;">[%= JSON.stringify(it[item]) %]</p>&nbsp;
+			<a class="btn1 caozuo genj_ure btn-success" href="#modal-record" data-toggle="modal" data-phone='[%= it[item]["user_phone"] %]' data-id='[%= it[item]["user_id"] %]' data-agentId='[%= it[item]["agent_id"] %]' data-name='[%= it[item]["user_name"] %]'>详情/跟进</a><p style="display: none;">[%= JSON.stringify(delName(it[item])) %]</p>&nbsp;
             <a class="btn1 btn-default is_show"  data-id='[%= it[item]["user_id"] %]'>取消收藏</a>
             
 			[% if(it[item]['agent_id'] == it[item]['current_agent_id'] || check_auth('index/pcEditClient')) { %]