Skip to content

T
tl_estate
Commit 0cfc0160 authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

parents 444e2eb9 bc5860b9
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 39 deletions
application/app_broker/view/index/customerinfo_details_new.html
View file @ 0cfc0160
......@@ -218,7 +218,7 @@
<script type="text/javascript" src="/app/js/jquery-1122-min.js"></script>
<script src="/app/js/common.js?new42" charset="utf-8"></script>
<script src="/app/js/customerinfo_details_new.js?new73"></script>
<script src="/app/js/customerinfo_details_new.js?new75"></script>
</body>
......
application/index/controller/Broker.php
View file @ 0cfc0160
......@@ -770,7 +770,7 @@ class Broker extends Basic
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$where['status'] = 0;
$where['status'] = ['in', '0,3'];
if (isset($this->params['position']) && $this->params['position'] != -1) {
$where['position'] = $this->params['position'];
} else {
......
application/index/controller/Finance.php
View file @ 0cfc0160
......@@ -23,6 +23,7 @@ use app\model\OFinancialAudit;
use app\model\OPartialCommission;
use app\model\OPayLogModel;
use app\model\ORefundModel;
use app\model\TAgentTotalModel;
use app\task\controller\ResultsSummaryNewTask;
use think\Request;
......@@ -1956,7 +1957,7 @@ class Finance extends Basic
if ($result) {
$code = 200;
$this->editRecordLog($this->params['bargain_id'], '[撤销成交报告]', 3); //日志记录
$this->updatePerformanceAll($this->params['bargain_id']);
$this->updatePerformanceAll($this->params['bargain_id'], 1);
$bargain_data = $this->m_bargain->getBargainDetail('order_id,order_no,agent_id', [ 'id' => $this->params['bargain_id'] ]);
$financial_data['bargain_id'] = $this->params['bargain_id'];
......@@ -2012,20 +2013,43 @@ class Finance extends Basic
* 更新多人业绩
*
* @param int $bargain_id
* @param int $is_select 重新统计经纪人业绩
* @return bool
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
private function updatePerformanceAll(int $bargain_id = 0): bool
private function updatePerformanceAll(int $bargain_id = 0, $is_select = 0): bool
{
$where = [];
$where = $update_data = [];
if ($bargain_id) {
$where['b.id'] = $bargain_id;
}
if (!empty($where)) {
//获取被修改人信息
$m_agent = new AAgents();
$m_agent_total = new TAgentTotalModel();
$agent_data = $m_agent->agentBargainAll('a.id,a.store_id,a.district_id,b.create_time', $where);
foreach ($agent_data as $v) {
foreach ($agent_data as $k=>$v) {
$this->updatePerformanceData($v['id'], $v['create_time'], $v['store_id'],$v['district_id']);
if ($is_select) {
$create_time = date('Y-m-d', strtotime($v['create_time']));
$where_bargain['agent_id'] = $v['id'];
$where_bargain['create_time'] = ['BETWEEN', [$create_time.' 00:00:00', $create_time.' 23:59:59']];
$bargainSum = $this->m_bargain->getAddBargainNumGroupTimeNew($where_bargain, 1);
$id = $m_agent_total->getTotalEndTimeByAgentId('id', ['total_time'=>$where_bargain['create_time'], 'agent_id'=>$where_bargain['agent_id']]);
if (!empty($id)) {
$update_data[$k]["performance"] = !empty($bargainSum[0]["num"]) ? $bargainSum[0]["num"] : 0;
$update_data[$k]['id'] = $id[0]['id'];
}
if (count($update_data) > 0) {
$m_agent_total->saveTotal($update_data);
}
}
}
}
return true;
......
application/index/view/marchin/marchin_list.html
View file @ 0cfc0160
......@@ -85,9 +85,9 @@
<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>
<th class="text-center">操作</th>
</tr>
</thead>
......@@ -132,12 +132,12 @@
<td>{0}</td>
<td>{1}</td>
<td>{2}</td>
<td>{3}</td>
<td>{4}</td>
<td>
<img src='{5}' class="diagram-image J_preview"
data-bimg='{5}'>
</td>
<td>{4}</td>
<td>{3}</td>
<td>{6}</td>
</tr>
</script>
......
application/index/view/performance_ranking/performance_ranking.html
View file @ 0cfc0160
{layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="performance_ranking" />
<style>
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
html{
font-size:640%;
}
......@@ -145,6 +147,25 @@
.table {
margin-bottom : 0rem !important;
}
.table-scro::-webkit-scrollbar-track
{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
background-color: #ccc;
}/* 滚动条的滑轨背景颜色 */
.table-scro::-webkit-scrollbar
{
width: 3px;
background-color: #ccc;
}
.table-scro::-webkit-scrollbar-thumb
{
background-color: #D3D8EF;
}/* 滑块颜色 */
</style>
<div class="backer"></div>
<div id="page-content-wrapper">
......@@ -262,7 +283,7 @@
<span class="title-time" id="table-time"></span>
</div>
<div style="height:6.97rem;;overflow-y:scroll">
<div class="table-scro" style="height:6.97rem;;overflow-y:scroll">
<table class="table table-striped" data-toggle="table" data-height="460" style="max-width:500px;">
<thead>
<tr>
......
public/app/js/customerinfo_details_new.js
View file @ 0cfc0160
......@@ -174,7 +174,19 @@ function loadMain(){
}else{}
};
}else{
$('.call-btn-main').show();
//如果不是vip，则按照以前的逻辑走
if(data['data']['is_outstrip_twenty_four_hours']==0){
//在保护期内
$('#baohuqi_span').show();
if(data['data']['user_info']['agent_id'] == _userId){
//客方与当前用户一致时
//或者is_can_look为0时，总监，总监是客方的总监
$('.call-btn-main').show();
}else{}
}else{
//超过保护期
$('.call-btn-main').show();
}
}
$('#call_modal_phone_self').val(_userPhone);
......
public/resource/js/performance_ranking.js
View file @ 0cfc0160
......@@ -287,35 +287,43 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
data: params,
dataType: 'json',
success: function(data) {
$('#tbody').empty();
that.loadTable(data.data.list,data.data.grade);
var grade = data.data.grade ;
var index = data.data.grade ;
var indexTimes = 0 ;
if (grade < 27){
index = data.data.grade
if (data.code == 200 ){
$('#tbody').empty();
that.loadTable(data.data.list,data.data.grade);
var grade = data.data.grade ;
var index = data.data.grade ;
var indexTimes = 0 ;
if (grade < 27){
index = data.data.grade
} else {
index = data.data.grade%26;
indexTimes = parseInt(data.data.grade/26)
}
var str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
var value = str[index]+""+(indexTimes > 0 ? indexTimes+"" : "");
var name = data.data.position;
var text = "";
if (name == 0 ){
text = "新人职称" + value + "档"
} else if (name == 1 ){
text = "店长职称" + value + "档"
} else if (name == 2 ){
text = "经理职称" + value + "档"
} else if (name == 3 ){
text = "主任职称" + value + "档"
} else if (name == 4 ){
text = "顾问职称" + value + "档"
} else if (name == 5 ){
text = "无职称职称" + value + "档"
}
$('#table-title').text(text);
} else {
index = data.data.grade%26;
indexTimes = parseInt(data.data.grade/26)
$('#table-title').text('职称排行');
var tableDat = '<tr><td colspan="4" >您还没有职称</td></tr>';
tableDat += "<tr></tr>"
$('#tbody').append(tableDat);
$('#overlay').fadeOut('')
}
var str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
var value = str[index]+""+(indexTimes > 0 ? indexTimes+"" : "");
var name = data.data.position;
var text = "";
if (name == 0 ){
text = "新人职称" + value + "档"
} else if (name == 1 ){
text = "店长职称" + value + "档"
} else if (name == 2 ){
text = "经理职称" + value + "档"
} else if (name == 3 ){
text = "主任职称" + value + "档"
} else if (name == 4 ){
text = "顾问职称" + value + "档"
} else if (name == 5 ){
text = "无职称职称" + value + "档"
}
$('#table-title').text(text);
},
error : function(data){
$('#table-title').text('职称排行');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment