Skip to content

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

Merge remote-tracking branch 'origin/test' into test

parents 39f56892 a41ed954
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 4 deletions
application/index/controller/OperationData.php
View file @ ad45affa
...@@ -96,6 +96,32 @@ class OperationData extends Basic ...@@ -96,6 +96,32 @@ class OperationData extends Basic
return $this->response(200, 'success', $result); return $this->response(200, 'success', $result);
} }
/**
* 客户来电数
* @return \think\Response
*/
// public function userPhoneNum()
// {
// $params = $this->params;1
// $params_['a.create_time'] = [ 'between', [ $params['create_time_start'] . ' 00:00:00', $params['create_time_end'] . ' 23:59:59' ] ];
// // 先查新所有部门
// $district_list = $this->getDistrict();
//
// foreach ($district_list as $key => $v) {
// $result_["id"] = $v['id'];
// $result_["district_name"] = $v['district_name'];
//
// // 客户来电数
// $params_["b.district_id"] = $v['id'];
// $model = new AUserCallAgent();
// $res = $model->getUserCallAgentCount($params_);
//
// $result_["user_phone_num"] = isset($res) ? $res : 0;
// $result[] = $result_;
// }
// return $this->response(200, 'success', $result);
// }
/** /**
* 客户来电数 * 客户来电数
* @return \think\Response * @return \think\Response
...@@ -119,7 +145,7 @@ class OperationData extends Basic ...@@ -119,7 +145,7 @@ class OperationData extends Basic
$agentModel = new AAgents(); $agentModel = new AAgents();
$res = $agentModel->getUserPhoneNum($field, $params); $res = $agentModel->getUserPhoneNum($field, $params);
$result_["user_phone_num"] = isset($res) ? $res : 0; $result_["call_number_total"] = isset($res[0]['call_number_total']) ? $res[0]['call_number_total'] : 0;
$result[] = $result_; $result[] = $result_;
} }
return $this->response(200, 'success', $result); return $this->response(200, 'success', $result);
......
application/index/view/finance/account_statement.html
View file @ ad45affa
...@@ -62,6 +62,18 @@ ...@@ -62,6 +62,18 @@
#maintable_form_search>span.total-commission{ #maintable_form_search>span.total-commission{
margin-top: 16px; margin-top: 16px;
} }
/*加载图标*/
#main_loading_pic {
position: fixed;
top: 50%;
left: 50%;
width: 100px;
height: 100px;
margin-left: 50px;
margin-top: -100px;
overflow: hidden;
display: none;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -767,4 +779,8 @@ ...@@ -767,4 +779,8 @@
<!-- /.modal-content --> <!-- /.modal-content -->
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div>
<!--加载图标-->
<div id="main_loading_pic">
<img src="/resource/image/jz2.gif">
</div> </div>
\ No newline at end of file
application/index/view/performancesubsidiary/performancesubsidiaryList.html
View file @ ad45affa
...@@ -35,6 +35,18 @@ ...@@ -35,6 +35,18 @@
border-radius: 15px; border-radius: 15px;
} }
/*客户详情 样式*/ /*客户详情 样式*/
/*加载图标*/
#main_loading_pic {
position: fixed;
top: 50%;
left: 50%;
width: 100px;
height: 100px;
margin-left: 50px;
margin-top: -100px;
overflow: hidden;
display: none;
}
</style> </style>
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<div class="container"> <div class="container">
...@@ -688,4 +700,8 @@ ...@@ -688,4 +700,8 @@
<!-- /.modal-content --> <!-- /.modal-content -->
</div> </div>
<!-- /.modal --> <!-- /.modal -->
</div>
<!--加载图标-->
<div id="main_loading_pic">
<img src="/resource/image/jz2.gif">
</div> </div>
\ No newline at end of file
public/resource/js/performance_subsidiary.js
View file @ ad45affa
...@@ -1493,7 +1493,9 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r ...@@ -1493,7 +1493,9 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
url: '/index/performanceInfo', //获取业绩明细列表 url: '/index/performanceInfo', //获取业绩明细列表
data: params, data: params,
dataType: 'json', dataType: 'json',
beforeSend: function() {}, beforeSend: function() {
$('#main_loading_pic').show();
},
success: function(data) { success: function(data) {
if(typeof data === 'object') { if(typeof data === 'object') {
if(data.code == 200) { if(data.code == 200) {
...@@ -1513,7 +1515,9 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r ...@@ -1513,7 +1515,9 @@ define(['doT','text!temp/performance_subsidiary_template_tpl.html', 'text!temp/r
alert('数据错误'); alert('数据错误');
}; };
}, },
complete: function(xhr, textStatus) {
$('#main_loading_pic').hide();
}
}); });
}, },
getDistrict: function(fn) { getDistrict: function(fn) {
......
public/resource/js/reportList.js
View file @ ad45affa
...@@ -1563,7 +1563,9 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -1563,7 +1563,9 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
data: params, data: params,
timeout: 30000, timeout: 30000,
dataType: 'json', dataType: 'json',
beforeSend: function() {}, beforeSend: function() {
$('#main_loading_pic').show();
},
success: function(data) { success: function(data) {
if(typeof data === 'object') { if(typeof data === 'object') {
if(data.code == 200) { if(data.code == 200) {
...@@ -1595,6 +1597,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', ' ...@@ -1595,6 +1597,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
alert('error'); alert('error');
}, },
complete: function(xhr, textStatus) { complete: function(xhr, textStatus) {
$('#main_loading_pic').hide();
if(textStatus === 'timeout') { if(textStatus === 'timeout') {
alert('请求超时'); alert('请求超时');
}; };
......
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